From e725950fe05bff8053c89906c81744e7596817be Mon Sep 17 00:00:00 2001
From: 15093570141 <141405260+17521612761@users.noreply.github.com>
Date: Thu, 7 Nov 2024 09:45:35 +0800
Subject: [PATCH] =?UTF-8?q?uniapp=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91?=
 =?UTF-8?q?=EF=BC=9A=20=E6=9B=B4=E6=8D=A2=E5=AF=8C=E6=96=87=E6=9C=AC?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=A0=87=E7=AD=BE=E4=BC=98=E5=8C=96=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E8=B6=85=E5=87=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../custom-page/components/home-content/home-content.vue  | 2 +-
 .../pages/subpackage/activity/solitaire/detail/detail.vue | 2 +-
 .../CoreShop/pages/subpackage/agency/apply/apply-form.vue | 2 +-
 .../CoreShop/pages/subpackage/agency/apply/index.vue      | 2 +-
 .../CoreShop/pages/subpackage/article/detail/detail.vue   | 8 ++++----
 .../pages/subpackage/distribution/apply/apply-form.vue    | 2 +-
 .../pages/subpackage/distribution/apply/index.vue         | 2 +-
 .../CoreShop/pages/subpackage/notice/detail/detail.vue    | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-content/home-content.vue b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-content/home-content.vue
index 3bc89fdf..15183c17 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-content/home-content.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-content/home-content.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="m-b-25 p-20 bg-white radius-15">
-		<rich-text :nodes="props.data"></rich-text>
+		<uv-parse :content="props.data"></uv-parse>
 	</view>
 </template>
 <script setup lang="ts">
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/solitaire/detail/detail.vue b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/solitaire/detail/detail.vue
index 924bc635..c0343cfa 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/solitaire/detail/detail.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/solitaire/detail/detail.vue
@@ -28,7 +28,7 @@
 					</view>
 				</view>
 				<view class="content">
-					<rich-text :nodes="state.solitaireInfo?.contentBody"></rich-text>
+					<uv-parse :content="state.solitaireInfo?.contentBody"></uv-parse>
 				</view>
 				<view class="share-box" @click="handleToggleShowShare">
 					<uv-icon name="share-fill" color="#fff" size="20"></uv-icon>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/agency/apply/apply-form.vue b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/agency/apply/apply-form.vue
index 8181d65b..ec83fcdb 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/agency/apply/apply-form.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/agency/apply/apply-form.vue
@@ -2,7 +2,7 @@
 	<view class="content">
 		<view class="title">申请成为代理商</view>
 		<view class="detail">
-			<rich-text :nodes="shopConfigStore.config?.agentAgreement"></rich-text>
+			<uv-parse :content="shopConfigStore.config?.agentAgreement"></uv-parse>
 		</view>
 		<coreshop-fixed-bottom-button @onClick="onSubmitApply()" title="申请成为代理商"></coreshop-fixed-bottom-button>
 	</view>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/agency/apply/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/agency/apply/index.vue
index 774f1582..d940bd58 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/agency/apply/index.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/agency/apply/index.vue
@@ -2,7 +2,7 @@
 	<coreshop-page title="代理商申请" mode="left">
 		<view v-if="state.show">
 			<view class="content">
-				<rich-text :nodes="shopConfigStore.config?.agentNotes"></rich-text>
+				<uv-parse :content="shopConfigStore.config?.agentNotes"></uv-parse>
 			</view>
 
 			<coreshop-fixed-bottom-button v-if="state.info?.conditionStatus" @onClick="onShowSubmitApplyAgency()"
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/article/detail/detail.vue b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/article/detail/detail.vue
index 42257a21..9816ba33 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/article/detail/detail.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/article/detail/detail.vue
@@ -5,7 +5,7 @@
 				<view class="title">{{ state.articleDetail?.title }}</view>
 				<view class="time">{{ state.articleDetail?.createTime }}</view>
 				<view class="content">
-					<rich-text :nodes="state.articleDetail?.contentBody"></rich-text>
+					<uv-parse :content="state.articleDetail?.contentBody"></uv-parse>
 				</view>
 			</view>
 		</view>
@@ -14,11 +14,11 @@
 <script setup lang="ts">
 	import { reactive } from 'vue';
 	import { onLoad, onShareAppMessage, onShareTimeline } from '@dcloudio/uni-app';
-	import { queryArticleDetail, queryShare, queryNoticeInfo, queryMessageDetil } from '@/core/api';
-	import type { Response, NoticeType } from '@/core/models';
+	import { queryArticleDetail, queryNoticeInfo, queryMessageDetil } from '@/core/api';
+	import type { Response } from '@/core/models';
 	import { handleShowToast, handleRouteSwitchTab ,getShareUrl} from '@/core/utils';
 	import { ShareClientEnum, ShareModelEnum, ShareEnum, ArticleDetailEnum } from '@/core/enum';
-	import { UserToken, shareUrl } from '@/core/consts'
+	import { shareUrl } from '@/core/consts'
 
 	interface QueryParams {
 		id : number;
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/distribution/apply/apply-form.vue b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/distribution/apply/apply-form.vue
index 19af1632..126311ad 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/distribution/apply/apply-form.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/distribution/apply/apply-form.vue
@@ -35,7 +35,7 @@
 		<uv-popup ref="popup" mode="bottom" :round="8" :closeOnClickOverlay="false" closeable>
 			<view class="popup-content">
 				<view class="title">分销协议</view>
-				<rich-text :nodes="shopConfigStore.config?.distributionAgreement"></rich-text>
+				<uv-parse :content="shopConfigStore.config?.distributionAgreement"></uv-parse>
 			</view>
 		</uv-popup>
 	</view>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/distribution/apply/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/distribution/apply/index.vue
index 96546ba5..19999744 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/distribution/apply/index.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/distribution/apply/index.vue
@@ -18,7 +18,7 @@
 			<view class="requierd">
 				<view class="tit">分销商须知</view>
 				<view class="desc">
-					<rich-text :nodes="shopConfigStore.config?.distributionNotes"></rich-text>
+					<uv-parse :content="shopConfigStore.config?.distributionNotes"></uv-parse>
 				</view>
 			</view>
 			
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/notice/detail/detail.vue b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/notice/detail/detail.vue
index 24222087..695818eb 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/notice/detail/detail.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/notice/detail/detail.vue
@@ -5,7 +5,7 @@
 				<view class="title">{{ state.noticeInfo?.title }}</view>
 				<view class="time">{{ state.noticeInfo?.createTime }}</view>
 				<view class="content">
-					<rich-text :nodes="state.noticeInfo?.contentBody"></rich-text>
+					<uv-parse :content="state.noticeInfo?.contentBody"></uv-parse>
 				</view>
 			</view>
 		</view>