From 51fe757b6a81b2b6e6f6db1960b2d9bdd3cebb5e Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Fri, 29 May 2026 10:28:04 +0800
Subject: [PATCH] 11

---
 src/pages/merchant/merchant-activity.vue | 25 ++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/pages/merchant/merchant-activity.vue b/src/pages/merchant/merchant-activity.vue
index 6efbaa9..998e04c 100644
--- a/src/pages/merchant/merchant-activity.vue
+++ b/src/pages/merchant/merchant-activity.vue
@@ -1,6 +1,6 @@
 <template>
 	<crud-layout mainIsScroll bg="/static/page/blue-bg.png">
-		<view v-if="state.actId" class="px-2 py-4">
+		<view v-if="state.actId" class="py-4">
 			<view v-if="state.actType == 'CANCEL_ACT'"
 				class="card rounded-lb-0! rounded-rb-0! w-full h-400rpx relative activity-card overflow-hidden">
 				<view class="ribbon">兑换券</view>
@@ -68,10 +68,6 @@
 						<text>天内使用</text>
 					</view>
 				</view>
-				<view v-if="state.actDetail.description"
-					class="m-l-20rpx m-y-20rpx w-55% text-28 bg-#eeeeee44 c-#fff p-2 rounded-16rpx">
-					{{ state.actDetail.description }}
-				</view>
 			</view>
 			<view v-if="state.couponInfo.actStatus == '2'"
 				class="text-center card rounded-lt-0! rounded-rt-0! p-3 sub-text-30">
@@ -85,6 +81,9 @@
 				</view>
 			</template>
 		</view>
+		<view class="detail-content">
+			<rich-text :nodes="nodes || ''"></rich-text>
+		</view>
 		<template #main-bottom>
 			<view class="text-center">
 				<tm-button class="px-32 m-2" @click="doQrcode">我的礼券</tm-button>
@@ -95,7 +94,7 @@
 </template>
 
 <script setup lang="ts">
-import { reactive, ref, nextTick } from "vue"
+import { reactive, ref, nextTick, computed } from "vue"
 import { onLoad } from "@dcloudio/uni-app"
 
 import { actCancel, actComApi, actCouponApi, userApi } from "@/sheep/api"
@@ -116,6 +115,10 @@ const state = reactive<any>({
 	userDetail: {},
 })
 
+const nodes = computed(() => {
+	return state.actDetail.description?.replaceAll(`<img src="/api`, `<img src="https://stgl.pj.gov.cn/api`)
+})
+
 onLoad((option: any) => {
 	const { actId, actType } = option
 	if (!actId || !actType) return uni.showToast({ title: "参数错误", icon: "error" })
@@ -255,6 +258,16 @@ const modifyUserClose = () => {
 </script>
 
 <style scoped>
+.detail-content {
+	background: #fff;
+	border-radius: 16rpx;
+	padding: 32rpx;
+	font-size: 24rpx;
+	color: #333;
+	line-height: 1.6;
+	overflow: auto;
+}
+
 .activity-card {
 	background-image: url("../../static/page/activity-card-bg.png");
 	background-repeat: no-repeat;