From a2f1d9f59ee38f47f075a37bd8f7a27b3bd367f6 Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Mon, 17 Nov 2025 14:04:56 +0800
Subject: [PATCH] =?UTF-8?q?Fix=EF=BC=9A4373=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=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E4=B8=AD=E7=8A=B6=E6=80=81=E4=B8=8B=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E6=92=A4=E9=94=80=E5=85=A5=E9=A9=BB=E7=94=B3=E8=AF=B7=EF=BC=88?=
 =?UTF-8?q?=E5=8F=82=E8=80=83=E4=BE=9B=E5=BA=94=E5=95=86=E5=92=8C=E7=89=B9?=
 =?UTF-8?q?=E8=89=B2=E5=BA=97=E9=93=BA=E7=9A=84=E5=85=A5=E9=A9=BB=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=EF=BC=8C=E3=80=90=E5=AE=A1=E6=A0=B8=E4=B8=AD=E3=80=91?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=A0=87=E8=AF=86=E6=8F=90=E5=88=B0=E9=A1=B6?=
 =?UTF-8?q?=E9=83=A8=E6=98=BE=E7=A4=BA=EF=BC=8C=E5=BA=95=E9=83=A8=E6=94=B9?=
 =?UTF-8?q?=E6=88=90=E3=80=90=E6=92=A4=E9=94=80=E7=94=B3=E8=AF=B7=E3=80=91?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit b260bb9e34c2af8ae0d4ba5a54fea120d9cc5a73)
---
 api/join.js                        |  7 +++++++
 pkg_join/views/travelResidence.vue | 33 ++++++++++++++++++++++++++++--
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/api/join.js b/api/join.js
index 253f96a..47ea1ec 100644
--- a/api/join.js
+++ b/api/join.js
@@ -85,3 +85,10 @@ export function saveTravel(params) {
 export function saveTravelDraft(params) {
     return request.post("/merchantApply/travel/saveDraft", params, {login: true})
 }
+
+/**
+ * 旅居管家撤销申请
+ */
+export function revokeTravel(params) {
+    return request.post("/travel/revoke", params, {login: true})
+}
diff --git a/pkg_join/views/travelResidence.vue b/pkg_join/views/travelResidence.vue
index ffcd73d..c03b6b2 100644
--- a/pkg_join/views/travelResidence.vue
+++ b/pkg_join/views/travelResidence.vue
@@ -3,6 +3,9 @@
     <view class="v12-pa-2 reason-box" v-if="form.reviewStatus === 2">
       驳回原因: {{ form.reviewMsg }}
     </view>
+    <view class="v12-pa-2 reason-box" v-if="form.isDraft === 0 && form.reviewStatus !== 1 &&form.reviewStatus === 0">
+      审核中
+    </view>
     <view class="form-item">
       <view class="title">
         <text class="required">* </text>
@@ -318,7 +321,7 @@
     </view>
     <view v-if="form.isDraft === 0 && form.reviewStatus !== 1">
       <view class="v12-primary v12-white-text submit-btn" @click="submitForm" :style="{'background': form.reviewStatus === 0 ? '#FA979F !important' : '#4A97FC'}">
-        {{ form.reviewStatus === 0 ? '审核中' : form.reviewStatus === 2 ? '重新提交' : '提交审核' }}
+        {{ form.reviewStatus === 0 ? '撤销申请' : form.reviewStatus === 2 ? '重新提交' : '提交审核' }}
       </view>
     </view>
     <view v-if="form.isDraft === 1">
@@ -364,7 +367,8 @@ import {
   getShopData,
   getTravelInfo,
   saveTravel,
-  saveTravelDraft
+  saveTravelDraft,
+  revokeTravel
 } from '@/api/join'
 export default {
   components: {
@@ -535,10 +539,35 @@ export default {
         // uni.$u.toast(err.msg)
       })
     },
+    /**
+     * 撤销申请
+     */
+    revokeTravel() {
+      uni.showModal({
+        title: '提示',
+        content: '确定撤销申请吗？',
+        success: (res) => {
+          if (res.confirm) {
+            revokeTravel().then(res => {
+              if (res.status === 200) {
+                uni.$u.toast('撤销申请成功')
+                this.initInfo()
+              }
+            }).catch(err => {
+              uni.$u.toast(err.msg)
+            })
+          }
+        }
+      })
+    },
     /**
      * 提交表单
      */
     submitForm() {
+      if(this.form.reviewStatus === 0 && this.form.isDraft === 0 && this.form.reviewStatus !== 1) {
+        this.revokeTravel()
+        return
+      }
       if(this.form.isDraft === 0 && (this.form.reviewStatus === 0 || this.form.reviewStatus === 1)) return
       this.form.cover = this.coverImg.filter(item => item.url).map(item => item.url).join(',')
       this.form.avatar = this.avatarImg.filter(item => item.url).map(item => item.url).join(',')