From ae650ecc7e54287f1717f73614aad774e4ce2d1a Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Thu, 21 Dec 2023 18:28:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=BC=B9=E7=AA=97=E8=92=99?=
 =?UTF-8?q?=E5=B1=82=E9=98=BB=E6=AD=A2=E6=BB=91=E5=8A=A8=E5=92=8C=E7=AD=BE?=
 =?UTF-8?q?=E6=94=B6=E5=9B=BE=E7=89=87=E7=BC=93=E5=AD=98=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 compoment/BasicContainer/BasicContainer.vue   |  21 ++--
 compoment/PopUp/PopUp.vue                     |   2 +-
 compoment/tiplist/tiplist.vue                 |   2 +-
 pagesHome/pages/CustomerSign/CustomerSign.vue |   1 +
 pagesHome/pages/signinScan/signinScan.vue     |   3 +-
 unpackage/dist/dev/app-plus/app-service.js    | 106 ++++++++++--------
 utils/request.js                              |   3 +
 7 files changed, 79 insertions(+), 59 deletions(-)

diff --git a/compoment/BasicContainer/BasicContainer.vue b/compoment/BasicContainer/BasicContainer.vue
index 0313bb2..ca9cf63 100644
--- a/compoment/BasicContainer/BasicContainer.vue
+++ b/compoment/BasicContainer/BasicContainer.vue
@@ -108,13 +108,20 @@
 
 	// 下拉刷新
 	onPullDownRefresh(async () => {
-		await pullDownRefreshInitPage()
-		const timer = setTimeout(() => {
-			// 触发下拉回调
-			uni.stopPullDownRefresh()
-			// 清除定时器
-			clearTimeout(timer)
-		}, 300)
+		try {
+			await pullDownRefreshInitPage()
+
+		} catch (e) {
+			//TODO handle the exception
+		} finally {
+			console.log('111 :>> ', 111);
+			const timer = setTimeout(() => {
+				// 触发下拉回调
+				uni.stopPullDownRefresh()
+				// 清除定时器
+				clearTimeout(timer)
+			}, 300)
+		}
 	})
 
 	// 触发下拉刷新
diff --git a/compoment/PopUp/PopUp.vue b/compoment/PopUp/PopUp.vue
index 8f3f099..5b5aed8 100644
--- a/compoment/PopUp/PopUp.vue
+++ b/compoment/PopUp/PopUp.vue
@@ -1,6 +1,6 @@
 <template>
 	<!-- 弹窗组件 -->
-	<view class="popUpMask" @click="details.close" v-if="showPopUp">
+	<view class="popUpMask" @touchmove.stop.prevent @click="details.close" v-if="showPopUp">
 		<view class="container" @click.stop :style="{height:details.height}">
 			<scroll-view class="scoolv" scroll-y="true">
 				<view class="title">
diff --git a/compoment/tiplist/tiplist.vue b/compoment/tiplist/tiplist.vue
index 4bca8a8..47e01ee 100644
--- a/compoment/tiplist/tiplist.vue
+++ b/compoment/tiplist/tiplist.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="maboxbg" v-if="isshow" @click="checkbox(0)">
+	<view class="maboxbg" @touchmove.stop.prevent v-if="isshow" @click="checkbox(0)">
 		<scroll-view class="modtips" @click.stop.prevent>
 			<view class="title">
 				{{title||'提示'}}
diff --git a/pagesHome/pages/CustomerSign/CustomerSign.vue b/pagesHome/pages/CustomerSign/CustomerSign.vue
index c01ff27..f7c77d5 100644
--- a/pagesHome/pages/CustomerSign/CustomerSign.vue
+++ b/pagesHome/pages/CustomerSign/CustomerSign.vue
@@ -255,6 +255,7 @@
 				details.isChange = true
 				imglis = res.data.deliverySignPictures
 				details.imgList.forEach((item, index) => {
+					item.imgList = []
 					if (!imglis[item.dictKey]) return
 					details.imgList[index].imgList = imglis[item.dictKey]
 				})
diff --git a/pagesHome/pages/signinScan/signinScan.vue b/pagesHome/pages/signinScan/signinScan.vue
index 6afc49e..70e91c3 100644
--- a/pagesHome/pages/signinScan/signinScan.vue
+++ b/pagesHome/pages/signinScan/signinScan.vue
@@ -130,7 +130,7 @@
 		title: '签收扫描',
 		haveData: true,
 		async pullDownRefreshInitPage() {
-			await init()
+			return await init()
 		}
 	}
 	let details = reactive({
@@ -192,6 +192,7 @@
 		}, 200)
 	})
 	async function init() {
+		details.datalist = []
 		details.current = 1
 		return await initpage()
 	}
diff --git a/unpackage/dist/dev/app-plus/app-service.js b/unpackage/dist/dev/app-plus/app-service.js
index 2fb47ae..fbdc49e 100644
--- a/unpackage/dist/dev/app-plus/app-service.js
+++ b/unpackage/dist/dev/app-plus/app-service.js
@@ -56218,55 +56218,63 @@ This will fail in production if not fixed.`);
           null,
           [
             vue.createCommentVNode(" 弹窗组件 "),
-            vue.unref(showPopUp) ? (vue.openBlock(), vue.createElementBlock("view", {
-              key: 0,
-              class: "popUpMask",
-              onClick: _cache[3] || (_cache[3] = (...args) => details.close && details.close(...args))
-            }, [
-              vue.createElementVNode(
-                "view",
-                {
-                  class: "container",
-                  onClick: _cache[2] || (_cache[2] = vue.withModifiers(() => {
-                  }, ["stop"])),
-                  style: vue.normalizeStyle({ height: details.height })
-                },
-                [
-                  vue.createElementVNode("scroll-view", {
-                    class: "scoolv",
-                    "scroll-y": "true"
-                  }, [
-                    vue.createElementVNode(
-                      "view",
-                      { class: "title" },
-                      vue.toDisplayString(details.title),
-                      1
-                      /* TEXT */
-                    ),
-                    vue.createCommentVNode(" 插槽 "),
-                    vue.renderSlot(_ctx.$slots, "default", {}, void 0, true)
-                  ]),
-                  vue.createElementVNode("view", { class: "buttonContainer" }, [
-                    vue.createElementVNode("view", {
-                      class: "closeButton",
-                      onClick: _cache[0] || (_cache[0] = (...args) => details.close && details.close(...args))
-                    }, " 取消 "),
-                    vue.createElementVNode(
-                      "view",
-                      {
-                        class: "confirmButton",
-                        onClick: _cache[1] || (_cache[1] = (...args) => details.success && details.success(...args))
-                      },
-                      vue.toDisplayString(vue.unref(confirmText) || "确认"),
-                      1
-                      /* TEXT */
-                    )
-                  ])
-                ],
-                4
-                /* STYLE */
-              )
-            ])) : vue.createCommentVNode("v-if", true)
+            vue.unref(showPopUp) ? (vue.openBlock(), vue.createElementBlock(
+              "view",
+              {
+                key: 0,
+                class: "popUpMask",
+                onTouchmove: _cache[3] || (_cache[3] = vue.withModifiers(() => {
+                }, ["prevent"])),
+                onClick: _cache[4] || (_cache[4] = (...args) => details.close && details.close(...args))
+              },
+              [
+                vue.createElementVNode(
+                  "view",
+                  {
+                    class: "container",
+                    onClick: _cache[2] || (_cache[2] = vue.withModifiers(() => {
+                    }, ["stop"])),
+                    style: vue.normalizeStyle({ height: details.height })
+                  },
+                  [
+                    vue.createElementVNode("scroll-view", {
+                      class: "scoolv",
+                      "scroll-y": "true"
+                    }, [
+                      vue.createElementVNode(
+                        "view",
+                        { class: "title" },
+                        vue.toDisplayString(details.title),
+                        1
+                        /* TEXT */
+                      ),
+                      vue.createCommentVNode(" 插槽 "),
+                      vue.renderSlot(_ctx.$slots, "default", {}, void 0, true)
+                    ]),
+                    vue.createElementVNode("view", { class: "buttonContainer" }, [
+                      vue.createElementVNode("view", {
+                        class: "closeButton",
+                        onClick: _cache[0] || (_cache[0] = (...args) => details.close && details.close(...args))
+                      }, " 取消 "),
+                      vue.createElementVNode(
+                        "view",
+                        {
+                          class: "confirmButton",
+                          onClick: _cache[1] || (_cache[1] = (...args) => details.success && details.success(...args))
+                        },
+                        vue.toDisplayString(vue.unref(confirmText) || "确认"),
+                        1
+                        /* TEXT */
+                      )
+                    ])
+                  ],
+                  4
+                  /* STYLE */
+                )
+              ],
+              32
+              /* HYDRATE_EVENTS */
+            )) : vue.createCommentVNode("v-if", true)
           ],
           2112
           /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */
diff --git a/utils/request.js b/utils/request.js
index 0e44fc7..6b3b221 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -212,6 +212,7 @@ const HandleRequest = (params, key, loadingObj) => {
 					// #ifdef APP
 					utils.ttsspke('接口出错，请联系后端开发人员')
 					// #endif
+					relove({})
 					return
 				} else if (res.statusCode == 401) {
 					// 登录失败时
@@ -247,11 +248,13 @@ const HandleRequest = (params, key, loadingObj) => {
 						})
 					}
 				} else {
+					console.log('111 :>> ', 111);
 					delete requestObj[key]
 					functions.error('连接服务器失败')
 					// #ifdef APP
 					utils.ttsspke('连接服务器失败')
 					// #endif
+					reject(res)
 				}
 			}
 		}).catch(async err => {