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)