From bfcd2384d24285140c5656112593abae1aa1dcf3 Mon Sep 17 00:00:00 2001
From: huangzhen <huangzhen@rd3.ngsoft.com>
Date: Thu, 24 Oct 2024 17:41:12 +0800
Subject: [PATCH] =?UTF-8?q?update=20@UI=E6=94=B9=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/templates/cmsCash/index.scss     | 3 +++
 src/views/templates/cmsCash/index.vue      | 4 ++--
 src/views/templates/cmsLJJConfig/index.vue | 4 ++--
 src/views/templates/cmsVoucher/index.vue   | 4 ++--
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/views/templates/cmsCash/index.scss b/src/views/templates/cmsCash/index.scss
index 054bc81..ce8bbb9 100644
--- a/src/views/templates/cmsCash/index.scss
+++ b/src/views/templates/cmsCash/index.scss
@@ -35,6 +35,9 @@
         font-weight: bold;
         text-align: center;
       }
+      .titleOnly {
+        margin: 50px 0 -20px 0;
+      }
       .effect_date {
         font-size: 12px;
         line-height: 40px;
diff --git a/src/views/templates/cmsCash/index.vue b/src/views/templates/cmsCash/index.vue
index 811a890..86b3342 100644
--- a/src/views/templates/cmsCash/index.vue
+++ b/src/views/templates/cmsCash/index.vue
@@ -3,8 +3,8 @@
   <div v-else class="redPacketsViews">
     <div class="box" :style="{ backgroundImage: `url(${needInput ? bgInput : bgDefault})` }">
       <div class="top">
-        <p class="title">{{ goods.name }}</p>
-        <p class="effect_date">
+        <p :class="['title', !cash.end_time && 'titleOnly']">{{ goods.name }}</p>
+        <p class="effect_date" :style="{ visibility: !cash.end_time ? 'hidden' : '' }">
           <span>红包有效期截止 {{ cash.end_time }}</span>
         </p>
         <p class="money">
diff --git a/src/views/templates/cmsLJJConfig/index.vue b/src/views/templates/cmsLJJConfig/index.vue
index a474fb6..a2aca22 100644
--- a/src/views/templates/cmsLJJConfig/index.vue
+++ b/src/views/templates/cmsLJJConfig/index.vue
@@ -17,7 +17,7 @@
           满{{ parseFloat(info.full_amount || 0) }}元减{{ parseFloat(info.amount || 0) }}元
         </p>
         <p class="validity" v-if="info.time_limit?.begin_date && info.time_limit?.end_date">
-          请在 {{ info.time_limit.begin_date }} ～ {{ info.time_limit.end_date }} 内领取
+          请在 {{ info.time_limit.begin_date }}~{{ info.time_limit.end_date }} 内领取
         </p>
         <div class="cardTypeBox">
           <p class="cardType" v-for="(item, index) in info.card_type" :key="index">{{ getCardType(Number(item)) }}</p>
@@ -56,7 +56,7 @@
       </div>
       <div class="illustrate">
         <div v-if="info.receive_type && (info.receive_type !== 1)">
-          <h3 class="illustrateTitle">可用时间</h3>
+          <h3 class="illustrateTitle">领取时间</h3>
           <div class="timeBox">
             <template v-if="info.receive_type === 4">
               <p class="itemContent" v-for="(item, index) in info.receive_day" :key="index">
diff --git a/src/views/templates/cmsVoucher/index.vue b/src/views/templates/cmsVoucher/index.vue
index a3890a7..f691138 100644
--- a/src/views/templates/cmsVoucher/index.vue
+++ b/src/views/templates/cmsVoucher/index.vue
@@ -17,7 +17,7 @@
         </p>
         <p style="font-size: 11px">{{ cardType(info.card_type) }}可用</p>
         <p class="validity" v-if="info.time_limit?.begin_date && info.time_limit?.end_date">
-          有效期: {{ info.time_limit.begin_date }} 至 {{info.time_limit.end_date }}
+          有效期: {{ info.time_limit.begin_date }}~{{info.time_limit.end_date }}
         </p>
       </div>
     </div>
@@ -35,7 +35,7 @@
     <div class="coupon_explain">
       <h1>- 兑换说明 -</h1>
       <div v-if="info.receive_type && (info.receive_type !== 1)" class="content">
-        <h3>可用时间</h3>
+        <h3>领取时间</h3>
         <div class="timeBox">
           <template v-if="info.receive_type === 4">
             <p class="itemContent" v-for="(item, index) in info.receive_day" :key="index">