From 1cffccebf30550dc20dfc3f225bede2036bd0402 Mon Sep 17 00:00:00 2001
From: LinCyJang <linxi957440651@163.com>
Date: Thu, 16 Oct 2025 00:49:28 +0800
Subject: [PATCH] =?UTF-8?q?Fix=EF=BC=9A4262=20=E3=80=90=E6=97=85=E5=B1=85?=
 =?UTF-8?q?=E5=95=86=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E8=BF=9B?=
 =?UTF-8?q?=E5=85=A5=E6=97=85=E5=B1=85=E5=85=A5=E9=A9=BB=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E6=93=8D=E4=BD=9C=E7=AD=89=E4=B8=A4=E7=A7=92?=
 =?UTF-8?q?=E5=B7=A6=E5=8F=B3=EF=BC=8C=E8=87=AA=E5=8A=A8=E5=BD=95=E5=85=A5?=
 =?UTF-8?q?=E4=B8=8A=E6=AC=A1=E5=A1=AB=E5=86=99=E7=9A=84=E8=8D=89=E7=A8=BF?=
 =?UTF-8?q?=EF=BC=8C=E6=97=A0=E6=B3=95=E9=87=8D=E6=96=B0=E5=94=A4=E8=B5=B7?=
 =?UTF-8?q?=E9=94=AE=E7=9B=98=E6=88=96=E7=9B=B8=E5=86=8C=EF=BC=8C=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E4=BB=BB=E4=BD=95=E5=9C=B0=E6=96=B9=E9=83=BD=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E5=8F=8D=E5=BA=94\=E7=A6=81=E7=94=A8=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg_join/views/travelResidence.vue | 33 ++++++++++++++++--------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/pkg_join/views/travelResidence.vue b/pkg_join/views/travelResidence.vue
index 3676eac..c5c88b2 100644
--- a/pkg_join/views/travelResidence.vue
+++ b/pkg_join/views/travelResidence.vue
@@ -28,7 +28,7 @@
           <u-upload
             :fileList="coverImg"
             :disabled="form.isDraft === 0 && (coverImg.length > 0 || form.reviewStatus === 0 || form.reviewStatus === 1)"
-            :deletable="form.isDraft === 0 && (form.reviewStatus !== 0 && form.reviewStatus !== 1)"
+            :deletable="form.isDraft === 1 || (form.reviewStatus !== 0 && form.reviewStatus !== 1)"
             :maxCount="1"
             count="1"
             name="coverImg"
@@ -41,13 +41,13 @@
       <view class="v12-ml-2">
         <view class="title">
           <text class="required">* </text>
-          头像:
+          头像: 
         </view>
         <view class="input">
           <u-upload
             :fileList="avatarImg"
             :disabled="form.isDraft === 0 && (avatarImg.length > 0 || form.reviewStatus === 0 || form.reviewStatus === 1)"
-            :deletable="form.isDraft === 0 && (form.reviewStatus !== 0 && form.reviewStatus !== 1)"
+            :deletable="form.isDraft === 1 || (form.reviewStatus !== 0 && form.reviewStatus !== 1)"
             :maxCount="1"
             count="1"
             name="avatarImg"
@@ -67,7 +67,7 @@
         <u-upload
           :fileList="bannerImg"
           :disabled="form.isDraft === 0 && (bannerImg.length > 8 || form.reviewStatus === 0 || form.reviewStatus === 1)"
-          :deletable="form.isDraft === 0 && (form.reviewStatus !== 0 && form.reviewStatus !== 1)"
+          :deletable="form.isDraft === 1 || (form.reviewStatus !== 0 && form.reviewStatus !== 1)"
           :maxCount="9"
           count="9"
           name="bannerImg"
@@ -89,7 +89,7 @@
           :max-count="9"
           :fileList="videos"
           :disabled="form.isDraft === 0 && (videos.length > 8 || form.reviewStatus === 0 || form.reviewStatus === 1)"
-          :deletable="form.isDraft === 0 && (form.reviewStatus !== 0 && form.reviewStatus !== 1)"
+          :deletable="form.isDraft === 1 || (form.reviewStatus !== 0 && form.reviewStatus !== 1)"
           :maxCount="9"
           count="9"
           name="bannerImg"
@@ -145,7 +145,7 @@
         <CitySelect
           ref="cityselect"
           :disabled="form.isDraft === 0 && (form.reviewStatus === 0 || form.reviewStatus === 1)"
-          :defaultValue="form.area || ''"
+          :defaultValue="form.area || '请选择地址'"
           :items="district"
           @callback="resultCity"
         />
@@ -195,14 +195,14 @@
         >
           <template slot="suffix" >
             <u-code
-              v-if="form.reviewStatus !== 0 && form.reviewStatus !== 1"
+              v-if="form.isDraft === 1 || (form.reviewStatus !== 0 && form.reviewStatus !== 1)"
               ref="uCode"
               @change="codeChange"
               seconds="30"
               changeText="X秒重新获取"
             ></u-code>
             <u-button
-              v-if="form.reviewStatus !== 0 && form.reviewStatus !== 1"
+              v-if="form.isDraft === 1 || (form.reviewStatus !== 0 && form.reviewStatus !== 1)"
               @tap="getCode"
               :text="tips"
               type="success"
@@ -254,7 +254,7 @@
         <u-upload
           :fileList="cultureImg"
           :disabled="form.isDraft === 0 && (form.reviewStatus === 0 || form.reviewStatus === 1) || cultureImg.length > 8"
-          :deletable="form.isDraft === 0 && form.reviewStatus !== 0 && form.reviewStatus !== 1"
+          :deletable="form.isDraft === 1 || (form.reviewStatus !== 0 && form.reviewStatus !== 1)"
           :maxCount="9"
           count="9"
           name="cultureImg"
@@ -273,7 +273,7 @@
          <u-upload
           :fileList="qualificationImg"
           :disabled="form.isDraft === 0 && (form.reviewStatus === 0 || form.reviewStatus === 1) || qualificationImg.length > 8"
-          :deletable="form.isDraft === 0 && form.reviewStatus !== 0 && form.reviewStatus !== 1"
+          :deletable="form.isDraft === 1 || (form.reviewStatus !== 0 && form.reviewStatus !== 1)"
           :maxCount="9"
           count="9"
           name="qualificationImg"
@@ -394,7 +394,7 @@ export default {
     this.initInfo()
   },
   onHide() {
-    if (this.form.reviewStatus === 0 || this.form.reviewStatus === 1) {
+    if (this.form.isDraft === 0 && (this.form.reviewStatus === 0 || this.form.reviewStatus === 1)) {
       return
     }
     this.saveDraft()
@@ -449,6 +449,8 @@ export default {
           this.qualificationImg = this.stringToMapArr(travelInfo.qualification)
           this.form.reviewStatus = res.data.reviewStatus
           this.form.reviewMsg = res.data.reviewMsg
+          this.form.isDraft = res.data.isDraft
+          this.form.area = `${this.form.provinceName || ''} ${this.form.cityName || ''} ${this.form.areaName || ''}` 
           this.captcha = travelInfo.captcha
         }
       }).catch(err => {
@@ -459,7 +461,7 @@ export default {
      * 提交表单
      */
     submitForm() {
-      if(this.form.reviewStatus === 0) return
+      if(this.form.isDraft === 0 && (this.form.reviewStatus === 0 || this.form.reviewStatus === 1)) return
       this.form.cover = this.coverImg.map(item => item.url).join(',')
       this.form.cover = this.coverImg.map(item => item.url).join(',')
       this.form.avatar = this.avatarImg.map(item => item.url).join(',')
@@ -615,9 +617,7 @@ export default {
      * 选择位置
      */
     chooLocation() {
-      if (this.form.reviewStatus === 0 || this.form.reviewStatus === 1) {
-        return
-      }
+      if(this.form.isDraft === 0 && (this.form.reviewStatus === 0 || this.form.reviewStatus === 1)) return
       uni.chooseLocation({
         success: (res) => {
           this.form.address = res.address
@@ -641,6 +641,9 @@ export default {
         areaId: values.district.id
       }
       this.form.area = `${address.province || ''} ${address.city || ''} ${address.district || ''}`
+      this.form.areaName = address.district || ''
+      this.form.provinceName = address.province || ''
+      this.form.cityName = address.city || ''
       this.form.provinceId = address.provinceId
       this.form.cityId = address.cityId
       this.form.areaId = address.areaId