.env

@@ -2,7 +2,7 @@
 VITE_IS_TOC=true
 
 #是否是H5模式
-VITE_IS_H5=true
+VITE_IS_H5=false
 
 #是否是微服务架构
 VITE_IS_MICRO=true
@@ -17,31 +17,27 @@ VITE_PWD_ENC_KEY='pigxpigxpigxpigx'
 VITE_OAUTH2_APP_CLIENT='mini:mini'
 
 # 图片访问基础地址
- VITE_IMAGE_BASE_PATH = http://localhost:9999
+VITE_IMAGE_BASE_PATH = http://localhost:9999
-# VITE_IMAGE_BASE_PATH = http://192.168.101.64:9999 # 邓-本地
+# VITE_IMAGE_BASE_PATH = http://192.168.101.123:9999 # 邓-本地
 # VITE_IMAGE_BASE_PATH = https://123.156.230.15:8089/api # 线上
 # VITE_IMAGE_BASE_PATH = http://220.191.229.171:8090/api # 线上
-#VITE_IMAGE_BASE_PATH = https://stgl.pj.gov.cn/api # 线上
+# VITE_IMAGE_BASE_PATH = https://stgl.pj.gov.cn/api # 线上
-; # VITE_IMAGE_BASE_PATH = http://pjcloud.center.takin.cc # 张
+# VITE_IMAGE_BASE_PATH = http://pjcloud.center.takin.cc # 张
-#VITE_IMAGE_BASE_PATH = http://59.202.170.152:81/api # 信创线上
+# VITE_IMAGE_BASE_PATH = http://59.202.170.152:81/api # 信创线上
 
 # ******************** start 开发环境 start ********************
-#VITE_APP_DEV_SERVICE = http://59.202.170.152:81/api # 信创线上
+# VITE_APP_DEV_SERVICE = http://59.202.170.152:81/api # 信创线上
-#VITE_APP_DEV_SERVICE = https://stgl.pj.gov.cn/api
+# VITE_APP_DEV_SERVICE = https://stgl.pj.gov.cn/api
-# VITE_APP_DEV_SERVICE = http://192.168.101.64:9999 # 邓-本地
+# VITE_APP_DEV_SERVICE = http://192.168.101.123:9999 # 邓-本地
-  VITE_APP_DEV_SERVICE = http://127.0.0.1:9999
+# VITE_APP_DEV_SERVICE = http://127.0.0.1:9999
-# VITE_APP_DEV_SERVICE = http://123.156.230.15:8089/api/ # 线上
+VITE_APP_DEV_SERVICE = http://123.156.230.15:8089/api # 访客线上
 # VITE_APP_DEV_SERVICE = http://220.191.229.171:8090/api # 线上
-# VITE_APP_DEV_SERVICE = http://localhost:9999
 # ******************** end 开发环境 end ********************
 
 # ******************** start 生产环境 start ****************
-#VITE_APP_PROD_SERVICE = http://123.156.228.134:48080/app-api
+# VITE_APP_PROD_SERVICE = http://123.156.228.134:48080/app-api
-; #VITE_APP_PROD_SERVICE = http://59.202.170.152:81/api
+# VITE_APP_PROD_SERVICE = http://59.202.170.152:81/api
-#VITE_APP_PROD_SERVICE = https://stgl.pj.gov.cn/api
+# VITE_APP_PROD_SERVICE = https://stgl.pj.gov.cn/api
-VITE_APP_PROD_SERVICE = http://60.12.184.86:8089/api
+VITE_APP_PROD_SERVICE = http://123.156.230.15:8089/api
-#VITE_APP_PROD_SERVICE = http://59.202.170.152:81/api # 信创线上
+# VITE_APP_PROD_SERVICE = http://59.202.170.152:81/api # 信创线上
 # ******************** end 生产环境 end ********************
-
-VITE_DEV_ENV = dev
-# VITE_DEV_ENV = prod

package.json

@@ -67,7 +67,6 @@
     "luch-request": "^3.1.1",
     "pinia": "^2.2.6",
     "qrcode": "^1.5.4",
-    "qs": "^6.13.1",
     "radash": "^12.1.0",
     "vue": "^3.3.11",
     "vue-i18n": "^9.1.9",

pnpm-lock.yaml

@@ -53,6 +53,9 @@ importers:
       '@dcloudio/uni-quickapp-webview':
         specifier: 3.0.0-4020920240930001
         version: 3.0.0-4020920240930001(postcss@8.5.1)(rollup@4.34.2)(vue@3.5.13(typescript@4.9.5))
+      '@vant/weapp':
+        specifier: ^1.11.7
+        version: 1.11.7
       '@vue/compiler-core':
         specifier: ^3.5.11
         version: 3.5.13
@@ -74,9 +77,9 @@ importers:
       pinia:
         specifier: ^2.2.6
         version: 2.3.1(typescript@4.9.5)(vue@3.5.13(typescript@4.9.5))
-      qs:
+      qrcode:
-        specifier: ^6.13.1
+        specifier: ^1.5.4
-        version: 6.14.0
+        version: 1.5.4
       radash:
         specifier: ^12.1.0
         version: 12.1.0
@@ -1565,6 +1568,9 @@ packages:
     peerDependencies:
       vite: ^2.9.0 || ^3.0.0-0 || ^4.0.0 || ^5.0.0-0
 
+  '@vant/weapp@1.11.7':
+    resolution: {integrity: sha512-Rwn9BBnb4kHSV4XmvBicwtd42J+amEUfnFDcXJsGNPNX4a9c/DoT6YLsm4X1wB2+sQbdiQsbFBLAvGRBxCkD8g==}
+
   '@vitejs/plugin-legacy@5.3.2':
     resolution: {integrity: sha512-8moCOrIMaZ/Rjln0Q6GsH6s8fAt1JOI3k8nmfX4tXUxE5KAExVctSyOBk+A25GClsdSWqIk2yaUthH3KJ2X4tg==}
     engines: {node: ^18.0.0 || >=20.0.0}
@@ -2001,6 +2007,9 @@ packages:
   cjs-module-lexer@1.4.3:
     resolution: {integrity: sha512-9z8TZaGM1pfswYeXrUpzPrkx8UnWYdhJclsiYMm6x/w5+nN+8Tf/LnAgfLGQCm59qAOxU8WwHEq2vNwF6i4j+Q==}
 
+  cliui@6.0.0:
+    resolution: {integrity: sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==}
+
   cliui@7.0.4:
     resolution: {integrity: sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==}
 
@@ -2150,6 +2159,10 @@ packages:
       supports-color:
         optional: true
 
+  decamelize@1.2.0:
+    resolution: {integrity: sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==}
+    engines: {node: '>=0.10.0'}
+
   decimal.js@10.5.0:
     resolution: {integrity: sha512-8vDa8Qxvr/+d94hSh5P3IJwI5t8/c0KsMp+g8bNw9cY2icONa5aPfvKeieW1WlG0WQYwwhJ7mjui2xtiePQSXw==}
 
@@ -2190,6 +2203,9 @@ packages:
     resolution: {integrity: sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==}
     engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
 
+  dijkstrajs@1.0.3:
+    resolution: {integrity: sha512-qiSlmBq9+BCdCA/L46dw8Uy93mloxsPSbwnm5yrKn2vMPiy8KyAskTF6zuV/j5BMsmOGZDPs7KjU+mjb670kfA==}
+
   dom-walk@0.1.2:
     resolution: {integrity: sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==}
 
@@ -3205,6 +3221,10 @@ packages:
     resolution: {integrity: sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w==}
     engines: {node: '>=4.0.0'}
 
+  pngjs@5.0.0:
+    resolution: {integrity: sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw==}
+    engines: {node: '>=10.13.0'}
+
   postcss-import@14.1.0:
     resolution: {integrity: sha512-flwI+Vgm4SElObFVPpTIT7SU7R3qk2L7PyduMcokiaVKuWv9d/U+Gm/QAd8NDLuykTWTkcrjOeD2Pp1rMeBTGw==}
     engines: {node: '>=10.0.0'}
@@ -3297,14 +3317,15 @@ packages:
     resolution: {integrity: sha512-EXtzRZmC+YGmGlDFbXKxQiMZNwCLEO6BANKXG4iCtSIM0yqc/pappSx3RIKr4r0uh5JsBckOXeKrB3Iz7mdQpQ==}
     hasBin: true
 
+  qrcode@1.5.4:
+    resolution: {integrity: sha512-1ca71Zgiu6ORjHqFBDpnSMTR2ReToX4l1Au1VFLyVeBTFavzQnv5JxMFr3ukHVKpSrSA2MCk0lNJSykjUfz7Zg==}
+    engines: {node: '>=10.13.0'}
+    hasBin: true
+
   qs@6.13.0:
     resolution: {integrity: sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==}
     engines: {node: '>=0.6'}
 
-  qs@6.14.0:
-    resolution: {integrity: sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==}
-    engines: {node: '>=0.6'}
-
   querystringify@2.2.0:
     resolution: {integrity: sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==}
 
@@ -3371,6 +3392,9 @@ packages:
     resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==}
     engines: {node: '>=0.10.0'}
 
+  require-main-filename@2.0.0:
+    resolution: {integrity: sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==}
+
   requires-port@1.0.0:
     resolution: {integrity: sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==}
 
@@ -3476,6 +3500,9 @@ packages:
     resolution: {integrity: sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==}
     engines: {node: '>= 0.8.0'}
 
+  set-blocking@2.0.0:
+    resolution: {integrity: sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==}
+
   setprototypeof@1.2.0:
     resolution: {integrity: sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==}
 
@@ -3919,11 +3946,18 @@ packages:
     resolution: {integrity: sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==}
     engines: {node: '>=10'}
 
+  which-module@2.0.1:
+    resolution: {integrity: sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==}
+
   which@2.0.2:
     resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==}
     engines: {node: '>= 8'}
     hasBin: true
 
+  wrap-ansi@6.2.0:
+    resolution: {integrity: sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==}
+    engines: {node: '>=8'}
+
   wrap-ansi@7.0.0:
     resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==}
     engines: {node: '>=10'}
@@ -3989,6 +4023,9 @@ packages:
     resolution: {integrity: sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==}
     engines: {node: '>=0.4'}
 
+  y18n@4.0.3:
+    resolution: {integrity: sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==}
+
   y18n@5.0.8:
     resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==}
     engines: {node: '>=10'}
@@ -4000,10 +4037,18 @@ packages:
     resolution: {integrity: sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==}
     engines: {node: '>= 6'}
 
+  yargs-parser@18.1.3:
+    resolution: {integrity: sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==}
+    engines: {node: '>=6'}
+
   yargs-parser@20.2.9:
     resolution: {integrity: sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==}
     engines: {node: '>=10'}
 
+  yargs@15.4.1:
+    resolution: {integrity: sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==}
+    engines: {node: '>=8'}
+
   yargs@16.2.0:
     resolution: {integrity: sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==}
     engines: {node: '>=10'}
@@ -6268,6 +6313,8 @@ snapshots:
     transitivePeerDependencies:
       - rollup
 
+  '@vant/weapp@1.11.7': {}
+
   '@vitejs/plugin-legacy@5.3.2(terser@5.37.0)(vite@5.2.8(@types/node@18.19.75)(sass@1.71.1)(terser@5.37.0))':
     dependencies:
       '@babel/core': 7.26.7
@@ -6833,6 +6880,12 @@ snapshots:
 
   cjs-module-lexer@1.4.3: {}
 
+  cliui@6.0.0:
+    dependencies:
+      string-width: 4.2.3
+      strip-ansi: 6.0.1
+      wrap-ansi: 6.2.0
+
   cliui@7.0.4:
     dependencies:
       string-width: 4.2.3
@@ -6946,6 +6999,8 @@ snapshots:
     dependencies:
       ms: 2.1.3
 
+  decamelize@1.2.0: {}
+
   decimal.js@10.5.0: {}
 
   dedent@0.7.0: {}
@@ -6970,6 +7025,8 @@ snapshots:
 
   diff-sequences@27.5.1: {}
 
+  dijkstrajs@1.0.3: {}
+
   dom-walk@0.1.2: {}
 
   domexception@2.0.1:
@@ -8176,6 +8233,8 @@ snapshots:
 
   pngjs@3.4.0: {}
 
+  pngjs@5.0.0: {}
+
   postcss-import@14.1.0(postcss@8.5.1):
     dependencies:
       postcss: 8.5.1
@@ -8269,11 +8328,13 @@ snapshots:
 
   qrcode-terminal@0.12.0: {}
 
-  qs@6.13.0:
+  qrcode@1.5.4:
     dependencies:
-      side-channel: 1.1.0
+      dijkstrajs: 1.0.3
+      pngjs: 5.0.0
+      yargs: 15.4.1
 
-  qs@6.14.0:
+  qs@6.13.0:
     dependencies:
       side-channel: 1.1.0
 
@@ -8339,6 +8400,8 @@ snapshots:
 
   require-from-string@2.0.2: {}
 
+  require-main-filename@2.0.0: {}
+
   requires-port@1.0.0: {}
 
   resolve-cwd@3.0.0:
@@ -8469,6 +8532,8 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  set-blocking@2.0.0: {}
+
   setprototypeof@1.2.0: {}
 
   shebang-command@2.0.0:
@@ -8935,10 +9000,18 @@ snapshots:
       tr46: 2.1.0
       webidl-conversions: 6.1.0
 
+  which-module@2.0.1: {}
+
   which@2.0.2:
     dependencies:
       isexe: 2.0.0
 
+  wrap-ansi@6.2.0:
+    dependencies:
+      ansi-styles: 4.3.0
+      string-width: 4.2.3
+      strip-ansi: 6.0.1
+
   wrap-ansi@7.0.0:
     dependencies:
       ansi-styles: 4.3.0
@@ -8984,14 +9057,35 @@ snapshots:
 
   xtend@4.0.2: {}
 
+  y18n@4.0.3: {}
+
   y18n@5.0.8: {}
 
   yallist@3.1.1: {}
 
   yaml@1.10.2: {}
 
+  yargs-parser@18.1.3:
+    dependencies:
+      camelcase: 5.3.1
+      decamelize: 1.2.0
+
   yargs-parser@20.2.9: {}
 
+  yargs@15.4.1:
+    dependencies:
+      cliui: 6.0.0
+      decamelize: 1.2.0
+      find-up: 4.1.0
+      get-caller-file: 2.0.5
+      require-directory: 2.1.1
+      require-main-filename: 2.0.0
+      set-blocking: 2.0.0
+      string-width: 4.2.3
+      which-module: 2.0.1
+      y18n: 4.0.3
+      yargs-parser: 18.1.3
+
   yargs@16.2.0:
     dependencies:
       cliui: 7.0.4

src/App.vue

@@ -1,217 +1,25 @@
 <script lang="ts">
-import isDevEnv from "./sheep/utils/isDevEnv"
-
 // import { onLaunch, onShow, onHide } from "@dcloudio/uni-app"
 // onLaunch(() => {})
 // onShow(() => {})
 // onHide(() => {})
 
-interface TabbarItem {
-	pagePath: string
-	text: string
-	iconPath: string
-	selectedIconPath: string
-	launchParam: string[]
-	auth: string[]
-}
-
-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/my",
-		text: "我的",
-		iconPath: "/static/tabbar/my.png",
-		selectedIconPath: "/static/tabbar/my-select.png",
-		launchParam: ["canteen", "selfMerchant"],
-		auth: ["user", "merchant"],
-	},
-]
-
-// 获取启动参数
-const getLaunchParam = () => {
-	return new URL(window.location.href).searchParams.get("launchParam")
-}
-
-// 设置tabbar项目
-const setTabbarItem = (index: number, item: TabbarItem, visible: boolean) => {
-	uni.setTabBarItem({
-		index,
-		pagePath: item.pagePath,
-		text: item.text,
-		iconPath: item.iconPath,
-		selectedIconPath: item.selectedIconPath,
-		visible,
-	})
-}
-
-// 根据启动参数设置tabbar项目
-const setTabbarByLaunchParam = (launchParam: string) => {
-	tabbar.forEach((item, index) => {
-		const visible = item.launchParam.includes(launchParam)
-		setTabbarItem(index, item, visible)
-	})
-}
-
-// 根据用户角色设置tabbar项目
-const setTabbarByUserRole = (role: string) => {
-	tabbar.forEach((item, index) => {
-		const visible = item.auth.includes(role)
-		setTabbarItem(index, item, visible)
-	})
-}
-
 export default {
-	async onLaunch() {
+	onLaunch() {
-		if (isDevEnv()) return
+		// 检查登录状态
-
+		const token = uni.getStorageSync("token")
-		uni.setNavigationBarTitle({ title: "" })
+		if (!token) {
-
+			uni.navigateTo({
-		// 环境判断
+				url: "/pages/test/login",
-		const res = await (window as any).CP2.getAppInfo()
+			})
-		if (res.code == 0) {
+			return
-			// 不是诗画环境
-			const launchParam = getLaunchParam()
-
-			console.log("app launch 启动路径参数", launchParam)
-
-			switch (launchParam) {
-				case "canteen":
-					uni.switchTab({ url: "/pages/tabbar/canteen" })
-					break
-				case "selfMerchant":
-					uni.switchTab({ url: "/pages/tabbar/selfMerchant" })
-					break
-				default:
-					break
-			}
-		} else {
-			// 是诗画环境
-			const userRole = uni.getStorageSync("userRole")
-			if (!userRole) return uni.redirectTo({ url: "/pages/user/userRole" })
-			if (userRole === "user") return uni.switchTab({ url: "/pages/tabbar/coopMerchant" })
-			if (userRole === "merchant") return uni.switchTab({ url: "/pages/tabbar/individualOrder" })
 		}
 	},
 	onShow() {},
 	onHide() {},
 
 	methods: {
-		async _initTabbar() {
+		async _initTabbar() {},
-			if (isDevEnv()) {
-				tabbar.forEach((item, index) => {
-					setTabbarItem(index, item, true)
-				})
-				return
-			}
-
-			const launchParam = getLaunchParam()
-			console.log("tabbar launch 启动路径参数", launchParam)
-
-			const res = await (window as any).CP2.getAppInfo()
-			if (res.code == 0) {
-				// 不是诗画环境
-				if (launchParam) {
-					setTabbarByLaunchParam(launchParam)
-				} else {
-					uni.hideTabBar()
-					uni.showToast({ title: "启动参数不合法", icon: "none" })
-				}
-			} else {
-				// 是诗画环境
-				const userRole = uni.getStorageSync("userRole")
-				switch (userRole) {
-					case "user":
-						setTabbarByUserRole("user")
-						break
-					case "merchant":
-						setTabbarByUserRole("merchant")
-						break
-					default:
-						uni.hideTabBar()
-						uni.showToast({ title: "用户身份未确认", icon: "none" })
-						break
-				}
-			}
-		},
 	},
 }
 </script>

src/manifest.json

@@ -1,30 +1,30 @@
 {
-	"name": "",
+    "name" : "",
-	"appid": "",
+    "appid" : "",
-	"description": "浦江县机关事务智慧后勤一体化平台",
+    "description" : "浦江县机关事务智慧后勤一体化平台",
-	"versionName": "1.0.0",
+    "versionName" : "1.0.0",
-	"versionCode": "100",
+    "versionCode" : "100",
-	"transformPx": false,
+    "transformPx" : false,
     /* 5+App特有相关 */
-	"app-plus": {
+    "app-plus" : {
-		"usingComponents": true,
+        "usingComponents" : true,
-		"nvueCompiler": "uni-app",
+        "nvueCompiler" : "uni-app",
-		"renderer": "native",
+        "renderer" : "native",
-		"nvueStyleCompiler": "uni-app",
+        "nvueStyleCompiler" : "uni-app",
-		"compilerVersion": 3,
+        "compilerVersion" : 3,
-		"splashscreen": {
+        "splashscreen" : {
-			"alwaysShowBeforeRender": true,
+            "alwaysShowBeforeRender" : true,
-			"waiting": true,
+            "waiting" : true,
-			"autoclose": true,
+            "autoclose" : true,
-			"delay": 0
+            "delay" : 0
         },
         /* 模块配置 */
-		"modules": {},
+        "modules" : {},
         /* 应用发布信息 */
-		"distribute": {
+        "distribute" : {
             /* android打包配置 */
-			"android": {
+            "android" : {
-				"permissions": [
+                "permissions" : [
                     "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
                     "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
@@ -44,48 +44,48 @@
                 ]
             },
             /* ios打包配置 */
-			"ios": {},
+            "ios" : {},
             /* SDK配置 */
-			"sdkConfigs": {}
+            "sdkConfigs" : {}
         }
     },
     /* 快应用特有相关 */
-	"quickapp": {},
+    "quickapp" : {},
     /* 小程序特有相关 */
-	"mp-weixin": {
+    "mp-weixin" : {
-		"appid": "",
+        "appid" : "wxe860b6ed8d1ceabe",
-		"setting": {
+        "setting" : {
-			"urlCheck": false,
+            "urlCheck" : false,
-			"es6": true,
+            "es6" : true,
-			"postcss": true,
+            "postcss" : true,
-			"minified": true
+            "minified" : true
         },
-		"usingComponents": true,
+        "usingComponents" : true,
-		"requiredPrivateInfos": ["getLocation"],
+        "requiredPrivateInfos" : [ "getLocation" ],
-		"permission": {
+        "permission" : {
-			"scope.userLocation": {
+            "scope.userLocation" : {
-				"desc": "你的位置信息将用于小程序位置接口的效果展示"
+                "desc" : "你的位置信息将用于小程序位置接口的效果展示"
             }
         }
     },
-	"mp-alipay": {
+    "mp-alipay" : {
-		"usingComponents": true
+        "usingComponents" : true
     },
-	"mp-baidu": {
+    "mp-baidu" : {
-		"usingComponents": true
+        "usingComponents" : true
     },
-	"mp-toutiao": {
+    "mp-toutiao" : {
-		"usingComponents": true
+        "usingComponents" : true
     },
-	"uniStatistics": {
+    "uniStatistics" : {
-		"enable": false
+        "enable" : false
     },
-	"vueVersion": "3",
+    "vueVersion" : "3",
-	"h5": {
+    "h5" : {
-		"router": {
+        "router" : {
-			"base": "/h5/",
+            "base" : "/h5/",
-			"mode": "hash"
+            "mode" : "hash"
         },
-		"title": "浦江县机关事务智慧后勤一体化平台"
+        "title" : "浦江县机关事务智慧后勤一体化平台"
     }
 }

src/pages.json

@@ -9,55 +9,6 @@
 		}
 	},
 	"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": {
@@ -65,10 +16,34 @@
 				"disableScroll": true
 			}
 		},
+		{
+			"path": "pages/integrated/visitor/index",
+			"style": {
+				"navigationBarTitleText": "访客申请"
+			}
+		},
+		{
+			"path": "pages/integrated/visitor/myvisitor",
+			"style": {
+				"navigationBarTitleText": "申请记录"
+			}
+		},
+		{
+			"path": "pages/integrated/visitor/myyyvisitor",
+			"style": {
+				"navigationBarTitleText": "主动邀约"
+			}
+		},
+		{
+			"path": "pages/integrated/visitor/myyyvisitorlist",
+			"style": {
+				"navigationBarTitleText": "邀约记录"
+			}
+		},
 		{
 			"path": "pages/integrated/visitor/verify",
 			"style": {
-				"navigationStyle": "custom"
+				"navigationBarTitleText": "访客核销"
 			}
 		}
 	],
@@ -189,14 +164,14 @@
 						"disableScroll": true
 					}
 				},
-				{
+				// {
-					"path": "food",
+				// 	"path": "food",
-					"style": {
+				// 	"style": {
-						"navigationBarTitleText": "菜谱",
+				// 		"navigationBarTitleText": "菜谱",
-						"navigationBarBackgroundColor": "#1777FF",
+				// 		"navigationBarBackgroundColor": "#1777FF",
-						"disableScroll": true
+				// 		"disableScroll": true
-					}
+				// 	}
-				},
+				// },
 				{
 					"path": "product-detail",
 					"style": {
@@ -243,158 +218,7 @@
 				{
 					"path": "login",
 					"style": {
-						"navigationBarTitleText": "",
+						"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": "邀约记录"
-					}
-				}
-			]
-		},
-		{
-			"root": "pages/integrated",
-			"pages": [
-				{
-					"path": "visitor/visitorDetail",
-					"style": {
-						"navigationStyle": "custom",
-						"navigationBarTitleText": "记录详情"
 					}
 				}
 			]
@@ -402,85 +226,94 @@
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "浦江小程序",
+		"navigationBarTitleText": "uni-app",
-		"navigationBarBackgroundColor": "#1777FF",
+		"navigationBarBackgroundColor": "#F8F8F8",
-		"backgroundColor": "#ecf4f9",
+		"backgroundColor": "#F8F8F8"
-		"navigationStyle": "custom"
 	},
 	"tabBar": {
+		"color": "#7A7E83",
+		"selectedColor": "#3cc51f",
+		"borderStyle": "black",
+		"backgroundColor": "#ffffff",
 		"list": [
 			{
 				"pagePath": "pages/integrated/visitor/index",
 				"text": "访客申请",
-				"iconPath": "",
+				"iconPath": "/static/tabbar/my.png",
-				"selectedIconPath": ""
+				"selectedIconPath": "/static/tabbar/my-select.png"
 			},
 			{
 				"pagePath": "pages/integrated/visitor/myvisitor",
 				"text": "申请记录",
-				"iconPath": "",
+				"iconPath": "/static/tabbar/my.png",
-				"selectedIconPath": ""
+				"selectedIconPath": "/static/tabbar/my-select.png"
 			},
 			{
 				"pagePath": "pages/integrated/visitor/myyyvisitor",
 				"text": "访客邀约",
-				"iconPath": "",
+				"iconPath": "/static/tabbar/my.png",
-				"selectedIconPath": ""
+				"selectedIconPath": "/static/tabbar/my-select.png"
 			},
 			{
 				"pagePath": "pages/integrated/visitor/myyyvisitorlist",
 				"text": "邀约记录",
-				"iconPath": "",
+				"iconPath": "/static/tabbar/my.png",
-				"selectedIconPath": ""
+				"selectedIconPath": "/static/tabbar/my-select.png"
 			},
+			// {
+			// 	"pagePath": "pages/integrated/visitor/verify",
+			// 	"text": "访客核销",
+			// 	"iconPath": "/static/tabbar/my.png",
+			// 	"selectedIconPath": "/static/tabbar/my-select.png"
+			// },
 			{
-				"pagePath": "pages/integrated/visitor/verify",
+				"pagePath": "pages/tabbar/my",
-				"text": "核销",
+				"text": "我的",
-				"iconPath": "",
+				"iconPath": "/static/tabbar/my.png",
-				"selectedIconPath": ""
+				"selectedIconPath": "/static/tabbar/my-select.png"
-			},
+			}
-//			{
+			//			{
-//				"pagePath": "pages/tabbar/canteen",
+			//				"pagePath": "pages/tabbar/canteen",
-//				"text": "",
+			//				"text": "",
-//				"iconPath": "",
+			//				"iconPath": "",
-//				"selectedIconPath": ""
+			//				"selectedIconPath": ""
-//			},
+			//			},
-//			{
+			//			{
-//				"pagePath": "pages/tabbar/selfMerchant",
+			//				"pagePath": "pages/tabbar/selfMerchant",
-//				"text": "",
+			//				"text": "",
-//				"iconPath": "",
+			//				"iconPath": "",
-//				"selectedIconPath": ""
+			//				"selectedIconPath": ""
-//			},
+			//			},
-//			{
+			//			{
-//				"pagePath": "pages/tabbar/coopMerchant",
+			//				"pagePath": "pages/tabbar/coopMerchant",
-//				"text": "",
+			//				"text": "",
-//				"iconPath": "",
+			//				"iconPath": "",
-//				"selectedIconPath": ""
+			//				"selectedIconPath": ""
-//			},
+			//			},
-//			{
+			//			{
-//				"pagePath": "pages/tabbar/order",
+			//				"pagePath": "pages/tabbar/order",
-//				"text": "",
+			//				"text": "",
-//				"iconPath": "",
+			//				"iconPath": "",
-//				"selectedIconPath": ""
+			//				"selectedIconPath": ""
-//			},
+			//			},
-//			{
+			//			{
-//				"pagePath": "pages/tabbar/flowStatistics",
+			//				"pagePath": "pages/tabbar/flowStatistics",
-//				"text": "",
+			//				"text": "",
-//				"iconPath": "",
+			//				"iconPath": "",
-//				"selectedIconPath": ""
+			//				"selectedIconPath": ""
-//			},
+			//			},
-//			{
+			//			{
-//				"pagePath": "pages/tabbar/individualOrder",
+			//				"pagePath": "pages/tabbar/individualOrder",
-//				"text": "",
+			//				"text": "",
-//				"iconPath": "",
+			//				"iconPath": "",
-//				"selectedIconPath": ""
+			//				"selectedIconPath": ""
-//			},
+			//			},
-//			{
+			//			{
-//				"pagePath": "pages/tabbar/my",
+			//				"pagePath": "pages/tabbar/my",
-//				"text": "",
+			//				"text": "",
-//				"iconPath": "",
+			//				"iconPath": "",
-//				"selectedIconPath": ""
+			//				"selectedIconPath": ""
-//			}
+			//			}
 			// {
 			// 	"pagePath": "pages/tabbar/canteen",
 			// 	"text": "食堂",
@@ -517,13 +350,12 @@
 			// 	"iconPath": "static/tabbar/order.png",
 			// 	"selectedIconPath": "static/tabbar/order-select.png"
 			// },
-			 {
+			//  {
-			 	"pagePath": "pages/tabbar/my",
+			//  	"pagePath": "pages/tabbar/my",
-			 	"text": "我的",
+			//  	"text": "我的",
-			 	"iconPath": "static/tabbar/my.png",
+			//  	"iconPath": "static/tabbar/my.png",
-			 	"selectedIconPath": "static/tabbar/my-select.png"
+			//  	"selectedIconPath": "static/tabbar/my-select.png"
-			 }
+			//  }
-
 		]
 	}
 }

src/pages/apply/foreign-apply.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
-import { ref, reactive } from "vue";
+import { ref, reactive } from "vue"
-import { onLoad, onShow } from "@dcloudio/uni-app";
+import { onLoad, onShow } from "@dcloudio/uni-app"
 import { isEmpty } from "radash"
 import dayjs from "dayjs"
 
@@ -12,34 +12,30 @@ const state = reactive<any>({
 	detailId: null,
 	detail: null,
 })
-const applyForm = reactive<any>({
+let applyForm = reactive<any>({
 	displayTimeRange: "",
 	displayTimeRangeStr: "",
 	count: 1,
 	remark: "",
 })
 const applyFormRules = reactive<any>({
-    displayTimeRangeStr: [
+	displayTimeRangeStr: [{ required: true, message: "请选择使用时间" }],
-        { required: true, message: '请选择使用时间' }
-    ],
 	count: [
-        { required: true, message: '请输入申请数量' },
+		{ required: true, message: "请输入申请数量" },
-        { required: true, min: 1, message: '最少申请1张' },
+		{ required: true, min: 1, message: "最少申请1张" },
-        { required: true, max: 20, message: '最多申请20张' },
+		{ required: true, max: 20, message: "最多申请20张" },
-    ]
+	],
 })
 
 onLoad((options: any) => {
 	const { type, id } = options
 	if (!isEmpty(type)) state.detailType = type
 	if (!isEmpty(id)) state.detailId = id
-    if (type === 'view') {
+	if (type === "view") {
 		getDetail()
 	}
-});
-onShow(() => {
-
 })
+onShow(() => {})
 
 const getDetail = async () => {
 	if (isEmpty(state.detailId)) return
@@ -65,9 +61,9 @@ const doSubmit = async () => {
 	const { isPass } = applyFormRef.value.validate()
 	if (!isPass) return
 	const range = applyForm.displayTimeRange
-    console.log(range);
+	console.log(range)
 	try {
-        uni.showLoading({ title: '申请中...', mask: false });
+		uni.showLoading({ title: "申请中...", mask: false })
 		const _pa = {
 			applyStartTime: hooks.useTime(range[0], "{y}-{m}-{d}"),
 			applyEndTime: hooks.useTime(range[1], "{y}-{m}-{d}"),
@@ -77,30 +73,32 @@ const doSubmit = async () => {
 		const { data, code }: any = await applyApi.foreignApply(_pa)
 		if (code != 0) throw new Error()
 		uni.hideLoading()
-        uni.showToast({ title: '申请成功', icon: "none" });
+		uni.showToast({ title: "申请成功", icon: "none" })
 		router.back()
 	} catch (error) {
-        console.error(error);
+		console.error(error)
 		uni.hideLoading()
 	}
 }
-
 </script>
 
-
 <template>
 	<crud-layout title="外来人员就餐" bg="/static/page/blue-bg.png">
 		<view class="h-30rpx" />
 		<view class="card p-x-30rpx p-y-40rpx">
 			<tm-form ref="applyFormRef" v-model="applyForm" :rules="applyFormRules" direction="vertical">
 				<tm-form-item name="displayTimeRangeStr" label="使用时间" :showBottom="false">
-                    <tm-between-time start="2020-1-1" end="2030-1-1" v-model="applyForm.displayTimeRange"
+					<tm-between-time
-                        v-model:model-str="applyForm.displayTimeRangeStr" format="YYYY-MM-DD">
+						start="2020-1-1"
+						end="2030-1-1"
+						v-model="applyForm.displayTimeRange"
+						v-model:model-str="applyForm.displayTimeRangeStr"
+						format="YYYY-MM-DD"
+					>
 						<view :style="{ pointerEvents: state.detailType == 'view' ? 'auto' : 'none' }">
 							<tm-input v-model="applyForm.displayTimeRangeStr" disabled placeholder="请选择使用时间..">
 								<template v-slot:rightIcon>
-                                    <text v-if="state.detailType != 'view'"
+									<text v-if="state.detailType != 'view'" class="p-0.5rem color-#b1b1b1 iconfont icon-xiangxiajiantouxiao"></text>
-                                        class="p-0.5rem color-#b1b1b1 iconfont icon-xiangxiajiantouxiao"></text>
 								</template>
 							</tm-input>
 						</view>
@@ -108,20 +106,31 @@ const doSubmit = async () => {
 				</tm-form-item>
 				<view class="h-30rpx" />
 				<tm-form-item name="count" label="申请数量" :showBottom="false">
-                    <tm-input v-model="applyForm.count" type="number" :disabled="state.detailType == 'view'"
+					<tm-input
-                        :showClear="state.detailType != 'view'" placeholder="请输入申请数量.." />
+						v-model="applyForm.count"
+						type="number"
+						:disabled="state.detailType == 'view'"
+						:showClear="state.detailType != 'view'"
+						placeholder="请输入申请数量.."
+					/>
 				</tm-form-item>
 				<view class="h-30rpx" />
 				<tm-form-item name="remark" label="备注" :required="false" :showBottom="false">
-                    <tm-input v-model="applyForm.remark" type="textarea" :disabled="state.detailType == 'view'"
+					<tm-input
+						v-model="applyForm.remark"
+						type="textarea"
+						:disabled="state.detailType == 'view'"
 						:showClear="state.detailType != 'view'"
-                        :placeholder="state.detailType == 'view' ? '' : '请输入备注..'"></tm-input>
+						:placeholder="state.detailType == 'view' ? '' : '请输入备注..'"
+					></tm-input>
 				</tm-form-item>
 			</tm-form>
 		</view>
-        <view v-if="state.detailType != 'view'"
+		<view
+			v-if="state.detailType != 'view'"
 			class="bg-#0094ff p-y-20rpx text-center rounded-40rpx m-x-30rpx m-t-60rpx sub-text-30 color-white!"
-            @tap="doSubmit">
+			@tap="doSubmit"
+		>
 			提交
 		</view>
 	</crud-layout>

src/pages/apply/stride-apply.vue

@@ -1,39 +1,36 @@
 <script setup lang="ts">
-import { ref, reactive } from "vue";
+import { ref, reactive } from "vue"
-import { onLoad, onShow } from "@dcloudio/uni-app";
+import { onLoad, onShow } from "@dcloudio/uni-app"
 import { isEmpty } from "radash"
 
-import { hooks, router } from "@@/index"
+import { router } from "@@/index"
 import { applyApi } from "@@/api"
 
 const state = reactive<any>({
 	detailType: "add",
 	detailId: null,
 	detail: null,
-
 })
-const applyForm = reactive<any>({
+let applyForm = reactive<any>({
 	count: 1,
 	remark: "",
 })
 const applyFormRules = reactive<any>({
 	count: [
-        { required: true, message: '请输入申请数量' },
+		{ required: true, message: "请输入申请数量" },
-        { required: true, min: 1, message: '最少申请1张' },
+		{ required: true, min: 1, message: "最少申请1张" },
-        { required: true, max: 20, message: '最多申请20张' },
+		{ required: true, max: 20, message: "最多申请20张" },
-    ]
+	],
 })
 onLoad((options: any) => {
 	const { type, id } = options
 	if (!isEmpty(type)) state.detailType = type
 	if (!isEmpty(id)) state.detailId = id
-    if (type === 'view') {
+	if (type === "view") {
 		getDetail()
 	}
-});
-onShow(() => {
-
 })
+onShow(() => {})
 
 const getDetail = async () => {
 	if (isEmpty(state.detailId)) return
@@ -58,7 +55,7 @@ const doSubmit = async () => {
 	if (!isPass) return
 	const range = applyForm.displayTimeRange
 	try {
-        uni.showLoading({ title: '申请中...', mask: false });
+		uni.showLoading({ title: "申请中...", mask: false })
 		const _pa = {
 			count: applyForm.count,
 			remark: applyForm.remark,
@@ -66,37 +63,46 @@ const doSubmit = async () => {
 		const { data, code }: any = await applyApi.strideApply(_pa)
 		if (code != 0) throw new Error()
 		uni.hideLoading()
-        uni.showToast({ title: '申请成功', icon: "none" });
+		uni.showToast({ title: "申请成功", icon: "none" })
 		router.back()
 	} catch (error) {
-        console.error(error);
+		console.error(error)
 		uni.hideLoading()
 	}
 }
-
 </script>
 
-
 <template>
 	<crud-layout title="外来人员就餐" bg="/static/page/blue-bg.png">
 		<view class="h-30rpx" />
 		<view class="card p-x-30rpx p-y-40rpx">
 			<tm-form ref="applyFormRef" v-model="applyForm" :rules="applyFormRules" direction="vertical">
 				<tm-form-item name="count" label="申请数量" :showBottom="false">
-                    <tm-input v-model="applyForm.count" type="number" :disabled="state.detailType == 'view'"
+					<tm-input
-                        :showClear="state.detailType != 'view'" placeholder="请输入申请数量.." />
+						v-model="applyForm.count"
+						type="number"
+						:disabled="state.detailType == 'view'"
+						:showClear="state.detailType != 'view'"
+						placeholder="请输入申请数量.."
+					/>
 				</tm-form-item>
 				<view class="h-30rpx" />
 				<tm-form-item name="remark" label="备注" :required="false" :showBottom="false">
-                    <tm-input v-model="applyForm.remark" type="textarea" :disabled="state.detailType == 'view'"
+					<tm-input
+						v-model="applyForm.remark"
+						type="textarea"
+						:disabled="state.detailType == 'view'"
 						:showClear="state.detailType != 'view'"
-                        :placeholder="state.detailType == 'view' ? '' : '请输入备注..'"></tm-input>
+						:placeholder="state.detailType == 'view' ? '' : '请输入备注..'"
+					></tm-input>
 				</tm-form-item>
 			</tm-form>
 		</view>
-        <view v-if="state.detailType != 'view'"
+		<view
+			v-if="state.detailType != 'view'"
 			class="bg-#0094ff p-y-20rpx text-center rounded-40rpx m-x-30rpx m-t-60rpx sub-text-30 color-white!"
-            @tap="doSubmit">
+			@tap="doSubmit"
+		>
 			提交
 		</view>
 	</crud-layout>

src/pages/boxes/apply.vue

@@ -19,7 +19,7 @@ const state = reactive<any>({
 		end: "",
 	},
 })
-const applyForm = reactive<any>({
+let applyForm = reactive<any>({
 	displayTimeRange: "",
 	displayTimeRangeStr: "",
 	bxDate: null,

src/pages/integrated/visitor/index.vue

@@ -2,21 +2,15 @@
 	<view class="visitor-page">
 		<!-- 顶部导航 -->
 		<view class="header">
-      <view class="back-btn" @tap="goBack">
-        <text class="back-icon">〈</text>
-      </view>
 			<view class="title">普通访客入园预约</view>
 			<view class="right-placeholder"></view>
 		</view>
 
 		<!-- 使用scroll-view包裹内容区域 -->
-    <scroll-view 
+		<scroll-view scroll-y class="page-content">
-      scroll-y 
-      class="page-content"
-    >
 			<view class="content-wrapper">
 				<view class="tips-box">
-          <text class="tips-icon">ℹ</text>
+					<text class="tips-icon">!</text>
 					<text class="tips-text">入园预约请填写以下信息：</text>
 				</view>
 
@@ -24,83 +18,45 @@
 				<view class="form-content">
 					<view class="form-item">
 						<text class="label">您的姓名</text>
-            <text class="required">*必填</text>
+						<text class="required">*</text>
-            <input
+						<input type="text" v-model="formData.name" placeholder="请输入姓名" placeholder-class="placeholder" class="input" />
-              type="text"
-              v-model="formData.name"
-              placeholder="请输入姓名"
-              placeholder-class="placeholder"
-              class="input"
-            />
 					</view>
 
 					<view class="form-item">
 						<text class="label">联系方式</text>
-            <text class="required">*必填</text>
+						<text class="required">*</text>
-            <input
+						<input type="text" v-model="formData.mobile" placeholder="请输入手机号" placeholder-class="placeholder" class="input" />
-              type="text"
-              v-model="formData.mobile"
-              placeholder="请输入手机号"
-              placeholder-class="placeholder"
-              class="input"
-            />
 					</view>
 
 					<view class="form-item">
 						<text class="label">公司名称</text>
 						<text class="required">*</text>
-            <input
+						<input type="text" v-model="formData.companyName" placeholder="请输入公司名称" placeholder-class="placeholder" class="input" />
-              type="text"
-              v-model="formData.companyName"
-              placeholder="请输入公司名称"
-              placeholder-class="placeholder"
-              class="input"
-            />
 					</view>
 
 					<view class="form-item">
 						<text class="label">拜访原因<text class="required">*</text></text>
-            <picker 
+						<picker :range="reasonList" range-key="label" @change="onReasonChange">
-              :range="reasonList" 
-              range-key="label"
-              @change="onReasonChange"
-            >
 							<view class="input-wrapper">
 								<text :class="['placeholder', formData.reasonValue ? 'active' : '']">
-                  {{ formData.reasonLabel || '请选择拜访原因' }}
+									{{ formData.reasonLabel || "请选择拜访原因" }}
 								</text>
-                <text class="arrow">></text>
+								<text class="c-coolGray"> ></text>
 							</view>
 						</picker>
 					</view>
 
 					<view class="form-item switch-item">
 						<text class="label">是否有随行人员</text>
-            <switch
+						<switch :checked="formData.isOtherPeople === '1'" @change="onSwitchOtherPeople" style="transform: scale(0.9)" />
-              :checked="formData.isOtherPeople === '1'"
-              @change="onSwitchOtherPeople"
-              style="transform:scale(0.9)"
-            />
 					</view>
 
 					<!-- 随行人员信息 -->
 					<block v-if="formData.isOtherPeople === '1'">
 						<view v-for="(person, index) in otherPeople" :key="index" class="companion-item">
 							<view class="companion-inputs">
-                <input
+								<input type="text" v-model="person.name" placeholder="姓名" class="companion-input" placeholder-class="placeholder" />
-                  type="text"
+								<input type="text" v-model="person.mobile" placeholder="手机号" class="companion-input" placeholder-class="placeholder" />
-                  v-model="person.name"
-                  placeholder="姓名"
-                  class="companion-input"
-                  placeholder-class="placeholder"
-                />
-                <input
-                  type="text"
-                  v-model="person.mobile"
-                  placeholder="手机号"
-                  class="companion-input"
-                  placeholder-class="placeholder"
-                />
 							</view>
 							<text v-if="index > 0" class="delete-text" @tap="removeOtherPeople(index)">删除</text>
 						</view>
@@ -112,23 +68,13 @@
 
 					<view class="form-item switch-item">
 						<text class="label">是否驾驶车辆</text>
-            <switch
+						<switch :checked="formData.isDrive === '1'" @change="onSwitchDrive" style="transform: scale(0.9)" />
-              :checked="formData.isDrive === '1'"
-              @change="onSwitchDrive"
-              style="transform:scale(0.9)"
-            />
 					</view>
 
 					<!-- 车牌信息 -->
 					<block v-if="formData.isDrive === '1'">
 						<view v-for="(car, index) in carList" :key="index" class="car-item">
-              <input
+							<input type="text" v-model="car.carNumber" placeholder="请输入车牌号" class="car-input" placeholder-class="placeholder" />
-                type="text"
-                v-model="car.carNumber"
-                placeholder="请输入车牌号"
-                class="car-input"
-                placeholder-class="placeholder"
-              />
 							<text v-if="index > 0" class="delete-text" @tap="removeCarNumber(index)">删除</text>
 						</view>
 						<view v-if="carList.length < 2" class="add-btn" @tap="addCarNumber">
@@ -140,25 +86,25 @@
 					<view class="form-item select-item" @tap="showDeptPicker">
 						<text class="label">到访单位</text>
 						<view class="select-right">
-              <text class="select-value">{{ selectedDeptName || '请选择' }}</text>
+							<text class="select-value">{{ selectedDeptName || "请选择" }}</text>
 							<text class="select-arrow">></text>
 						</view>
 					</view>
 
 					<view class="form-item select-item" @tap="showUserPicker">
 						<text class="label">接待人</text>
-            <text class="required">*必填</text>
+						<text class="required">*</text>
 						<view class="select-right">
-              <text class="select-value">{{ selectedUserName || '请选择' }}</text>
+							<text class="select-value">{{ selectedUserName || "请选择" }}</text>
 							<text class="select-arrow">></text>
 						</view>
 					</view>
 
 					<view class="form-item select-item" @tap="showTimePicker">
 						<text class="label">到访时间</text>
-            <text class="required">*必填</text>
+						<text class="required">*</text>
 						<view class="select-right">
-              <text class="select-value">{{ selectedTime || '请选择' }}</text>
+							<text class="select-value">{{ selectedTime || "请选择" }}</text>
 							<text class="select-arrow">></text>
 						</view>
 					</view>
@@ -183,10 +129,10 @@
 						:key="dept.id"
 						class="dept-item"
 						:class="{
-              'active': selectedDeptId === dept.id,
+							active: selectedDeptId === dept.id,
 							'level-1': dept.level === 1,
 							'level-2': dept.level === 2,
-              'level-3': dept.level === 3
+							'level-3': dept.level === 3,
 						}"
 						@tap="selectDept(dept)"
 					>
@@ -257,11 +203,7 @@
 					/>
 				</view>
 
-        <scroll-view 
+				<scroll-view scroll-y class="user-list" :style="{ height: '50vh' }">
-          scroll-y 
-          class="user-list"
-          :style="{ height: '50vh' }"
-        >
 					<view
 						v-for="user in filteredUserList"
 						:key="user.userId"
@@ -272,7 +214,7 @@
 						<text class="user-name">{{ user.name }}</text>
 					</view>
 					<view v-if="filteredUserList.length === 0" class="empty-tip">
-            {{ searchKeyword ? '未找到相关接待人' : '暂无接待人数据' }}
+						{{ searchKeyword ? "未找到相关接待人" : "暂无接待人数据" }}
 					</view>
 				</scroll-view>
 
@@ -285,40 +227,38 @@
 </template>
 
 <script setup lang="ts">
-import { ref, reactive, computed, onMounted } from 'vue'
+import { ref, reactive, computed, onMounted } from "vue"
-import visitorApi from '@/sheep/api/integrated/visitors'
+import visitorApi from "@/sheep/api/integrated/visitors"
-import dayjs from 'dayjs'
+import dayjs from "dayjs"
-import deptApi from '@/sheep/api/integrated/dept'
+import deptApi from "@/sheep/api/integrated/dept"
 
 // 表单数据
 const formData = reactive({
-  name: '测试访客',
+	name: "测试访客",
-  mobile: '13800138000',
+	mobile: "13800138000",
-  companyName: '测试公司',
+	companyName: "测试公司",
-  isOtherPeople: '1', // 默认有随行人员
+	isOtherPeople: "1", // 默认有随行人员
-  isDrive: '1', // 默认有车辆
+	isDrive: "1", // 默认有车辆
-  deptId: '',  // 这个需要等部门列表加载后设置
+	deptId: "", // 这个需要等部门列表加载后设置
-  deptName: '',
+	deptName: "",
-  userId: '',  // 这个需要等用户列表加载后设置
+	receiveId: "", // 这个需要等用户列表加载后设置
-  userName: '',
+	userName: "",
-  vstartDate: '',  // 这个会在页面加载时设置
+	vstartDate: "", // 这个会在页面加载时设置
-  vendDate: '',
+	vendDate: "",
-  type: '1',
+	type: "1",
-  checkStatus: '0',
+	checkStatus: "0",
-  reasonValue: '',  // 这个需要等原因列表加载后设置
+	reasonValue: "", // 这个需要等原因列表加载后设置
-  reasonLabel: '',
+	reasonLabel: "",
 })
 
 // 随行人员列表默认数据
 const otherPeople = ref([
-  { name: '随行人员1', mobile: '13800138001' },
+	{ name: "随行人员1", mobile: "13800138001" },
-  { name: '随行人员2', mobile: '13800138002' }
+	{ name: "随行人员2", mobile: "13800138002" },
 ])
 
 // 车牌列表默认数据
-const carList = ref([
+const carList = ref([{ carNumber: "沪A12345" }])
-  { carNumber: '沪A12345' }
-])
 
 // 弹窗控制
 const showDeptPopup = ref(false)
@@ -328,34 +268,34 @@ const showUserPopup = ref(false)
 // 时间选择相关的状态
 const selectedDateIndex = ref(0)
 const selectedTimeIndex = ref(-1)
-const selectedTime = ref('')
+const selectedTime = ref("")
 
 // 部门选择相关的状态
 const deptList = ref<any[]>([])
 const flatDeptList = ref<any[]>([])
-const selectedDeptId = ref('')
+const selectedDeptId = ref("")
-const selectedDeptName = ref('')
+const selectedDeptName = ref("")
 
 // 接待人选择相关的状态
 const userList = ref<any[]>([])
-const selectedUserId = ref('')
+const selectedUserId = ref("")
-const selectedUserName = ref('')
+const selectedUserName = ref("")
-const searchKeyword = ref('')
+const searchKeyword = ref("")
 
 // 拜访原因相关
 const reasonList = ref<any[]>([])
 
 // 生成未来一周的日期
 const dateList = computed(() => {
-  const dates = []
+	const dates: any = []
-  const weekDays = ['周日', '周一', '周二', '周三', '周四', '周五', '周六']
+	const weekDays = ["周日", "周一", "周二", "周三", "周四", "周五", "周六"]
 
 	for (let i = 0; i < 7; i++) {
-    const date = dayjs().add(i, 'day')
+		const date = dayjs().add(i, "day")
 		dates.push({
-      date: date.format('MM.DD'),
+			date: date.format("MM.DD"),
 			weekDay: weekDays[date.day()],
-      fullDate: date.format('YYYY-MM-DD')
+			fullDate: date.format("YYYY-MM-DD"),
 		})
 	}
 
@@ -364,9 +304,9 @@ const dateList = computed(() => {
 
 // 生成时间段列表（8:00-18:00，每小时一个时间段）
 const timeList = computed(() => {
-  const times = []
+	const times: any = []
 	for (let i = 8; i < 18; i++) {
-    times.push(`${i.toString().padStart(2, '0')}:00-${(i + 1).toString().padStart(2, '0')}:00`)
+		times.push(`${i.toString().padStart(2, "0")}:00-${(i + 1).toString().padStart(2, "0")}:00`)
 	}
 	return times
 })
@@ -375,9 +315,7 @@ const timeList = computed(() => {
 const filteredUserList = computed(() => {
 	if (!searchKeyword.value) return userList.value
 	const keyword = searchKeyword.value.toLowerCase()
-  return userList.value.filter(user => 
+	return userList.value.filter((user) => user.name.toLowerCase().includes(keyword))
-    user.name.toLowerCase().includes(keyword)
-  )
 })
 
 // 获取部门数据
@@ -390,17 +328,17 @@ const getDeptList = async () => {
 			flattenDeptList(data)
 		}
 	} catch (error) {
-    console.error('获取部门列表失败:', error)
+		console.error("获取部门列表失败:", error)
 	}
 }
 
 // 扁平化部门数据并添加层级信息
 const flattenDeptList = (depts: any[], level = 1, result: any[] = []) => {
-  depts.forEach(dept => {
+	depts.forEach((dept) => {
 		result.push({
 			id: dept.id,
 			name: dept.name,
-      level
+			level,
 		})
 		if (dept.children && dept.children.length > 0) {
 			flattenDeptList(dept.children, level + 1, result)
@@ -411,24 +349,24 @@ const flattenDeptList = (depts: any[], level = 1, result: any[] = []) => {
 
 // 开关控制 - 随行人员
 const onSwitchOtherPeople = (value: boolean) => {
-  formData.isOtherPeople = value ? '1' : '0'
+	formData.isOtherPeople = value ? "1" : "0"
 	if (value && otherPeople.value.length === 0) {
-    otherPeople.value.push({ name: '', mobile: '' })
+		otherPeople.value.push({ name: "", mobile: "" })
 	}
 }
 
 // 开关控制 - 驾驶车辆
 const onSwitchDrive = (value: boolean) => {
-  formData.isDrive = value ? '1' : '0'
+	formData.isDrive = value ? "1" : "0"
 	if (value && carList.value.length === 0) {
-    carList.value.push({ carNumber: '' })
+		carList.value.push({ carNumber: "" })
 	}
 }
 
 // 随行人员管理
 const addOtherPeople = () => {
 	if (otherPeople.value.length < 5) {
-    otherPeople.value.push({ name: '', mobile: '' })
+		otherPeople.value.push({ name: "", mobile: "" })
 	}
 }
 
@@ -439,7 +377,7 @@ const removeOtherPeople = (index: number) => {
 // 车牌管理
 const addCarNumber = () => {
 	if (carList.value.length < 2) {
-    carList.value.push({ carNumber: '' })
+		carList.value.push({ carNumber: "" })
 	}
 }
 
@@ -455,27 +393,27 @@ const goBack = () => {
 // 表单验证
 const validateForm = () => {
 	if (!formData.name) {
-    uni.showToast({ title: '请输入姓名', icon: 'none' })
+		uni.showToast({ title: "请输入姓名", icon: "none" })
 		return false
 	}
 	if (!formData.mobile) {
-    uni.showToast({ title: '请输入联系方式', icon: 'none' })
+		uni.showToast({ title: "请输入联系方式", icon: "none" })
 		return false
 	}
 	if (!formData.deptId || !formData.deptName) {
-    uni.showToast({ title: '请选择到访单位', icon: 'none' })
+		uni.showToast({ title: "请选择到访单位", icon: "none" })
 		return false
 	}
-  if (!formData.userId || !formData.userName) {
+	if (!formData.receiveId || !formData.userName) {
-    uni.showToast({ title: '请选择接待人', icon: 'none' })
+		uni.showToast({ title: "请选择接待人", icon: "none" })
 		return false
 	}
 	if (!formData.vstartDate || !formData.vendDate) {
-    uni.showToast({ title: '请选择到访时间', icon: 'none' })
+		uni.showToast({ title: "请选择到访时间", icon: "none" })
 		return false
 	}
 	if (!formData.reasonValue || !formData.reasonLabel) {
-    uni.showToast({ title: '请选择拜访原因', icon: 'none' })
+		uni.showToast({ title: "请选择拜访原因", icon: "none" })
 		return false
 	}
 	return true
@@ -487,15 +425,15 @@ const handleSubmit = async () => {
 
 	try {
 		uni.showLoading({
-      title: '提交中...',
+			title: "提交中...",
-      mask: true
+			mask: true,
 		})
 
 		const submitData = {
 			...formData,
-      peopleNumber: formData.isOtherPeople === '1' ? otherPeople.value.length : 0,
+			peopleNumber: formData.isOtherPeople === "1" ? otherPeople.value.length : 0,
-      otherPeople: formData.isOtherPeople === '1' ? otherPeople.value : [],
+			otherPeople: formData.isOtherPeople === "1" ? otherPeople.value : [],
-      carList: formData.isDrive === '1' ? carList.value : []
+			carList: formData.isDrive === "1" ? carList.value : [],
 		}
 
 		const { code, msg } = await visitorApi.save(submitData)
@@ -504,9 +442,9 @@ const handleSubmit = async () => {
 
 		if (code === 0) {
 			uni.showToast({
-        title: '提交成功，请耐心等待您的拜访对象接受此次申请',
+				title: "提交成功，请耐心等待您的拜访对象接受此次申请",
-        icon: 'none',
+				icon: "none",
-        duration: 3000
+				duration: 3000,
 			})
 
 			// 延迟返回，让用户能看到提示
@@ -515,15 +453,15 @@ const handleSubmit = async () => {
 			}, 2000)
 		} else {
 			uni.showToast({
-        title: msg || '提交失败',
+				title: msg || "提交失败",
-        icon: 'none'
+				icon: "none",
 			})
 		}
 	} catch (error) {
 		uni.hideLoading()
 		uni.showToast({
-      title: '提交失败',
+			title: "提交失败",
-      icon: 'none'
+			icon: "none",
 		})
 	}
 }
@@ -552,8 +490,8 @@ const selectTime = (index: number) => {
 const confirmTimeSelect = () => {
 	if (selectedTimeIndex.value === -1) {
 		uni.showToast({
-      title: '请选择具体时间',
+			title: "请选择具体时间",
-      icon: 'none'
+			icon: "none",
 		})
 		return
 	}
@@ -562,7 +500,7 @@ const confirmTimeSelect = () => {
 	const selectedTimeRange = timeList.value[selectedTimeIndex.value]
 
 	// 更新表单数据
-  const [startTime, endTime] = selectedTimeRange.split('-')
+	const [startTime, endTime] = selectedTimeRange.split("-")
 	formData.vstartDate = `${selectedDate.fullDate} ${startTime}:00`
 	formData.vendDate = `${selectedDate.fullDate} ${endTime}:00`
 
@@ -595,8 +533,8 @@ const selectDept = (dept: any) => {
 const confirmDeptSelect = () => {
 	if (!selectedDeptId.value) {
 		uni.showToast({
-      title: '请选择到访单位',
+			title: "请选择到访单位",
-      icon: 'none'
+			icon: "none",
 		})
 		return
 	}
@@ -606,10 +544,10 @@ const confirmDeptSelect = () => {
 	formData.deptName = selectedDeptName.value
 
 	// 清空已选择的接待人
-  formData.userId = ''
+	formData.receiveId = ""
-  formData.userName = ''
+	formData.userName = ""
-  selectedUserName.value = ''
+	selectedUserName.value = ""
-  selectedUserId.value = ''
+	selectedUserId.value = ""
 
 	// 关闭弹窗
 	closeDeptPicker()
@@ -624,7 +562,7 @@ const getUserList = async (deptId: string) => {
 			userList.value = Array.isArray(data) ? data : []
 		}
 	} catch (error) {
-    console.error('获取用户列表失败:', error)
+		console.error("获取用户列表失败:", error)
 		userList.value = []
 	}
 }
@@ -639,14 +577,14 @@ const selectUser = (user: any) => {
 const confirmUserSelect = () => {
 	if (!selectedUserId.value) {
 		uni.showToast({
-      title: '请选择接待人',
+			title: "请选择接待人",
-      icon: 'none'
+			icon: "none",
 		})
 		return
 	}
 
 	// 更新表单数据，同时保存ID和名称
-  formData.userId = selectedUserId.value
+	formData.receiveId = selectedUserId.value
 	formData.userName = selectedUserName.value
 
 	// 关闭弹窗
@@ -657,8 +595,8 @@ const confirmUserSelect = () => {
 const showUserPicker = async () => {
 	if (!formData.deptId) {
 		uni.showToast({
-      title: '请先选择到访单位',
+			title: "请先选择到访单位",
-      icon: 'none'
+			icon: "none",
 		})
 		return
 	}
@@ -668,8 +606,8 @@ const showUserPicker = async () => {
 		await getUserList(formData.deptId)
 		currentDeptId.value = formData.deptId
 		// 清空选择
-    selectedUserId.value = ''
+		selectedUserId.value = ""
-    selectedUserName.value = ''
+		selectedUserName.value = ""
 	}
 
 	showUserPopup.value = true
@@ -678,22 +616,22 @@ const showUserPicker = async () => {
 // 关闭用户选择器
 const closeUserPicker = () => {
 	showUserPopup.value = false
-  searchKeyword.value = ''
+	searchKeyword.value = ""
 }
 
 // 记录当前选中的部门ID，用于判断是否需要重新获取用户列表
-const currentDeptId = ref('')
+const currentDeptId = ref("")
 
 // 获取拜访原因列表
 const getReasonList = async () => {
 	try {
-    const { code, data } = await visitorApi.getDictListByType('1')
+		const { code, data } = await visitorApi.getDictListByType("1")
 		if (code === 0 && data) {
 			// 将对象转换为数组
 			reasonList.value = Object.values(data)
 		}
 	} catch (error) {
-    console.error('获取拜访原因失败:', error)
+		console.error("获取拜访原因失败:", error)
 	}
 }
 
@@ -727,11 +665,20 @@ onMounted(async () => {
 			const firstUser = userList.value[0]
 			selectedUserId.value = firstUser.userId
 			selectedUserName.value = firstUser.name
-      formData.userId = firstUser.userId
+			formData.receiveId = firstUser.userId
 			formData.userName = firstUser.name
 		}
 	}
 
+	// 设置默认的接待人（选择第一个用户）
+	if (userList.value.length > 0) {
+		const firstUser = userList.value[0]
+		selectedUserId.value = firstUser.userId
+		selectedUserName.value = firstUser.name
+		formData.userId = firstUser.userId
+		formData.userName = firstUser.name
+	}
+
 	// 设置默认的拜访原因（选择第一个原因）
 	if (reasonList.value.length > 0) {
 		const firstReason = reasonList.value[0]
@@ -744,7 +691,7 @@ onMounted(async () => {
 	selectedTimeIndex.value = 0
 	const selectedDate = dateList.value[0]
 	const selectedTimeRange = timeList.value[0]
-  const [startTime, endTime] = selectedTimeRange.split('-')
+	const [startTime, endTime] = selectedTimeRange.split("-")
 	formData.vstartDate = `${selectedDate.fullDate} ${startTime}:00`
 	formData.vendDate = `${selectedDate.fullDate} ${endTime}:00`
 	selectedTime.value = `${selectedDate.weekDay} ${selectedDate.date} ${selectedTimeRange}`
@@ -758,7 +705,8 @@ onMounted(async () => {
 	display: flex;
 	flex-direction: column;
 	position: relative;
-  font-family: -apple-system, BlinkMacSystemFont, 'Helvetica Neue', Helvetica, Segoe UI, Arial, Roboto, 'PingFang SC', 'miui', 'Hiragino Sans GB', 'Microsoft Yahei', sans-serif;
+	font-family: -apple-system, BlinkMacSystemFont, "Helvetica Neue", Helvetica, Segoe UI, Arial, Roboto, "PingFang SC", "miui",
+		"Hiragino Sans GB", "Microsoft Yahei", sans-serif;
 }
 
 .header {
@@ -788,6 +736,7 @@ onMounted(async () => {
 		color: #323233;
 		font-weight: 500;
 		letter-spacing: 0.5rpx;
+		margin: 0 auto;
 	}
 
 	.right-placeholder {
@@ -802,19 +751,19 @@ onMounted(async () => {
 
 .content-wrapper {
 	min-height: 100%;
-  padding: 0 0 calc(240rpx + env(safe-area-inset-bottom));
+	padding: 0 0 150rpx;
 	background: #fff;
 }
 
 .tips-box {
 	padding: 24rpx 30rpx;
-  background: #FFF7E6;
+	background: #fff7e6;
 	display: flex;
 	align-items: center;
 
 	.tips-icon {
 		margin-right: 12rpx;
-    color: #FF9900;
+		color: #ff9900;
 	}
 
 	.tips-text {
@@ -842,7 +791,7 @@ onMounted(async () => {
 
 	.required {
 		font-size: 28rpx;
-    color: #EE0A24;
+		color: #ee0a24;
 	}
 
 	.input {
@@ -860,7 +809,6 @@ onMounted(async () => {
 }
 
 .select-item {
-  display: flex;
 	justify-content: space-between;
 	align-items: center;
 }
@@ -886,7 +834,8 @@ onMounted(async () => {
 	font-size: 30rpx;
 }
 
-.companion-item, .car-item {
+.companion-item,
+.car-item {
 	padding: 24rpx 0;
 
 	.companion-inputs {
@@ -894,10 +843,11 @@ onMounted(async () => {
 		gap: 24rpx;
 	}
 
-  .companion-input, .car-input {
+	.companion-input,
+	.car-input {
 		flex: 1;
 		height: 88rpx;
-    background: #F7F8FA;
+		background: #f7f8fa;
 		border-radius: 8rpx;
 		padding: 0 24rpx;
 		font-size: 30rpx;
@@ -908,7 +858,7 @@ onMounted(async () => {
 .delete-text {
 	display: block;
 	text-align: right;
-  color: #EE0A24;
+	color: #ee0a24;
 	font-size: 28rpx;
 	margin-top: 12rpx;
 	padding: 8rpx 0;
@@ -922,13 +872,13 @@ onMounted(async () => {
 
 	.add-icon {
 		font-size: 32rpx;
-    color: #1989FA;
+		color: #1989fa;
 		margin-right: 12rpx;
 	}
 
 	.add-text {
 		font-size: 30rpx;
-    color: #1989FA;
+		color: #1989fa;
 		font-weight: 400;
 	}
 }
@@ -937,9 +887,9 @@ onMounted(async () => {
 	position: fixed;
 	left: 30rpx;
 	right: 30rpx;
-  bottom: calc(120rpx + env(safe-area-inset-bottom));
+	bottom: 30rpx;
 	height: 88rpx;
-  background: #1989FA;
+	background: #1989fa;
 	border-radius: 44rpx;
 	display: flex;
 	align-items: center;
@@ -957,7 +907,7 @@ onMounted(async () => {
 	background-color: #dcdee0 !important;
 
 	&.uni-switch-input-checked {
-    background-color: #1989FA !important;
+		background-color: #1989fa !important;
 	}
 }
 
@@ -1029,11 +979,12 @@ onMounted(async () => {
 		padding: 16rpx 0;
 
 		&.active {
-      background: #E8F3FF;
+			background: #e8f3ff;
 			border-radius: 8rpx;
 
-      .date-week, .date-day {
+			.date-week,
-        color: #1989FA;
+			.date-day {
+				color: #1989fa;
 			}
 		}
 
@@ -1062,14 +1013,14 @@ onMounted(async () => {
 		display: flex;
 		align-items: center;
 		justify-content: center;
-    background: #F7F8FA;
+		background: #f7f8fa;
 		border-radius: 8rpx;
 		font-size: 28rpx;
 		color: #323233;
 
 		&.active {
-      background: #E8F3FF;
+			background: #e8f3ff;
-      color: #1989FA;
+			color: #1989fa;
 		}
 	}
 }
@@ -1083,7 +1034,7 @@ onMounted(async () => {
 
 	.confirm-btn {
 		height: 88rpx;
-    background: #1989FA;
+		background: #1989fa;
 		border-radius: 44rpx;
 		display: flex;
 		align-items: center;
@@ -1108,8 +1059,8 @@ onMounted(async () => {
 	color: #323233;
 
 	&.active {
-    color: #1989FA;
+		color: #1989fa;
-    background: #F5F5F5;
+		background: #f5f5f5;
 	}
 
 	&.level-1 {
@@ -1127,7 +1078,7 @@ onMounted(async () => {
 
 // 增加底部空间
 .dept-list::after {
-  content: '';
+	content: "";
 	display: block;
 	height: 400rpx; // 增加更多的底部空间
 	width: 100%;
@@ -1141,7 +1092,7 @@ onMounted(async () => {
 
 .search-input {
 	height: 72rpx;
-  background: #F7F8FA;
+	background: #f7f8fa;
 	border-radius: 36rpx;
 	padding: 0 32rpx;
 	font-size: 28rpx;
@@ -1163,8 +1114,8 @@ onMounted(async () => {
 	align-items: center;
 
 	&.active {
-    color: #1989FA;
+		color: #1989fa;
-    background: #F5F5F5;
+		background: #f5f5f5;
 	}
 
 	.user-name {

src/pages/integrated/visitor/myvisitor.vue

@@ -2,13 +2,7 @@
 	<view class="visitor-list">
 		<!-- 顶部标签页 -->
 		<view class="tabs">
-      <view 
+			<view v-for="(tab, index) in tabs" :key="index" class="tab-item" :class="{ active: currentTab === index }" @tap="switchTab(index)">
-        v-for="(tab, index) in tabs" 
-        :key="index"
-        class="tab-item"
-        :class="{ active: currentTab === index }"
-        @tap="switchTab(index)"
-      >
 				<text>{{ tab }}</text>
 			</view>
 		</view>
@@ -22,12 +16,7 @@
 			@refresherrefresh="onRefresh"
 			@scrolltolower="loadMore"
 		>
-      <view 
+			<view v-for="item in visitorList" :key="item.id" class="visitor-item" @tap="goToDetail(item)">
-        v-for="item in visitorList" 
-        :key="item.id"
-        class="visitor-item"
-        @tap="goToDetail(item)"
-      >
 				<view class="item-header">
 					<text class="visit-time">{{ formatTime(item.vstartDate, item.vendDate) }}</text>
 					<text :class="['status-tag', getStatusClass(item.checkStatus)]">
@@ -58,16 +47,8 @@
 				</view>
 				<view class="item-footer" v-if="canCancel(item.checkStatus) || canVisit(item.checkStatus)">
 					<view class="btn-group">
-            <view 
+						<view v-if="canVisit(item.checkStatus)" class="visit-btn" @tap="handleVisit(item)">已到访</view>
-              v-if="canVisit(item.checkStatus)"
+						<view v-if="canCancel(item.checkStatus)" class="cancel-btn" @tap="handleCancel(item)">取消</view>
-              class="visit-btn" 
-              @tap="handleVisit(item)"
-            >已到访</view>
-            <view 
-              v-if="canCancel(item.checkStatus)"
-              class="cancel-btn" 
-              @tap="handleCancel(item)"
-            >取消</view>
 					</view>
 				</view>
 			</view>
@@ -75,19 +56,17 @@
 			<!-- 加载状态 -->
 			<view v-if="loading && !refreshing" class="loading">加载中...</view>
 			<view v-if="!loading && !hasMore" class="no-more">没有更多数据了</view>
-      <view v-if="!loading && visitorList.length === 0" class="empty">
+			<view v-if="!loading && visitorList.length === 0" class="empty">暂无访客记录</view>
-        暂无访客记录
-      </view>
 		</scroll-view>
 	</view>
 </template>
 
 <script setup lang="ts">
-import { ref, onMounted } from 'vue'
+import { ref, onMounted } from "vue"
-import visitorApi from '@/sheep/api/integrated/visitors'
+import visitorApi from "@/sheep/api/integrated/visitors"
 
 // 标签页配置
-const tabs = ['全部', '待审核', '待到访', '已到访', '已取消']
+const tabs = ["全部", "待审核", "待到访", "已到访", "已取消"]
 const currentTab = ref(0)
 
 // 列表数据
@@ -100,7 +79,7 @@ const size = 10
 
 // 格式化访问时间
 const formatTime = (start: string, end: string) => {
-  if (!start || !end) return ''
+	if (!start || !end) return ""
 	const startDate = new Date(start)
 	const endDate = new Date(end)
 	return `${startDate.getMonth() + 1}/${startDate.getDate()} ${startDate.getHours()}:00-${endDate.getHours()}:00`
@@ -108,7 +87,7 @@ const formatTime = (start: string, end: string) => {
 
 // 格式化创建时间
 const formatCreateTime = (time: string) => {
-  if (!time) return ''
+	if (!time) return ""
 	const date = new Date(time)
 	return `${date.getFullYear()}/${date.getMonth() + 1}/${date.getDate()} ${date.getHours()}:${date.getMinutes()}`
 }
@@ -116,10 +95,10 @@ const formatCreateTime = (time: string) => {
 // 获取状态文本
 const getStatusText = (status: string) => {
 	const statusMap: Record<string, string> = {
-    '1': '待审核',
+		"1": "待审核",
-    '2': '待到访',
+		"2": "待到访",
-    '0': '已到访',
+		"0": "已到访",
-    '5': '已取消'
+		"5": "已取消",
 	}
 	return statusMap[status] || status
 }
@@ -127,12 +106,12 @@ const getStatusText = (status: string) => {
 // 获取状态样式
 const getStatusClass = (status: string) => {
 	const statusMap: Record<string, string> = {
-    '1': 'status-pending',
+		"1": "status-pending",
-    '2': 'status-waiting',
+		"2": "status-waiting",
-    '0': 'status-visited',
+		"0": "status-visited",
-    '5': 'status-cancelled'
+		"5": "status-cancelled",
 	}
-  return statusMap[status] || ''
+	return statusMap[status] || ""
 }
 
 // 切换标签页
@@ -158,12 +137,12 @@ const getVisitorList = async () => {
 	try {
 		const params: any = {
 			current: current.value,
-      size
+			size,
 		}
 
 		// 添加状态筛选
 		if (currentTab.value > 0) {
-      const statusMap = ['', '1', '2', '0', '5']
+			const statusMap = ["", "1", "2", "0", "5"]
 			params.checkStatus = statusMap[currentTab.value]
 		}
 
@@ -182,10 +161,10 @@ const getVisitorList = async () => {
 			}
 		}
 	} catch (error) {
-    console.error('获取访客记录失败:', error)
+		console.error("获取访客记录失败:", error)
 		uni.showToast({
-      title: '获取数据失败',
+			title: "获取数据失败",
-      icon: 'none'
+			icon: "none",
 		})
 	} finally {
 		loading.value = false
@@ -209,12 +188,12 @@ const loadMore = () => {
 
 // 判断是否可以取消
 const canCancel = (status: string) => {
-  return status === '1' || status === '2' || status === '5'
+	return status === "1" || status === "2" || status === "5"
 }
 
 // 判断是否可以标记到访
 const canVisit = (status: string) => {
-  return status === '2'
+	return status === "2"
 }
 
 // 修改取消预约方法
@@ -222,14 +201,14 @@ const handleCancel = (item: any) => {
 	if (!item.id) return
 
 	uni.showModal({
-    title: '提示',
+		title: "提示",
-    content: '确定要取消此次预约吗？',
+		content: "确定要取消此次预约吗？",
 		success: async (res) => {
 			if (res.confirm) {
 				try {
 					uni.showLoading({
-            title: '取消中...',
+						title: "取消中...",
-            mask: true
+						mask: true,
 					})
 
 					const { code, msg } = await visitorApi.cancelVisitor(item.id)
@@ -238,27 +217,27 @@ const handleCancel = (item: any) => {
 
 					if (code === 0) {
 						uni.showToast({
-              title: '取消成功',
+							title: "取消成功",
-              icon: 'success'
+							icon: "success",
 						})
 						// 刷新列表
 						resetList()
 						getVisitorList()
 					} else {
 						uni.showToast({
-              title: msg || '取消失败',
+							title: msg || "取消失败",
-              icon: 'none'
+							icon: "none",
 						})
 					}
 				} catch (error) {
 					uni.hideLoading()
 					uni.showToast({
-            title: '取消失败',
+						title: "取消失败",
-            icon: 'none'
+						icon: "none",
 					})
 				}
 			}
-    }
+		},
 	})
 }
 
@@ -267,14 +246,14 @@ const handleVisit = (item: any) => {
 	if (!item.id) return
 
 	uni.showModal({
-    title: '提示',
+		title: "提示",
-    content: '确认访客已到访？',
+		content: "确认访客已到访？",
 		success: async (res) => {
 			if (res.confirm) {
 				try {
 					uni.showLoading({
-            title: '处理中...',
+						title: "处理中...",
-            mask: true
+						mask: true,
 					})
 
 					const { code, msg } = await visitorApi.haveVisitor(item.id)
@@ -283,34 +262,34 @@ const handleVisit = (item: any) => {
 
 					if (code === 0) {
 						uni.showToast({
-              title: '操作成功',
+							title: "操作成功",
-              icon: 'success'
+							icon: "success",
 						})
 						// 刷新列表
 						resetList()
 						getVisitorList()
 					} else {
 						uni.showToast({
-              title: msg || '操作失败',
+							title: msg || "操作失败",
-              icon: 'none'
+							icon: "none",
 						})
 					}
 				} catch (error) {
 					uni.hideLoading()
 					uni.showToast({
-            title: '操作失败',
+						title: "操作失败",
-            icon: 'none'
+						icon: "none",
 					})
 				}
 			}
-    }
+		},
 	})
 }
 
 // 跳转到详情页
 const goToDetail = (item: any) => {
 	uni.navigateTo({
-    url: `/pages/integrated/visitor/visitorDetail?id=${item.id}&token=${item.token}`
+		url: `/pages/integrated/visitor/visitorDetail?id=${item.id}&token=${item.token}`,
 	})
 }
 
@@ -321,170 +300,162 @@ onMounted(() => {
 
 <style lang="scss" scoped>
 .visitor-list {
-  min-height: 100vh;
-  background: #F7F8FA;
-}
-
-.tabs {
 	display: flex;
-  background: #fff;
+	flex-direction: column;
-  padding: 0 32rpx;
+	height: 100vh;
-  position: fixed;
+	background-color: #f5f5f5;
+
+	.tabs {
+		display: flex;
+		background-color: #fff;
+		padding: 20rpx 0;
+		position: sticky;
 		top: 0;
-  left: 0;
+		z-index: 100;
-  right: 0;
+		border-bottom: 1rpx solid #eee;
-  z-index: 1;
-}
 
-.tab-item {
+		.tab-item {
 			flex: 1;
-  height: 88rpx;
+			text-align: center;
-  display: flex;
+			padding: 20rpx 0;
-  align-items: center;
-  justify-content: center;
 			font-size: 28rpx;
 			color: #666;
 			position: relative;
 
 			&.active {
-    color: #1989FA;
+				color: #1777ff;
-    font-weight: 500;
+				font-weight: bold;
 
 				&::after {
-      content: '';
+					content: "";
 					position: absolute;
 					bottom: 0;
 					left: 50%;
 					transform: translateX(-50%);
 					width: 40rpx;
 					height: 4rpx;
-      background: #1989FA;
+					background-color: #1777ff;
 					border-radius: 2rpx;
 				}
 			}
-}
-
-.list-content {
-  padding: 108rpx 32rpx 32rpx;
-}
-
-.visitor-item {
-  background: #fff;
-  border-radius: 12rpx;
-  padding: 24rpx;
-  margin-bottom: 20rpx;
-  &:active {
-    opacity: 0.8;
 		}
-}
+	}
 
-.item-header {
+	.list-content {
+		flex: 1;
+		height: calc(100vh - 100rpx);
+		padding: 20rpx;
+		box-sizing: border-box;
+	}
+
+	.visitor-item {
+		background-color: #fff;
+		border-radius: 12rpx;
+		padding: 20rpx;
+		margin-bottom: 20rpx;
+		box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
+
+		.item-header {
 			display: flex;
 			justify-content: space-between;
 			align-items: center;
 			margin-bottom: 20rpx;
-}
 
-.visit-time {
+			.visit-time {
 				font-size: 28rpx;
 				color: #333;
-  font-weight: 500;
+				font-weight: bold;
-}
+			}
 
-.status-tag {
+			.status-tag {
+				padding: 4rpx 16rpx;
+				border-radius: 20rpx;
 				font-size: 24rpx;
-  padding: 4rpx 12rpx;
-  border-radius: 4rpx;
 
 				&.status-pending {
-    background: #FFF3E0;
+					background-color: #fff7e6;
-    color: #FF9800;
+					color: #fa8c16;
 				}
 
 				&.status-waiting {
-    background: #E3F2FD;
+					background-color: #e6f7ff;
-    color: #2196F3;
+					color: #1890ff;
 				}
 
 				&.status-visited {
-    background: #E8F5E9;
+					background-color: #f6ffed;
-    color: #4CAF50;
+					color: #52c41a;
 				}
 
 				&.status-cancelled {
-    background: #EEEEEE;
+					background-color: #fff1f0;
-    color: #9E9E9E;
+					color: #f5222d;
+				}
+			}
 		}
-}
 
-.info-row {
+		.item-content {
+			.info-row {
 				display: flex;
-  margin-bottom: 16rpx;
+				margin-bottom: 12rpx;
-  
+				font-size: 26rpx;
-  &:last-child {
-    margin-bottom: 0;
-  }
 
 				.label {
-    font-size: 26rpx;
+					color: #999;
-    color: #666;
 					width: 140rpx;
-    flex-shrink: 0;
 				}
 
 				.value {
-    font-size: 26rpx;
 					color: #333;
 					flex: 1;
 				}
 
 				&.check-reason {
-    margin-top: 16rpx;
-    padding-top: 16rpx;
-    border-top: 1rpx solid #F5F5F5;
-    
 					.value {
-      color: #FF4D4F;
+						color: #f5222d;
+					}
+				}
 			}
 		}
-}
 
-.item-footer {
+		.item-footer {
 			margin-top: 20rpx;
 			padding-top: 20rpx;
-  border-top: 1rpx solid #F5F5F5;
+			border-top: 1rpx solid #eee;
-}
 
-.btn-group {
+			.btn-group {
 				display: flex;
 				justify-content: flex-end;
 				gap: 20rpx;
-}
 
-.cancel-btn, .visit-btn {
+				.visit-btn,
-  padding: 12rpx 32rpx;
+				.cancel-btn {
-  border-radius: 32rpx;
+					padding: 10rpx 30rpx;
+					border-radius: 30rpx;
 					font-size: 26rpx;
+				}
 
-  &:active {
+				.visit-btn {
-    opacity: 0.8;
+					background-color: #1777ff;
+					color: #fff;
+				}
+
+				.cancel-btn {
+					background-color: #fff;
+					color: #666;
+					border: 1rpx solid #ddd;
+				}
+			}
+		}
+	}
+
+	.loading,
+	.no-more,
+	.empty {
+		text-align: center;
+		padding: 30rpx;
+		color: #999;
+		font-size: 26rpx;
 	}
 }
-
-.cancel-btn {
-  border: 1rpx solid #DCDEE0;
-  color: #666;
-}
-
-.visit-btn {
-  background: #1989FA;
-  color: #fff;
-}
-
-.loading, .no-more, .empty {
-  text-align: center;
-  font-size: 24rpx;
-  color: #999;
-  padding: 20rpx 0;
-}
 </style>

src/pages/integrated/visitor/myyyvisitor.vue

@@ -7,41 +7,23 @@
 		<view class="form-content">
 			<view class="form-item">
 				<text class="label">访客姓名<text class="required">*</text></text>
-        <input 
+				<input class="uni-input" type="text" v-model="form.name" placeholder="请输入真实姓名" placeholder-style="color: #999999;" />
-          class="uni-input" 
-          type="text" 
-          v-model="form.name"
-          placeholder="请输入真实姓名"
-          placeholder-style="color: #999999;"
-        />
 			</view>
 
 			<view class="form-item">
 				<text class="label">访客手机号<text class="required">*</text></text>
-        <input 
+				<input class="uni-input" type="number" v-model="form.mobile" placeholder="请输入手机号" placeholder-style="color: #999999;" />
-          class="uni-input" 
-          type="number" 
-          v-model="form.mobile"
-          placeholder="请输入手机号"
-          placeholder-style="color: #999999;"
-        />
 			</view>
 
 			<view class="form-item">
 				<text class="label">来访公司名称</text>
-        <input 
+				<input class="uni-input" type="text" v-model="form.companyName" placeholder="请输入公司名称" placeholder-style="color: #999999;" />
-          class="uni-input" 
-          type="text" 
-          v-model="form.companyName"
-          placeholder="请输入公司名称"
-          placeholder-style="color: #999999;"
-        />
 			</view>
 
 			<view class="form-item select-item" @tap="showTimePicker">
 				<text class="label">拜访时间<text class="required">*</text></text>
 				<view class="select-right">
-          <text class="select-value">{{ selectedTime || '请选择' }}</text>
+					<text class="select-value">{{ selectedTime || "请选择" }}</text>
 					<text class="select-arrow">></text>
 				</view>
 			</view>
@@ -49,20 +31,16 @@
 			<view class="form-item select-item" @tap="showDeptPicker">
 				<text class="label">拜访部门<text class="required">*</text></text>
 				<view class="select-right">
-          <text class="select-value">{{ selectedDeptName || '请选择' }}</text>
+					<text class="select-value">{{ selectedDeptName || "请选择" }}</text>
 					<text class="select-arrow">></text>
 				</view>
 			</view>
 
 			<view class="form-item">
 				<text class="label">拜访原因<text class="required">*</text></text>
-        <picker 
+				<picker :range="reasonList" range-key="label" @change="onReasonChange">
-          :range="reasonList" 
-          range-key="label"
-          @change="onReasonChange"
-        >
 					<view class="input-wrapper">
-            <text class="input-text">{{ form.reasonLabel || '请选择拜访原因' }}</text>
+						<text class="input-text">{{ form.reasonLabel || "请选择拜访原因" }}</text>
 						<text class="arrow">></text>
 					</view>
 				</picker>
@@ -70,11 +48,7 @@
 
 			<view class="form-item switch-item">
 				<text class="label">是否可随行人员</text>
-        <switch 
+				<switch :checked="form.hasFollower" @change="onSwitchChange" color="#1989fa" />
-          :checked="form.hasFollower" 
-          @change="onSwitchChange"
-          color="#1989fa"
-        />
 			</view>
 		</view>
 
@@ -133,10 +107,10 @@
 						:key="dept.id"
 						class="dept-item"
 						:class="{
-              'active': selectedDeptId === dept.id,
+							active: selectedDeptId === dept.id,
 							'level-1': dept.level === 1,
 							'level-2': dept.level === 2,
-              'level-3': dept.level === 3
+							'level-3': dept.level === 3,
 						}"
 						@tap="selectDept(dept)"
 					>
@@ -152,33 +126,33 @@
 </template>
 
 <script setup lang="ts">
-import { ref, reactive, onMounted, computed } from 'vue'
+import { ref, reactive, onMounted, computed } from "vue"
-import visitorApi from '@/sheep/api/integrated/visitors'
+import visitorApi from "@/sheep/api/integrated/visitors"
-import dayjs from 'dayjs'
+import dayjs from "dayjs"
 
 const showTimePopup = ref(false)
 const showDeptPopup = ref(false)
 
 const selectedDateIndex = ref(0)
 const selectedTimeIndex = ref(-1)
-const selectedTime = ref('')
+const selectedTime = ref("")
 
 const deptList = ref<any[]>([])
 const flatDeptList = ref<any[]>([])
-const selectedDeptId = ref('')
+const selectedDeptId = ref("")
-const selectedDeptName = ref('')
+const selectedDeptName = ref("")
 
 const form = reactive({
-  name: '',
+	name: "",
-  mobile: '',
+	mobile: "",
-  companyName: '',
+	companyName: "",
-  vstartDate: '',
+	vstartDate: "",
-  vEndDate: '',
+	vEndDate: "",
-  deptId: '',
+	deptId: "",
-  deptName: '',
+	deptName: "",
-  reasonValue: '',
+	reasonValue: "",
-  reasonLabel: '',
+	reasonLabel: "",
-  hasFollower: false
+	hasFollower: false,
 })
 
 const reasonList = ref<any[]>([])
@@ -189,24 +163,24 @@ const getReasonList = async () => {
 		if (code === 0 && data) {
 			reasonList.value = data.map((item: any) => ({
 				value: item.value,
-        label: item.label
+				label: item.label,
 			}))
 		}
 	} catch (error) {
-    console.error('获取拜访原因列表失败:', error)
+		console.error("获取拜访原因列表失败:", error)
 	}
 }
 
 const dateList = computed(() => {
 	const dates = []
-  const weekDays = ['周日', '周一', '周二', '周三', '周四', '周五', '周六']
+	const weekDays = ["周日", "周一", "周二", "周三", "周四", "周五", "周六"]
 
 	for (let i = 0; i < 7; i++) {
-    const date = dayjs().add(i, 'day')
+		const date = dayjs().add(i, "day")
 		dates.push({
-      date: date.format('MM.DD'),
+			date: date.format("MM.DD"),
 			weekDay: weekDays[date.day()],
-      fullDate: date.format('YYYY-MM-DD')
+			fullDate: date.format("YYYY-MM-DD"),
 		})
 	}
 
@@ -216,7 +190,7 @@ const dateList = computed(() => {
 const timeList = computed(() => {
 	const times = []
 	for (let i = 8; i < 18; i++) {
-    times.push(`${i.toString().padStart(2, '0')}:00-${(i + 1).toString().padStart(2, '0')}:00`)
+		times.push(`${i.toString().padStart(2, "0")}:00-${(i + 1).toString().padStart(2, "0")}:00`)
 	}
 	return times
 })
@@ -229,16 +203,16 @@ const getDeptList = async () => {
 			flattenDeptList(data)
 		}
 	} catch (error) {
-    console.error('获取部门列表失败:', error)
+		console.error("获取部门列表失败:", error)
 	}
 }
 
 const flattenDeptList = (depts: any[], level = 1, result: any[] = []) => {
-  depts.forEach(dept => {
+	depts.forEach((dept) => {
 		result.push({
 			id: dept.id,
 			name: dept.name,
-      level
+			level,
 		})
 		if (dept.children && dept.children.length > 0) {
 			flattenDeptList(dept.children, level + 1, result)
@@ -266,8 +240,8 @@ const selectTime = (index: number) => {
 const confirmTimeSelect = () => {
 	if (selectedTimeIndex.value === -1) {
 		uni.showToast({
-      title: '请选择具体时间',
+			title: "请选择具体时间",
-      icon: 'none'
+			icon: "none",
 		})
 		return
 	}
@@ -275,7 +249,7 @@ const confirmTimeSelect = () => {
 	const selectedDate = dateList.value[selectedDateIndex.value]
 	const selectedTimeRange = timeList.value[selectedTimeIndex.value]
 
-  const [startTime, endTime] = selectedTimeRange.split('-')
+	const [startTime, endTime] = selectedTimeRange.split("-")
 	form.vstartDate = `${selectedDate.fullDate} ${startTime}:00`
 	form.vEndDate = `${selectedDate.fullDate} ${endTime}:00`
 
@@ -303,8 +277,8 @@ const selectDept = (dept: any) => {
 const confirmDeptSelect = () => {
 	if (!selectedDeptId.value) {
 		uni.showToast({
-      title: '请选择拜访部门',
+			title: "请选择拜访部门",
-      icon: 'none'
+			icon: "none",
 		})
 		return
 	}
@@ -329,40 +303,40 @@ const handleSubmit = async () => {
 	// 表单验证
 	if (!form.name) {
 		uni.showToast({
-      title: '请输入访客姓名',
+			title: "请输入访客姓名",
-      icon: 'none'
+			icon: "none",
 		})
 		return
 	}
 
 	if (!form.mobile) {
 		uni.showToast({
-      title: '请输入手机号',
+			title: "请输入手机号",
-      icon: 'none'
+			icon: "none",
 		})
 		return
 	}
 
 	if (!form.vstartDate) {
 		uni.showToast({
-      title: '请选择拜访时间',
+			title: "请选择拜访时间",
-      icon: 'none'
+			icon: "none",
 		})
 		return
 	}
 
 	if (!form.deptId) {
 		uni.showToast({
-      title: '请选择拜访部门',
+			title: "请选择拜访部门",
-      icon: 'none'
+			icon: "none",
 		})
 		return
 	}
 
 	if (!form.reasonValue) {
 		uni.showToast({
-      title: '请选择拜访原因',
+			title: "请选择拜访原因",
-      icon: 'none'
+			icon: "none",
 		})
 		return
 	}
@@ -371,35 +345,35 @@ const handleSubmit = async () => {
 		const { code, msg } = await visitorApi.saveYY(form)
 		if (code === 0) {
 			uni.showToast({
-        title: '提交成功',
+				title: "提交成功",
-        icon: 'success'
+				icon: "success",
 			})
 			// 重置表单
 			Object.assign(form, {
-        name: '',
+				name: "",
-        mobile: '',
+				mobile: "",
-        companyName: '',
+				companyName: "",
-        vstartDate: '',
+				vstartDate: "",
-        vEndDate: '',
+				vEndDate: "",
-        deptId: '',
+				deptId: "",
-        deptName: '',
+				deptName: "",
-        reasonValue: '',
+				reasonValue: "",
-        reasonLabel: '',
+				reasonLabel: "",
-        hasFollower: false
+				hasFollower: false,
 			})
-      selectedTime.value = ''
+			selectedTime.value = ""
-      selectedDeptName.value = ''
+			selectedDeptName.value = ""
 		} else {
 			uni.showToast({
-        title: msg || '提交失败',
+				title: msg || "提交失败",
-        icon: 'none'
+				icon: "none",
 			})
 		}
 	} catch (error) {
-    console.error('提交失败:', error)
+		console.error("提交失败:", error)
 		uni.showToast({
-      title: '提交失败',
+			title: "提交失败",
-      icon: 'none'
+			icon: "none",
 		})
 	}
 }
@@ -480,7 +454,9 @@ onMounted(() => {
 }
 
 .submit-button {
-  padding: 40rpx 30rpx;
+	margin-left: 40rpx;
+	margin-right: 40rpx;
+	margin-bottom: 20rpx;
 
 	.btn {
 		width: 100%;
@@ -558,11 +534,12 @@ onMounted(() => {
 		padding: 16rpx 0;
 
 		&.active {
-      background: #E8F3FF;
+			background: #e8f3ff;
 			border-radius: 8rpx;
 
-      .date-week, .date-day {
+			.date-week,
-        color: #1989FA;
+			.date-day {
+				color: #1989fa;
 			}
 		}
 
@@ -591,14 +568,14 @@ onMounted(() => {
 		display: flex;
 		align-items: center;
 		justify-content: center;
-    background: #F7F8FA;
+		background: #f7f8fa;
 		border-radius: 8rpx;
 		font-size: 28rpx;
 		color: #323233;
 
 		&.active {
-      background: #E8F3FF;
+			background: #e8f3ff;
-      color: #1989FA;
+			color: #1989fa;
 		}
 	}
 }
@@ -609,7 +586,7 @@ onMounted(() => {
 
 	.confirm-btn {
 		height: 88rpx;
-    background: #1989FA;
+		background: #1989fa;
 		border-radius: 44rpx;
 		display: flex;
 		align-items: center;
@@ -631,8 +608,8 @@ onMounted(() => {
 	color: #323233;
 
 	&.active {
-    color: #1989FA;
+		color: #1989fa;
-    background: #F5F5F5;
+		background: #f5f5f5;
 	}
 
 	&.level-1 {

src/pages/integrated/visitor/myyyvisitorlist.vue

@@ -13,12 +13,7 @@
 		</view>
 
 		<view class="visitor-list">
-      <view
+			<view v-for="(item, index) in visitorList" :key="item.id" class="visitor-item" @tap="goToDetail(item)">
-        v-for="(item, index) in visitorList"
-        :key="item.id"
-        class="visitor-item"
-        @tap="goToDetail(item)"
-      >
 				<view class="visitor-header">
 					<text class="visit-time">{{ formatDateTime(item.vStartDate) }}</text>
 					<text :class="['status-tag', getStatusClass(item.checkStatus)]">{{ getStatusText(item.checkStatus) }}</text>
@@ -46,7 +41,7 @@
 					</view>
 					<view class="info-row">
 						<text class="label">拜访原因：</text>
-            <text class="value">{{ getReasonText(item.description) }}</text>
+						<text class="value">{{ getReasonText(item.reasonValue) }}</text>
 					</view>
 				</view>
 				<view class="visitor-footer">
@@ -69,37 +64,13 @@
 		<view class="empty" v-if="!loading && visitorList.length === 0">
 			<text>暂无数据</text>
 		</view>
-
-    <!-- 底部固定导航 -->
-    <view class="bottom-nav">
-      <view class="nav-item">
-        <image src="/static/images/visitor/visitor-apply.png" mode="aspectFit" class="nav-icon"></image>
-        <text class="nav-text active">访客申请</text>
-      </view>
-      <view class="nav-item">
-        <image src="/static/images/visitor/visitor-record.png" mode="aspectFit" class="nav-icon"></image>
-        <text class="nav-text">申请记录</text>
-      </view>
-      <view class="nav-item">
-        <image src="/static/images/visitor/visitor-invite.png" mode="aspectFit" class="nav-icon"></image>
-        <text class="nav-text">主动邀约</text>
-      </view>
-      <view class="nav-item">
-        <image src="/static/images/visitor/visitor-invited.png" mode="aspectFit" class="nav-icon"></image>
-        <text class="nav-text">邀约记录</text>
-      </view>
-      <view class="nav-item">
-        <image src="/static/images/visitor/visitor-my.png" mode="aspectFit" class="nav-icon"></image>
-        <text class="nav-text">我的</text>
-      </view>
-    </view>
 	</view>
 </template>
 
 <script setup lang="ts">
-import { ref, onMounted } from 'vue'
+import { ref, onMounted } from "vue"
-import visitorApi from '@/sheep/api/integrated/visitors'
+import visitorApi from "@/sheep/api/integrated/visitors"
-import dayjs from 'dayjs'
+import dayjs from "dayjs"
 
 // 定义响应式变量
 const visitorList = ref<any[]>([])
@@ -107,14 +78,14 @@ const loading = ref(false)
 const hasMore = ref(true)
 const current = ref(1)
 const size = ref(10)
-const currentTab = ref('')
+const currentTab = ref("")
 const reasonDict = ref<any[]>([])
 
 const tabs = [
-  { label: '全部', value: '' },
+	{ label: "全部", value: "" },
-  { label: '待审核', value: '1' },
+	{ label: "待审核", value: "1" },
-  { label: '待到访', value: '2' },
+	{ label: "待到访", value: "2" },
-  { label: '已取消', value: '5' }
+	{ label: "已取消", value: "5" },
 ]
 
 // 获取拜访原因字典
@@ -125,47 +96,47 @@ const getReasonDict = async () => {
 			reasonDict.value = data
 		}
 	} catch (error) {
-    console.error('获取拜访原因字典失败:', error)
+		console.error("获取拜访原因字典失败:", error)
 	}
 }
 
 // 获取拜访原因文本
 const getReasonText = (value: string) => {
-  const reason = reasonDict.value.find(item => item.value === value)
+	const reason = reasonDict.value.find((item) => item.value === value)
 	return reason ? reason.label : value
 }
 
 // 格式化日期时间
 const formatDateTime = (dateStr: string) => {
-  if (!dateStr) return ''
+	if (!dateStr) return ""
-  return dayjs(dateStr).format('YYYY/MM/DD HH:mm')
+	return dayjs(dateStr).format("YYYY/MM/DD HH:mm")
 }
 
 // 获取状态文本
 const getStatusText = (status: string) => {
 	const statusMap: { [key: string]: string } = {
-    '1': '待审核',
+		"1": "待审核",
-    '2': '待到访',
+		"2": "待到访",
-    '5': '已取消',
+		"5": "已取消",
-    '0': '已到访'
+		"0": "已到访",
 	}
-  return statusMap[status] || ''
+	return statusMap[status] || ""
 }
 
 // 获取状态样式类
 const getStatusClass = (status: string) => {
 	const statusClassMap: { [key: string]: string } = {
-    '1': 'status-pending',
+		"1": "status-pending",
-    '2': 'status-waiting',
+		"2": "status-waiting",
-    '5': 'status-cancelled',
+		"5": "status-cancelled",
-    '0': 'status-visited'
+		"0": "status-visited",
 	}
-  return statusClassMap[status] || ''
+	return statusClassMap[status] || ""
 }
 
 // 判断是否可以取消
 const canCancel = (status: string) => {
-  return ['1', '2'].includes(status)
+	return ["1", "2"].includes(status)
 }
 
 // 处理标签切换
@@ -195,7 +166,7 @@ const getVisitorList = async (isRefresh = false) => {
 		const { code, data } = await visitorApi.getVisitorYYList({
 			current: current.value,
 			size: size.value,
-      checkStatus: currentTab.value || undefined
+			checkStatus: currentTab.value || undefined,
 		})
 
 		if (code === 0 && data) {
@@ -211,7 +182,7 @@ const getVisitorList = async (isRefresh = false) => {
 			}
 		}
 	} catch (error) {
-    console.error('获取访客列表失败:', error)
+		console.error("获取访客列表失败:", error)
 	} finally {
 		loading.value = false
 	}
@@ -220,115 +191,115 @@ const getVisitorList = async (isRefresh = false) => {
 // 处理取消邀约
 const handleCancel = async (item: any) => {
 	uni.showModal({
-    title: '提示',
+		title: "提示",
-    content: '确定要取消该邀约吗？',
+		content: "确定要取消该邀约吗？",
 		success: async (res) => {
 			if (res.confirm) {
 				try {
 					const { code, msg } = await visitorApi.cancelVisitor(item.id)
 					if (code === 0) {
 						uni.showToast({
-              title: '取消成功',
+							title: "取消成功",
-              icon: 'success'
+							icon: "success",
 						})
 						// 刷新列表
 						getVisitorList(true)
 					} else {
 						uni.showToast({
-              title: msg || '取消失败',
+							title: msg || "取消失败",
-              icon: 'none'
+							icon: "none",
 						})
 					}
 				} catch (error) {
-          console.error('取消邀约失败:', error)
+					console.error("取消邀约失败:", error)
 					uni.showToast({
-            title: '取消失败',
+						title: "取消失败",
-            icon: 'none'
+						icon: "none",
 					})
 				}
 			}
-    }
+		},
 	})
 }
 
 // 处理接受邀约
 const handleAccept = async (item: any) => {
 	uni.showModal({
-    title: '提示',
+		title: "提示",
-    content: '确定接受该邀约吗？',
+		content: "确定接受该邀约吗？",
 		success: async (res) => {
 			if (res.confirm) {
 				try {
 					const { code, msg } = await visitorApi.updateCheckStatus({
 						id: item.id,
-            checkStatus: '2'
+						checkStatus: "2",
 					})
 					if (code === 0) {
 						uni.showToast({
-              title: '已接受',
+							title: "已接受",
-              icon: 'success'
+							icon: "success",
 						})
 						// 刷新列表
 						getVisitorList(true)
 					} else {
 						uni.showToast({
-              title: msg || '操作失败',
+							title: msg || "操作失败",
-              icon: 'none'
+							icon: "none",
 						})
 					}
 				} catch (error) {
-          console.error('接受邀约失败:', error)
+					console.error("接受邀约失败:", error)
 					uni.showToast({
-            title: '操作失败',
+						title: "操作失败",
-            icon: 'none'
+						icon: "none",
 					})
 				}
 			}
-    }
+		},
 	})
 }
 
 // 处理拒绝邀约
 const handleReject = async (item: any) => {
 	uni.showModal({
-    title: '提示',
+		title: "提示",
-    content: '确定拒绝该邀约吗？',
+		content: "确定拒绝该邀约吗？",
 		success: async (res) => {
 			if (res.confirm) {
 				try {
 					const { code, msg } = await visitorApi.updateCheckStatus({
 						id: item.id,
-            checkStatus: '3'
+						checkStatus: "3",
 					})
 					if (code === 0) {
 						uni.showToast({
-              title: '已拒绝',
+							title: "已拒绝",
-              icon: 'success'
+							icon: "success",
 						})
 						// 刷新列表
 						getVisitorList(true)
 					} else {
 						uni.showToast({
-              title: msg || '操作失败',
+							title: msg || "操作失败",
-              icon: 'none'
+							icon: "none",
 						})
 					}
 				} catch (error) {
-          console.error('拒绝邀约失败:', error)
+					console.error("拒绝邀约失败:", error)
 					uni.showToast({
-            title: '操作失败',
+						title: "操作失败",
-            icon: 'none'
+						icon: "none",
 					})
 				}
 			}
-    }
+		},
 	})
 }
 
 // 跳转到详情页
 const goToDetail = (item: any) => {
 	uni.navigateTo({
-    url: `/pages/integrated/visitor/visitorDetail?token=${item.token}`
+		url: `/pages/integrated/visitor/visitorDetail?token=${item.token}`,
 	})
 }
 
@@ -340,9 +311,9 @@ onMounted(() => {
 
 // 页面配置
 defineOptions({
-  navigationBarTitleText: '我的邀约',
+	navigationBarTitleText: "我的邀约",
 	enablePullDownRefresh: true,
-  backgroundColor: '#f5f5f5'
+	backgroundColor: "#f5f5f5",
 })
 
 // 下拉刷新
@@ -354,7 +325,7 @@ defineExpose({
 	},
 	onReachBottom() {
 		getVisitorList()
-  }
+	},
 })
 </script>
 
@@ -380,18 +351,18 @@ defineExpose({
 		padding: 20rpx 0;
 
 		&.active {
-      color: #1777FF;
+			color: #1777ff;
 			font-weight: 500;
 
 			&::after {
-        content: '';
+				content: "";
 				position: absolute;
 				bottom: 0;
 				left: 50%;
 				transform: translateX(-50%);
 				width: 40rpx;
 				height: 4rpx;
-        background-color: #1777FF;
+				background-color: #1777ff;
 				border-radius: 2rpx;
 			}
 		}
@@ -493,53 +464,19 @@ defineExpose({
 
 			.accept-btn {
 				color: #fff;
-        background-color: #1777FF;
+				background-color: #1777ff;
-        border-color: #1777FF;
+				border-color: #1777ff;
 			}
 		}
 	}
 }
 
-.loading-more, .no-more, .empty {
+.loading-more,
+.no-more,
+.empty {
 	text-align: center;
 	padding: 30rpx;
 	color: #999;
 	font-size: 26rpx;
 }
-
-.bottom-nav {
-  position: fixed;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  height: 100rpx;
-  background-color: #fff;
-  display: flex;
-  justify-content: space-around;
-  align-items: center;
-  border-top: 1rpx solid #eee;
-  padding-bottom: env(safe-area-inset-bottom); // 适配iPhone底部安全区
-
-  .nav-item {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    padding: 10rpx 0;
-
-    .nav-icon {
-      width: 44rpx;
-      height: 44rpx;
-      margin-bottom: 4rpx;
-    }
-
-    .nav-text {
-      font-size: 20rpx;
-      color: #999;
-
-      &.active {
-        color: #1777FF;
-      }
-    }
-  }
-}
 </style>

src/pages/integrated/visitor/verify.vue

@@ -1,14 +1,5 @@
 <template>
 	<view class="verify-page">
-    <!-- 顶部导航 -->
-    <view class="header">
-      <view class="back-btn" @tap="goBack">
-        <text class="back-icon">〈</text>
-      </view>
-      <view class="title">访客核销</view>
-      <view class="right-placeholder"></view>
-    </view>
-
 		<!-- 扫码按钮 -->
 		<view class="scan-section">
 			<view class="scan-btn" @tap="handleScan">
@@ -37,61 +28,56 @@
 </template>
 
 <script setup lang="ts">
-import { ref } from 'vue'
+import { ref } from "vue"
-import visitorApi from '@/sheep/api/integrated/visitors'
+import visitorApi from "@/sheep/api/integrated/visitors"
-import dayjs from 'dayjs'
+import dayjs from "dayjs"
 
 const recentVerifyList = ref<any[]>([])
 
 // 格式化时间
 const formatDateTime = (time: string) => {
-  if (!time) return ''
+	if (!time) return ""
-  return dayjs(time).format('YYYY-MM-DD HH:mm')
+	return dayjs(time).format("YYYY-MM-DD HH:mm")
 }
 
 // 处理扫码
 const handleScan = () => {
 	uni.scanCode({
-    scanType: ['qrCode'],
+		scanType: ["qrCode"],
 		success: async (res) => {
 			try {
 				// 假设扫描结果就是token
 				const token = res.result
-        const { code, msg } = await visitorApi.verifyVisitor({ token })
+				const { code, msg }: any = await visitorApi.verifyVisitor({ token })
 
 				if (code === 0) {
 					uni.showToast({
-            title: '核销成功',
+						title: "核销成功",
-            icon: 'success'
+						icon: "success",
 					})
 					// 刷新最近核销记录
 					// getRecentVerifyList()
 				} else {
 					uni.showToast({
-            title: msg || '核销失败',
+						title: msg || "核销失败",
-            icon: 'none'
+						icon: "none",
 					})
 				}
 			} catch (error) {
 				uni.showToast({
-          title: '核销失败',
+					title: "核销失败",
-          icon: 'none'
+					icon: "none",
 				})
 			}
 		},
 		fail: () => {
 			uni.showToast({
-        title: '扫码失败',
+				title: "扫码失败",
-        icon: 'none'
+				icon: "none",
 			})
-    }
+		},
 	})
 }
-
-// 返回上一页
-const goBack = () => {
-  uni.navigateBack()
-}
 </script>
 
 <style lang="scss" scoped>
@@ -100,38 +86,6 @@ const goBack = () => {
 	background: #f5f5f5;
 }
 
-.header {
-  background: #fff;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  height: 90rpx;
-  padding: 0 30rpx;
-  border-bottom: 1rpx solid #f5f5f5;
-
-  .back-btn {
-    width: 60rpx;
-    height: 90rpx;
-    display: flex;
-    align-items: center;
-  }
-
-  .back-icon {
-    font-size: 38rpx;
-    color: #323233;
-  }
-
-  .title {
-    font-size: 36rpx;
-    color: #323233;
-    font-weight: 500;
-  }
-
-  .right-placeholder {
-    width: 60rpx;
-  }
-}
-
 .scan-section {
 	padding: 60rpx 30rpx;
 
@@ -217,7 +171,7 @@ const goBack = () => {
 				font-size: 26rpx;
 
 				&.success {
-          color: #07C160;
+					color: #07c160;
 				}
 			}
 		}

src/pages/integrated/visitor/visitorDetail.vue

@@ -44,8 +44,8 @@
 
 		<!-- 展开更多按钮 -->
 		<view class="expand-btn" @tap="toggleExpand">
-      <text>{{ isExpanded ? '收起' : '查看详细信息' }}</text>
+			<text>{{ isExpanded ? "收起" : "查看详细信息" }}</text>
-      <text :class="['expand-icon', { 'expanded': isExpanded }]">{{ isExpanded ? '∧' : '∨' }}</text>
+			<text :class="['expand-icon', { expanded: isExpanded }]">{{ isExpanded ? "∧" : "∨" }}</text>
 		</view>
 
 		<!-- 详细信息 -->
@@ -120,42 +120,42 @@
 </template>
 
 <script setup lang="ts">
-import { ref, onMounted, nextTick } from 'vue'
+import { ref, onMounted, nextTick } from "vue"
-import visitorApi from '@/sheep/api/integrated/visitors'
+import visitorApi from "@/sheep/api/integrated/visitors"
-import dayjs from 'dayjs'
+import dayjs from "dayjs"
-import QRCode from 'qrcode'
+import QRCode from "qrcode"
 
 const detail = ref<any>({})
 const isExpanded = ref(false)
 
 // 格式化日期（年月日）
 const formatDate = (time: string) => {
-  if (!time) return ''
+	if (!time) return ""
 	const weekMap: { [key: string]: string } = {
-    'Mon': '一',
+		Mon: "一",
-    'Tue': '二',
+		Tue: "二",
-    'Wed': '三',
+		Wed: "三",
-    'Thu': '四',
+		Thu: "四",
-    'Fri': '五',
+		Fri: "五",
-    'Sat': '六',
+		Sat: "六",
-    'Sun': '日'
+		Sun: "日",
 	}
 	const date = dayjs(time)
-  const weekEn = date.format('ddd')
+	const weekEn = date.format("ddd")
 	const weekCn = weekMap[weekEn] || weekEn
-  return `${date.format('M月D日')} 周${weekCn}`
+	return `${date.format("M月D日")} 周${weekCn}`
 }
 
 // 格式化时间（时分）
 const formatTime = (time: string) => {
-  if (!time) return ''
+	if (!time) return ""
-  return dayjs(time).format('HH:mm')
+	return dayjs(time).format("HH:mm")
 }
 
 // 格式化完整时间
 const formatDateTime = (time: string, onlyTime = false) => {
-  if (!time) return ''
+	if (!time) return ""
-  return onlyTime ? dayjs(time).format('HH:mm') : dayjs(time).format('YYYY-MM-DD HH:mm')
+	return onlyTime ? dayjs(time).format("HH:mm") : dayjs(time).format("YYYY-MM-DD HH:mm")
 }
 
 // 生成二维码
@@ -166,22 +166,22 @@ const generateQRCode = async (token: string) => {
 			width: 200,
 			margin: 2,
 			color: {
-        dark: '#000000',
+				dark: "#000000",
-        light: '#ffffff'
+				light: "#ffffff",
-      }
+			},
 		})
 		if (base64) {
 			const img = new Image()
 			img.src = base64
-      img.style.width = '400rpx'
+			img.style.width = "400rpx"
-      img.style.height = '400rpx'
+			img.style.height = "400rpx"
-      const container = document.querySelector('.qr-code')
+			const container = document.querySelector(".qr-code")
-      const canvas = document.querySelector('#qrcode')
+			const canvas = document.querySelector("#qrcode")
 			if (container && canvas) {
-        const div = document.createElement('div')
+				const div = document.createElement("div")
-        div.style.width = '400rpx'
+				div.style.width = "400rpx"
-        div.style.height = '400rpx'
+				div.style.height = "400rpx"
-        div.style.marginBottom = '20rpx'
+				div.style.marginBottom = "20rpx"
 				div.appendChild(img)
 				container.replaceChild(div, canvas)
 			}
@@ -191,12 +191,12 @@ const generateQRCode = async (token: string) => {
 		// #ifdef MP-WEIXIN
 		const query = uni.createSelectorQuery()
 		query
-      .select('#qrcode')
+			.select("#qrcode")
 			.fields({ node: true, size: true })
 			.exec((res) => {
 				if (res[0] && res[0].node) {
 					const canvas = res[0].node
-          const ctx = canvas.getContext('2d')
+					const ctx = canvas.getContext("2d")
 
 					// 设置canvas大小
 					const dpr = uni.getSystemInfoSync().pixelRatio
@@ -209,15 +209,15 @@ const generateQRCode = async (token: string) => {
 						width: 200,
 						margin: 2,
 						color: {
-              dark: '#000000',
+							dark: "#000000",
-              light: '#ffffff'
+							light: "#ffffff",
-            }
+						},
 					})
 				}
 			})
 		// #endif
 	} catch (error) {
-    console.error('生成二维码失败:', error)
+		console.error("生成二维码失败:", error)
 	}
 }
 
@@ -235,8 +235,8 @@ const getDetail = async () => {
 
 		if (!token) {
 			uni.showToast({
-        title: '参数错误',
+				title: "参数错误",
-        icon: 'none'
+				icon: "none",
 			})
 			return
 		}
@@ -258,10 +258,10 @@ const getDetail = async () => {
 			// #endif
 		}
 	} catch (error) {
-    console.error('获取详情失败:', error)
+		console.error("获取详情失败:", error)
 		uni.showToast({
-      title: '获取详情失败',
+			title: "获取详情失败",
-      icon: 'none'
+			icon: "none",
 		})
 	}
 }
@@ -412,7 +412,7 @@ onMounted(() => {
 	background: #fff;
 	border-radius: 8rpx;
 	font-size: 28rpx;
-  color: #1989FA;
+	color: #1989fa;
 
 	.expand-icon {
 		margin-left: 8rpx;
@@ -440,7 +440,7 @@ onMounted(() => {
 		font-weight: 500;
 		margin-bottom: 20rpx;
 		padding-left: 20rpx;
-    border-left: 4rpx solid #1989FA;
+		border-left: 4rpx solid #1989fa;
 	}
 }
 

src/pages/merchant/food.vue

@@ -1,201 +0,0 @@
-<script setup lang="ts">
-import { ref, reactive, computed } from "vue"
-import { onLoad, onShow } from "@dcloudio/uni-app"
-import { isEmpty } from "radash"
-import dayjs from "dayjs"
-import { hooks, router } from "@@/index"
-import { foodApi } from "@@/api"
-import zTabs from "@@/components/other/z-tabs/z-tabs.vue"
-import { LazyImg, Waterfall } from "vue-waterfall-plugin-next"
-import "vue-waterfall-plugin-next/dist/style.css"
-// import CustomWaterfallsFlow from "@@/components/other/custom-waterfalls-flow/custom-waterfalls-flow.vue"
-import { filePath } from "@@/utils/file"
-
-const menus = {
-	tabs: [
-		// { id: null, name: "全部", disabled: false },
-		{ id: 1, name: "早餐", disabled: false },
-		{ id: 2, name: "午餐", disabled: false },
-		{ id: 3, name: "晚餐", disabled: false },
-	],
-	weekDays: ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"],
-}
-const state = reactive<any>({
-	dateList: [],
-	currentDateIndex: 0,
-	pa: {
-		merchantId: null,
-		startTime: null,
-		hourType: menus.tabs[0].id,
-	},
-})
-
-onLoad((options: any) => {
-	initDate()
-	if (!isEmpty(options.merchantId)) {
-		state.pa.merchantId = options.merchantId
-	}
-})
-onShow(() => {
-	if (pageRef.value && pageRef.value.reload) {
-		pageRef.value.reload(false)
-	}
-})
-
-const pageRef = ref<any>(null)
-const pageHook = hooks.usePage(pageRef, foodApi.page, null, "data.records")
-const query = (page: number, pagesize: number) => {
-	pageHook.startPage(page, pagesize, false, state.pa)
-}
-
-// 重新设置图片路径
-const foodList = computed(() => {
-	return pageHook.list.map((item: any) => {
-		return { ...item, picUrl: filePath(item.picUrl) }
-	})
-})
-
-const initDate = () => {
-	const list: any = []
-	const now = new Date()
-	for (let i = 0; i < 10; i++) {
-		const date = dayjs(now).add(i, "d")
-		const weekDayStr = date.isSame(now, "day") ? "今天" : menus.weekDays[date.day()]
-		list.push({
-			weekDayStr,
-			date: date.toDate(),
-			dayTime: date.format("MM-DD"),
-			dateTime: date.format("YYYY-MM-DD"),
-		})
-	}
-	state.dateList = list
-	state.pa.startTime = state.dateList[0].dateTime
-	pageRef.value?.reload(false)
-}
-
-const doDateItem = (v: any, i: any) => {
-	state.currentDateIndex = i
-	state.pa.startTime = state.dateList[i].dateTime
-	pageHook.list = []
-	pageRef.value.reload(true)
-}
-
-const doTab = (e: any) => {
-	const target = menus.tabs[e]
-	state.pa.hourType = target.id
-	pageHook.list = []
-	pageRef.value.reload(true)
-}
-
-const doProduct = (v: any) => {
-	// 	router.jump("/pages/merchant/product-detail", { spuId: v.spuId })
-}
-</script>
-
-<template>
-	<crud-layout title="每日菜谱" navBgColor="#1777FF" navBgTitleColor="white" bg="/static/page/blue-bg.png">
-		<z-paging
-			ref="pageRef"
-			height="100%"
-			:fixed="false"
-			v-model="pageHook.list"
-			:default-page-size="8"
-			safe-area-inset-bottom
-			:loading-more-enabled="true"
-			:show-scrollbar="false"
-			@query="query"
-			:auto-clean-list-when-reload="false"
-			:auto-scroll-to-top-when-reload="false"
-			@scroll="pageHook.scroll"
-		>
-			<template #top>
-				<view class="bg-#1777FF p-15rpx">
-					<scroll-view scroll-x class="whitespace-nowrap">
-						<view class="flex-row items-center space-x-15rpx">
-							<view
-								:class="{ active_date: state.currentDateIndex == i }"
-								class="flex-col-center flex-shrink-0 size-95rpx color-white rounded-8rpx font-size-24rpx font-700"
-								v-for="(v, i) in state.dateList"
-								:key="i"
-								@tap="doDateItem(v, i)"
-							>
-								<view>{{ v.dayTime }}</view>
-								<view>{{ v.weekDayStr }}</view>
-							</view>
-						</view>
-					</scroll-view>
-				</view>
-				<view class="bg-white rounded-16rpx px-20rpx m-x-10rpx m-t-15rpx">
-					<z-tabs :list="menus.tabs" @change="doTab" />
-				</view>
-			</template>
-
-			<view class="h-20rpx" />
-
-			<view class="m-x-20rpx">
-				<Waterfall
-					v-if="foodList.length"
-					:list="foodList"
-					:gutter="10"
-					:breakpoints="{
-						1800: { rowPerView: 4 },
-						1400: { rowPerView: 3 },
-						975: { rowPerView: 2 },
-					}"
-					:hasAroundGutter="false"
-					backgroundColor="#ffffff00"
-					:crossOrigin="false"
-					:animationDuration="100"
-				>
-					<template #default="{ item, url, index }">
-						<div class="card">
-							<LazyImg class="rounded-2" :url="item.picUrl" />
-							<view class="p-x-15rpx p-y-25rpx flex items-center justify-between">
-								<view class="sub-text-28 show-line">{{ item.name }}</view>
-								<!-- <view class="m-t-10rpx flex-row items-center"> -->
-								<view class="second-text-32 color-#f63a36!"> ¥{{ hooks.useMoney(item.price) }} </view>
-								<!-- <view class="m-l-20rpx mt-1 second-text-24 line-through">¥{{ hooks.useMoney(item.marketPrice) }}</view> -->
-								<!-- </view> -->
-								<!-- <view class="flex-col items-start"> -->
-								<!-- <view class="second-text-24">{{ hooks.useFormatNum("库存", "", item.stock) }}</view> -->
-								<!-- <view class="w-1px h-20rpx m-x-5rpx bg-#999" /> -->
-								<!-- <view class="second-text-24">{{ hooks.useFormatNum("销量", "", item.salesCount) }}</view> -->
-								<!-- </view> -->
-							</view>
-						</div>
-					</template>
-				</Waterfall>
-
-				<!-- <custom-waterfalls-flow v-model="foodList" imageKey="picUrl" :columnSpace="1" @wapperClick="doProduct" @imageClick="doProduct">
-					<template v-slot:default="v">
-						<view class="p-x-15rpx p-y-25rpx">
-							<view class="sub-text-28 show-line">{{ v.name }}</view>
-							<view class="m-t-10rpx flex-row items-center">
-								<view class="second-text-32 color-#f63a36!"> ¥{{ hooks.useMoney(v.price) }} </view>
-								<view class="m-l-20rpx second-text-24 line-through"> ¥{{ hooks.useMoney(v.marketPrice) }} </view>
-							</view>
-							<view class="flex-row items-center MT 10rpx">
-								<view class="second-text-24">{{ hooks.useFormatNum("库存", "", v.stock) }}</view>
-								<view class="w-1px h-20rpx m-x-5rpx bg-#999" />
-								<view class="second-text-24">{{ hooks.useFormatNum("销量", "", v.salesCount) }}</view>
-							</view>
-						</view>
-					</template>
-				</custom-waterfalls-flow> -->
-			</view>
-		</z-paging>
-	</crud-layout>
-</template>
-
-<style lang="scss" scoped>
-:deep() {
-	.layout_main > scroll-view {
-		padding: 0 !important;
-	}
-}
-
-.active_date {
-	background-color: white;
-	color: #1679ff !important;
-}
-</style>

src/pages/tabbar/my.vue

@@ -1,20 +1,12 @@
 <template>
-	<crud-layout bg="/static/page/blue-bg.png">
+	<view class="bg-#F8F8F8 w-full h-screen overflow-hidden">
-		<view class="h-20rpx" />
+		<view class="card p-30rpx mx-4 flex items-center">
-		<view class="flex-row items-center">
+			<image v-if="userInfo?.avatar" class="w-100rpx h-100rpx rounded-full" :src="userInfo.avatarUrl" mode="aspectFill" />
-			<image
-				v-if="state.userInfo?.sysUser?.avatar"
-				class="w-100rpx h-100rpx rounded-full"
-				:src="filePath(state.userInfo.sysUser.avatar)"
-				mode="aspectFill"
-			/>
 			<image v-else class="w-100rpx h-100rpx rounded-full" src="/static/icon/default-avatar.png" mode="aspectFill" />
-			<view class="m-l-30rpx" v-if="state.userInfo?.sysUser?.userId">
+			<view class="m-l-30rpx" v-if="token">
 				<view class="flex-row items-center">
-					<text class="sub-text-30">{{ state.userInfo?.sysUser?.name }}</text>
+					<text class="sub-text-30">{{ userInfo.nickName }}</text>
-					<!-- <text class="iconfont icon-youjiantou color-#666666 m-l-20rpx"></text> -->
 				</view>
-				<text class="sub-text-26">ID {{ state.userInfo?.sysUser?.userId }}</text>
 			</view>
 			<view v-else class="flex-row items-center m-l-30rpx" @tap="onTabLogin">
 				<text class="sub-text-32">请先登录</text>
@@ -22,375 +14,53 @@
 			</view>
 		</view>
 
-		<view class="m-t-20rpx rounded-20rpx shadow-main p-30rpx p-b-40rpx bg-white!">
+		<view class="card p-30rpx m-4 active:bg-#F8F8F8!">
-			<view class="service_item flex-row items-center justify-between" v-for="(v, i) in state.menuList" :key="i" @tap="onTabMenu(v, i)">
+			<view class="flex items-center justify-between" @tap="onTabMenu">
-				<view class="flex-row-center">
+				<text class="sub-text-36 m-l-20rpx">核销</text>
-					<image class="w-40rpx h-40rpx" :src="v.icon" mode="aspectFill" />
-					<text class="sub-text-28 m-l-20rpx">{{ v.text }}</text>
-				</view>
 				<view class="iconfont icon-youjiantou" />
 			</view>
 		</view>
-
-		<view v-if="isDevEnv()" class="flex-col-center m-t-40rpx m-x-30rpx">
-			<view class="w-full text-center sub-text-28 p-y-20rpx rounded-40rpx border-solid border border-#0094ff" @tap="doLogout">
-				退出登录
 	</view>
-		</view>
-		<view v-if="state.appInfo == 'sh'" class="flex-col-center m-t-40rpx m-x-30rpx">
-			<view class="w-full text-center sub-text-28 p-y-20rpx rounded-40rpx border-solid border border-#0094ff" @tap="doChangeRole">
-				切换角色
-			</view>
-		</view>
-	</crud-layout>
 </template>
 
 <script setup lang="ts">
-import { reactive, ref } from "vue"
+import { ref } from "vue"
 import { onLoad, onShow } from "@dcloudio/uni-app"
 import { isEmpty } from "radash"
-import { filePath } from "@@/utils/file"
-import { getAppInfo } from "@@/utils/getAppInfo"
-import { hooks, router, constant } from "@@/index"
-import { userApi } from "@@/api"
-import isDevEnv from "@/sheep/utils/isDevEnv"
-import { usePayStore } from "@/sheep/stores/pay"
-// import dd from "gdt-jsapi"
 
-const state = reactive<{
+const userInfo = ref<any>({})
-	wallet: any[]
+const token = ref("")
-	userInfo: any
-	menuList: {
-		text: string
-		icon: string
-		router: string
-	}[]
-	appInfo: string
-}>({
-	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/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" }
+// 获取存储的用户信息
-	],
+const getUserInfo = () => {
-	appInfo: "",
+	const tokenStorage = uni.getStorageSync("token")
-})
+	const userStorage = uni.getStorageSync("user_info")
-
-// 常量
-const STORAGE_KEYS = {
-	TOKEN: constant.storageConstant.TOKEN,
-	USER_INFO: constant.storageConstant.USERINFO,
-}
-
-const storage = {
-	// 获取存储的用户信息
-	getUserInfo: () => {
-		const tokenStorage = uni.getStorageSync(STORAGE_KEYS.TOKEN)
-		const userStorage = uni.getStorageSync(STORAGE_KEYS.USER_INFO)
 
 	if (!isEmpty(userStorage) && !isEmpty(tokenStorage)) {
-			state.userInfo = userStorage
+		userInfo.value = userStorage
+		token.value = tokenStorage
 	} else {
-			state.userInfo = {}
+		userInfo.value = {}
-		}
+		token.value = ""
-	},
-
-	// 保存用户信息到存储
-	saveUserInfo: (userData: any) => {
-		uni.setStorageSync(STORAGE_KEYS.USER_INFO, userData)
-		storage.getUserInfo()
-	},
-
-	// 保存token到存储
-	saveToken: (tokenData: any) => {
-		uni.setStorageSync(STORAGE_KEYS.TOKEN, tokenData)
-	},
-
-	// 清除用户登录相关的存储
-	clearUserStorage: () => {
-		uni.removeStorageSync(STORAGE_KEYS.TOKEN)
-		uni.removeStorageSync(STORAGE_KEYS.USER_INFO)
-		state.userInfo = {}
-	},
-}
-
-const login = {
-	// 检查应用环境并登录
-	checkAppInfo: async () => {
-		try {
-			// 先尝试诗画登录
-			const shihuaResult = await login.shihuaLogin()
-			if (shihuaResult) return
-
-			// 尝试浙政钉登录
-			const zhengdingResult = login.zhengdingLogin()
-			if (zhengdingResult) return
-
-			uni.showToast({ title: "当前登录环境未知", icon: "none" })
-		} catch (error) {
-			console.error("登录失败:", error)
-			uni.showToast({ title: "登录失败", icon: "none" })
-		}
-	},
-
-	// 诗画环境登录
-	shihuaLogin: async () => {
-		const appInfo = await (window as any).CP2.getAppInfo()
-		if (appInfo.code == 0) return false
-
-		const userInfo = await (window as any).CP2.getUserInfo()
-		if (userInfo.code == 0) {
-			uni.showToast({ title: "获取诗画用户信息失败", icon: "none" })
-			return false
-		} else {
-			const { accountId, sessionId } = userInfo.data
-			return login.doLogin(1, "", accountId, sessionId)
-			// return login.doLogin(1, "", "67186e49d63fea141aad6772", "67186e49d63fea141aad6776")
-		}
-	},
-
-	// 浙政钉登录
-	zhengdingLogin: () => {
-		const params = new URL(window.location.href).searchParams
-		const token = params.get("uabaseToken")
-		if (token) {
-			return login.doLogin(2, token, "", "")
-		}
-		return false
-	},
-
-	// 执行登录操作 - loginType 1:诗画登录 2:浙政钉登录
-	doLogin: async (loginType: number, token: string, accountId: string, sessionId: string) => {
-		const tokenStorage = uni.getStorageSync(STORAGE_KEYS.TOKEN)
-		const userStorage = uni.getStorageSync(STORAGE_KEYS.USER_INFO)
-
-		switch (loginType) {
-			case 1: // 诗画登录
-				uni.showLoading({ title: "登录中...", mask: true })
-				const response = await userApi.authsh({ accountId, sessionId })
-
-				if (response.code == 0) {
-					storage.saveToken({ accessToken: response.data.accessToken })
-					uni.hideLoading()
-					uni.showToast({ title: "登录成功", icon: "none" })
-
-					const { data: userData } = await userApi.userInfo()
-					storage.saveUserInfo(userData)
-				} else {
-					uni.hideLoading()
-					storage.clearUserStorage()
-					if (response.msg == "token已失效") {
-						uni.showToast({ title: "用户凭证已失效，请退出并重新进入智慧后勤应用", icon: "none", duration: 6000 })
-					} else {
-						uni.showToast({ title: response.msg || "登录失败", icon: "none" })
-					}
-				}
-				break
-
-			case 2: // 浙政钉登录
-				if (isEmpty(tokenStorage) || isEmpty(userStorage)) {
-					try {
-						uni.showLoading({ title: "登录中...", mask: true })
-						const res = await userApi.auth(token)
-
-						if (res.code == 0) {
-							storage.saveToken(res.data)
-							uni.hideLoading()
-							uni.showToast({ title: "登录成功", icon: "none" })
-
-							const { data: userData } = await userApi.userInfo()
-							storage.saveUserInfo(userData)
-						} else {
-							storage.clearUserStorage()
-							if (res.msg == "token已失效") {
-								uni.showToast({ title: "用户凭证已失效，请退出并重新进入智慧后勤应用", icon: "none", duration: 6000 })
-							} else {
-								uni.showToast({ title: res.msg || "登录失败", icon: "none" })
-							}
-						}
-					} catch (error) {
-						uni.showToast({ title: "登录错误", icon: "none" })
-					} finally {
-						uni.hideLoading()
-					}
-				}
-				break
-
-			default:
-				uni.showToast({ title: "当前登录环境未知", icon: "none" })
-		}
-	},
-
-	// 退出登录
-	logout: async () => {
-		const isLogin = await hooks.useCheckLogin()
-		if (!isLogin) return
-
-		uni.showLoading({ title: "退出登录中...", mask: true })
-		storage.clearUserStorage()
-		uni.hideLoading()
-		uni.showToast({ title: "退出登录成功", icon: "none" })
-	},
-
-	// 切换角色
-	changeRole: () => {
-		router.jump("/pages/user/userRole")
-	},
-}
-
-const scanCode = {
-	// 扫一扫
-	scan: async () => {
-		usePayStore().setPayData({})
-		try {
-			const decodedString = await scanCode.getScanResult()
-
-			if (decodedString) {
-				scanCode.processScanResult(decodedString)
-			}
-			//  else {
-			// 	uni.showToast({ title: "无效的二维码", icon: "none" })
-			// }
-		} catch (error: any) {
-			// if (error) {
-			// 	uni.showToast({ title: error, icon: "none" })
-			// }
-		}
-	},
-
-	// 获取扫码结果
-	getScanResult: async (): Promise<string | undefined> => {
-		if (isDevEnv()) {
-			// 开发环境模拟扫码
-			// const testQrCode = "eyJpZCI6IjE4OTYxNTcyMDc2NDQwNTM1MDYiLCJuYW1lIjoi5rWL6K+V5ZWG5oi3In0=" // 线上-测试超市-收款码
-			// const testQrCode = "eyJpZCI6IjE5MDU4MTY3NTEwNDM0NTI5MzAiLCJuYW1lIjoi5paw5Y6/5bqc6LaF5biCIn0=" // 测试环境-邓本地-新县府超市-收款码
-			const testQrCode = "eyJpZCI6IjE5MDc2ODQwNTY4NDA4NDMyNjYiLCJuYW1lIjoi5pm66IO95p+c6Ieq6JCl5ZWG5oi3MSJ9" // 测试环境-邓本地-智能柜自营商户1-收款码
-			uni.showToast({ title: "开发环境不是浙政钉环境，扫码仅供测试，收款商家为测试商户超市", icon: "none" })
-			return scanCode.decodeBase64(testQrCode)
-		} else if (state.appInfo == "dd") {
-			// 浙政钉扫码
-			const res: any = await (window as any).dd.scan({ type: "all" })
-			return scanCode.decodeBase64(res.text)
-		} else if (state.appInfo == "sh") {
-			// 诗画扫码
-			const res = await (window as any).CP2.showScanQr({ needResult: 1 })
-			if (res.code == 1) return scanCode.decodeBase64(res.data.qrCode)
-		} else {
-			uni.showToast({ title: "当前环境未知", icon: "none" })
-		}
-	},
-
-	// 处理扫码结果
-	processScanResult: (decodedString: string) => {
-		try {
-			const decodedJson = JSON.parse(decodedString)
-			if (decodedJson?.id && decodedJson?.name) {
-				usePayStore().setPayData(decodedJson)
-				router.jump("/pages/pay/scanPay")
-			} else {
-				uni.showToast({ title: "无效的二维码", icon: "none" })
-			}
-		} catch (error) {
-			uni.showToast({ title: "无效的二维码内容", icon: "none" })
-		}
-	},
-
-	// 解码base64
-	decodeBase64: (base64String: string): string | undefined => {
-		try {
-			const decodedBinaryString = atob(base64String)
-			const uint8Array = new Uint8Array(decodedBinaryString.length)
-			for (let i = 0; i < decodedBinaryString.length; i++) {
-				uint8Array[i] = decodedBinaryString.charCodeAt(i)
-			}
-			const decoder = new TextDecoder("utf-8")
-			const decodedString = decoder.decode(uint8Array)
-			console.log("解码结果", decodedString)
-			return decodedString
-		} catch (error) {
-			console.error("Base64 解码失败:", error)
-			uni.showToast({ title: "无效的二维码", icon: "none" })
-			return undefined
-		}
-	},
-}
-
-const onTabLogin = () => (isDevEnv() ? router.jump("/pages/test/login") : login.checkAppInfo())
-
-const onTabMenu = async (item: any, index: number) => {
-	if (index == state.menuList.length - 1) {
-		router.jump(item.router)
-		return
-	}
-
-	const isLogin = await hooks.useCheckLogin()
-	if (isLogin) {
-		if (item.text === "扫一扫") {
-			await scanCode.scan()
-		} else {
-			router.jump(item.router)
-		}
 	}
 }
 
-// 退出登录
+// 点击登录
-const doLogout = async () => {
+const onTabLogin = () => {
-	await login.logout()
+	uni.navigateTo({
-}
+		url: "/pages/test/login",
-
-// 切换角色
-const doChangeRole = () => {
-	login.changeRole()
-}
-
-// 初始化配置菜单
-const initMenuConfig = () => {
-	if (isDevEnv()) {
-		state.menuList.push({
-			text: "测试-登录",
-			icon: "/static/icon/login.png",
-			router: "/pages/test/login",
 	})
-		state.menuList.push({
-			text: "测试-角色选择",
-			icon: "/static/icon/login.png",
-			router: "/pages/user/userRole",
-		})
-	}
 }
 
-onLoad(async () => {
+// 点击菜单
-	const app = getApp()
+const onTabMenu = () => {
-	app._initTabbar()
+	uni.navigateTo({ url: "/pages/integrated/visitor/verify" })
+}
 
-	// 初始化配置菜单
+onLoad(() => {
-	initMenuConfig()
+	getUserInfo()
-
-	// 获取应用信息
-	state.appInfo = await getAppInfo()
 })
-
 onShow(() => {
-	// 获取存储中的用户信息
+	getUserInfo()
-	storage.getUserInfo()
 })
 </script>
-
-<style lang="scss" scoped>
-.service_item:not(:last-child) {
-	padding-bottom: 40rpx;
-	border-bottom: 1px solid #fafafa;
-	margin-bottom: 40rpx;
-}
-</style>

src/pages/test/login.vue

@@ -1,13 +1,36 @@
+<template>
+	<view class="bg-#F8F8F8 w-full h-screen overflow-hidden">
+		<view class="card p-30rpx m-4">
+			<view class="text-lg text-center my-1">员工登录</view>
+			<tm-form ref="applyFormRef" v-model="applyForm" :rules="applyFormRules" direction="vertical">
+				<tm-form-item name="username" label="用户名" :showBottom="false">
+					<tm-input v-model="applyForm.username" placeholder="请输入用户名..." />
+				</tm-form-item>
+				<view class="h-10rpx" />
+				<tm-form-item name="password" label="密码" :showBottom="false">
+					<tm-input password showEye v-model="applyForm.password" placeholder="请输入用户密码..." />
+				</tm-form-item>
+			</tm-form>
+
+			<tm-button block @tap="doSubmit">登录</tm-button>
+		</view>
+
+		<view class="card p-30rpx m-4">
+			<view class="text-lg text-center my-1">访客登录</view>
+			<button class="bg-#0779fd rounded-3 c-white text-lg py-2" open-type="getUserInfo" @click="getUserInfo">微信登录</button>
+		</view>
+	</view>
+</template>
+
 <script setup lang="ts">
 import { ref, reactive } from "vue"
-import { onShow } from "@dcloudio/uni-app"
 import { constant, router } from "@@/index"
 import { userApi } from "@@/api"
 
-const state = reactive<any>({
+const tokenKey = constant.storageConstant.TOKEN
-	userInfo: null,
+const userInfoKey = constant.storageConstant.USERINFO
-})
+
-const applyForm = reactive<any>({
+let applyForm = reactive<any>({
 	username: "",
 	password: "",
 })
@@ -16,21 +39,15 @@ const applyFormRules = reactive<any>({
 	password: [{ required: true, message: "请输入密码" }],
 })
 
-onShow(() => {
-	const userInfoKey = constant.storageConstant.USERINFO
-	state.userInfo = uni.getStorageSync(userInfoKey)
-})
-
 const applyFormRef = ref<any>(null)
 const doSubmit = async () => {
 	applyFormRef.value.submit()
 	const { isPass } = applyFormRef.value.validate()
 	if (!isPass) return
-	const tokenKey = constant.storageConstant.TOKEN
+
-	const userInfoKey = constant.storageConstant.USERINFO
 	uni.removeStorageSync(tokenKey)
 	uni.showLoading({ title: "登录中...", mask: true })
-	const res = await userApi.login({
+	const res: any = await userApi.login({
 		...applyForm,
 		grant_type: "password",
 		scope: "server",
@@ -46,36 +63,91 @@ const doSubmit = async () => {
 	uni.showToast({ title: "登录成功", icon: "none" })
 	router.back()
 }
-</script>
 
-<template>
+// 获取用户信息
-	<crud-layout title="登录" bg="/static/page/blue-bg.png">
+const getUserInfo = () => {
-		<view class="h-30rpx" />
+	uni.showLoading({ title: "登录中...", mask: true })
-		<view class="card p-x-30rpx p-y-40rpx">
+	uni.getUserInfo({
-			<tm-form ref="applyFormRef" v-model="applyForm" :rules="applyFormRules" direction="vertical">
+		success: (res) => {
-				<tm-form-item name="username" label="用户名" :showBottom="false">
+			// 存储用户信息
-					<tm-input v-model="applyForm.username" placeholder="请输入用户名.." />
+			uni.setStorageSync(userInfoKey, res.userInfo)
-				</tm-form-item>
-				<view class="h-30rpx" />
-				<tm-form-item name="password" label="密码" :showBottom="false">
-					<tm-input password showEye v-model="applyForm.password" placeholder="请输入用户密码.." />
-				</tm-form-item>
-			</tm-form>
-		</view>
-		<view
-			v-if="state.detailType != 'view'"
-			class="bg-#0094ff p-y-20rpx text-center rounded-40rpx m-x-30rpx m-t-60rpx sub-text-30 color-white!"
-			@tap="doSubmit"
-		>
-			登录
-		</view>
-	</crud-layout>
-</template>
 
-<style lang="scss" scoped>
+			// 微信登录
-:deep() {
+			login()
-	.tmFormItemLabel {
+		},
-		padding-bottom: 10rpx !important;
+		fail: (res) => {
+			return uni.showToast({ title: "获取用户信息失败", icon: "error" })
+		},
+		complete: () => {
+			uni.hideLoading()
+		},
+	})
+}
+
+// 登录
+const login = async () => {
+	uni.showLoading({ title: "登录中...", mask: true })
+	const result = await uni.login({ provider: "weixin" }).catch((error) => error)
+	if (result.errMsg === "login:ok") {
+		console.log("code", result.code)
+
+		const res: any = await userApi.mnpLogin(result.code)
+		if (res.code == 0) {
+			uni.setStorageSync(tokenKey, res.data)
+			uni.hideLoading()
+			uni.showToast({ title: "登录成功", icon: "none" })
+			router.back()
+		} else {
+			uni.hideLoading()
+			uni.showToast({ title: "获取token失败", icon: "error" })
+		}
+	} else {
+		uni.hideLoading()
+		uni.showToast({ title: "获取登录code失败", icon: "error" })
 	}
 }
-</style>
+
+// 绑定
+// const bind = async (mobile?: string, code?: string) => {
+// 	// 1. 使用验证码登录获取token
+// 	const params = {
+// 		mobile: "SMS@" + "17319791971",
+// 		code: "0e3XvSll2ptntf4bg3ol2BdVFH1XvSlM",
+// 		grant_type: "mobile",
+// 	}
+
+// 	const res = await request({
+// 		url: "/auth/oauth2/token",
+// 		method: "post",
+// 		data: params,
+// 		header: {
+// 			Authorization: "Basic bWluaTptaW5p",
+// 			"Content-Type": "application/x-www-form-urlencoded",
+// 		},
+// 	})
+// 	console.log(res)
+
+// 	const token = res.data.access_token
+
+// 	// 2. 获取新的小程序code并完成绑定
+// 	// uni.login({
+// 	// 	success(loginRes) {
+// 	// 		wx.request({
+// 	// 			url: "${BASE_URL}/admin/social/bind?state=MINI&code=" + loginRes.code,
+// 	// 			method: "post",
+// 	// 			header: {
+// 	// 				Authorization: "Bearer " + token,
+// 	// 			},
+// 	// 			success() {
+// 	// 				wx.showToast({
+// 	// 					title: "绑定成功",
+// 	// 					success() {
+// 	// 						wx.navigateBack()
+// 	// 					},
+// 	// 				})
+// 	// 			},
+// 	// 		})
+// 	// 	},
+// 	// })
+// }
+</script>

src/sheep/api/user.ts

@@ -1,17 +1,18 @@
 import request from "@/sheep/utils/request"
-import { encryption } from "@/sheep/utils/encryption"
+import { encryption, encryptionBase64 } from "@/sheep/utils/encryption"
 
-// 将 Basic Auth 字符串提取为常量
+// 加密
-const BASIC_AUTH = "Basic " + window.btoa(import.meta.env.VITE_OAUTH2_APP_CLIENT)
+const basicAuth = "Basic " + encryptionBase64(import.meta.env.VITE_OAUTH2_APP_CLIENT)
 
 // 定义接口类型
 interface LoginParams {
-	username: string
+	username?: string
-	password: string
+	password?: string
-	randomStr: string
+	randomStr?: string
-	code: string
+	mobile?: string
-	grant_type: string
+	code?: string
-	scope: string
+	grant_type?: string
+	scope?: string
 }
 
 export default {
@@ -64,7 +65,7 @@ export default {
 	// 登录
 	login: (params: LoginParams) => {
 		const { username, password, randomStr, code, grant_type, scope } = params
-		const encPassword = encryption(password, import.meta.env.VITE_PWD_ENC_KEY)
+		// const encPassword = encryption(password, import.meta.env.VITE_PWD_ENC_KEY)
 
 		return request({
 			url: `/auth/oauth2/token`,
@@ -80,7 +81,7 @@ export default {
 			data: { password },
 			header: {
 				skipToken: true,
-				Authorization: BASIC_AUTH,
+				Authorization: basicAuth,
 				"content-type": "application/x-www-form-urlencoded",
 			},
 			custom: {
@@ -97,4 +98,26 @@ export default {
 				showLoading: false,
 			},
 		}),
+	mnpLogin: (code: string) => {
+		const form = {
+			mobile: `APP-MINI@${code}`,
+			code: code,
+			grant_type: "mobile",
+			scope: "server",
+		}
+
+		return request({
+			url: "/auth/oauth2/token",
+			method: "POST",
+			params: form,
+			header: {
+				Authorization: basicAuth,
+				"content-type": "application/x-www-form-urlencoded",
+			},
+			custom: {
+				showLoading: false,
+				withToken: false,
+			},
+		})
+	},
 }

src/sheep/components/base/base-just-flot-nav/base-just-flot-nav.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { defineProps, computed } from "vue"
+import { computed } from "vue"
 import { router } from "@@/index"
 
 const props = defineProps({

src/sheep/components/base/base-nav/base-nav.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { defineProps, computed } from "vue"
+import { computed } from "vue"
 import { router } from "@@/index"
 
 const props = defineProps({

src/sheep/components/base/base-safe-height/base-safe-height.vue

@@ -1,22 +1,22 @@
 <script setup lang="ts">
-import { defineProps, withDefaults } from "vue";
+import { withDefaults } from "vue"
 
 export interface Props {
-  type: "top" | "bottom";
+	type: "top" | "bottom"
-  bgColor: string;
+	bgColor: string
 }
 
 const props = withDefaults(defineProps<Props>(), {
 	type: "top",
 	bgColor: "transparent",
-});
+})
 
 function getHeight() {
-  const { top, bottom } = uni.getSystemInfoSync().safeAreaInsets!;
+	const { top, bottom } = uni.getSystemInfoSync().safeAreaInsets!
 	if (props.type && props.type === "bottom") {
-    return bottom + "px";
+		return bottom + "px"
 	}
-  return top + "px";
+	return top + "px"
 }
 </script>
 

src/sheep/components/crud/crud-layout/crud-layout.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { defineProps, withDefaults, watch, ref, reactive, onMounted } from "vue"
+import { withDefaults, watch, ref, reactive, onMounted } from "vue"
 import { router } from "@@/index"
 
 export type Props = {

src/sheep/router/index.ts

@@ -1,37 +1,37 @@
-import { throttle } from "radash";
+import { throttle } from "radash"
 
 function paramsToQuery(params: { [key: string]: string }) {
-  let query = [];
+	let query = []
 	for (let key in params) {
-    query.push(key + "=" + params[key]);
+		query.push(key + "=" + params[key])
 	}
-  return query.join("&");
+	return query.join("&")
 }
 
 // 路由跳转
 function _jump(path = "", params = {}, type = 1) {
 	if (!path) {
-    console.error("router::jump>>path 不能为空");
+		console.error("router::jump>>path 不能为空")
 	}
 	if (hasTabbar(path)) {
-    uni.switchTab({ url: path });
+		uni.switchTab({ url: path })
-    return;
+		return
 	}
-  let url: string = "";
+	let url: string = ""
 	if (Object.keys(params)) {
-    url = `${path}?${paramsToQuery(params)}`;
+		url = `${path}?${paramsToQuery(params)}`
 	}
 	if (type == 1) {
-    uni.navigateTo({ url: url });
+		uni.navigateTo({ url: url })
-    return;
+		return
 	}
 	if (type == 2) {
-    uni.redirectTo({ url: url });
+		uni.redirectTo({ url: url })
-    return;
+		return
 	}
 	if (type == 3) {
-    uni.reLaunch({ url: url });
+		uni.reLaunch({ url: url })
-    return;
+		return
 	}
 }
 
@@ -40,43 +40,43 @@ function _back(page = 1) {
 	if (hasHistory()) {
 		uni.navigateBack({
 			delta: page,
-    });
+		})
 	} else {
-    _jump(__TABBAR__[0], {});
+		_jump(__TABBAR__[0], {})
 	}
 }
 
 export function jump(...args: any) {
-  throttle({ interval: 500 }, () => _jump(...args))();
+	throttle({ interval: 500 }, () => _jump(...args))()
 }
 
 export function back(...args: any) {
-  throttle({ interval: 500 }, () => _back(...args))();
+	throttle({ interval: 500 }, () => _back(...args))()
 }
 
 export function hasHistory() {
-  const pages = getCurrentPages();
+	const pages = getCurrentPages()
 	if (pages.length > 1) {
-    return true;
+		return true
 	}
-  return false;
+	return false
 }
 
 export function getCurrentPage() {
-  const pages = getCurrentPages();
+	const pages = getCurrentPages()
-  return pages[pages.length - 1];
+	return pages[pages.length - 1]
 }
 
 export function hasTabbar(str: string = "") {
 	if (!str) {
-    const { route } = getCurrentPage();
+		const { route } = getCurrentPage()
 		if (route) {
-      str = `/${route}`;
+			str = `/${route}`
 		}
 	}
 	if (Array.isArray(__TABBAR__) && __TABBAR__.indexOf(str) !== -1) {
-    return true;
+		return true
 	} else {
-    return false;
+		return false
 	}
 }

src/sheep/utils/encryption.ts

@@ -1,15 +1,23 @@
-import * as CryptoJS from "crypto-js";
+import * as CryptoJS from "crypto-js"
 
 /**
  *加密处理
  */
 export function encryption(src: string, keyWord: string) {
-  const key = CryptoJS.enc.Utf8.parse(keyWord);
+	const key = CryptoJS.enc.Utf8.parse(keyWord)
 	// 加密
 	var encrypted = CryptoJS.AES.encrypt(src, key, {
 		iv: key,
 		mode: CryptoJS.mode.CFB,
 		padding: CryptoJS.pad.NoPadding,
-  });
+	})
-  return encrypted.toString();
+	return encrypted.toString()
+}
+
+/**
+ *加密处理
+ */
+export function encryptionBase64(rawStr: string) {
+	let wordArray = CryptoJS.enc.Utf8.parse(rawStr)
+	return CryptoJS.enc.Base64.stringify(wordArray)
 }

src/sheep/utils/request.ts

@@ -1,8 +1,6 @@
 import Request from "luch-request"
 import { isEmpty } from "radash"
-import isDevEnv from "./isDevEnv"
 import { router, constant } from "@@/index"
-import { userApi } from "../api"
 
 // 常量定义
 const TOKEN_KEY = constant.storageConstant.TOKEN
@@ -32,116 +30,6 @@ function showLoading(message: string) {
 	}
 }
 
-// 读取token并处理Authorization请求头
-const getAuthHeader = (tokenStorage: any) => {
-	if (isDevEnv()) {
-		return tokenStorage?.access_token ? `Bearer ${tokenStorage.access_token}` : null
-	}
-	return tokenStorage?.accessToken?.tokenValue ? `Bearer ${tokenStorage.accessToken.tokenValue}` : null
-}
-
-// 浙政钉登录 登录成功返回true，否则返回false
-async function handleZzdLogin(): Promise<boolean> {
-	try {
-		uni.showLoading({ title: "加载中...", mask: true })
-		const params = new URL(window.location.href).searchParams
-		const token = params.get("uabaseToken")
-
-		if (!token) return false
-
-		const res = await userApi.auth(token)
-		if (res?.code == 0) {
-			uni.setStorageSync(TOKEN_KEY, res.data)
-			const { data: userData } = await userApi.userInfo()
-			uni.setStorageSync(USER_INFO_KEY, userData)
-			return true
-		} else {
-			uni.removeStorageSync(TOKEN_KEY)
-			uni.removeStorageSync(USER_INFO_KEY)
-			if (res.msg == "token已失效") {
-				uni.showToast({ title: "用户凭证已失效，请退出并重新进入智慧后勤应用", icon: "none", duration: 6000 })
-			} else {
-				uni.showToast({ title: res.msg || "登录失败", icon: "none" })
-			}
-			return false
-		}
-	} catch (error) {
-		uni.showToast({ title: "登录错误", icon: "none" })
-		return false
-	} finally {
-		uni.hideLoading()
-	}
-}
-
-// 诗画登录 登录成功返回true，否则返回false
-async function handleShLogin(): Promise<boolean> {
-	try {
-		uni.showLoading({ title: "登录中...", mask: true })
-		const userInfo = await (window as any).CP2.getUserInfo()
-
-		if (userInfo.code == 0) {
-			uni.showToast({ title: "获取诗画用户信息失败", icon: "none" })
-			return false
-		}
-
-		const { accountId, sessionId } = userInfo.data
-		const response = await userApi.authsh({ accountId, sessionId })
-
-		if (response.code == 0) {
-			uni.setStorageSync(TOKEN_KEY, { accessToken: response.data.accessToken })
-			const { data: userData } = await userApi.userInfo()
-			uni.setStorageSync(USER_INFO_KEY, userData)
-			uni.showToast({ title: "登录成功", icon: "none" })
-			return true
-		} else {
-			uni.removeStorageSync(TOKEN_KEY)
-			uni.removeStorageSync(USER_INFO_KEY)
-			if (response.msg == "token已失效") {
-				uni.showToast({ title: "用户凭证已失效，请退出并重新进入智慧后勤应用", icon: "none", duration: 6000 })
-			} else {
-				uni.showToast({ title: response.msg || "登录失败", icon: "none" })
-			}
-			return false
-		}
-	} catch (error) {
-		uni.showToast({ title: "登录错误", icon: "none" })
-		return false
-	} finally {
-		uni.hideLoading()
-	}
-}
-
-// 根据应用环境自动登录 返回登录结果
-async function autoLogin(): Promise<boolean> {
-	const appInfo = await (window as any).CP2.getAppInfo()
-
-	// 浙政钉环境
-	if (appInfo.code == 0) {
-		return await handleZzdLogin()
-	}
-	// 诗画环境
-	else {
-		return await handleShLogin()
-	}
-}
-
-// token过期刷新检查
-async function checkAndRefreshToken(tokenStorage: any) {
-	const { accessToken } = tokenStorage
-	if (!accessToken) return
-
-	const expiresDate = new Date(accessToken.expiresAt).getTime()
-
-	// console.log("过期时间", expiresDate)
-	// console.log("现在时间", new Date().getTime())
-	// console.log("现在时间大于过期时间吗", new Date().getTime() >= expiresDate)
-
-	// token已过期，尝试刷新
-	if (new Date().getTime() >= expiresDate) {
-		await autoLogin()
-	}
-}
-
 // 处理错误响应
 function handleErrorResponse(response: any) {
 	if (!response.config?.custom?.showError) return
@@ -156,7 +44,8 @@ function handleErrorResponse(response: any) {
 			break
 		case 424:
 			// 处理token过期
-			autoLogin()
+			uni.showToast({ title: "登录已过期，请重新登录", icon: "none" })
+			router.jump("/pages/test/login")
 			break
 		default:
 			uni.showToast({
@@ -180,8 +69,9 @@ function handleSuccessMessage(response: any) {
 
 // 创建请求实例
 const http = new Request({
-	baseURL: import.meta.env.VITE_API_URL,
+	// baseURL: import.meta.env.VITE_API_URL,
-	timeout: 8000,
+	baseURL: import.meta.env.VITE_APP_PROD_SERVICE,
+	timeout: 15000,
 	method: "GET",
 	header: {
 		Accept: "*/*",
@@ -223,23 +113,13 @@ http.interceptors.request.use(async (config) => {
 
 	if (needAuth) {
 		if (!isEmpty(tokenStorage)) {
-			// token过期刷新检查
+			const authHeader = tokenStorage?.access_token ? `Bearer ${tokenStorage.access_token}` : null
-			await checkAndRefreshToken(tokenStorage)
-
-			const authHeader = getAuthHeader(tokenStorage)
 			if (authHeader) {
 				config_header.Authorization = authHeader
 			}
 		} else {
-			// token不存在，则发起登录
+			uni.showToast({ title: "登录已过期，请重新登录", icon: "none" })
-			await autoLogin()
+			router.jump("/pages/test/login")
-
-			// 登录后重新获取token
-			const newTokenStorage = uni.getStorageSync(TOKEN_KEY)
-			const authHeader = getAuthHeader(newTokenStorage)
-			if (authHeader) {
-				config_header.Authorization = authHeader
-			}
 		}
 	}
 
@@ -282,16 +162,12 @@ http.interceptors.response.use(
 
 		// 处理 424 错误(token过期)
 		if (error.statusCode === 424) {
-			if (isDevEnv()) {
+			// 清除token并跳转登录
-				// 开发环境直接清除token并跳转登录
 			uni.removeStorageSync(TOKEN_KEY)
 			uni.removeStorageSync(USER_INFO_KEY)
 			uni.showToast({ title: "登录已过期，请重新登录", icon: "none" })
-				router.jump("/pages/test/login")
+			router.jump("/pages/test/login", {}, 1)
 			return false
-			} else {
-				await autoLogin()
-			}
 		}
 
 		// 显示错误信息