diff --git a/src/App.vue b/src/App.vue index 6fea0de..3eba186 100644 --- a/src/App.vue +++ b/src/App.vue @@ -85,11 +85,19 @@ const tabbar: TabbarItem[] = [ auth: ["merchant"], }, { - pagePath: "pages/tabbar/visitor", - text: "访客", - iconPath: "/static/tabbar/visitor.png", - selectedIconPath: "/static/tabbar/visitor-select.png", - launchParam: [], + 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/invitation.png", + selectedIconPath: "/static/tabbar/invitation-select.png", + launchParam: ["invitation"], auth: [], }, { @@ -113,7 +121,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", "invitation"], auth: ["user", "merchant", "doorAdmin"], }, ] diff --git a/src/pages.json b/src/pages.json index 231e57c..69fd36f 100644 --- a/src/pages.json +++ b/src/pages.json @@ -73,12 +73,19 @@ } }, { - "path": "pages/tabbar/visitor", + "path": "pages/tabbar/invitation", "style": { "navigationBarTitleText": "访客", "disableScroll": true } }, + { + "path": "pages/tabbar/invitationRecord", + "style": { + "navigationBarTitleText": "访客记录", + "disableScroll": true + } + }, { "path": "pages/tabbar/message", "style": { @@ -408,30 +415,12 @@ ] }, { - "root": "pages/visitor", + "root": "pages/invitation", "pages": [ { - "path": "apply", + "path": "detail", "style": { - "navigationBarTitleText": "访客申请" - } - }, - { - "path": "applyRecord", - "style": { - "navigationBarTitleText": "申请记录" - } - }, - { - "path": "invitation", - "style": { - "navigationBarTitleText": "访客邀约" - } - }, - { - "path": "invitationRecord", - "style": { - "navigationBarTitleText": "邀约记录" + "navigationBarTitleText": "访客详情" } } ] @@ -607,7 +596,13 @@ "selectedIconPath": "" }, { - "pagePath": "pages/tabbar/visitor", + "pagePath": "pages/tabbar/invitation", + "text": "", + "iconPath": "", + "selectedIconPath": "" + }, + { + "pagePath": "pages/tabbar/invitationRecord", "text": "", "iconPath": "", "selectedIconPath": "" diff --git a/src/pages/visitor/applyRecord.vue b/src/pages/invitation/applyRecord.vue similarity index 100% rename from src/pages/visitor/applyRecord.vue rename to src/pages/invitation/applyRecord.vue diff --git a/src/pages/invitation/detail.vue b/src/pages/invitation/detail.vue new file mode 100644 index 0000000..a79b335 --- /dev/null +++ b/src/pages/invitation/detail.vue @@ -0,0 +1,3 @@ + + + diff --git a/src/pages/visitor/invitation.vue b/src/pages/invitation/invitation.vue similarity index 100% rename from src/pages/visitor/invitation.vue rename to src/pages/invitation/invitation.vue diff --git a/src/pages/visitor/invitationRecord.vue b/src/pages/invitation/invitationRecord.vue similarity index 100% rename from src/pages/visitor/invitationRecord.vue rename to src/pages/invitation/invitationRecord.vue diff --git a/src/pages/tabbar/index.vue b/src/pages/tabbar/index.vue index 9acf52f..7fe358c 100644 --- a/src/pages/tabbar/index.vue +++ b/src/pages/tabbar/index.vue @@ -40,10 +40,10 @@ const moduleList = [ launchParam: "flowStatistics", }, { - pagePath: "/pages/tabbar/visitor", + pagePath: "/pages/tabbar/invitation", text: "访客", - iconPath: "/static/tabbar/visitor-select.png", - launchParam: "visitor", + iconPath: "/static/tabbar/invitation-select.png", + launchParam: "invitation", }, { pagePath: "/pages/tabbar/message", diff --git a/src/pages/tabbar/invitation.vue b/src/pages/tabbar/invitation.vue new file mode 100644 index 0000000..7eaf64d --- /dev/null +++ b/src/pages/tabbar/invitation.vue @@ -0,0 +1,141 @@ + + + diff --git a/src/pages/tabbar/invitationRecord.vue b/src/pages/tabbar/invitationRecord.vue new file mode 100644 index 0000000..a79b335 --- /dev/null +++ b/src/pages/tabbar/invitationRecord.vue @@ -0,0 +1,3 @@ + + + diff --git a/src/pages/tabbar/visitor.vue b/src/pages/tabbar/visitor.vue deleted file mode 100644 index d5420ac..0000000 --- a/src/pages/tabbar/visitor.vue +++ /dev/null @@ -1,49 +0,0 @@ - - - diff --git a/src/pages/visitor/apply.vue b/src/pages/visitor/apply.vue deleted file mode 100644 index 6502863..0000000 --- a/src/pages/visitor/apply.vue +++ /dev/null @@ -1,174 +0,0 @@ - - - diff --git a/src/sheep/api/index.ts b/src/sheep/api/index.ts index b48d4ad..a661577 100644 --- a/src/sheep/api/index.ts +++ b/src/sheep/api/index.ts @@ -35,3 +35,5 @@ export { default as individualOrderApi } from "./individualOrder" export { default as hardApi } from "./hard" export { default as noticeApi } from "./notice" + +export { default as invitationApi } from "./invitation" diff --git a/src/sheep/api/invitation.ts b/src/sheep/api/invitation.ts new file mode 100644 index 0000000..bced8fd --- /dev/null +++ b/src/sheep/api/invitation.ts @@ -0,0 +1,17 @@ +import request from "@/sheep/utils/request" + +export default { + // 获取拜访原因字典 + getDictListByType: (type: number | string): Promise => + request({ + url: `/integrated/app/visitor/getDictListByType?type=${type}`, + method: "GET", + }), +} + +// const updateCheckStatus = () => { +// request({ +// url: `/integrated/visitors/app/updateCheckStatus?id=1950037876011745282&checkStatus=2`, +// method: "GET", +// }) +// } diff --git a/src/static/tabbar/visitor-select.png b/src/static/tabbar/invitation-select.png similarity index 100% rename from src/static/tabbar/visitor-select.png rename to src/static/tabbar/invitation-select.png diff --git a/src/static/tabbar/visitor.png b/src/static/tabbar/invitation.png similarity index 100% rename from src/static/tabbar/visitor.png rename to src/static/tabbar/invitation.png diff --git a/src/uni_modules/tm-ui/components/tm-switch/tm-switch.vue b/src/uni_modules/tm-ui/components/tm-switch/tm-switch.vue index c051d85..b253646 100644 --- a/src/uni_modules/tm-ui/components/tm-switch/tm-switch.vue +++ b/src/uni_modules/tm-ui/components/tm-switch/tm-switch.vue @@ -1,8 +1,17 @@ \ No newline at end of file +