From 349b3a3baa03e7466cc1b59ff3514ed2f70291b4 Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Wed, 12 Nov 2025 16:27:35 +0800
Subject: [PATCH] =?UTF-8?q?Fix=EF=BC=9A4343=20=E3=80=90=E6=97=85=E5=B1=85?=
 =?UTF-8?q?=E4=BE=9B=E5=BA=94=E9=93=BE=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91?=
 =?UTF-8?q?=E8=BF=9B=E5=85=A5=E8=B5=84=E6=96=99=E5=A1=AB=E5=86=99=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E6=B2=A1=E6=9C=89=E6=98=BE=E7=A4=BA=E5=85=A5?=
 =?UTF-8?q?=E9=A9=BB=E7=94=B3=E8=AF=B7=E9=A1=BB=E7=9F=A5=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg_join/views/travelResidence.vue | 58 ++++++++++++++++++++++++++++--
 1 file changed, 55 insertions(+), 3 deletions(-)

diff --git a/pkg_join/views/travelResidence.vue b/pkg_join/views/travelResidence.vue
index e22e6f2..5be8ca7 100644
--- a/pkg_join/views/travelResidence.vue
+++ b/pkg_join/views/travelResidence.vue
@@ -326,6 +326,30 @@
         {{ '提交审核' }}
       </view>
     </view>
+    <u-popup :show="show" mode="center" round="10" @close="show=false"
+      :customStyle="{'width': '90%', 'padding': '40rpx 20rpx'}"
+    >
+      <view class="popup-body">
+        <view class="tc bold">入驻申请须知</view>
+        <view class="content">
+          <rich-text :nodes="notice" />
+        </view>
+        <view class="agree-box v12-mb-2">
+          <checkbox-group @change="changeAgree">
+            <label>
+              <checkbox value="yes" style="transform:scale(0.8)"/>
+            </label>
+            <text>我已仔细阅读并同意</text>
+          </checkbox-group>
+        </view>
+        <u-button
+          type="error"
+          text="确定"
+          :disabled="!isAgree"
+          @click="save"
+        />
+      </view>
+    </u-popup>
   </view>
 </template>
 
@@ -338,6 +362,7 @@ import {
   uploadImage
 } from '@/utils'
 import {
+  getShopData,
   getTravelInfo,
   saveTravel,
   saveTravelDraft
@@ -348,6 +373,9 @@ export default {
   },
   data() {
     return {
+      isAgree: false,
+      show: false,
+      notice: '',
       tips: '获取验证码',
       inputPlaceholderStyle: {
         fontSize: '32rpx'
@@ -422,7 +450,10 @@ export default {
   onLoad(opts) {
     this.partnerId = opts.partnerId
     this.queryCity()
-    this.initInfo()
+    getShopData().then(({data}) => {
+      this.notice = data.merchantApplyNotice
+      this.initInfo()
+    })
   },
   // onShow() {
   // },
@@ -434,6 +465,12 @@ export default {
 
   },
   methods: {
+    changeAgree(e) {
+      this.isAgree = e.detail.value.includes('yes')
+    },
+    save() {
+      this.show = false
+    },
     /**
      * 字符串转换为数组
      * @param {string} str 字符串
@@ -453,7 +490,6 @@ export default {
       this.form.video = this.videos.filter(item => item.url).map(item => item.url).join(',')
       this.form.culture = this.cultureImg.filter(item => item.url).map(item => item.url).join(',')
       this.form.qualification = this.qualificationImg.filter(item => item.url).map(item => item.url).join(',')
-      console.log(this.bannerImg, '-----------');
       const params = {
         travelInfo: {...this.form},
         partnerId: this.partnerId,
@@ -472,6 +508,9 @@ export default {
      */
     initInfo() {
       getTravelInfo().then(res => {
+        if(res.data.isDraft === null || res.data.isDraft === 1) {
+          this.show = true
+        }
         const {travelInfo} = res.data || {}
         if (res.status === 200) {
           this.form = {...this.form, ...travelInfo}
@@ -762,7 +801,20 @@ export default {
 }
 </script>
 
-<style scoped>
+<style scoped lang="scss">
+.popup-body {
+    .title {
+      line-height: 80rpx;
+      text-align: center;
+    }
+    .content {
+      padding: 0 30rpx 30rpx 30rpx;
+      .content-html {
+        max-height: 70vh;
+        overflow-y: auto;
+      }
+    }
+  }
 .container {
   padding: 20rpx;
   background: #fff;