diff --git a/src/App.vue b/src/App.vue index 98f2e9a..a1fc523 100644 --- a/src/App.vue +++ b/src/App.vue @@ -121,7 +121,7 @@ const tabbar: TabbarItem[] = [ text: "我的", iconPath: "/static/tabbar/my.png", selectedIconPath: "/static/tabbar/my-select.png", - launchParam: ["canteen", "selfMerchant", "onlineShop", "coopMerchant", "invitation"], + launchParam: ["canteen", "selfMerchant", "onlineShop", "coopMerchant"], auth: ["user", "merchant", "doorAdmin"], }, ] diff --git a/src/pages.json b/src/pages.json index 69fd36f..0579678 100644 --- a/src/pages.json +++ b/src/pages.json @@ -429,9 +429,9 @@ "root": "pages/thirdApp", "pages": [ { - "path": "thirdAppList", + "path": "happyMall", "style": { - "navigationBarTitleText": "第三方应用" + "navigationBarTitleText": "美好商城" } } ] diff --git a/src/pages/tabbar/index.vue b/src/pages/tabbar/index.vue index 7fe358c..5bcf43f 100644 --- a/src/pages/tabbar/index.vue +++ b/src/pages/tabbar/index.vue @@ -99,7 +99,7 @@ const jumpByParam = async () => { const userRole = uni.getStorageSync("userRole") // 获取用户角色 if (!launchParam) return uni.hideTabBar() - if (launchParam == "thirdApp") return uni.reLaunch({ url: "/pages/thirdApp/thirdAppList" }) + if (launchParam == "thirdApp") return uni.reLaunch({ url: "/pages/thirdApp/happyMall" }) switch (userRole) { case "merchant": diff --git a/src/pages/tabbar/my.vue b/src/pages/tabbar/my.vue index f1dece8..d713fe9 100644 --- a/src/pages/tabbar/my.vue +++ b/src/pages/tabbar/my.vue @@ -405,7 +405,7 @@ const initMenuConfig = () => { { 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/thirdApp/happyMall" }, { 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/thirdApp/thirdAppList.vue b/src/pages/thirdApp/happyMall.vue similarity index 54% rename from src/pages/thirdApp/thirdAppList.vue rename to src/pages/thirdApp/happyMall.vue index d1488a7..e86392a 100644 --- a/src/pages/thirdApp/thirdAppList.vue +++ b/src/pages/thirdApp/happyMall.vue @@ -1,6 +1,6 @@