diff --git a/src/App.vue b/src/App.vue index c2d2aca..c7fe546 100644 --- a/src/App.vue +++ b/src/App.vue @@ -161,17 +161,19 @@ export default { } else if (appInfo == "sh") { // 诗画环境 const userRole = uni.getStorageSync("userRole") - switch (userRole) { - case "merchant": - return uni.switchTab({ url: "/pages/tabbar/individualOrder" }) - case "user": - if (getLaunchParam() === "selfMerchant") return uni.switchTab({ url: "/pages/tabbar/selfMerchant" }) - if (getLaunchParam() === "coopMerchant") return uni.reLaunch({ url: "/pages/tabbar/coopMerchant" }) - return - case "doorAdmin": - return uni.switchTab({ url: "/pages/tabbar/cabinet" }) - default: - return uni.redirectTo({ url: "/pages/user/userRole" }) + if (getLaunchParam()) { + switch (userRole) { + case "merchant": + return uni.switchTab({ url: "/pages/tabbar/individualOrder" }) + case "user": + if (getLaunchParam() === "selfMerchant") return uni.switchTab({ url: "/pages/tabbar/selfMerchant" }) + if (getLaunchParam() === "coopMerchant") return uni.reLaunch({ url: "/pages/tabbar/coopMerchant" }) + return + case "doorAdmin": + return uni.switchTab({ url: "/pages/tabbar/cabinet" }) + default: + return uni.redirectTo({ url: "/pages/user/userRole" }) + } } } }, @@ -197,7 +199,7 @@ export default { uni.showTabBar() } else { uni.hideTabBar() - uni.showToast({ title: "启动参数不合法", icon: "none" }) + // uni.showToast({ title: "启动参数不合法", icon: "none" }) } } else if (appInfo == "sh") { // 是诗画环境 @@ -225,7 +227,7 @@ export default { } } else { uni.hideTabBar() - uni.showToast({ title: "启动参数不合法", icon: "none" }) + // uni.showToast({ title: "启动参数不合法", icon: "none" }) } } }, diff --git a/src/pages/tabbar/my.vue b/src/pages/tabbar/my.vue index 874eaf6..4cabee2 100644 --- a/src/pages/tabbar/my.vue +++ b/src/pages/tabbar/my.vue @@ -293,8 +293,8 @@ const scanCode = { // const testQrCode = "eyJpZCI6IjE4OTYxNTcyMDc2NDQwNTM1MDYiLCJuYW1lIjoi5rWL6K+V5ZWG5oi3In0=" // 线上-测试超市-收款二维码 // const testQrCode = "eyJpZCI6IjE5MDU4MTY3NTEwNDM0NTI5MzAiLCJuYW1lIjoi5paw5Y6/5bqc6LaF5biCIn0=" // 邓本地-测试环境-新县府超市收款二维码 // const testQrCode = "eyJoYXJkRG9vcklkIjoiMTkxNDI0MjgzMDkyOTk4OTYzNCIsImNhYmluZXRObyI6IjEifQ==" // 测试智能柜柜门二维码 - // const testQrCode = "http://192.168.101.45:8889/h5/#/pages/pay/scanPay?id=1905816751043452930&name=测试新县府超市" // 邓本地-测试环境-新县府超市收款二维码 - const testQrCode = "http://192.168.101.45:8889/h5/#/pages/pay/scanPay?hardDoorId=1914242830929989634&cabinetNo=1" // 测试智能柜柜门二维码 + const testQrCode = "http://192.168.101.45:8889/h5/#/pages/pay/scanPay?id=1905816751043452930&name=测试新县府超市" // 邓本地-测试环境-新县府超市收款二维码 + // const testQrCode = "http://192.168.101.45:8889/h5/#/pages/pay/scanPay?hardDoorId=1914242830929989634&cabinetNo=1" // 测试智能柜柜门二维码 uni.showModal({ content: "开发环境不是浙政钉和诗画环境,扫码仅供测试,收款商家为测试商户超市" }) return testQrCode diff --git a/src/sheep/utils/request.ts b/src/sheep/utils/request.ts index 0f6704e..1d32324 100644 --- a/src/sheep/utils/request.ts +++ b/src/sheep/utils/request.ts @@ -302,13 +302,13 @@ http.interceptors.response.use( } // 显示错误信息 - if (error?.data?.msg) { - uni.showToast({ - title: error.data.msg, - icon: "none", - mask: true, - }) - } + // if (error?.data?.msg) { + // uni.showToast({ + // title: error.data.msg, + // icon: "none", + // mask: true, + // }) + // } return Promise.resolve(error.data) }, )