From 985897adbdac5cbb21479b9d51a0a1a467df571a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=88=B1=7E=E6=B5=B7=7E=E7=88=B1=E6=B5=B7=E7=88=B1?=
 =?UTF-8?q?=E6=B5=B7=7E=E5=8F=B3?= <1828712314@qq.com>
Date: Thu, 20 Feb 2025 11:44:57 +0800
Subject: [PATCH] =?UTF-8?q?request=20=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index.vue         | 20 ++++++++++++++++++++
 sub/enterprise/edit.vue |  7 +++++--
 sub/task/enforce.vue    |  1 +
 sub/task/locate.vue     |  8 ++++----
 utils/request.js        | 21 +++++++++++++--------
 5 files changed, 43 insertions(+), 14 deletions(-)

diff --git a/pages/index.vue b/pages/index.vue
index 05e6780..911ddcf 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -25,6 +25,10 @@
         :scroll-y="true"
         :style="{ maxHeight: `${viewHeigth}px` }"
         class="view"
+        :refresher-enabled="true"
+        @refresherrefresh="refresherrefresh"
+        :refresher-triggered="refresherTriggered"
+        @refresherpulling="refresherpulling"
       >
         <view class="box row-1">
           <view class="wd-flex" style="justify-content: space-around">
@@ -205,6 +209,7 @@ export default {
           type: 2
         }
       ],
+      refresherTriggered: false,
       list: [],
       color: ['#1B84FF', '#7239EA', '#F6B100', '#F8285A', '#17C653']
     }
@@ -222,6 +227,9 @@ export default {
       this.getPageHeight()
     })
   },
+  onShow() {
+    this.init()
+  },
   methods: {
     getPageHeight() {
       const query = uni.createSelectorQuery().in(this)
@@ -362,6 +370,18 @@ export default {
     changeTab(type) {
       this.queryParams.type = type
       this.getList()
+    },
+    refresherpulling() {
+      const that = this
+      if (!this.refresherTriggered) {
+        this.refresherTriggered = true
+        setTimeout(() => {
+          that.refresherTriggered = false
+        }, 1000)
+      }
+    },
+    refresherrefresh() {
+      this.init()
     }
   }
 }
diff --git a/sub/enterprise/edit.vue b/sub/enterprise/edit.vue
index fec2917..43e6b3a 100644
--- a/sub/enterprise/edit.vue
+++ b/sub/enterprise/edit.vue
@@ -1,5 +1,5 @@
 <template>
-  <view>
+  <view class="view-container">
     <view class="container">
       <uni-steps :options="step.options" :active="step.active"></uni-steps>
       <scroll-view
@@ -598,7 +598,11 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.view-container {
+  height: 100vh;
+}
 .container {
+  height: 100%;
   background-color: #fff;
   padding: 10px;
   overflow: hidden;
@@ -606,7 +610,6 @@ export default {
   flex-flow: column nowrap;
   height: 100%;
   .info-container {
-    max-height: 75vh;
     padding: 0 10px;
     margin-top: 10px;
   }
diff --git a/sub/task/enforce.vue b/sub/task/enforce.vue
index 847b05c..36d3394 100644
--- a/sub/task/enforce.vue
+++ b/sub/task/enforce.vue
@@ -140,6 +140,7 @@ export default {
           }
         })
       ).then(res => {
+        // 一次传三张
         this.form.photo = res
       })
     },
diff --git a/sub/task/locate.vue b/sub/task/locate.vue
index 12ea0fc..4d83e59 100644
--- a/sub/task/locate.vue
+++ b/sub/task/locate.vue
@@ -74,7 +74,7 @@
     </view>
 
     <cs-bottom-wrapper v-if="!isLocate">
-      <view class="operation" v-if="">
+      <view class="operation" v-if="distance < 30">
         <button
           class="btn green"
           v-if="distance < radius"
@@ -179,8 +179,8 @@ export default {
         const arr = i.split('=')
         obj[arr[0]] = arr[1]
       })
-      this.inspectionsId = obj.inspectionsId
-      this.enterpriseId = obj.enterpriseId
+      this.inspectionsId = obj.aId
+      this.enterpriseId = obj.bId
     } else {
       this.inspectionsId = res.inspectionsId
       this.enterpriseId = res.enterpriseId
@@ -227,7 +227,7 @@ export default {
   methods: {
     async init() {
       const res = await getMiniappCode({
-        scene: `inspectionsId=${this.inspectionsId}&enterpriseId=${this.enterpriseId}`,
+        scene: `aId=${this.inspectionsId}&bId=${this.enterpriseId}`,
         path: 'sub/task/locate',
         checkPath: false,
         envVersion: 'develop',
diff --git a/utils/request.js b/utils/request.js
index 91d4530..be39593 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -47,14 +47,19 @@ const request = config => {
 				const code = res.data.code || 200
 				const msg = errorCode[code] || res.data.msg || errorCode['default']
 				if (code === 401) {
-					showConfirm('登录状态已过期，您可以继续留在该页面，或者重新登录?').then(res => {
-						if (res.confirm) {
-							store.dispatch('LogOut').then(res => {
-								uni.reLaunch({
-									url: '/pages/login'
-								})
-							})
-						}
+					// showConfirm('登录状态已过期，您可以继续留在该页面，或者重新登录?').then(res => {
+					// 	if (res.confirm) {
+					// 		store.dispatch('LogOut').then(res => {
+					// 			uni.reLaunch({
+					// 				url: '/pages/login'
+					// 			})
+					// 		})
+					// 	}
+					// })
+					store.dispatch('LogOut').then(res => {
+						uni.reLaunch({
+							url: '/pages/login'
+						})
 					})
 					reject('无效的会话，或者会话已过期，请重新登录。')
 				} else if (code === 500) {