1

common/http.interceptor.js

@@ -19,13 +19,13 @@ const install = (Vue, vm) => {
 			
 	// 	},
 	// }); 
-	uni.setStorageSync('deptId', 101);
+	uni.setStorageSync('deptId', 100);
 	Vue.prototype.$u.http.setConfig({
 			// baseUrl: 'http://61.174.243.28:15861',
 			// baseUrl: 'http://192.168.2.14:8080',
 			// baseUrl: 'http://124.221.246.124:2289',
-			baseUrl: 'https://dianche.chuantewulian.cn/prod-api',
+			// baseUrl: 'https://dianche.chuantewulian.cn/prod-api',
-			// baseUrl: 'https://dche.ccttiot.com/prod-api',
+			baseUrl: 'https://dche.ccttiot.com/prod-api',
 			loadingText: '努力加载中~',
 			// loadingTime: 2000,
 			// 设置自定义头部content-type

manifest.json

@@ -51,7 +51,7 @@
     /* 小程序特有相关 */
     "mp-weixin" : {
         "libVersion" : "latest",
-        "appid" : "wx4d178f8c80348214",
+        "appid" : "wx3428c498d5061192",
         "setting" : {
             "urlCheck" : false
         },

package-lock.json

@@ -0,0 +1,406 @@
+{
+  "name": "dianbiao",
+  "version": "1.0.0",
+  "lockfileVersion": 2,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "dianbiao",
+      "version": "1.0.0",
+      "license": "ISC",
+      "dependencies": {
+        "fast-xml-parser": "^4.0.12",
+        "uview-ui": "^1.8.8"
+      },
+      "devDependencies": {
+        "autoprefixer": "^10.4.19",
+        "browserslist": "^4.23.1",
+        "caniuse-lite": "^1.0.30001636"
+      }
+    },
+    "node_modules/autoprefixer": {
+      "version": "10.4.19",
+      "resolved": "https://registry.npmmirror.com/autoprefixer/-/autoprefixer-10.4.19.tgz",
+      "integrity": "sha512-BaENR2+zBZ8xXhM4pUaKUxlVdxZ0EZhjvbopwnXmxRUfqDmwSpC2lAi/QXvx7NRdPCo1WKEcEF6mV64si1z4Ew==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/autoprefixer"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "dependencies": {
+        "browserslist": "^4.23.0",
+        "caniuse-lite": "^1.0.30001599",
+        "fraction.js": "^4.3.7",
+        "normalize-range": "^0.1.2",
+        "picocolors": "^1.0.0",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "bin": {
+        "autoprefixer": "bin/autoprefixer"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/browserslist": {
+      "version": "4.23.1",
+      "resolved": "https://registry.npmmirror.com/browserslist/-/browserslist-4.23.1.tgz",
+      "integrity": "sha512-TUfofFo/KsK/bWZ9TWQ5O26tsWW4Uhmt8IYklbnUa70udB6P2wA7w7o4PY4muaEPBQaAX+CEnmmIA41NVHtPVw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "dependencies": {
+        "caniuse-lite": "^1.0.30001629",
+        "electron-to-chromium": "^1.4.796",
+        "node-releases": "^2.0.14",
+        "update-browserslist-db": "^1.0.16"
+      },
+      "bin": {
+        "browserslist": "cli.js"
+      },
+      "engines": {
+        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+      }
+    },
+    "node_modules/caniuse-lite": {
+      "version": "1.0.30001636",
+      "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001636.tgz",
+      "integrity": "sha512-bMg2vmr8XBsbL6Lr0UHXy/21m84FTxDLWn2FSqMd5PrlbMxwJlQnC2YWYxVgp66PZE+BBNF2jYQUBKCo1FDeZg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ]
+    },
+    "node_modules/electron-to-chromium": {
+      "version": "1.4.810",
+      "resolved": "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.810.tgz",
+      "integrity": "sha512-Kaxhu4T7SJGpRQx99tq216gCq2nMxJo+uuT6uzz9l8TVN2stL7M06MIIXAtr9jsrLs2Glflgf2vMQRepxawOdQ==",
+      "dev": true
+    },
+    "node_modules/escalade": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmmirror.com/escalade/-/escalade-3.1.2.tgz",
+      "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/fast-xml-parser": {
+      "version": "4.3.2",
+      "integrity": "sha512-rmrXUXwbJedoXkStenj1kkljNF7ugn5ZjR9FJcwmCfcCbtOMDghPajbc+Tck6vE6F5XsDmx+Pr2le9fw8+pXBg==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/NaturalIntelligence"
+        },
+        {
+          "type": "paypal",
+          "url": "https://paypal.me/naturalintelligence"
+        }
+      ],
+      "dependencies": {
+        "strnum": "^1.0.5"
+      },
+      "bin": {
+        "fxparser": "src/cli/cli.js"
+      }
+    },
+    "node_modules/fraction.js": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmmirror.com/fraction.js/-/fraction.js-4.3.7.tgz",
+      "integrity": "sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "type": "patreon",
+        "url": "https://github.com/sponsors/rawify"
+      }
+    },
+    "node_modules/nanoid": {
+      "version": "3.3.7",
+      "resolved": "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.7.tgz",
+      "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "peer": true,
+      "bin": {
+        "nanoid": "bin/nanoid.cjs"
+      },
+      "engines": {
+        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+      }
+    },
+    "node_modules/node-releases": {
+      "version": "2.0.14",
+      "resolved": "https://registry.npmmirror.com/node-releases/-/node-releases-2.0.14.tgz",
+      "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==",
+      "dev": true
+    },
+    "node_modules/normalize-range": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmmirror.com/normalize-range/-/normalize-range-0.1.2.tgz",
+      "integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/picocolors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmmirror.com/picocolors/-/picocolors-1.0.1.tgz",
+      "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==",
+      "dev": true
+    },
+    "node_modules/postcss": {
+      "version": "8.4.38",
+      "resolved": "https://registry.npmmirror.com/postcss/-/postcss-8.4.38.tgz",
+      "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/postcss"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "peer": true,
+      "dependencies": {
+        "nanoid": "^3.3.7",
+        "picocolors": "^1.0.0",
+        "source-map-js": "^1.2.0"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14"
+      }
+    },
+    "node_modules/postcss-value-parser": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmmirror.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
+      "dev": true
+    },
+    "node_modules/source-map-js": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmmirror.com/source-map-js/-/source-map-js-1.2.0.tgz",
+      "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/strnum": {
+      "version": "1.0.5",
+      "integrity": "sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA=="
+    },
+    "node_modules/update-browserslist-db": {
+      "version": "1.0.16",
+      "resolved": "https://registry.npmmirror.com/update-browserslist-db/-/update-browserslist-db-1.0.16.tgz",
+      "integrity": "sha512-KVbTxlBYlckhF5wgfyZXTWnMn7MMZjMu9XG8bPlliUOP9ThaF4QnhP8qrjrH7DRzHfSk0oQv1wToW+iA5GajEQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "dependencies": {
+        "escalade": "^3.1.2",
+        "picocolors": "^1.0.1"
+      },
+      "bin": {
+        "update-browserslist-db": "cli.js"
+      },
+      "peerDependencies": {
+        "browserslist": ">= 4.21.0"
+      }
+    },
+    "node_modules/uview-ui": {
+      "version": "1.8.8",
+      "integrity": "sha512-Osal3yzXiHor0In9OPTZuXTaqTbDglMZ9RGK/MPYDoQQs+y0hrBCUD0Xp5T70C8i2lLu2X6Z11zJhmsQWMR7Jg=="
+    }
+  },
+  "dependencies": {
+    "autoprefixer": {
+      "version": "10.4.19",
+      "resolved": "https://registry.npmmirror.com/autoprefixer/-/autoprefixer-10.4.19.tgz",
+      "integrity": "sha512-BaENR2+zBZ8xXhM4pUaKUxlVdxZ0EZhjvbopwnXmxRUfqDmwSpC2lAi/QXvx7NRdPCo1WKEcEF6mV64si1z4Ew==",
+      "dev": true,
+      "requires": {
+        "browserslist": "^4.23.0",
+        "caniuse-lite": "^1.0.30001599",
+        "fraction.js": "^4.3.7",
+        "normalize-range": "^0.1.2",
+        "picocolors": "^1.0.0",
+        "postcss-value-parser": "^4.2.0"
+      }
+    },
+    "browserslist": {
+      "version": "4.23.1",
+      "resolved": "https://registry.npmmirror.com/browserslist/-/browserslist-4.23.1.tgz",
+      "integrity": "sha512-TUfofFo/KsK/bWZ9TWQ5O26tsWW4Uhmt8IYklbnUa70udB6P2wA7w7o4PY4muaEPBQaAX+CEnmmIA41NVHtPVw==",
+      "dev": true,
+      "requires": {
+        "caniuse-lite": "^1.0.30001629",
+        "electron-to-chromium": "^1.4.796",
+        "node-releases": "^2.0.14",
+        "update-browserslist-db": "^1.0.16"
+      }
+    },
+    "caniuse-lite": {
+      "version": "1.0.30001636",
+      "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001636.tgz",
+      "integrity": "sha512-bMg2vmr8XBsbL6Lr0UHXy/21m84FTxDLWn2FSqMd5PrlbMxwJlQnC2YWYxVgp66PZE+BBNF2jYQUBKCo1FDeZg==",
+      "dev": true
+    },
+    "electron-to-chromium": {
+      "version": "1.4.810",
+      "resolved": "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.810.tgz",
+      "integrity": "sha512-Kaxhu4T7SJGpRQx99tq216gCq2nMxJo+uuT6uzz9l8TVN2stL7M06MIIXAtr9jsrLs2Glflgf2vMQRepxawOdQ==",
+      "dev": true
+    },
+    "escalade": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmmirror.com/escalade/-/escalade-3.1.2.tgz",
+      "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==",
+      "dev": true
+    },
+    "fast-xml-parser": {
+      "version": "4.3.2",
+      "requires": {
+        "strnum": "^1.0.5"
+      }
+    },
+    "fraction.js": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmmirror.com/fraction.js/-/fraction.js-4.3.7.tgz",
+      "integrity": "sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==",
+      "dev": true
+    },
+    "nanoid": {
+      "version": "3.3.7",
+      "resolved": "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.7.tgz",
+      "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
+      "dev": true,
+      "peer": true
+    },
+    "node-releases": {
+      "version": "2.0.14",
+      "resolved": "https://registry.npmmirror.com/node-releases/-/node-releases-2.0.14.tgz",
+      "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==",
+      "dev": true
+    },
+    "normalize-range": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmmirror.com/normalize-range/-/normalize-range-0.1.2.tgz",
+      "integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==",
+      "dev": true
+    },
+    "picocolors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmmirror.com/picocolors/-/picocolors-1.0.1.tgz",
+      "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==",
+      "dev": true
+    },
+    "postcss": {
+      "version": "8.4.38",
+      "resolved": "https://registry.npmmirror.com/postcss/-/postcss-8.4.38.tgz",
+      "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "nanoid": "^3.3.7",
+        "picocolors": "^1.0.0",
+        "source-map-js": "^1.2.0"
+      }
+    },
+    "postcss-value-parser": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmmirror.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
+      "dev": true
+    },
+    "source-map-js": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmmirror.com/source-map-js/-/source-map-js-1.2.0.tgz",
+      "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==",
+      "dev": true,
+      "peer": true
+    },
+    "strnum": {
+      "version": "1.0.5"
+    },
+    "update-browserslist-db": {
+      "version": "1.0.16",
+      "resolved": "https://registry.npmmirror.com/update-browserslist-db/-/update-browserslist-db-1.0.16.tgz",
+      "integrity": "sha512-KVbTxlBYlckhF5wgfyZXTWnMn7MMZjMu9XG8bPlliUOP9ThaF4QnhP8qrjrH7DRzHfSk0oQv1wToW+iA5GajEQ==",
+      "dev": true,
+      "requires": {
+        "escalade": "^3.1.2",
+        "picocolors": "^1.0.1"
+      }
+    },
+    "uview-ui": {
+      "version": "1.8.8"
+    }
+  }
+}

page_fix/fix_index.vue

@@ -58,13 +58,18 @@
 				fixdata: [],
 				eledata: [],
 				listData: [],
-				infonum: {}
+				infonum: {},
+				areaId:0
 			}
 		},
 		onShow() {
 			this.$store.dispatch('userInfo', this.$u).then(() => {
 				// 执行其他操作...
 			});
+			if(uni.getStorageSync('adminAreaid')){
+				this.areaId = uni.getStorageSync('adminAreaid')
+				
+			}
 			this.getArea()
 			
 			
@@ -144,7 +149,10 @@
 				});
 			},
 			getordernum() {
-				this.$u.get('/appVerify/adminOrder/num?adminId=' + 2).then((res) => {
+				let data ={
+					areaId:this.areaId
+				}
+				this.$u.get('/appVerify/adminOrder/num?' ,data).then((res) => {
 					if (res.code === 200) {
 						this.infonum = res.data;
 					}

page_fix/repair/repair_index.vue

@@ -272,6 +272,7 @@
 </template>
 
 <script>
+import { data } from 'browserslist';
 	export default {
 		data() {
 			return {
@@ -284,9 +285,17 @@
 				fixdata: [],
 				eledata: [],
 				listData: [],
-				alreadyList: []
+				alreadyList: [],
+				areaId:0,
 			}
 		},
+		onShow() {
+			if(uni.getStorageSync('adminAreaid')){
+				this.areaId = uni.getStorageSync('adminAreaid')
+				this.getmarks();
+			}
+			
+		},
 		watch: {
 			curtitidx(newValue, oldValue) {
 				console.log('curtitidx 发生变化', newValue, oldValue);
@@ -342,7 +351,10 @@
 				this.curtitidx = e.detail.current;
 			},
 			getmarks() {
-				this.$u.get(`/appVerify/adminOrder/list?adminId=` + 2).then((res) => {
+				let data ={
+					areaId:this.areaId
+				}
+				this.$u.get(`/appVerify/adminOrder/list?`,data).then((res) => {
 					if (res.code == 200) {
 						this.listData = res.rows;
 						this.fixdata = [];
@@ -374,9 +386,7 @@
 			}
 			
 		},
-		onShow() {
+		
-			this.getmarks();
-		}
 	}
 </script>
 

pages/index/index.vue

@@ -4,7 +4,7 @@
 			<image src="https://lxnapi.ccttiot.com/bike/img/static/uVcMTydm81zCMhHomXl1" mode="" @click="topage(6)">
 			</image>
 			<view class="txts" v-if="gps.deptId==100">
-				创享出行
+			{{areaInfo.areaName}}
 			</view>
 				<view class="txts" v-if="gps.deptId==101">
 				嵛你出行
@@ -706,11 +706,14 @@
 			
 			
 			}
-			if(this.showagre){
+			if(this.gps.deptId==101){
-				uni.redirectTo({
+				if(this.showagre){
-					url:'/page_user/agreement?needback=true&qParam='+this.qParam
+					uni.redirectTo({
-				})
+						url:'/page_user/agreement?needback=true&qParam='+this.qParam
+					})
+				}
 			}
+			
 			if (e.sn) {
 				this.sn = e.sn
 				if (this.sn != '') {
@@ -744,18 +747,20 @@
 				uni.getLocation({
 					type: 'wgs84',
 					success: function(lb) {
-
+						that.latitude = 23.440359
-						// that.gps.latitude = lb.latitude;
+						that.longitude =117.074552
-						// that.gps.longitude = lb.longitude;
 						that.gps.latitude =23.440359
 						that.gps.longitude = 117.074552;
-						// that.latitude = '26.940805',
+						
-						// 	that.longitude = '120.356157';
+						
+						
+						// that.gps.latitude = lb.latitude;
+						// that.gps.longitude = lb.longitude;
+						
 						// that.latitude = Number(lb.latitude.toFixed(5)) - 0.005
 						// that.longitude = Number(lb.longitude.toFixed(5)) + 0.005
 						
-						that.latitude = 23.440359
+						
-						that.longitude =117.074552
 						console.log(that.areaInfo, 'that.areaInfo');
 						that.getArea()
 						if (that.qParam!='null'&&that.showagre==false) {
@@ -3608,7 +3613,7 @@
 
 			.txts {
 				position: absolute;
-				left: 300rpx;
+				left: 150rpx;
 				bottom: 90rpx;
 				font-weight: 500;
 				font-size: 36rpx;

pages/my.vue

@@ -270,6 +270,22 @@
 					})
 				}
 
+			},
+			confirm(e){
+				// console.log(e);
+				uni.setStorageSync('adminAreaid', e[0].value);
+				if(this.totype=2){
+					
+					uni.navigateTo({
+						url:'/pages_admin/admin_index'
+					})
+				}else{
+					uni.navigateTo({
+						url:'/page_fix/fix_index'
+					})
+				}
+				
+				
 			},
 			getareaList(){
 

pages_admin/order/search_device.vue

@@ -101,7 +101,7 @@
 					key:this.searchKeyword,
 					areaId:this.areaId
 				}
-				this.$u.get(`/app/device/search?`, data).then((res) => {
+				this.$u.get(`/appVerify/device/search?`, data).then((res) => {
 					if (res.code == 200) {
 						this.searchList=res.data
 						

pages_admin/worke/woke_deviceMgmt.vue

@@ -192,13 +192,19 @@
 				stepindex: 0,
 				selectedItems: [],
 				searchKeyword:'',
-				filteredList:[]
+				filteredList:[],
+				areaId: 0,
+				
 
 			}
 		},
 
 		onLoad() {
-			this.getDevice()
+			if(uni.getStorageSync('adminAreaid')){
+				this.areaId = uni.getStorageSync('adminAreaid')
+					this.getDevice()
+			}
+		
 		},
 		computed: {
 			isAllSelected() {
@@ -334,6 +340,7 @@
 					powerEnd: '',
 					sort: this.scidx,
 					status: this.typeidx,
+					areaId: this.areaId
 					
 				}
 

pages_admin/worke/worke_Operation.vue

@@ -248,7 +248,8 @@
 					second: false
 				},
 				cutidx: 0,
-				info:{}
+				info:{},
+				areaId:0,
 			}
 		},
 		onLoad() {
@@ -258,7 +259,11 @@
 			// 格式化日期为 yyyy-MM-dd
 			this.firsTime = this.formatDate(today);
 			this.lasTime = this.formatDate(today);
-			this.operatingData()
+			if(uni.getStorageSync('adminAreaid')){
+				this.areaId = uni.getStorageSync('adminAreaid')
+				this.operatingData()
+			}
+			
 		},
 		methods:{
 			changeTime(num) {
@@ -302,7 +307,7 @@
 				let data = {
 					timeStart: this.firsTime,
 					timeEnd: this.lasTime,
-			
+					areaId:this.areaId
 				}
 				this.$u.get('/appVerify/operatingData', data).then((res) => {
 					if (res.code === 200) {

pages_admin/worke/worke_income.vue

@@ -141,7 +141,8 @@
 				},
 				typeindex: 1,
 				infoList: [],
-				searchKeyword: ''
+				searchKeyword: '',
+				areaId:null
 
 			}
 		},
@@ -153,7 +154,11 @@
 			// 格式化日期为 yyyy-MM-dd
 			this.firsTime = this.formatDate(sevenDaysAgo);
 			this.lasTime = this.formatDate(today);
-			this.operatingData()
+			
+			if(uni.getStorageSync('adminAreaid')){
+				this.areaId = uni.getStorageSync('adminAreaid')
+				this.operatingData()
+			}
 		},
 		onReady() {
 			// this.firsTime = this.formatDate(sevenDaysAgo);
@@ -178,7 +183,8 @@
 					timeStart: this.firsTime,
 					timeEnd: this.lasTime,
 					type: this.typeindex,
-					sn: this.searchKeyword
+					sn: this.searchKeyword,
+					areaId:this.areaId
 				}
 				this.$u.get('/appVerify/reconciliation', data).then((res) => {
 					if (res.code === 200) {