新增弹窗蒙层阻止滑动和签收图片缓存问题

compoment/BasicContainer/BasicContainer.vue

@@ -108,13 +108,20 @@
 
 	// 下拉刷新
 	onPullDownRefresh(async () => {
-		await pullDownRefreshInitPage()
+		try {
-		const timer = setTimeout(() => {
+			await pullDownRefreshInitPage()
-			// 触发下拉回调
+
-			uni.stopPullDownRefresh()
+		} catch (e) {
-			// 清除定时器
+			//TODO handle the exception
-			clearTimeout(timer)
+		} finally {
-		}, 300)
+			console.log('111 :>> ', 111);
+			const timer = setTimeout(() => {
+				// 触发下拉回调
+				uni.stopPullDownRefresh()
+				// 清除定时器
+				clearTimeout(timer)
+			}, 300)
+		}
 	})
 
 	// 触发下拉刷新

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">

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||'提示'}}

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]
 				})

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()
 	}

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", {
+            vue.unref(showPopUp) ? (vue.openBlock(), vue.createElementBlock(
-              key: 0,
+              "view",
-              class: "popUpMask",
+              {
-              onClick: _cache[3] || (_cache[3] = (...args) => details.close && details.close(...args))
+                key: 0,
-            }, [
+                class: "popUpMask",
-              vue.createElementVNode(
+                onTouchmove: _cache[3] || (_cache[3] = vue.withModifiers(() => {
-                "view",
+                }, ["prevent"])),
-                {
+                onClick: _cache[4] || (_cache[4] = (...args) => details.close && details.close(...args))
-                  class: "container",
+              },
-                  onClick: _cache[2] || (_cache[2] = vue.withModifiers(() => {
+              [
-                  }, ["stop"])),
+                vue.createElementVNode(
-                  style: vue.normalizeStyle({ height: details.height })
+                  "view",
-                },
+                  {
-                [
+                    class: "container",
-                  vue.createElementVNode("scroll-view", {
+                    onClick: _cache[2] || (_cache[2] = vue.withModifiers(() => {
-                    class: "scoolv",
+                    }, ["stop"])),
-                    "scroll-y": "true"
+                    style: vue.normalizeStyle({ height: details.height })
-                  }, [
+                  },
-                    vue.createElementVNode(
+                  [
-                      "view",
+                    vue.createElementVNode("scroll-view", {
-                      { class: "title" },
+                      class: "scoolv",
-                      vue.toDisplayString(details.title),
+                      "scroll-y": "true"
-                      1
+                    }, [
-                      /* TEXT */
+                      vue.createElementVNode(
-                    ),
+                        "view",
-                    vue.createCommentVNode(" 插槽 "),
+                        { class: "title" },
-                    vue.renderSlot(_ctx.$slots, "default", {}, void 0, true)
+                        vue.toDisplayString(details.title),
-                  ]),
+                        1
-                  vue.createElementVNode("view", { class: "buttonContainer" }, [
+                        /* TEXT */
-                    vue.createElementVNode("view", {
+                      ),
-                      class: "closeButton",
+                      vue.createCommentVNode(" 插槽 "),
-                      onClick: _cache[0] || (_cache[0] = (...args) => details.close && details.close(...args))
+                      vue.renderSlot(_ctx.$slots, "default", {}, void 0, true)
-                    }, " 取消 "),
+                    ]),
-                    vue.createElementVNode(
+                    vue.createElementVNode("view", { class: "buttonContainer" }, [
-                      "view",
+                      vue.createElementVNode("view", {
-                      {
+                        class: "closeButton",
-                        class: "confirmButton",
+                        onClick: _cache[0] || (_cache[0] = (...args) => details.close && details.close(...args))
-                        onClick: _cache[1] || (_cache[1] = (...args) => details.success && details.success(...args))
+                      }, " 取消 "),
-                      },
+                      vue.createElementVNode(
-                      vue.toDisplayString(vue.unref(confirmText) || "确认"),
+                        "view",
-                      1
+                        {
-                      /* TEXT */
+                          class: "confirmButton",
-                    )
+                          onClick: _cache[1] || (_cache[1] = (...args) => details.success && details.success(...args))
-                  ])
+                        },
-                ],
+                        vue.toDisplayString(vue.unref(confirmText) || "确认"),
-                4
+                        1
-                /* STYLE */
+                        /* TEXT */
-              )
+                      )
-            ])) : vue.createCommentVNode("v-if", true)
+                    ])
+                  ],
+                  4
+                  /* STYLE */
+                )
+              ],
+              32
+              /* HYDRATE_EVENTS */
+            )) : vue.createCommentVNode("v-if", true)
           ],
           2112
           /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */

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 => {