diff --git a/src/App.vue b/src/App.vue
index 01059e3..55e3905 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -16,54 +16,86 @@ 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/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/my",
text: "我的",
diff --git a/src/pages.json b/src/pages.json
index 1724bc9..5c1ec3d 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -1,451 +1,480 @@
-{
- "easycom": {
- "autoscan": true,
- "custom": {
- "^base-(.*)": "@/sheep/components/base/base-$1/base-$1.vue",
- "^crud-(.*)": "@/sheep/components/crud/crud-$1/crud-$1.vue",
- "^tm-(.*)": "@/uni_modules/tm-ui/components/tm-$1/tm-$1.vue",
- "^(?!z-paging-refresh|z-paging-load-more)z-paging(.*)": "z-paging/components/z-paging$1/z-paging$1.vue"
- }
- },
- "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/tabbar/my",
- "style": {
- "navigationBarTitleText": "我的",
- "disableScroll": true
- }
- }
- ],
- "subPackages": [
- {
- "root": "pages/shop",
- "pages": [
- {
- "path": "detail",
- "style": {
- "navigationBarTitleText": "",
- "disableScroll": true
- }
- },
- {
- "path": "brandDetail",
- "style": {
- "navigationBarTitleText": "",
- "disableScroll": true
- }
- },
- {
- "path": "product-detail",
- "style": {
- "navigationBarTitleText": "",
- "disableScroll": true
- }
- }
- ]
- },
- {
- "root": "pages/apply",
- "pages": [
- {
- "path": "foreign-apply",
- "style": {
- "navigationBarTitleText": "",
- "disableScroll": true
- }
- },
- {
- "path": "foreign-list",
- "style": {
- "navigationBarTitleText": "",
- "disableScroll": true
- }
- },
- {
- "path": "foreign-items",
- "style": {
- "navigationBarTitleText": "",
- "disableScroll": true
- }
- },
- {
- "path": "stride-apply",
- "style": {
- "navigationBarTitleText": "",
- "disableScroll": true
- }
- },
- {
- "path": "stride-list",
- "style": {
- "navigationBarTitleText": "",
- "disableScroll": true
- }
- },
- {
- "path": "stride-items",
- "style": {
- "navigationBarTitleText": "",
- "disableScroll": true
- }
- }
- ]
- },
- {
- "root": "pages/boxes",
- "pages": [
- {
- "path": "apply",
- "style": {
- "navigationBarTitleText": "",
- "disableScroll": true
- }
- },
- {
- "path": "detail",
- "style": {
- "navigationBarTitleText": "",
- "disableScroll": true
- }
- },
- {
- "path": "list",
- "style": {
- "navigationBarTitleText": "",
- "disableScroll": true
- }
- },
- {
- "path": "apply-list",
- "style": {
- "navigationBarTitleText": "",
- "disableScroll": true
- }
- }
- ]
- },
- {
- "root": "pages/merchant",
- "pages": [
- {
- "path": "detail",
- "style": {
- "navigationBarTitleText": "",
- "disableScroll": true
- }
- },
- {
- "path": "food",
- "style": {
- "navigationBarTitleText": "菜谱",
- "navigationBarBackgroundColor": "#1777FF",
- "disableScroll": true
- }
- },
- {
- "path": "product-detail",
- "style": {
- "navigationBarTitleText": "",
- "disableScroll": true
- }
- }
- ]
- },
- {
- "root": "pages/order",
- "pages": [
- {
- "path": "detail",
- "style": {
- "navigationBarTitleText": "",
- "disableScroll": true
- }
- }
- ]
- },
- {
- "root": "pages/refund",
- "pages": [
- {
- "path": "apply",
- "style": {
- "navigationBarTitleText": "",
- "disableScroll": true
- }
- },
- {
- "path": "history",
- "style": {
- "navigationBarTitleText": "",
- "disableScroll": true
- }
- }
- ]
- },
- {
- "root": "pages/test",
- "pages": [
- {
- "path": "login",
- "style": {
- "navigationBarTitleText": "",
- "disableScroll": true
- }
- }
- ]
- },
- {
- "root": "pages/wallet",
- "pages": [
- {
- "path": "list",
- "style": {
- "navigationBarTitleText": "",
- "disableScroll": true
- }
- },
- {
- "path": "detail",
- "style": {
- "navigationBarTitleText": "",
- "disableScroll": true
- }
- },
- {
- "path": "recharge",
- "style": {
- "navigationBarTitleText": "",
- "disableScroll": true
- }
- }
- ]
- },
- {
- "root": "pages/human-face",
- "pages": [
- {
- "path": "list",
- "style": {
- "navigationBarTitleText": "",
- "disableScroll": true
- }
- },
- {
- "path": "apply",
- "style": {
- "navigationBarTitleText": "",
- "disableScroll": true
- }
- }
- ]
- },
- {
- "root": "pages/user",
- "pages": [
- {
- "path": "userRole",
- "style": {
- "navigationBarTitleText": "用户身份",
- "disableScroll": true
- }
- }
- ]
- },
- {
- "root": "pages/pay",
- "pages": [
- {
- "path": "scanPay",
- "style": {
- "navigationBarTitleText": "支付",
- "disableScroll": true
- }
- },
- {
- "path": "payComplete",
- "style": {
- "navigationBarTitleText": "支付完成",
- "disableScroll": true
- }
- },
- {
- "path": "transferMoney",
- "style": {
- "navigationBarTitleText": "转账",
- "disableScroll": true
- }
- }
- ]
- },
- {
- "root": "pages/integrated",
- "pages": [
- {
- "path": "feedback/index",
- "style": {
- "navigationBarTitleText": "意见反馈"
- }
- }
- ]
- },
- {
- "root": "pages/integrated",
- "pages": [
- {
- "path": "visitor/index",
- "style": {
- "navigationBarTitleText": "访客"
- }
- }
- ]
- },
- {
- "root": "pages/integrated",
- "pages": [
- {
- "path": "visitor/myvisitor",
- "style": {
- "navigationBarTitleText": "访客记录"
- }
- }
- ]
- }
- ],
- "globalStyle": {
- "navigationBarTextStyle": "black",
- "navigationBarTitleText": "浦江小程序",
- "navigationBarBackgroundColor": "#1777FF",
- "backgroundColor": "#ecf4f9",
- "navigationStyle": "custom"
- },
- "tabBar": {
- "list": [
- {
- "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/canteen",
- // "text": "食堂",
- // "iconPath": "static/tabbar/canteen.png",
- // "selectedIconPath": "static/tabbar/canteen-select.png"
- // },
- // {
- // "pagePath": "pages/tabbar/selfMerchant",
- // "text": "自营商家",
- // "iconPath": "static/tabbar/selfMerchant.png",
- // "selectedIconPath": "static/tabbar/selfMerchant-select.png"
- // },
- // {
- // pagePath: "pages/tabbar/coopMerchant",
- // text: "合作商家",
- // iconPath: "static/tabbar/coopMerchant.png",
- // selectedIconPath: "static/tabbar/coopMerchant-select.png",
- // },
- // {
- // "pagePath": "pages/tabbar/order",
- // "text": "订单",
- // "iconPath": "static/tabbar/order.png",
- // "selectedIconPath": "static/tabbar/order-select.png"
- // },
- // {
- // "pagePath": "pages/tabbar/flowStatistics",
- // "text": "流水统计",
- // "iconPath": "static/tabbar/order.png",
- // "selectedIconPath": "static/tabbar/order-select.png"
- // },
- // {
- // "pagePath": "pages/tabbar/individualOrder",
- // "text": "订单",
- // "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"
- // },
- ]
- }
-}
+{
+ "easycom": {
+ "autoscan": true,
+ "custom": {
+ "^base-(.*)": "@/sheep/components/base/base-$1/base-$1.vue",
+ "^crud-(.*)": "@/sheep/components/crud/crud-$1/crud-$1.vue",
+ "^tm-(.*)": "@/uni_modules/tm-ui/components/tm-$1/tm-$1.vue",
+ "^(?!z-paging-refresh|z-paging-load-more)z-paging(.*)": "z-paging/components/z-paging$1/z-paging$1.vue"
+ }
+ },
+ "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/my",
+ "style": {
+ "navigationBarTitleText": "我的",
+ "disableScroll": true
+ }
+ }
+ ],
+ "subPackages": [
+ {
+ "root": "pages/shop",
+ "pages": [
+ {
+ "path": "detail",
+ "style": {
+ "navigationBarTitleText": "",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "brandDetail",
+ "style": {
+ "navigationBarTitleText": "",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "product-detail",
+ "style": {
+ "navigationBarTitleText": "",
+ "disableScroll": true
+ }
+ }
+ ]
+ },
+ {
+ "root": "pages/apply",
+ "pages": [
+ {
+ "path": "foreign-apply",
+ "style": {
+ "navigationBarTitleText": "",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "foreign-list",
+ "style": {
+ "navigationBarTitleText": "",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "foreign-items",
+ "style": {
+ "navigationBarTitleText": "",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "stride-apply",
+ "style": {
+ "navigationBarTitleText": "",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "stride-list",
+ "style": {
+ "navigationBarTitleText": "",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "stride-items",
+ "style": {
+ "navigationBarTitleText": "",
+ "disableScroll": true
+ }
+ }
+ ]
+ },
+ {
+ "root": "pages/boxes",
+ "pages": [
+ {
+ "path": "apply",
+ "style": {
+ "navigationBarTitleText": "",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "detail",
+ "style": {
+ "navigationBarTitleText": "",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "list",
+ "style": {
+ "navigationBarTitleText": "",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "apply-list",
+ "style": {
+ "navigationBarTitleText": "",
+ "disableScroll": true
+ }
+ }
+ ]
+ },
+ {
+ "root": "pages/merchant",
+ "pages": [
+ {
+ "path": "detail",
+ "style": {
+ "navigationBarTitleText": "",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "food",
+ "style": {
+ "navigationBarTitleText": "菜谱",
+ "navigationBarBackgroundColor": "#1777FF",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "product-detail",
+ "style": {
+ "navigationBarTitleText": "",
+ "disableScroll": true
+ }
+ }
+ ]
+ },
+ {
+ "root": "pages/order",
+ "pages": [
+ {
+ "path": "detail",
+ "style": {
+ "navigationBarTitleText": "",
+ "disableScroll": true
+ }
+ }
+ ]
+ },
+ {
+ "root": "pages/refund",
+ "pages": [
+ {
+ "path": "apply",
+ "style": {
+ "navigationBarTitleText": "",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "history",
+ "style": {
+ "navigationBarTitleText": "",
+ "disableScroll": true
+ }
+ }
+ ]
+ },
+ {
+ "root": "pages/test",
+ "pages": [
+ {
+ "path": "login",
+ "style": {
+ "navigationBarTitleText": "",
+ "disableScroll": true
+ }
+ }
+ ]
+ },
+ {
+ "root": "pages/wallet",
+ "pages": [
+ {
+ "path": "list",
+ "style": {
+ "navigationBarTitleText": "",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "detail",
+ "style": {
+ "navigationBarTitleText": "",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "recharge",
+ "style": {
+ "navigationBarTitleText": "",
+ "disableScroll": true
+ }
+ }
+ ]
+ },
+ {
+ "root": "pages/human-face",
+ "pages": [
+ {
+ "path": "list",
+ "style": {
+ "navigationBarTitleText": "",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "apply",
+ "style": {
+ "navigationBarTitleText": "",
+ "disableScroll": true
+ }
+ }
+ ]
+ },
+ {
+ "root": "pages/user",
+ "pages": [
+ {
+ "path": "userRole",
+ "style": {
+ "navigationBarTitleText": "用户身份",
+ "disableScroll": true
+ }
+ }
+ ]
+ },
+ {
+ "root": "pages/pay",
+ "pages": [
+ {
+ "path": "scanPay",
+ "style": {
+ "navigationBarTitleText": "支付",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "payComplete",
+ "style": {
+ "navigationBarTitleText": "支付完成",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "transferMoney",
+ "style": {
+ "navigationBarTitleText": "转账",
+ "disableScroll": true
+ }
+ }
+ ]
+ },
+ {
+ "root": "pages/integrated",
+ "pages": [
+ {
+ "path": "feedback/index",
+ "style": {
+ "navigationBarTitleText": "意见反馈"
+ }
+ }
+ ]
+ },
+ {
+ "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": "邀约记录"
+ }
+ }
+ ]
+ }
+ ],
+ "globalStyle": {
+ "navigationBarTextStyle": "black",
+ "navigationBarTitleText": "浦江小程序",
+ "navigationBarBackgroundColor": "#1777FF",
+ "backgroundColor": "#ecf4f9",
+ "navigationStyle": "custom"
+ },
+ "tabBar": {
+ "list": [
+ {
+ "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/canteen",
+ // "text": "食堂",
+ // "iconPath": "static/tabbar/canteen.png",
+ // "selectedIconPath": "static/tabbar/canteen-select.png"
+ // },
+ // {
+ // "pagePath": "pages/tabbar/selfMerchant",
+ // "text": "自营商家",
+ // "iconPath": "static/tabbar/selfMerchant.png",
+ // "selectedIconPath": "static/tabbar/selfMerchant-select.png"
+ // },
+ // {
+ // pagePath: "pages/tabbar/coopMerchant",
+ // text: "合作商家",
+ // iconPath: "static/tabbar/coopMerchant.png",
+ // selectedIconPath: "static/tabbar/coopMerchant-select.png",
+ // },
+ // {
+ // "pagePath": "pages/tabbar/order",
+ // "text": "订单",
+ // "iconPath": "static/tabbar/order.png",
+ // "selectedIconPath": "static/tabbar/order-select.png"
+ // },
+ // {
+ // "pagePath": "pages/tabbar/flowStatistics",
+ // "text": "流水统计",
+ // "iconPath": "static/tabbar/order.png",
+ // "selectedIconPath": "static/tabbar/order-select.png"
+ // },
+ // {
+ // "pagePath": "pages/tabbar/individualOrder",
+ // "text": "订单",
+ // "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"
+ // },
+ ]
+ }
+}
diff --git a/src/pages/integrated/visitor/index.vue b/src/pages/integrated/visitor/index.vue
index 6cd3cf8..f44c482 100644
--- a/src/pages/integrated/visitor/index.vue
+++ b/src/pages/integrated/visitor/index.vue
@@ -48,6 +48,7 @@
公司名称
+ *
+
+ 拜访原因*
+
+
+
+ {{ formData.reasonLabel || '请选择拜访原因' }}
+
+ >
+
+
+
+
是否有随行人员
-
- 确定
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/integrated/visitor/myyyvisitorlist.vue b/src/pages/integrated/visitor/myyyvisitorlist.vue
new file mode 100644
index 0000000..2249e72
--- /dev/null
+++ b/src/pages/integrated/visitor/myyyvisitorlist.vue
@@ -0,0 +1,472 @@
+
+
+
+
+
+ {{ tab.label }}
+
+
+
+
+
+
+
+
+ 访客姓名:
+ {{ item.name }}
+
+
+ 手机号码:
+ {{ item.mobile }}
+
+
+ 拜访部门:
+ {{ item.deptName }}
+
+
+ 来访公司:
+ {{ item.companyName }}
+
+
+ 拜访时间:
+ {{ formatDateTime(item.vStartDate) }} - {{ formatDateTime(item.vEndDate) }}
+
+
+ 拜访原因:
+ {{ getReasonText(item.description) }}
+
+
+
+
+
+
+
+
+ 加载中...
+
+
+ 没有更多了
+
+
+ 暂无数据
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/tabbar/my.vue b/src/pages/tabbar/my.vue
index 2190f32..573fd5d 100644
--- a/src/pages/tabbar/my.vue
+++ b/src/pages/tabbar/my.vue
@@ -78,6 +78,8 @@ const state = reactive<{
{ 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/feedback/index" }
],
appInfo: "",
diff --git a/src/sheep/api/integrated/visitors.ts b/src/sheep/api/integrated/visitors.ts
index 5c0bcb0..1446360 100644
--- a/src/sheep/api/integrated/visitors.ts
+++ b/src/sheep/api/integrated/visitors.ts
@@ -22,6 +22,101 @@ const visitorApi = {
},
}),
+ // 获取访客记录列表
+ 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,
+ },
+ }),
}
export default visitorApi