From 9f25ac0bf84d51ba45c37393e7d57766598056e0 Mon Sep 17 00:00:00 2001
From: huangzhen <huangzhen@rd3.ngsoft.com>
Date: Fri, 27 Sep 2024 15:22:45 +0800
Subject: [PATCH] =?UTF-8?q?update=20@=E7=BB=84=E5=90=88=E5=95=86=E5=93=81-?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/base-dialog/index.vue    |  2 +-
 src/views/pages/comProduct/index.vue    | 69 +++++++++++++++++++++----
 src/views/templates/cmsDetail/index.vue |  2 +-
 src/views/templates/cmsList/index.vue   |  2 +-
 4 files changed, 62 insertions(+), 13 deletions(-)

diff --git a/src/components/base-dialog/index.vue b/src/components/base-dialog/index.vue
index 5f5cfc6..49dc357 100644
--- a/src/components/base-dialog/index.vue
+++ b/src/components/base-dialog/index.vue
@@ -8,7 +8,7 @@
     :showConfirmButton="false"
     v-bind:close="close"
   >
-    <img class="dialog-img" :src="imgUrl" />
+    <img class="dialog-img" :src="imgUrl"  alt="" />
     <p :class="['dialog-title', !text && 'titleCenter']">{{ title || '温馨提示' }}</p>
     <p v-if="text" class="dialog-text">{{ text }}</p>
     <div class="dialog-btn" @click="model = !model">{{ confirmTxt }}</div>
diff --git a/src/views/pages/comProduct/index.vue b/src/views/pages/comProduct/index.vue
index ab0006c..09e0aaa 100644
--- a/src/views/pages/comProduct/index.vue
+++ b/src/views/pages/comProduct/index.vue
@@ -58,11 +58,23 @@
         </li>
       </template>
     </ul>
-    <img v-if="0" @click="changePopComStatus" @touchmove.stop.prevent class="floatImg" src="https://lsxdmgoss.oss-cn-chengdu.aliyuncs.com/MarketingSystem/image/front/acticeTextTip.png" alt="">
-    <div v-if="groupInfo && popComStatus" class="popWrapper">
+    <img v-if="getProDesc" @click="changePopComStatus" class="floatImg" src="https://lsxdmgoss.oss-cn-chengdu.aliyuncs.com/MarketingSystem/image/front/spsm.png" alt="">
+    <div v-if="popComStatus" class="popWrapper">
       <img @click="changePopComStatus" class="backImg" src="https://lsxdmgoss.oss-cn-chengdu.aliyuncs.com/MarketingSystem/image/front/backprepageBtn.png" alt="">
-      <p class="title">活动规则</p>
-      <!-- <div v-if="cssData.floatText" class="description-2" v-html="cssData.floatText"></div> -->
+      <p class="title">商品说明</p>
+      <template v-if="groupInfo.is_active_time_show === 1">
+        <h3 class="timeTitle">生效时间段</h3>
+        <p class="time">{{ groupInfo.start_time }} - {{ groupInfo.end_time }}</p>
+      </template>
+      <template v-if="groupInfo.recive_type === 2">
+        <h3 class="timeTitle">领取时间段</h3>
+        <p class="time">{{ groupInfo.recive_start }} - {{ groupInfo.recive_end }}</p>
+      </template>
+      <template v-if="groupInfo.desc">
+        <h3 class="descTitle">使用规则</h3>
+        <p v-if="groupInfo.desc_type === 1" class="descText" v-html="groupInfo.desc"></p>
+        <img class="descImg" :src="groupInfo.desc" alt="">
+      </template>
     </div>
   </div>
   <!-- 遮罩 loading -->
@@ -231,6 +243,10 @@ export default {
     await this.getData('start');
   },
   computed: {
+    getProDesc() { // 商品说明
+      const groupInfo = this.groupInfo;
+      return groupInfo && ((groupInfo.is_active_time_show === 1) || (groupInfo.recive_type === 2) || groupInfo.desc)
+    },
     getModalTitle() { // 直充（非平台） + 红包/立减金（支付-账号领取/云闪付）
       const obj = this.selectedPro[0];
       if (this.selectedPro.length === 1) {
@@ -282,6 +298,16 @@ export default {
   methods: {
     changePopComStatus() {
       this.popComStatus = !this.popComStatus;
+      if (this.popComStatus) { // 弹窗禁止滑动穿透
+        const scrollTop = document.body.scrollTop || document.documentElement.scrollTop;
+        document.body.style.position = 'fixed';
+        document.body.style.top = `-${scrollTop}px`;
+      } else {
+        const top = document.body.style.top;
+        document.body.style.position = '';
+        document.body.style.top = '';
+        document.body.scrollTop = document.documentElement.scrollTop = -parseInt(top);
+      }
     },
     async getData(type: string) {
       if (!this.groupId) return showToast('组合商品ID不能为空');
@@ -584,8 +610,8 @@ export default {
     position: fixed;
     display: block;
     top: 40px;
-    right: 0;
-    width: 30px;
+    right: -6.5px;;
+    width: 40px;
     height: auto;
     cursor: pointer;
   }
@@ -615,6 +641,27 @@ export default {
       align-items: center;
       font-weight: 700;
       font-size: 16px;
+      margin-bottom: 20px;
+    }
+    .timeTitle, .descTitle {
+      font-size: 14px;
+      color: #171717;
+      padding: 0 20px;
+      margin-top: 10px;
+      line-height: 24px;
+    }
+    .time, .descText {
+      line-height: 20px;
+      color: #a8a8a8;
+      font-size: 12px;
+      margin-top: 10px;
+      padding: 0 20px;
+    }
+    .descImg {
+      display: block;
+      width: 345px;
+      height: auto;
+      margin: 10px auto 0;
     }
   }
   .typeBox {
@@ -763,6 +810,12 @@ export default {
           }
           .contentInfo {
             flex: auto;
+            p {
+              max-width: 170px;
+              white-space: nowrap;
+              overflow: hidden;
+              text-overflow: ellipsis;
+            }
             .contentInfoTop {
               height: 16px;
               font-family: Source Han Sans, Source Han Sans;
@@ -778,10 +831,6 @@ export default {
               font-size: 11px;
               color: #939393;
               line-height: 16px;
-              white-space: nowrap;
-              overflow: hidden;
-              text-overflow: ellipsis;
-              max-width: 129px;
               margin-top: 5px;
             }
           }
diff --git a/src/views/templates/cmsDetail/index.vue b/src/views/templates/cmsDetail/index.vue
index 9980093..ce1e72e 100644
--- a/src/views/templates/cmsDetail/index.vue
+++ b/src/views/templates/cmsDetail/index.vue
@@ -55,7 +55,7 @@
     <div v-if="cssData.activityDescType === 3 && cssData.floatText" class="description-3" v-html="cssData.floatText" />
     <div v-if="popComStatus" class="popWrapper">
       <img @click="changePopComStatus" class="backImg" src="https://lsxdmgoss.oss-cn-chengdu.aliyuncs.com/MarketingSystem/image/front/backprepageBtn.png" alt="">
-      <p class="title">活动规则</p>
+      <p class="title">活动说明</p>
       <div v-if="cssData.floatText" class="description-2" v-html="cssData.floatText"></div>
     </div>
   </div>
diff --git a/src/views/templates/cmsList/index.vue b/src/views/templates/cmsList/index.vue
index 1a666c2..adcb560 100644
--- a/src/views/templates/cmsList/index.vue
+++ b/src/views/templates/cmsList/index.vue
@@ -71,7 +71,7 @@
 
     <div v-if="popComStatus" class="popWrapper">
       <img @click="changePopComStatus" class="backImg" src="https://lsxdmgoss.oss-cn-chengdu.aliyuncs.com/MarketingSystem/image/front/backprepageBtn.png" alt="">
-      <p class="title">活动规则</p>
+      <p class="title">活动说明</p>
       <div v-if="cssData.floatText" class="description-2" v-html="cssData.floatText"></div>
     </div>
   </div>