Fix：5805 【商城小程序】【商户入驻-入驻申请须知】用户未勾选“我已仔细阅读并同意”时，点击弹窗空白区域即可关闭弹窗，不符合逻辑

pkg_join/views/experienceStore.vue

@@ -417,7 +417,7 @@
       :show="show"
       mode="center"
       round="10"
-      @close="show=false"
+      @close="handlePopupClose"
     >
       <view class="popup-body">
         <view class="tc bold">
@@ -440,7 +440,6 @@
         <u-button
           type="error"
           text="确定"
-          :disabled="!isAgree"
           @click="savePopup"
         />
       </view>
@@ -583,6 +582,23 @@ export default {
       this.isAgree = e.detail.value.includes('yes')
     },
     savePopup() {
+      if (!this.isAgree) {
+        uni.showToast({
+          title: '请先阅读并同意入驻申请须知',
+          icon: 'none'
+        })
+        return
+      }
+      this.show = false
+    },
+    handlePopupClose() {
+      if (!this.isAgree) {
+        uni.showToast({
+          title: '请先阅读并同意入驻申请须知',
+          icon: 'none'
+        })
+        return
+      }
       this.show = false
     },
     stringToMapArr(str, split = ',') {

pkg_join/views/shop.vue

@@ -440,7 +440,7 @@
       :show="show"
       mode="center"
       round="10"
-      @close="show=false"
+      @close="handlePopupClose"
     >
       <view class="popup-body">
         <view class="tc bold">入驻申请须知</view>
@@ -458,7 +458,6 @@
         <u-button
           type="error"
           text="确定"
-          :disabled="!isAgree"
           @click="handleAgree"
         />
       </view>
@@ -671,6 +670,23 @@ export default {
   },
   methods: {
     handleAgree(){
+      if (!this.isAgree) {
+        uni.showToast({
+          title: '请先阅读并同意入驻申请须知',
+          icon: 'none'
+        })
+        return
+      }
+      this.show = false
+    },
+    handlePopupClose() {
+      if (!this.isAgree) {
+        uni.showToast({
+          title: '请先阅读并同意入驻申请须知',
+          icon: 'none'
+        })
+        return
+      }
       this.show = false
     },
     timeRange(e) {

pkg_join/views/supplier.vue

@@ -546,7 +546,7 @@
       @cancel="changeRemove(false)"
       @confirm="onRemove"
     />
-    <u-popup :show="show" mode="center" round="10" @close="show=false">
+    <u-popup :show="show" mode="center" round="10" @close="handlePopupClose">
       <view class="popup-body">
         <view class="tc bold">入驻申请须知</view>
         <view class="content">
@@ -563,7 +563,6 @@
         <u-button
           type="error"
           text="确定"
-          :disabled="!isAgree"
           @click="handlAgree"
         />
       </view>
@@ -866,6 +865,23 @@ export default {
   },
   methods: {
     handlAgree() {
+      if (!this.isAgree) {
+        uni.showToast({
+          title: '请先阅读并同意入驻申请须知',
+          icon: 'none'
+        })
+        return
+      }
+      this.show = false
+    },
+    handlePopupClose() {
+      if (!this.isAgree) {
+        uni.showToast({
+          title: '请先阅读并同意入驻申请须知',
+          icon: 'none'
+        })
+        return
+      }
       this.show = false
     },
     timeRange(e) {

pkg_join/views/travelResidence.vue

@@ -344,7 +344,7 @@
         {{ '提交审核' }}
       </view>
     </view>
-    <u-popup :show="show" mode="center" round="10" @close="show=false"
+    <u-popup :show="show" mode="center" round="10" @close="handlePopupClose"
     >
       <view class="popup-body">
         <view class="tc bold">入驻申请须知</view>
@@ -362,7 +362,6 @@
         <u-button
           type="error"
           text="确定"
-          :disabled="!isAgree"
           @click="save"
         />
       </view>
@@ -493,6 +492,23 @@ export default {
       this.isAgree = e.detail.value.includes('yes')
     },
     save() {
+      if (!this.isAgree) {
+        uni.showToast({
+          title: '请先阅读并同意入驻申请须知',
+          icon: 'none'
+        })
+        return
+      }
+      this.show = false
+    },
+    handlePopupClose() {
+      if (!this.isAgree) {
+        uni.showToast({
+          title: '请先阅读并同意入驻申请须知',
+          icon: 'none'
+        })
+        return
+      }
       this.show = false
     },
     /**

pkg_join/views/wholesaler.vue

@@ -241,7 +241,7 @@
       @cancel="changeRemove(false)"
       @confirm="onRemove"
     />
-    <u-popup :show="show" mode="center" round="10" @close="show=false">
+    <u-popup :show="show" mode="center" round="10" @close="handlePopupClose">
       <view class="popup-body">
         <view class="tc bold">入驻申请须知</view>
         <view class="content">
@@ -258,7 +258,6 @@
         <u-button
           type="error"
           text="确定"
-          :disabled="!isAgree"
           @click="save"
         />
       </view>
@@ -541,6 +540,23 @@ export default {
       this.isAgree = event.detail.value.length > 0
     },
     save() {
+      if (!this.isAgree) {
+        uni.showToast({
+          title: '请先阅读并同意入驻申请须知',
+          icon: 'none'
+        })
+        return
+      }
+      this.show = false
+    },
+    handlePopupClose() {
+      if (!this.isAgree) {
+        uni.showToast({
+          title: '请先阅读并同意入驻申请须知',
+          icon: 'none'
+        })
+        return
+      }
       this.show = false
     }
   }