diff --git a/src/App.vue b/src/App.vue index a1fc523..32db043 100644 --- a/src/App.vue +++ b/src/App.vue @@ -85,35 +85,11 @@ const tabbar: TabbarItem[] = [ auth: ["merchant"], }, { - pagePath: "pages/tabbar/invitation", - text: "访客邀约", - iconPath: "/static/tabbar/invitation.png", - selectedIconPath: "/static/tabbar/invitation-select.png", - launchParam: ["invitation"], - auth: [], - }, - { - pagePath: "pages/tabbar/invitationRecord", - text: "邀约记录", - iconPath: "/static/tabbar/order.png", - selectedIconPath: "/static/tabbar/order-select.png", - launchParam: ["invitation"], - auth: [], - }, - { - pagePath: "pages/tabbar/message", - text: "通知公告", - iconPath: "/static/tabbar/message.png", - selectedIconPath: "/static/tabbar/message-select.png", - launchParam: ["message"], - auth: [], - }, - { - pagePath: "pages/integrated/index", + pagePath: "pages/tabbar/integrated", text: "综合服务", iconPath: "/static/tabbar/integrated.png", selectedIconPath: "/static/tabbar/integrated-select.png", - launchParam: [], + launchParam: ["integrated"], auth: [], }, { @@ -121,7 +97,7 @@ const tabbar: TabbarItem[] = [ text: "我的", iconPath: "/static/tabbar/my.png", selectedIconPath: "/static/tabbar/my-select.png", - launchParam: ["canteen", "selfMerchant", "onlineShop", "coopMerchant"], + launchParam: ["canteen", "selfMerchant", "onlineShop", "coopMerchant", "integrated"], auth: ["user", "merchant", "doorAdmin"], }, ] diff --git a/src/pages.json b/src/pages.json index 0579678..97de4b1 100644 --- a/src/pages.json +++ b/src/pages.json @@ -73,23 +73,9 @@ } }, { - "path": "pages/tabbar/invitation", + "path": "pages/tabbar/integrated", "style": { - "navigationBarTitleText": "访客", - "disableScroll": true - } - }, - { - "path": "pages/tabbar/invitationRecord", - "style": { - "navigationBarTitleText": "访客记录", - "disableScroll": true - } - }, - { - "path": "pages/tabbar/message", - "style": { - "navigationBarTitleText": "通知公告", + "navigationBarTitleText": "综合服务", "disableScroll": true } }, @@ -414,17 +400,6 @@ } ] }, - { - "root": "pages/invitation", - "pages": [ - { - "path": "detail", - "style": { - "navigationBarTitleText": "访客详情" - } - } - ] - }, { "root": "pages/thirdApp", "pages": [ @@ -439,12 +414,6 @@ { "root": "pages/integrated", "pages": [ - { - "path": "index", - "style": { - "navigationBarTitleText": "综合服务" - } - }, { "path": "lostAndFound/index", "style": { @@ -494,15 +463,21 @@ } }, { - "path": "visitor/index", + "path": "visitor/invitation", "style": { - "navigationBarTitleText": "访客管理" + "navigationBarTitleText": "访客邀约" + } + }, + { + "path": "visitor/invitationRecord", + "style": { + "navigationBarTitleText": "邀约记录" } }, { "path": "visitor/detail", "style": { - "navigationBarTitleText": "访客详情" + "navigationBarTitleText": "邀约详情" } }, { @@ -596,25 +571,7 @@ "selectedIconPath": "" }, { - "pagePath": "pages/tabbar/invitation", - "text": "", - "iconPath": "", - "selectedIconPath": "" - }, - { - "pagePath": "pages/tabbar/invitationRecord", - "text": "", - "iconPath": "", - "selectedIconPath": "" - }, - { - "pagePath": "pages/tabbar/message", - "text": "", - "iconPath": "", - "selectedIconPath": "" - }, - { - "pagePath": "pages/integrated/index", + "pagePath": "pages/tabbar/integrated", "text": "", "iconPath": "", "selectedIconPath": "" diff --git a/src/pages/integrated/index.vue b/src/pages/integrated/index.vue deleted file mode 100644 index d70b890..0000000 --- a/src/pages/integrated/index.vue +++ /dev/null @@ -1,139 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/pages/integrated/visitor/detail.vue b/src/pages/integrated/visitor/detail.vue index 57368aa..6516294 100644 --- a/src/pages/integrated/visitor/detail.vue +++ b/src/pages/integrated/visitor/detail.vue @@ -1,236 +1,105 @@ - - \ No newline at end of file diff --git a/src/pages/integrated/visitor/index.vue b/src/pages/integrated/visitor/index.vue deleted file mode 100644 index e2fd1fe..0000000 --- a/src/pages/integrated/visitor/index.vue +++ /dev/null @@ -1,438 +0,0 @@ -