From 896749d81279fee368cac6df9887cc949afef7f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Thu, 23 Dec 2021 18:36:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B4=AD=E7=89=A9=E8=BD=A6?=
 =?UTF-8?q?=E5=9C=A8=E6=9B=B4=E6=96=B0=E6=9C=80=E6=96=B0=E5=90=8E=E7=AB=AF?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=9A=84=E6=97=B6=E5=80=99=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/product/goods.vue                 | 11 ++++----
 pages/product/product/popup/address.vue |  2 +-
 pages/tabbar/cart/cartList.vue          | 34 ++++++++++++++++---------
 3 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/pages/product/goods.vue b/pages/product/goods.vue
index 9140588..b512e57 100644
--- a/pages/product/goods.vue
+++ b/pages/product/goods.vue
@@ -303,11 +303,11 @@
       <view class="spec">
         <!-- 促销弹窗 -->
         <u-popup
-          v-model="promotionFlag"
+          v-model="promotionShow"
           :height="setup.height"
           :mode="setup.mode"
           :border-radius="setup.radius"
-          @close="promotionFlag = false"
+          @close="promotionShow = false"
           :mask-close-able="setup.close"
           closeable
         >
@@ -404,7 +404,8 @@ export default {
   data() {
     return {
       setup,
-      promotionFlag: false,
+      promotionShow: false, //弹窗开关
+      promotionFlag: true, //活动开关
       // #ifdef H5
       navbarListX: 110, //导航栏列表栏x轴
       navbarListY: 80, //导航栏列表栏y轴
@@ -914,13 +915,13 @@ export default {
      * 规格弹窗开关
      */
     shutMask(flag, buyFlag, type) {
-      this.promotionFlag = false;
+      this.promotionShow = false;
       this.buyMask = false;
       this.addressFlag = false;
       if (flag) {
         switch (flag) {
           case 1: //优惠券弹窗
-            this.promotionFlag = true;
+            this.promotionShow = true;
 
             break;
           case 3:
diff --git a/pages/product/product/popup/address.vue b/pages/product/product/popup/address.vue
index ee9fb51..50ce0b9 100644
--- a/pages/product/product/popup/address.vue
+++ b/pages/product/product/popup/address.vue
@@ -1,5 +1,5 @@
 <template>
-  <u-popup class="popup" v-model="addressFlag" :height="setup.height" :mode="setup.mode" :border-radius="setup.radius" @close="closeAddress()" :mask-close-able="setup.close"  closeable>
+  <u-popup class="popup" v-model="addressFlag" :height="setup.height" :mode="setup.mode" :border-radius="setup.radius" @close="closeAddress()"   closeable>
     <view class="header-title">选择地址</view>
     <view class="view-box" v-if="addressDetail">
       <view class="view-item" v-for="(item, index) in addressDetail" :key="index" @click="clickAddress(item)">
diff --git a/pages/tabbar/cart/cartList.vue b/pages/tabbar/cart/cartList.vue
index 07cf0cd..e9eb0f3 100644
--- a/pages/tabbar/cart/cartList.vue
+++ b/pages/tabbar/cart/cartList.vue
@@ -39,9 +39,8 @@
           ref="swiperAction" class="cart-item" v-for="(skuItem, i) in item.skuList" :index="i" :key="skuItem.goodsSku.id"
           @click="changeActionTab(skuItem)" @longpress="changeActionTab(skuItem)">
           <!-- 满减活动 -->
-          <div v-if="skuItem.promotions" v-for="(fullDiscount,fullDiscountIndex) in skuItem.promotions"
-            :key="fullDiscountIndex">
-            <div v-if="fullDiscount.promotionType == 'FULL_DISCOUNT'">
+          <div v-if="Object.keys(skuItem.promotionMap).length != 0">
+            <div v-if="getPromotion(skuItem).includes('FULL_DISCOUNT')">
               <div class="promotion-notice" v-if="item.promotionNotice">
                 <span class="tips">满减</span>
                 <span style="flex:10;">{{item.promotionNotice}}</span>
@@ -76,7 +75,7 @@
               <p class="sp-type">{{skuItem.goodsSku.simpleSpecs}}</p>
               <p class="sp-number">
                 <view class="sp-price">
-                  <div class="default-color" :class="{'main-color':skuItem.promotions.length ==0  }">
+                  <div class="default-color" :class="{'main-color':Object.keys(skuItem.promotionMap).length ==0  }">
                     
                     ￥<span>{{ formatPrice(skuItem.goodsSku.price)[0] }}</span>
                     <span>.{{ formatPrice(skuItem.goodsSku.price)[1] }}</span>
@@ -95,9 +94,9 @@
                 </view>
                 <!-- 如果当有促销并且促销是 限时抢购 -->
                 <!-- promotions -->
-              <div class="promotions-list" v-if="skuItem.promotions"
-                v-for="(seckill,seckillIndex) in skuItem.promotions" :key="seckillIndex">
-                <div class="promotions-item-seckill" v-if="seckill.promotionType == 'SECKILL'">
+              <div class="promotions-list" v-if="Object.keys(skuItem.promotionMap).length != 0"
+              >
+                <div class="promotions-item-seckill" v-if="getPromotion(skuItem).includes('SECKILL')">
                   距秒杀结束: <u-count-down show-border :hide-zero-day="true" :color="$mainColor" border-color="#ededed"
                     font-size="24" :timestamp="getCountDownTime(seckill.endTime)">
                   </u-count-down>
@@ -106,7 +105,7 @@
 
               <!-- 如果有活动 并且是选中的状态,显示预估到手价格 -->
               <div class="priceDetail-flowPrice" :class="{'main-color':skuItem.priceDetailDTO}"
-                v-if="skuItem.priceDetailDTO && skuItem.invalid == 0  && skuItem.promotions.length!=0 && skuItem.checked && skuItem.checked">
+                v-if="skuItem.priceDetailDTO && skuItem.invalid == 0  && Object.keys(skuItem.promotionMap).length != 0 && skuItem.checked && skuItem.checked">
                 预估到手价 ￥<span>{{ formatPrice(skuItem.priceDetailDTO.flowPrice)[0]}}</span>
                 <span>.{{ formatPrice(skuItem.priceDetailDTO.flowPrice)[1] }} </span>
               </div>
@@ -490,6 +489,13 @@ export default {
       });
     },
 
+    // 数据去重一下 
+    getPromotion(item) {
+        return Object.keys(item.promotionMap).map((child) => {
+          return child.split("-")[0]
+        });
+    },
+
     /**
      * 获取购物车数据
      */
@@ -512,12 +518,16 @@ export default {
                 // 如果有拼团活动顺便删除
                 item.skuList &&
                   item.skuList.forEach((sku) => {
-                    sku.promotions &&
-                      sku.promotions.forEach((pro, proIndex) => {
-                        if (pro.promotionType == "PINTUAN") {
-                          sku.promotions.splice(proIndex, 1);
+                    if(Object.keys(sku.promotionMap).length != 0)
+                    {
+                      Object.keys(sku.promotionMap).forEach((pro, proIndex) => {
+                        pro = pro.split('-')[0]
+                        if (pro == "PINTUAN" ) {
+                           Object.keys(sku.promotionMap).splice(proIndex, 1);
                         }
                       });
+                    }
+                
                   });
               }
               uni.stopPullDownRefresh();