diff --git a/src/App.vue b/src/App.vue index e7179f0..6fea0de 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,5 +1,5 @@ + + diff --git a/src/pages/tabbar/my.vue b/src/pages/tabbar/my.vue index 8513ae5..11ea354 100644 --- a/src/pages/tabbar/my.vue +++ b/src/pages/tabbar/my.vue @@ -84,7 +84,6 @@ const state = reactive<{ menuList: [ { text: "扫一扫", icon: "/static/icon/scan.png", router: "" }, { text: "钱包管理", icon: "/static/icon/service_3.png", router: "/pages/wallet/list" }, - // { text: "包厢预定", icon: "/static/icon/service_4.png", router: "/pages/boxes/apply-list" }, { text: "人脸管理", icon: "/static/icon/service_5.png", router: "/pages/human-face/list" }, { text: "清除缓存", icon: "/static/icon/clear-storage.png", router: "" }, ], @@ -136,7 +135,6 @@ const storage = { success: (res) => { if (res.confirm) { uni.clearStorageSync() - uni.removeStorageSync("userRole") state.userInfo = {} uni.reLaunch({ url: "/pages/tabbar/my" }) } @@ -372,9 +370,10 @@ const scanCode = { const onTabLogin = () => (isDevEnv() ? router.jump("/pages/user/login") : login.checkAppInfo()) -const onTabMenu = async (item: any, index: number) => { +const onTabMenu = async (item: any) => { const isLogin = await hooks.useCheckLogin() if (isLogin) { + if (item.router == "/pages/tabbar/index") return uni.reLaunch({ url: item.router }) switch (item.text) { case "扫一扫": await scanCode.scan() @@ -401,28 +400,16 @@ const doChangeRole = () => { // 初始化配置菜单 const initMenuConfig = () => { if (isDevEnv()) { - state.menuList.push({ text: "dev-外来人员就餐", icon: "/static/icon/service_1.png", router: "/pages/apply/foreign-list" }) - state.menuList.push({ text: "dev-跨单位就餐", icon: "/static/icon/service_1.png", router: "/pages/apply/stride-list" }) - state.menuList.push({ - text: "测试-第三方应用", - icon: "/static/icon/login.png", - router: "/pages/thirdApp/thirdAppList", - }) - state.menuList.push({ - text: "测试-登录", - icon: "/static/icon/login.png", - router: "/pages/user/login", - }) - state.menuList.push({ - text: "测试-角色选择", - icon: "/static/icon/login.png", - router: "/pages/user/userRole", - }) - state.menuList.push({ - text: "测试-意见反馈", - icon: "/static/icon/service_5.png", - router: "/pages/integrated/feedback", - }) + state.menuList.push( + { text: "dev-✨导航✨", icon: "/static/icon/service_1.png", router: "/pages/tabbar/index" }, + { text: "dev-外来人员就餐", icon: "/static/icon/service_1.png", router: "/pages/apply/foreign-list" }, + { text: "dev-跨单位就餐", icon: "/static/icon/service_1.png", router: "/pages/apply/stride-list" }, + { text: "dev-包厢预定", icon: "/static/icon/service_4.png", router: "/pages/boxes/apply-list" }, + { text: "dev-第三方应用", icon: "/static/icon/login.png", router: "/pages/thirdApp/thirdAppList" }, + { text: "dev-登录", icon: "/static/icon/login.png", router: "/pages/user/login" }, + { text: "dev-角色选择", icon: "/static/icon/login.png", router: "/pages/user/userRole" }, + { text: "dev-意见反馈", icon: "/static/icon/service_5.png", router: "/pages/integrated/feedback/index" }, + ) } } diff --git a/src/pages/tabbar/order.vue b/src/pages/tabbar/order.vue index 15fb160..4566815 100644 --- a/src/pages/tabbar/order.vue +++ b/src/pages/tabbar/order.vue @@ -123,7 +123,7 @@ const doRefund = (v: any) => { - {{ v.productDesc }} + {{ v.productDesc?.replaceAll(";", "\;\n") }} ¥ {{ hooks.useMoney(v.totalPrice) }} diff --git a/src/pages/thirdApp/thirdAppList.vue b/src/pages/thirdApp/thirdAppList.vue index 2bb7434..d1488a7 100644 --- a/src/pages/thirdApp/thirdAppList.vue +++ b/src/pages/thirdApp/thirdAppList.vue @@ -62,7 +62,7 @@