From 85a9436961b7ae2860dac129bfe67b2686919806 Mon Sep 17 00:00:00 2001 From: weiwei Date: Fri, 18 Apr 2025 15:11:15 +0800 Subject: [PATCH 1/3] 1 --- .env | 2 - src/App.vue | 128 +- src/pages.json | 279 ++-- src/pages/integrated/visitor/index.vue | 1185 ----------------- src/pages/integrated/visitor/myvisitor.vue | 490 ------- src/pages/integrated/visitor/myyyvisitor.vue | 672 ---------- .../integrated/visitor/myyyvisitorlist.vue | 545 -------- src/pages/integrated/visitor/verify.vue | 226 ---- .../integrated/visitor/visitorDetail.vue | 486 ------- src/pages/tabbar/my.vue | 13 +- src/sheep/api/integrated/dept.ts | 26 - src/sheep/api/integrated/visitors.ts | 140 -- 12 files changed, 162 insertions(+), 4030 deletions(-) delete mode 100644 src/pages/integrated/visitor/index.vue delete mode 100644 src/pages/integrated/visitor/myvisitor.vue delete mode 100644 src/pages/integrated/visitor/myyyvisitor.vue delete mode 100644 src/pages/integrated/visitor/myyyvisitorlist.vue delete mode 100644 src/pages/integrated/visitor/verify.vue delete mode 100644 src/pages/integrated/visitor/visitorDetail.vue delete mode 100644 src/sheep/api/integrated/dept.ts delete mode 100644 src/sheep/api/integrated/visitors.ts diff --git a/.env b/.env index b5aefca..e1dcaf4 100644 --- a/.env +++ b/.env @@ -34,7 +34,5 @@ VITE_APP_PROD_SERVICE = https://stgl.pj.gov.cn/api # 域名线上 #VITE_APP_PROD_SERVICE = http://59.202.170.152:81/api # 信创线上 #VITE_APP_PROD_SERVICE = http://123.156.228.134:48080/app-api -# VITE_APP_PROD_SERVICE = http://60.12.184.86:8089/api - # --------------------------- 生产环境 图片访问基础地址 --------------------------- VITE_APP_PROD_IMAGE = https://stgl.pj.gov.cn/api # 域名线上 diff --git a/src/App.vue b/src/App.vue index 4bb8a17..266cc6c 100644 --- a/src/App.vue +++ b/src/App.vue @@ -17,86 +17,54 @@ interface TabbarItem { } const tabbar: TabbarItem[] = [ - // { - // pagePath: "pages/tabbar/canteen", - // text: "食堂", - // iconPath: "/static/tabbar/canteen.png", - // selectedIconPath: "/static/tabbar/canteen-select.png", - // launchParam: ["canteen"], - // auth: [], - // }, - // { - // pagePath: "pages/tabbar/selfMerchant", - // text: "自营商家", - // iconPath: "/static/tabbar/selfMerchant.png", - // selectedIconPath: "/static/tabbar/selfMerchant-select.png", - // launchParam: ["selfMerchant"], - // auth: [], - // }, - // { - // pagePath: "pages/tabbar/coopMerchant", - // text: "合作商家", - // iconPath: "/static/tabbar/coopMerchant.png", - // selectedIconPath: "/static/tabbar/coopMerchant-select.png", - // launchParam: ["selfMerchant"], - // auth: ["user"], - // }, - // { - // pagePath: "pages/tabbar/order", - // text: "订单", - // iconPath: "/static/tabbar/order.png", - // selectedIconPath: "/static/tabbar/order-select.png", - // launchParam: ["canteen", "selfMerchant"], - // auth: ["user"], - // }, - // { - // pagePath: "pages/tabbar/flowStatistics", - // text: "流水统计", - // iconPath: "/static/tabbar/order.png", - // selectedIconPath: "/static/tabbar/order-select.png", - // launchParam: [], - // auth: ["merchant"], - // }, - // { - // pagePath: "pages/tabbar/individualOrder", - // text: "订单", - // iconPath: "/static/tabbar/order.png", - // selectedIconPath: "/static/tabbar/order-select.png", - // launchParam: [], - // auth: ["merchant"], - // }, - { - pagePath: "pages/integrated/visitor/index", - text: "访客申请", - iconPath: "/static/tabbar/my.png", - selectedIconPath: "/static/tabbar/my-select.png", - launchParam: ["canteen", "selfMerchant"], - auth: ["user",], - }, - { - pagePath: "pages/integrated/visitor/myvisitor", - text: "申请记录", - iconPath: "/static/tabbar/my.png", - selectedIconPath: "/static/tabbar/my-select.png", - launchParam: ["canteen", "selfMerchant"], - auth: ["user",], - }, - { - pagePath: "pages/integrated/visitor/myyyvisitor", - text: "主动邀约", - iconPath: "/static/tabbar/my.png", - selectedIconPath: "/static/tabbar/my-select.png", - launchParam: ["canteen", "selfMerchant"], - auth: ["user",], - }, - { - pagePath: "pages/integrated/visitor/myyyvisitorlist", - text: "邀约记录", - iconPath: "/static/tabbar/my.png", - selectedIconPath: "/static/tabbar/my-select.png", - launchParam: ["canteen", "selfMerchant"], - auth: ["user",], - }, + { + pagePath: "pages/tabbar/canteen", + text: "食堂", + iconPath: "/static/tabbar/canteen.png", + selectedIconPath: "/static/tabbar/canteen-select.png", + launchParam: ["canteen"], + auth: [], + }, + { + pagePath: "pages/tabbar/selfMerchant", + text: "自营商家", + iconPath: "/static/tabbar/selfMerchant.png", + selectedIconPath: "/static/tabbar/selfMerchant-select.png", + launchParam: ["selfMerchant"], + auth: [], + }, + { + pagePath: "pages/tabbar/coopMerchant", + text: "合作商家", + iconPath: "/static/tabbar/coopMerchant.png", + selectedIconPath: "/static/tabbar/coopMerchant-select.png", + launchParam: ["selfMerchant"], + auth: ["user"], + }, + { + pagePath: "pages/tabbar/order", + text: "订单", + iconPath: "/static/tabbar/order.png", + selectedIconPath: "/static/tabbar/order-select.png", + launchParam: ["canteen", "selfMerchant"], + auth: ["user"], + }, + { + pagePath: "pages/tabbar/flowStatistics", + text: "流水统计", + iconPath: "/static/tabbar/order.png", + selectedIconPath: "/static/tabbar/order-select.png", + launchParam: [], + auth: ["merchant"], + }, + { + pagePath: "pages/tabbar/individualOrder", + text: "订单", + iconPath: "/static/tabbar/order.png", + selectedIconPath: "/static/tabbar/order-select.png", + launchParam: [], + auth: ["merchant"], + }, { pagePath: "pages/tabbar/my", text: "我的", diff --git a/src/pages.json b/src/pages.json index a359573..00c753c 100644 --- a/src/pages.json +++ b/src/pages.json @@ -9,67 +9,54 @@ } }, "pages": [ - // { - // "path": "pages/tabbar/canteen", - // "style": { - // "navigationBarTitleText": "食堂", - // "disableScroll": true - // } - // }, - // { - // "path": "pages/tabbar/selfMerchant", - // "style": { - // "navigationBarTitleText": "自营商家", - // "disableScroll": true - // } - // }, - // { - // "path": "pages/tabbar/coopMerchant", - // "style": { - // "navigationBarTitleText": "合作商家", - // "disableScroll": true - // } - // }, - // { - // "path": "pages/tabbar/order", - // "style": { - // "navigationBarTitleText": "订单", - // "disableScroll": true - // } - // }, - // { - // "path": "pages/tabbar/flowStatistics", - // "style": { - // "navigationBarTitleText": "流水统计", - // "disableScroll": true - // } - // }, - // { - // "path": "pages/tabbar/individualOrder", - // "style": { - // "navigationBarTitleText": "订单", - // "disableScroll": true - // } - // }, - // { - // "path": "pages/integrated/visitor/myvisitor", - // "style": { - // "navigationBarTitleText": "访客", - // "disableScroll": true - // } - // }, + { + "path": "pages/tabbar/canteen", + "style": { + "navigationBarTitleText": "食堂", + "disableScroll": true + } + }, + { + "path": "pages/tabbar/selfMerchant", + "style": { + "navigationBarTitleText": "自营商家", + "disableScroll": true + } + }, + { + "path": "pages/tabbar/coopMerchant", + "style": { + "navigationBarTitleText": "合作商家", + "disableScroll": true + } + }, + { + "path": "pages/tabbar/order", + "style": { + "navigationBarTitleText": "订单", + "disableScroll": true + } + }, + { + "path": "pages/tabbar/flowStatistics", + "style": { + "navigationBarTitleText": "流水统计", + "disableScroll": true + } + }, + { + "path": "pages/tabbar/individualOrder", + "style": { + "navigationBarTitleText": "订单", + "disableScroll": true + } + }, { "path": "pages/tabbar/my", "style": { "navigationBarTitleText": "我的", "disableScroll": true } - }, - { - "path": "pages/integrated/visitor/verify", - "style": { - "navigationStyle": "custom" - } } ], "subPackages": [ @@ -332,6 +319,46 @@ } ] }, + { + "root": "pages/cabinet", + "pages": [ + { + "path": "buy", + "style": { + "navigationBarTitleText": "选择支付方式", + "disableScroll": true + } + }, + { + "path": "cabinetList", + "style": { + "navigationBarTitleText": "智能柜列表", + "disableScroll": true + } + }, + { + "path": "cabinetDetail", + "style": { + "navigationBarTitleText": "智能柜详情", + "disableScroll": true + } + }, + { + "path": "replenishment", + "style": { + "navigationBarTitleText": "商品补货", + "disableScroll": true + } + }, + { + "path": "putaway", + "style": { + "navigationBarTitleText": "商品上架", + "disableScroll": true + } + } + ] + }, { "root": "pages/integrated", "pages": [ @@ -342,62 +369,6 @@ } } ] - }, - { - "root": "pages/integrated", - "pages": [ - { - "path": "visitor/index", - "style": { - "navigationBarTitleText": "访客" - } - } - ] - }, - { - "root": "pages/integrated", - "pages": [ - { - "path": "visitor/myvisitor", - "style": { - "navigationBarTitleText": "访客记录" - } - } - ] - }, - { - "root": "pages/integrated", - "pages": [ - { - "path": "visitor/myyyvisitor", - "style": { - "navigationBarTitleText": "邀约访客" - } - } - ] - }, - { - "root": "pages/integrated", - "pages": [ - { - "path": "visitor/myyyvisitorlist", - "style": { - "navigationBarTitleText": "邀约记录" - } - } - ] - }, - { - "root": "pages/integrated", - "pages": [ - { - "path": "visitor/visitorDetail", - "style": { - "navigationStyle": "custom", - "navigationBarTitleText": "记录详情" - } - } - ] } ], "globalStyle": { @@ -410,77 +381,47 @@ "tabBar": { "list": [ { - "pagePath": "pages/integrated/visitor/index", - "text": "访客申请", + "pagePath": "pages/tabbar/canteen", + "text": "", "iconPath": "", "selectedIconPath": "" }, { - "pagePath": "pages/integrated/visitor/myvisitor", - "text": "申请记录", + "pagePath": "pages/tabbar/selfMerchant", + "text": "", "iconPath": "", "selectedIconPath": "" }, { - "pagePath": "pages/integrated/visitor/myyyvisitor", - "text": "访客邀约", + "pagePath": "pages/tabbar/coopMerchant", + "text": "", "iconPath": "", "selectedIconPath": "" }, { - "pagePath": "pages/integrated/visitor/myyyvisitorlist", - "text": "邀约记录", + "pagePath": "pages/tabbar/order", + "text": "", "iconPath": "", "selectedIconPath": "" }, { - "pagePath": "pages/integrated/visitor/verify", - "text": "核销", + "pagePath": "pages/tabbar/flowStatistics", + "text": "", "iconPath": "", "selectedIconPath": "" }, - // { - // "pagePath": "pages/tabbar/canteen", - // "text": "", - // "iconPath": "", - // "selectedIconPath": "" - // }, - // { - // "pagePath": "pages/tabbar/selfMerchant", - // "text": "", - // "iconPath": "", - // "selectedIconPath": "" - // }, - // { - // "pagePath": "pages/tabbar/coopMerchant", - // "text": "", - // "iconPath": "", - // "selectedIconPath": "" - // }, - // { - // "pagePath": "pages/tabbar/order", - // "text": "", - // "iconPath": "", - // "selectedIconPath": "" - // }, - // { - // "pagePath": "pages/tabbar/flowStatistics", - // "text": "", - // "iconPath": "", - // "selectedIconPath": "" - // }, - // { - // "pagePath": "pages/tabbar/individualOrder", - // "text": "", - // "iconPath": "", - // "selectedIconPath": "" - // }, - // { - // "pagePath": "pages/tabbar/my", - // "text": "", - // "iconPath": "", - // "selectedIconPath": "" - // } + { + "pagePath": "pages/tabbar/individualOrder", + "text": "", + "iconPath": "", + "selectedIconPath": "" + }, + { + "pagePath": "pages/tabbar/my", + "text": "", + "iconPath": "", + "selectedIconPath": "" + } // { // "pagePath": "pages/tabbar/canteen", // "text": "食堂", @@ -517,12 +458,12 @@ // "iconPath": "static/tabbar/order.png", // "selectedIconPath": "static/tabbar/order-select.png" // }, - { - "pagePath": "pages/tabbar/my", - "text": "我的", - "iconPath": "static/tabbar/my.png", - "selectedIconPath": "static/tabbar/my-select.png" - } + // { + // "pagePath": "pages/tabbar/my", + // "text": "我的", + // "iconPath": "static/tabbar/my.png", + // "selectedIconPath": "static/tabbar/my-select.png" + // }, ] } } diff --git a/src/pages/integrated/visitor/index.vue b/src/pages/integrated/visitor/index.vue deleted file mode 100644 index faa999c..0000000 --- a/src/pages/integrated/visitor/index.vue +++ /dev/null @@ -1,1185 +0,0 @@ - - - - - diff --git a/src/pages/integrated/visitor/myvisitor.vue b/src/pages/integrated/visitor/myvisitor.vue deleted file mode 100644 index 3d1ac70..0000000 --- a/src/pages/integrated/visitor/myvisitor.vue +++ /dev/null @@ -1,490 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/pages/integrated/visitor/myyyvisitor.vue b/src/pages/integrated/visitor/myyyvisitor.vue deleted file mode 100644 index 001ff1f..0000000 --- a/src/pages/integrated/visitor/myyyvisitor.vue +++ /dev/null @@ -1,672 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/pages/integrated/visitor/myyyvisitorlist.vue b/src/pages/integrated/visitor/myyyvisitorlist.vue deleted file mode 100644 index bb4b466..0000000 --- a/src/pages/integrated/visitor/myyyvisitorlist.vue +++ /dev/null @@ -1,545 +0,0 @@ - - - - - diff --git a/src/pages/integrated/visitor/verify.vue b/src/pages/integrated/visitor/verify.vue deleted file mode 100644 index 0b795e8..0000000 --- a/src/pages/integrated/visitor/verify.vue +++ /dev/null @@ -1,226 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/pages/integrated/visitor/visitorDetail.vue b/src/pages/integrated/visitor/visitorDetail.vue deleted file mode 100644 index 4b16131..0000000 --- a/src/pages/integrated/visitor/visitorDetail.vue +++ /dev/null @@ -1,486 +0,0 @@ - - - - - diff --git a/src/pages/tabbar/my.vue b/src/pages/tabbar/my.vue index 19c3fc8..26e68f1 100644 --- a/src/pages/tabbar/my.vue +++ b/src/pages/tabbar/my.vue @@ -70,19 +70,14 @@ const state = reactive<{ wallet: [], userInfo: {}, menuList: [ - // { text: "扫一扫", icon: "/static/icon/scan.png", router: "" }, - // { text: "钱包管理", icon: "/static/icon/service_3.png", router: "/pages/wallet/list" }, + { 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_1.png", router: "/pages/apply/foreign-list" }, // { text: "跨单位就餐", icon: "/static/icon/service_1.png", router: "/pages/apply/stride-list" }, { text: "人脸管理", icon: "/static/icon/service_5.png", router: "/pages/human-face/list" }, - // { text: "访客", icon: "/static/icon/service_5.png", router: "/pages/integrated/visitor/index" }, - // { text: "访客记录", icon: "/static/icon/service_5.png", router: "/pages/integrated/visitor/myvisitor" }, - // { text: "访客邀约", icon: "/static/icon/service_5.png", router: "/pages/integrated/visitor/myyyvisitor" }, - // { text: "邀约记录", icon: "/static/icon/service_5.png", router: "/pages/integrated/visitor/myyyvisitorlist" }, - // { text: "访客核销", icon: "/static/icon/service_5.png", router: "/pages/integrated/visitor/verify" }, - - // { text: "意见反馈", icon: "/static/icon/service_5.png", router: "/pages/integrated/feedback/index" } + { text: "智能柜列表", icon: "/static/icon/service_5.png", router: "/pages/cabinet/cabinetList" }, + // { text: "意见反馈", icon: "/static/icon/service_5.png", router: "/pages/integrated/feedback/index" }, ], appInfo: "", }) diff --git a/src/sheep/api/integrated/dept.ts b/src/sheep/api/integrated/dept.ts deleted file mode 100644 index d8ea5f2..0000000 --- a/src/sheep/api/integrated/dept.ts +++ /dev/null @@ -1,26 +0,0 @@ -import request from '@/sheep/utils/request' - -const deptApi = { - // 获取部门树形数据 - getSimpleTree: () => - request({ - url: "/admin/dept/simpleTree", - method: "GET", - custom: { - showLoading: false, - }, - }), - - // 获取部门下的用户列表 - getUserList: (deptId: string) => - request({ - url: "/admin/user/getUserIdListByDeptId", - method: "GET", - params: { deptId }, - custom: { - showLoading: false, - }, - }), -} - -export default deptApi diff --git a/src/sheep/api/integrated/visitors.ts b/src/sheep/api/integrated/visitors.ts deleted file mode 100644 index 9bd7720..0000000 --- a/src/sheep/api/integrated/visitors.ts +++ /dev/null @@ -1,140 +0,0 @@ -import request from '@/sheep/utils/request' - -const visitorApi = { - // 保存访客信息 - save: (data: any) => - request({ - url: "/integrated/visitors/app/save", - method: "POST", - data, - custom: { - showLoading: false, - }, - }), - - // 获取部门树形数据 - getSimpleTree: () => - request({ - url: "/admin/dept/simpleTree", - method: "GET", - custom: { - showLoading: false, - }, - }), - - // 获取访客记录列表 - getVisitorList: (params: { - current: number; - size: number; - checkStatus?: string; - }) => - request({ - url: "/integrated/visitors/app/sq/page", - method: "GET", - params, - custom: { - showLoading: false, - }, - }), - - // 取消访客预约 - cancelVisitor: (id: string) => - request({ - url: "/integrated/visitors/app/cancelVisitor", - method: "GET", - params: { id }, - custom: { - showLoading: false, - }, - }), - - // 获取拜访原因字典 - getDictListByType: (type: number) => - request({ - url: '/integrated/visitors/app/getDictListByType', - method: 'GET', - params: { type }, - custom: { - showLoading: false, - }, - }), - - // 保存访客邀约 - saveYY: (data: any) => - request({ - url: "/integrated/visitors/app/saveYY", - method: "POST", - data, - custom: { - showLoading: false, - }, - }), - - // 获取邀约记录列表 - getVisitorYYList: (params: { - current: number; - size: number; - checkStatus?: string; - }) => - request({ - url: "/integrated/visitors/app/yy/page", - method: "GET", - params, - custom: { - showLoading: false, - }, - }), - - // 接受访客邀约 - acceptVisitor: (id: string) => - request({ - url: "/integrated/visitors/app/acceptYY", - method: "GET", - params: { id }, - custom: { - showLoading: false, - }, - }), - - // 拒绝访客邀约 - rejectVisitor: (id: string) => - request({ - url: "/integrated/visitors/app/rejectYY", - method: "GET", - params: { id }, - custom: { - showLoading: false, - }, - }), - - // 更新访客邀约状态 - updateCheckStatus: (params: { id: string; checkStatus: string }) => - request({ - url: "/integrated/visitors/app/updateCheckStatus", - method: "GET", - params, - custom: { - showLoading: false, - }, - }), - - // 获取访客详情 - getVisitorDetail: (params: { token: string }) => { - return request({ - url: '/integrated/visitors/app/get/visitorDetail', - method: 'GET', - params - }) - }, - - // 访客核销 - verifyVisitor: (params: { token: string }) => { - return request({ - url: '/integrated/visitors/app/verify', - method: 'POST', - data: params - }) - } -} - -export default visitorApi From 317606b59d84ec27638854fbfe0b05762d653dfd Mon Sep 17 00:00:00 2001 From: weiwei Date: Fri, 18 Apr 2025 15:35:31 +0800 Subject: [PATCH 2/3] 1 --- src/pages/tabbar/order.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/tabbar/order.vue b/src/pages/tabbar/order.vue index fa9fe90..79a08f9 100644 --- a/src/pages/tabbar/order.vue +++ b/src/pages/tabbar/order.vue @@ -62,7 +62,7 @@ const query = (page: number, pagesize: number) => { // 查看订单和核销码 const doToDetail = (v: any) => { - router.jump("/pages/order/detail", { id: v.id }) + // router.jump("/pages/order/detail", { id: v.id }) } const doAppraise = () => {} From e33a7efd61f11b2b81c67e9148b152ee9ca7d127 Mon Sep 17 00:00:00 2001 From: weiwei Date: Fri, 18 Apr 2025 15:35:53 +0800 Subject: [PATCH 3/3] 1 --- src/pages/tabbar/my.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/tabbar/my.vue b/src/pages/tabbar/my.vue index 26e68f1..2b779b4 100644 --- a/src/pages/tabbar/my.vue +++ b/src/pages/tabbar/my.vue @@ -76,7 +76,7 @@ const state = reactive<{ // { text: "外来人员就餐", icon: "/static/icon/service_1.png", router: "/pages/apply/foreign-list" }, // { text: "跨单位就餐", icon: "/static/icon/service_1.png", router: "/pages/apply/stride-list" }, { text: "人脸管理", icon: "/static/icon/service_5.png", router: "/pages/human-face/list" }, - { text: "智能柜列表", icon: "/static/icon/service_5.png", router: "/pages/cabinet/cabinetList" }, + // { text: "智能柜列表", icon: "/static/icon/service_5.png", router: "/pages/cabinet/cabinetList" }, // { text: "意见反馈", icon: "/static/icon/service_5.png", router: "/pages/integrated/feedback/index" }, ], appInfo: "",