diff --git a/pkg_join/views/shop.vue b/pkg_join/views/shop.vue
index 83b7973..9c68221 100644
--- a/pkg_join/views/shop.vue
+++ b/pkg_join/views/shop.vue
@@ -308,6 +308,25 @@
           </template>
         </u-cell>
       </u-form-item>
+      <u-form-item prop="serviceTime">
+        <u-cell title="营业时间" :border="false" isLink @click="showTimePicker">
+          <template #icon>
+            <text class="required">*</text>
+          </template>
+          <template #value>
+            <u--text :text="form.serviceTime + ' - ' + form.serviceEndTime"></u--text>
+            <tpf-time-range
+              :startTime="form.serviceTime"
+              :endTime="form.serviceEndTime"
+              :startDefaultTime="form.serviceTime"
+              :endDefaultTime="form.serviceEndTime"
+              ref="TimePickerPopupRef" 
+              @timeRange="timeRange"
+              >
+            </tpf-time-range>
+          </template>
+        </u-cell>
+      </u-form-item>
       <u-form-item prop="content">
         <u-cell title="一句话介绍" :border="false">
           <template #icon>
@@ -384,6 +403,7 @@
 </template>
 
 <script>
+import TimePickerPopup from '@/components/timePickerPopup/time-picker-popup.vue';
 import CitySelect from '@/components/CitySelect'
 import { pageListenMixins } from '@/mixins/pageListenMixins'
 import {
@@ -406,7 +426,8 @@ import {
 export default {
   name: 'PkgJoinShop',
   components: {
-    CitySelect
+    CitySelect,
+    TimePickerPopup
   },
   mixins: [pageListenMixins],
   data() {
@@ -429,7 +450,9 @@ export default {
         area: '',
         address: '',
         position: '',
-        content: ''
+        content: '',
+        serviceTime: '00:00',
+        serviceEndTime: '23:59'
       },
       rules: {
         'name': {
@@ -498,6 +521,12 @@ export default {
           message: '请选择定位信息',
           trigger: ['blur', 'change']
         },
+        'serviceTime': {
+          type: 'string',
+          required: true,
+          message: '请选择营业时间',
+          trigger: ['blur', 'change']
+        },
         'content': {
           type: 'string',
           required: true,
@@ -524,8 +553,38 @@ export default {
   },
   onLoad(options) {
     this.partnerId = options.partnerId
+    const local_form = uni.getStorageSync('merchantApplyHotel' + '_form')
+    this.quaPics = uni.getStorageSync('merchantApplyHotel' + '_quaPics') || []
+    if(!local_form.serviceTime)  {
+      local_form.serviceTime = '00:00'
+    }
+    if(!local_form.serviceEndTime)  {
+      local_form.serviceEndTime = '23:59'
+    }
+    this.form =  !reviewing ? local_form : {
+        name: '',
+        cover: '',
+        coverVideo: '',
+        coverType: 1, // coverType: 1-图片,2-视频
+        logo: '',
+        qualification: '',
+        type: 0,
+        typeText: '',
+        phone: '',
+        captcha: '',
+        area: '',
+        address: '',
+        position: '',
+        content: '',
+        serviceTime: '00:00',
+        serviceEndTime: '23:59'
+      }
     this.init()
   },
+  onUnload() {
+    uni.setStorageSync('merchantApplyHotel'+'_quaPics', this.quaPics)
+    uni.setStorageSync('merchantApplyHotel' + '_form', this.form)
+  },
   onReady() {
     this.$refs.shopForm.setRules(this.rules)
   },
@@ -585,6 +644,9 @@ export default {
         }
         this.isDraft = data.isDraft
         this.reviewStatus = data.reviewStatus
+        if(data.isDraft === null || data.isDraft === 1) {
+          this.show = true
+        }
         if (data.isDraft !== 1) {
           switch (data.reviewStatus) {
             case 0: