From f4539ccf4a139cbbc34d50425deecb051087bd89 Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Mon, 17 Aug 2026 16:18:47 +0800
Subject: [PATCH] =?UTF-8?q?Fix=EF=BC=9A5778=20=E3=80=90=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E3=80=90=E5=95=86=E6=88=B7?=
 =?UTF-8?q?=E5=85=A5=E9=A9=BB-=E5=85=A5=E9=A9=BB=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E9=A1=BB=E7=9F=A5=E3=80=91=E9=A6=99=E9=81=93=E6=BB=87=E5=B0=8F?=
 =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E5=B1=95=E7=A4=BA=E7=9A=84=E2=80=9C=E5=85=A5?=
 =?UTF-8?q?=E9=A9=BB=E7=94=B3=E8=AF=B7=E9=A1=BB=E7=9F=A5=E2=80=9D=E6=AE=B5?=
 =?UTF-8?q?=E8=90=BD=E6=A0=BC=E5=BC=8F=EF=BC=8C=E4=B8=8E=E9=A6=99=E9=81=93?=
 =?UTF-8?q?=E6=BB=87=E5=90=8E=E5=8F=B0=E7=AE=A1=E7=90=86=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=AD=E9=85=8D=E7=BD=AE=E7=9A=84=E5=86=85=E5=AE=B9=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E4=B8=8D=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/css/pkg_join.less           | 19 +++++++++++++++++++
 pkg_join/views/experienceStore.vue | 23 +++++++++++++++++++++--
 pkg_join/views/shop.vue            |  5 +++--
 pkg_join/views/supplier.vue        |  5 +++--
 pkg_join/views/travelResidence.vue | 24 ++++++++++++++++++++++--
 pkg_join/views/wholesaler.vue      |  4 ++--
 utils/index.js                     |  9 +++++++++
 7 files changed, 79 insertions(+), 10 deletions(-)

diff --git a/assets/css/pkg_join.less b/assets/css/pkg_join.less
index 9c468fc..3ab1dcc 100644
--- a/assets/css/pkg_join.less
+++ b/assets/css/pkg_join.less
@@ -127,6 +127,25 @@
     height: 52vh;
     overflow-y: auto;
     margin: 30rpx 0;
+
+    // 小程序rich-text内块级标签无默认段间距，补充与后台富文本编辑器一致的段落格式
+    rich-text {
+      display: block;
+      width: 100%;
+
+      p, div, ul, ol {
+        display: block;
+        margin: 0 0 16rpx;
+
+        &:last-child {
+          margin-bottom: 0;
+        }
+      }
+
+      li {
+        margin: 0 0 8rpx;
+      }
+    }
   }
 
   .agree-box {
diff --git a/pkg_join/views/experienceStore.vue b/pkg_join/views/experienceStore.vue
index e31a8dc..00df38e 100644
--- a/pkg_join/views/experienceStore.vue
+++ b/pkg_join/views/experienceStore.vue
@@ -451,7 +451,7 @@
 <script>
 import CitySelect from '@/components/CitySelect'
 import { getCity, registerVerify } from '@/api/user'
-import { uploadVideo, uploadImage } from '@/utils'
+import { uploadVideo, uploadImage, formatRichText } from '@/utils'
 import {
   getShopData,
   saveExperienceStore,
@@ -523,7 +523,7 @@ export default {
     this.promoterUid = opts.promoterUid || ''
     this.queryCity()
     getShopData({partnerId: this.partnerId, promoterUid: this.promoterUid}).then(({ data }) => {
-      this.notice = data.merchantApplyNotice
+      this.notice = formatRichText(data.merchantApplyNotice)
     })
     getExperienceStoreCategoryList().then(({ data }) => {
       this.experienceStoreCategoryList = data || []
@@ -865,6 +865,25 @@ export default {
   height: 52vh;
   overflow-y: auto;
   margin: 30rpx 0;
+
+  // 小程序rich-text内块级标签无默认段间距，补充与后台富文本编辑器一致的段落格式
+  ::v-deep rich-text {
+    display: block;
+    width: 100%;
+
+    p, div, ul, ol {
+      display: block;
+      margin: 0 0 16rpx;
+
+      &:last-child {
+        margin-bottom: 0;
+      }
+    }
+
+    li {
+      margin: 0 0 8rpx;
+    }
+  }
 }
 .popup-body .agree-box {
   margin: 60rpx 0;
diff --git a/pkg_join/views/shop.vue b/pkg_join/views/shop.vue
index 0790e5f..f61aa41 100644
--- a/pkg_join/views/shop.vue
+++ b/pkg_join/views/shop.vue
@@ -461,7 +461,8 @@ import {
   chooseImage,
   moreImage,
   uploadImage,
-  chooseVideoToUpload
+  chooseVideoToUpload,
+  formatRichText
 } from '@/utils'
 
 export default {
@@ -699,7 +700,7 @@ export default {
       getShopData({partnerId: this.partnerId, promoterUid: this.promoterUid}).then(({data}) => {
         this.hotelTypeList = data.hotelTypeList || []
         this.columnsType = this.hotelTypeList
-        this.notice = data.merchantApplyNotice
+        this.notice = formatRichText(data.merchantApplyNotice)
         getCountyFamousHotelType({
           page: 1,
           limit: 9999
diff --git a/pkg_join/views/supplier.vue b/pkg_join/views/supplier.vue
index be844e9..4eeaaa7 100644
--- a/pkg_join/views/supplier.vue
+++ b/pkg_join/views/supplier.vue
@@ -553,7 +553,8 @@ import {
   chooseImage,
   moreImage,
   uploadImage,
-  chooseVideoToUpload
+  chooseVideoToUpload,
+  formatRichText
 } from '@/utils'
 import { pageListenMixins } from '@/mixins/pageListenMixins'
 
@@ -886,7 +887,7 @@ export default {
       getShopData({partnerId: this.partnerId, promoterUid: this.promoterUid}).then(({data}) => {
         this.columnsType = data.hotelTypeList
         this.columnsSupplierType = data.supplierTypeList
-        this.notice = data.merchantApplyNotice
+        this.notice = formatRichText(data.merchantApplyNotice)
         this.initInfo()
       })
     },
diff --git a/pkg_join/views/travelResidence.vue b/pkg_join/views/travelResidence.vue
index 39784e4..372fbfd 100644
--- a/pkg_join/views/travelResidence.vue
+++ b/pkg_join/views/travelResidence.vue
@@ -376,7 +376,8 @@ import {getCity, registerVerify} from '@/api/user'
 import {
   chooseImage,
   uploadVideo,
-  uploadImage
+  uploadImage,
+  formatRichText
 } from '@/utils'
 import {
   getShopData,
@@ -471,7 +472,7 @@ export default {
     this.promoterUid = opts.promoterUid || ''
     this.queryCity()
     getShopData({partnerId: this.partnerId, promoterUid: this.promoterUid}).then(({data}) => {
-      this.notice = data.merchantApplyNotice
+      this.notice = formatRichText(data.merchantApplyNotice)
       this.initInfo()
     })
   },
@@ -860,6 +861,25 @@ export default {
     height: 52vh;
     overflow-y: auto;
     margin: 30rpx 0;
+
+    // 小程序rich-text内块级标签无默认段间距，补充与后台富文本编辑器一致的段落格式
+    ::v-deep rich-text {
+      display: block;
+      width: 100%;
+
+      p, div, ul, ol {
+        display: block;
+        margin: 0 0 16rpx;
+
+        &:last-child {
+          margin-bottom: 0;
+        }
+      }
+
+      li {
+        margin: 0 0 8rpx;
+      }
+    }
 }
 .popup-body .agree-box {
     margin: 60rpx 0;
diff --git a/pkg_join/views/wholesaler.vue b/pkg_join/views/wholesaler.vue
index 415bce6..5609ec9 100644
--- a/pkg_join/views/wholesaler.vue
+++ b/pkg_join/views/wholesaler.vue
@@ -270,7 +270,7 @@
 import CitySelect from '@/components/CitySelect'
 import {getShopData, getWholesaler, removeApply, saveWholesaler} from '@/api/join'
 import {getCity, registerVerify} from '@/api/user'
-import {chooseImage} from '@/utils'
+import {chooseImage, formatRichText} from '@/utils'
 import { pageListenMixins } from '@/mixins/pageListenMixins'
 
 export default {
@@ -413,7 +413,7 @@ export default {
         this.district = data
       })
       getShopData({partnerId: this.partnerId, promoterUid: this.promoterUid}).then(({data}) => {
-        this.notice = data.merchantApplyNotice
+        this.notice = formatRichText(data.merchantApplyNotice)
         this.initInfo()
       })
     },
diff --git a/utils/index.js b/utils/index.js
index ad33cea..87328f3 100644
--- a/utils/index.js
+++ b/utils/index.js
@@ -9,6 +9,15 @@ import stringify from "@/utils/querystring";
 import {VUE_APP_API_URL} from "@/config";
 import {auth} from '@/libs/wechat'
 
+// 富文本内容预处理：
+// 纯文本内容（不含HTML标签）中的换行符\n在rich-text中会被折叠为空格，需转为<br/>以保留换行格式
+export function formatRichText(content) {
+    if (!content) return ''
+    // 含HTML标签的富文本内容不做处理，避免破坏原有结构
+    if (/<[a-zA-Z][^>]*>/.test(content)) return content
+    return content.replace(/\r\n/g, '\n').replace(/\n/g, '<br/>')
+}
+
 export function dataFormat(time, option) {
     time = +time * 1000;
     const d = new Date(time);