From 474c9b840c816c326a146b414b45c0476edf81f0 Mon Sep 17 00:00:00 2001
From: Apple <>
Date: Mon, 15 Aug 2022 16:49:16 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90c=E7=AB=AF=E3=80=91=E7=AB=8B=E5=87=8F?=
 =?UTF-8?q?=E9=87=91=E5=95=86=E5=93=81=E5=8F=AF=E7=94=A8=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=AE=B5=E7=9A=84=E5=B1=95=E7=A4=BA=E4=BD=8D=E7=BD=AE=EF=BC=8C?=
 =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=90=8E=E5=8F=B0=E8=AE=BE=E7=BD=AE=E7=9A=84?=
 =?UTF-8?q?=E5=8F=AF=E7=94=A8=E6=97=B6=E9=97=B4=E6=AE=B5=E8=A7=84=E5=88=99?=
 =?UTF-8?q?=E6=9D=A5=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 reduce.html | 41 +++++++++++++++++++++++++++++++----------
 1 file changed, 31 insertions(+), 10 deletions(-)

diff --git a/reduce.html b/reduce.html
index 4812251..335a9ca 100644
--- a/reduce.html
+++ b/reduce.html
@@ -12,8 +12,8 @@
   </script>
   <script src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/siteqiexchange/js/swiper.min.js"></script>
   <link href="https://lsxdemall.oss-cn-beijing.aliyuncs.com/siteqiexchange/css/swiper.min.css" rel="stylesheet" />
-  <link rel="stylesheet" href="https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/css/homepage1_3_0.css?v=12" />
-  <script src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/js/api1_3_0.js?v=123"></script>
+  <link rel="stylesheet" href="https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/css/homepage1_3_0.css?v=124" />
+  <script src="http://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/js/api1_4_0.js"></script>
   <style>
     * {
       margin: 0 auto;
@@ -74,18 +74,41 @@
           <p class="validity">
             有效期:{{receive_time.effect_time.start_time}}至{{receive_time.effect_time.end_time}}
           </p>
-          <p class="validity" v-if="!fiexd_time">
+          <p class="validity" v-if="receive_time.use_time.type=='received'">
             领取后{{receive_time.use_time.effect_date_type==0?'立即':'次日凌晨'}}生效,有效期
               {{receive_time.use_time.effect_day}}天
           </p>
-          <p class="validity" v-else>
+          <p class="validity" v-if="receive_time.use_time.type=='fiexd'">
             可用时间:{{receive_time.use_time.fiexd_time.start_time}}-{{receive_time.use_time.fiexd_time.end_time}}
-          </p>
+          </p>  
         </div>
       </div>
       <div class="receiveBtn" @click="receiveFn" :class="goodInfo.available!=1?'readOnly':''">立即领取</div>
       <div class="coupon_explain">
         <h1>- {{reduceInfo.batch_goods_name}}兑换说明 -</h1>
+        <div class="content">
+          <h3 v-if="receive_time.use_time.type=='week'||receive_time.use_time.type=='irregular'">可用时间</h3>
+          <ul v-if="receive_time.use_time.type=='week'" class="weekTime">
+              <li v-for="(item,index) in receive_time.use_time.week" :key="index">
+                <p>{{item}}</p>
+                <div>
+                  <p v-for="(item2,index2) in receive_time.use_time.time" :key="index2">
+                    {{item2[0]}}~{{item2[1]}}
+                  </p>
+                </div>
+              </li>
+          </ul>
+          <ul v-if="receive_time.use_time.type=='irregular'">
+            <li v-for="(item,index) in receive_time.use_time.day" :key="index">
+              <p>{{item[0]}}至{{item[1]}}</p>
+              <div>
+                <p v-for="(item2,index2) in receive_time.use_time.time" :key="index2">
+                  {{item2[0]}}~{{item2[1]}}
+                </p>
+              </div>
+            </li>
+        </ul>
+        </div>
         <div class="content">
           <h3>使用须知</h3>
           <p>
@@ -119,7 +142,6 @@
         reduceInfo: {}, //券信息
         orderId: '',
         backAble: true,
-        fiexd_time:false,//固定时间段
         receive_time:{},//领取立减金时间
         tip: `1、立减金自领取之日起0天有效，请在有效期内使用<br />
             2、微信立减金自领取后每个立减金一次性使用，不兑换，不找零，到期后自动失效，逾期未使用不再补发。使用微信支付进行付款（大于立减金面额0.01元以上）即可自动抵扣<br />
@@ -142,11 +164,10 @@
       this.backAble = goodsCount > 1;//多个商品才有返回
       this.reduceInfo = goodsDetail.entity;
       this.plaflam = goodsDetail.entity.channel;
-      this.receive_time=goodsDetail.entity.time_limit;
-      if(goodsDetail.entity.time_limit.use_time.fiexd_time&&goodsDetail.entity.time_limit.use_time.fiexd_time.start_time){
-        this.fiexd_time=true;
+      if(goodsDetail.entity.time_limit.use_time.type=='week'){ //处理星期连贯操作
+        goodsDetail.entity.time_limit.use_time.week=sortWeeks(goodsDetail.entity.time_limit.use_time.week);
       }
-      console.log(133,goodsDetail);
+      this.receive_time=goodsDetail.entity.time_limit;
     },
     filters: {
       cardType(val) {