From f8e83800bbf6e761a4988961738cc37deb3d5919 Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Sat, 1 Mar 2025 17:02:53 +0800
Subject: [PATCH] =?UTF-8?q?Fix=EF=BC=9A3304=20=E3=80=90=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E7=89=B9=E8=89=B2=E5=BA=97?=
 =?UTF-8?q?=E9=93=BA=E6=8F=90=E4=BA=A4=E5=85=A5=E9=A9=BB=EF=BC=8C=E5=A1=AB?=
 =?UTF-8?q?=E5=86=99=E5=AE=8C=E8=B5=84=E6=96=99=E6=8F=90=E4=BA=A4=E5=90=8E?=
 =?UTF-8?q?=E4=BB=8D=E7=84=B6=E5=87=BA=E7=8E=B0=E5=85=A5=E9=A9=BB=E9=A1=BB?=
 =?UTF-8?q?=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg_join/views/shop.vue | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkg_join/views/shop.vue b/pkg_join/views/shop.vue
index 70931b5..02b4cb9 100644
--- a/pkg_join/views/shop.vue
+++ b/pkg_join/views/shop.vue
@@ -395,7 +395,7 @@
           type="error"
           text="确定"
           :disabled="!isAgree"
-          @click="save"
+          @click="handleAgree"
         />
       </view>
     </u-popup>
@@ -553,7 +553,7 @@ export default {
   },
   onLoad(options) {
     this.partnerId = options.partnerId
-    const local_form = uni.getStorageSync('merchantApplyHotel' + '_form')
+    const local_form = uni.getStorageSync('merchantApplyHotel' + '_form') || {}
     this.quaPics = uni.getStorageSync('merchantApplyHotel' + '_quaPics') || []
     if(!local_form.serviceTime)  {
       local_form.serviceTime = '00:00'
@@ -589,6 +589,9 @@ export default {
     this.$refs.shopForm.setRules(this.rules)
   },
   methods: {
+    handleAgree(){
+      this.show = false
+    },
     timeRange(e) {
       this.form.serviceTime = e[0]
       this.form.serviceEndTime = e[1]
@@ -805,7 +808,8 @@ export default {
       }
       this.$refs.shopForm.validate().then(res => {
         // 校验通过
-        this.show = true
+        // this.show = true
+        this.save()
       }).catch(errors => {
         // 校验失败
         console.log(errors)