diff --git a/pkg_join/views/travelResidence.vue b/pkg_join/views/travelResidence.vue
index 6e98985..ee53941 100644
--- a/pkg_join/views/travelResidence.vue
+++ b/pkg_join/views/travelResidence.vue
@@ -11,7 +11,7 @@
       <view class="input">
         <u-textarea
           border="none"
-          :disabled="form.reviewStatus === 0"
+          :disabled="form.reviewStatus === 0 || form.reviewStatus === 1"
           placeholder="请输入名称"
           :placeholder-style="inputPlaceholderStyle"
           v-model="form.name"
@@ -27,8 +27,8 @@
         <view class="input">
           <u-upload
             :fileList="coverImg"
-            :disabled="coverImg.length > 0 || form.reviewStatus === 0"
-            :deletable="form.reviewStatus !== 0"
+            :disabled="coverImg.length > 0 || form.reviewStatus === 0 || form.reviewStatus === 1"
+            :deletable="form.reviewStatus !== 0 && form.reviewStatus !== 1"
             :maxCount="1"
             count="1"
             name="coverImg"
@@ -46,8 +46,8 @@
         <view class="input">
           <u-upload
             :fileList="avatarImg"
-            :disabled="avatarImg.length > 0 || form.reviewStatus === 0"
-            :deletable="form.reviewStatus !== 0"
+            :disabled="avatarImg.length > 0 || form.reviewStatus === 0 || form.reviewStatus === 1"
+            :deletable="form.reviewStatus !== 0 && form.reviewStatus !== 1"
             :maxCount="1"
             count="1"
             name="avatarImg"
@@ -66,8 +66,8 @@
       <view class="input">
         <u-upload
           :fileList="bannerImg"
-          :disabled="bannerImg.length > 8 || form.reviewStatus === 0"
-          :deletable="form.reviewStatus !== 0"
+          :disabled="bannerImg.length > 8 || form.reviewStatus === 0 || form.reviewStatus === 1"
+          :deletable="form.reviewStatus !== 0 && form.reviewStatus !== 1"
           :maxCount="9"
           count="9"
           name="bannerImg"
@@ -88,8 +88,8 @@
           multiple
           :max-count="9"
           :fileList="videos"
-          :disabled="videos.length > 8 || form.reviewStatus === 0"
-          :deletable="form.reviewStatus !== 0"
+          :disabled="videos.length > 8 || form.reviewStatus === 0 || form.reviewStatus === 1"
+          :deletable="form.reviewStatus !== 0 && form.reviewStatus !== 1"
           :maxCount="9"
           count="9"
           name="bannerImg"
@@ -144,7 +144,7 @@
       <view class="v12-ml-2">
         <CitySelect
           ref="cityselect"
-          :disabled="form.reviewStatus === 0"
+          :disabled="form.reviewStatus === 0 || form.reviewStatus === 1"
           :defaultValue="form.area || ''"
           :items="district"
           @callback="resultCity"
@@ -160,7 +160,7 @@
       <view class="v12-ml-2">
         <input
           :placeholder-style="inputPlaceholderStyle"
-          :disabled="form.reviewStatus === 0"
+          :disabled="form.reviewStatus === 0 || form.reviewStatus === 1"
           type="text"
           placeholder="请输入详细地址"
           v-model="form.address"
@@ -188,21 +188,21 @@
         <u-input
           type="text"
           :placeholder-style="inputPlaceholderStyle"
-          :disabled="form.reviewStatus === 0"
+          :disabled="form.reviewStatus === 0 || form.reviewStatus === 1"
           placeholder="请输入商家电话"
           v-model="form.phone"
           border="none"
         >
           <template slot="suffix" >
             <u-code
-              v-if="form.reviewStatus !== 0"
+              v-if="form.reviewStatus !== 0 && form.reviewStatus !== 1"
               ref="uCode"
               @change="codeChange"
               seconds="30"
               changeText="X秒重新获取"
             ></u-code>
             <u-button
-              v-if="form.reviewStatus !== 0"
+              v-if="form.reviewStatus !== 0 && form.reviewStatus !== 1"
               @tap="getCode"
               :text="tips"
               type="success"
@@ -222,7 +222,7 @@
         <input
           type="text"
           :placeholder-style="inputPlaceholderStyle"
-          :disabled="form.reviewStatus === 0"
+          :disabled="form.reviewStatus === 0 || form.reviewStatus === 1"
           placeholder="请输入验证码"
           v-model="form.captcha"
         />
@@ -240,6 +240,7 @@
           :placeholder-style="inputPlaceholderStyle"
           placeholder="请输入微信号"
           v-model="form.wechat"
+          :disabled="form.reviewStatus === 0 || form.reviewStatus === 1"
         />
       </view>
     </view>
@@ -252,8 +253,8 @@
       <view class="input">
         <u-upload
           :fileList="cultureImg"
-          :disabled="form.reviewStatus === 0 || cultureImg.length > 8"
-          :deletable="form.reviewStatus !== 0"
+          :disabled="form.reviewStatus === 0 || form.reviewStatus === 1 || cultureImg.length > 8"
+          :deletable="form.reviewStatus !== 0 && form.reviewStatus !== 1"
           :maxCount="9"
           count="9"
           name="cultureImg"
@@ -271,8 +272,8 @@
       <view class="input">
          <u-upload
           :fileList="qualificationImg"
-          :disabled="form.reviewStatus === 0 || qualificationImg.length > 8"
-          :deletable="form.reviewStatus !== 0"
+          :disabled="form.reviewStatus === 0 || form.reviewStatus === 1 || qualificationImg.length > 8"
+          :deletable="form.reviewStatus !== 0 && form.reviewStatus !== 1"
           :maxCount="9"
           count="9"
           name="qualificationImg"
@@ -282,7 +283,7 @@
         ></u-upload>
       </view>
     </view>
-    <view class="v12-primary v12-white-text submit-btn" @click="submitForm" :style="{'background': form.reviewStatus === 0 ? '#FA979F !important' : '#4A97FC'}">
+    <view v-if="form.reviewStatus !== 1" class="v12-primary v12-white-text submit-btn" @click="submitForm" :style="{'background': form.reviewStatus === 0 ? '#FA979F !important' : '#4A97FC'}">
       {{ form.reviewStatus === 0 ? '审核中' : form.reviewStatus === 2 ? '重新提交' : '提交审核' }}
     </view>
   </view>
@@ -386,7 +387,11 @@ export default {
     this.initInfo()
   },
   onHide() {
+    if (this.form.reviewStatus === 0 || this.form.reviewStatus === 1) {
+      return
+    }
     this.saveDraft()
+
   },
   methods: {
     /**
@@ -578,7 +583,7 @@ export default {
         })
         registerVerify({
           phone: this.form.phone,
-          type: 'merchantApply'
+          type: 'merchantTravelApply'
         }).then(() => {
           uni.hideLoading()
           // 这里此提示会被this.start()方法中的提示覆盖
@@ -603,8 +608,7 @@ export default {
      * 选择位置
      */
     chooLocation() {
-      if (this.form.reviewStatus === 0) {
-        uni.$u.toast('您的入驻申请正在审核中，暂不能选择位置')
+      if (this.form.reviewStatus === 0 || this.form.reviewStatus === 1) {
         return
       }
       uni.chooseLocation({