更换核销product_id->goods_id

exchange.html

@@ -270,7 +270,7 @@
         let self = this;
         let data = {
           "key": sessionStorage.getItem('key'),
-          "product_id": this.goodInfo.product_id,
+          "goods_id": this.goodInfo.goods_id,
           "account": this.account,
           "code_batch_id": this.goodInfo.code_batch_id,
           "token": sessionStorage.getItem('token')

reduce.html

@@ -66,6 +66,13 @@
         <p class="validity">
           有效期:{{reduceInfo.time_limit.effect_time.start_time}}至{{reduceInfo.time_limit.effect_time.end_time}}
         </p>
+        <p class="validity" v-if="!fiexd_time">
+          领取后{{reduceInfo.time_limit.effect_date_type==0?'立即':'次日凌晨'}}生效,有效期
+            {{reduceInfo.time_limit.effect_day}}天
+        </p>
+        <p class="validity" v-else>
+          领取时间:{{reduceInfo.time_limit.fiexd_time.start_time}}-{{reduceInfo.time_limit.fiexd_time.end_time}}
+        </p>
       </div>
     </div>
     <div class="receiveBtn" @click="receiveFn">立即领取</div>
@@ -101,6 +108,8 @@
         reduceInfo: {}, //券信息
         orderId: '',
         backAble: true,
+        fiexd_time:false,//固定时间段
+        receive_time:{},//领取立减金时间
         tip: `1、立减金自领取之日起0天有效，请在有效期内使用<br />
             2、微信立减金自领取后每个立减金一次性使用，不兑换，不找零，到期后自动失效，逾期未使用不再补发。使用微信支付进行付款（大于立减金面额0.01元以上）即可自动抵扣<br />
             3、多张立减金可在单笔微信支付订单中一起使用，但当用户的立减金超过8张时，系统会选取其中一部分使用，不保证在一张订单中全部使用<br />
@@ -111,24 +120,23 @@
     },
     created() {
       /*  获取立减金信息*/
-      this.goodInfo = JSON.parse(sessionStorage.getItem("goodsInfo"));
+      let goodsDetail=JSON.parse(sessionStorage.getItem("goodsInfo"));
+      this.goodInfo = goodsDetail;
       goodsCount = sessionStorage.getItem('goodsCount');
       this.backAble = goodsCount > 1;//多个商品才有返回
-      this.reduceInfo = JSON.parse(
+      this.reduceInfo = goodsDetail.entity;
-        sessionStorage.getItem("goodsInfo")
+      this.plaflam = goodsDetail.entity.channel;
-      ).entity;
+      this.receive_time=goodsDetail.entity.time_limit;
-      this.plaflam = JSON.parse(
+      if(goodsDetail.entity.time_limit.use_time.fiexd_time?.start_time){
-        sessionStorage.getItem("goodsInfo")
+        this.fiexd_time=true;
-      ).entity.channel;
+      }
-      console.log(118, this.goodInfo);
+      console.log(133,goodsDetail);
     },
     filters: {
       cardType(val) {
-        return val
+        return val.map((item) => {
-          .map((item) => {
             return item == 1 ? "借记卡" : "信用卡" + " ";
-          })
+          }).join(" ");
-          .join(" ");
       },
     },
     methods: {
@@ -143,7 +151,7 @@
         let self = this;
         let data = {
           key: sessionStorage.getItem("key"),
-          product_id: this.goodInfo.product_id,
+          goods_id: this.goodInfo.entity.goods_id,
           code_batch_id: this.goodInfo.code_batch_id,
           token: sessionStorage.getItem("token"),
         };