From 0d50e3d06ab24773f0fa01de8859636943804b18 Mon Sep 17 00:00:00 2001
From: lf <1534621107@qq.com>
Date: Mon, 24 Jun 2024 10:39:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E6=A8=A1=E6=9D=BF=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/tt-activity/index.vue |  6 +++++-
 src/pages/tt-coupon/index.vue   |  6 ++++--
 src/pages/tt-coupon/product.vue | 23 +++++++++++++++--------
 src/pages/tt-coupon/redeem.vue  |  6 +++++-
 4 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/src/pages/tt-activity/index.vue b/src/pages/tt-activity/index.vue
index a8b02f8..a461569 100644
--- a/src/pages/tt-activity/index.vue
+++ b/src/pages/tt-activity/index.vue
@@ -61,7 +61,8 @@
             mode=""
           ></image>
         </view>
-        <view class="f24 mt30 mlr30" style="color: #2b6da8">
+        <rich-text v-if="contentMsg" :nodes="contentMsg"></rich-text>
+        <view v-else class="f24 mt30 mlr30" style="color: #2b6da8">
           <view>1.【活动时间】2023年11月1日至2023年12月 31日</view>
           <view class="mt20">
             2.【活动内容】此为文字内容此为文字内容此为文字内容此为文字内容此为文字内容此为文字内容此为文字内容此为文字内容此为文字内容此为文字内容此为文字内容此为文字内容此为文字内容。
@@ -195,6 +196,7 @@ export default {
       ismask: false,
       isz: 1,
       activity_code: '',
+      contentMsg: '',
     }
   },
   onLoad(options) {
@@ -251,6 +253,8 @@ export default {
           this.freeNum = lottery_count - use_lottery_count
           // eslint-disable-next-line camelcase
           this.lottery_code = lottery_code
+          // eslint-disable-next-line camelcase
+          this.contentMsg = activity_info.activity_description
         } else {
           uni.showToast({
             title: res.data.message,
diff --git a/src/pages/tt-coupon/index.vue b/src/pages/tt-coupon/index.vue
index fc92e75..f76b2b3 100644
--- a/src/pages/tt-coupon/index.vue
+++ b/src/pages/tt-coupon/index.vue
@@ -120,7 +120,9 @@ import api, { imgUrl } from './api'
 
 const istrue = ref<boolean>(false)
 const list = reactive<any>([])
-const query = reactive<any>({})
+const query = reactive<any>({
+  activity_code: 'quanyi',
+})
 
 const dui = (item) => {
   uni.navigateTo({
@@ -141,7 +143,7 @@ function getData() {
   const params = {
     page: 1,
     page_size: 10,
-    activity_code: query.activity_code,
+    activity_code: query.activity_code || 'quanyi',
   }
   api.getCouponList(params).then((res: any) => {
     if (res.code === 200) {
diff --git a/src/pages/tt-coupon/product.vue b/src/pages/tt-coupon/product.vue
index 0038909..f5a6c1c 100644
--- a/src/pages/tt-coupon/product.vue
+++ b/src/pages/tt-coupon/product.vue
@@ -95,13 +95,18 @@
             <view class="bold f40" style="color: #3d3d3d">宝贝详情</view>
             <!-- <view v-html="info.introduce" class="ql-editor"></view> -->
             <view class="flex_column flex_items mt20">
-              <image
-                v-for="(item, index) in info.images"
-                :key="index"
-                :src="item.imgurl"
-                style="width: 100%"
-                mode="widthFix"
-              ></image>
+              <template v-if="info.images && info.images.length">
+                <image
+                  v-for="(item, index) in info.images"
+                  :key="index"
+                  :src="item.imgurl"
+                  style="width: 100%"
+                  mode="widthFix"
+                ></image>
+              </template>
+              <template v-else>
+                <rich-text v-if="contentMsg" :nodes="contentMsg"></rich-text>
+              </template>
             </view>
           </view>
           <view style="height: 130rpx; width: 100%"></view>
@@ -243,6 +248,7 @@ const list = reactive<any>([
 const current = ref<number>(0)
 const curindex = ref<number>(0)
 const info = reactive<any>({})
+const contentMsg = ref<any>('')
 let tags = reactive<any>([
   {
     tt: '10元',
@@ -285,7 +291,7 @@ function getData() {
     .getProductDetail({
       // eslint-disable-next-line camelcase
       product_id: product_id.value,
-      activity_code: route.activity_code,
+      activity_code: route.activity_code || 'quanyi',
     })
     .then((res: any) => {
       uni.hideLoading()
@@ -294,6 +300,7 @@ function getData() {
         // this.info.detail_image = JSON.parse(this.info.detail_image)
         tags = []
         Object.assign(tags, [res.data.show_name])
+        contentMsg.value = res.data.remark
         istrue.value = true
       } else {
         uni.showToast({
diff --git a/src/pages/tt-coupon/redeem.vue b/src/pages/tt-coupon/redeem.vue
index 2e12f0e..8b718e0 100644
--- a/src/pages/tt-coupon/redeem.vue
+++ b/src/pages/tt-coupon/redeem.vue
@@ -55,7 +55,11 @@
       >
         <view class="flex_between flex_items pb20 bbe9s">
           <view class="flex_start flex_items">
-            <image style="width: 104rpx; height: 104rpx; border-radius: 12rpx" mode=""></image>
+            <image
+              :src="info.show_pic"
+              style="width: 104rpx; height: 104rpx; border-radius: 12rpx"
+              mode=""
+            ></image>
             <view class="flex_column f30 ml30" style="color: #333">
               <text class="bold">{{ info.show_name }}</text>
               <view class="f24 mt15" style="color: #666">