From 6deb07e11ff9d3cefa46d826e8b47b34816f94b5 Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Fri, 22 May 2020 15:42:07 +0800
Subject: [PATCH] 1。多梯位优惠， 2. 商品详情页面优惠条件内容的正确显示

---
 pages/cart/cart2/cart2.js            | 39 ++++++++++++++++++++++-----------------
 pages/goods/goodsInfo/goodsInfo.wxml |  2 +-
 2 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index 3cec031..f5c8c71 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -279,7 +279,7 @@ Page({
       data: {
         user_id: to.globalData.user_id, selected:1,state:0,
         store_id: oo.stoid, pageSize: 600 },
-      success:function (su) {
+      success:async function (su) {
         //按门店分类的数组
         var arr = new Array();
         var carr = su.data.data.pageData;
@@ -289,7 +289,7 @@ Page({
           var item = carr[i];
           //要把优惠活动加入,prom_goods_map中,赠品不要运算
           if(item.prom_type==3 && item.is_gift!=1){
-            th.add_prom_goods_map(item);
+            await th.add_prom_goods_map(item);
           }
           item.original_img = oo.imghost + item.original_img;
           /*----接口要弄出来的，先顶着-----*/
@@ -640,7 +640,7 @@ Page({
                     }
                   }).then(res => {
                      if (res.data.code == 0) {
-                      var get_data = res.data.data[0];
+                      var get_data = res.data.data;
                       item_map.is_bz = get_data.is_bz;         //是不是倍增
                       item_map.is_xz_yh = get_data.is_xz_yh;   //是不是优惠
                       item_map.bs = get_data.bs;               //是不是倍数
@@ -649,16 +649,18 @@ Page({
                       item_map.s_intValue = get_data.intValue;
                       item_map.s_coupon_id = get_data.coupon_id;
                       item_map.s_coupon_num = get_data.coupon_num;
-                      item_map.gift_id = get_data.gift_id;
-                      item_map.gift_goods_id = get_data.goods_id;
-                      item_map.gift_goods_name = get_data.goods_name;
-                      item_map.gift_goods_color = get_data.goodsinfo.goods_color;
-                      item_map.gift_goods_spec = get_data.goodsinfo.goods_spec;
-                      item_map.gift_original_img = get_data.goodsinfo.original_img;
-                      item_map.gift_limit_num = get_data.limit_num;
-                      item_map.gift_storecount = get_data.gift_storecount;
-                      item_map.gift_weight = get_data.goodsinfo.weight;
-                      item_map.gift_exp_sum_type = get_data.goodsinfo.exp_sum_type;
+                      if(get_data.gift_id && get_data.goodsinfo) {
+                          item_map.gift_id = get_data.gift_id;
+                          item_map.gift_goods_id = get_data.goods_id;
+                          item_map.gift_goods_name = get_data.goods_name;
+                          item_map.gift_goods_color = get_data.goodsinfo.goods_color ? get_data.goodsinfo.goods_color : '';
+                          item_map.gift_goods_spec = get_data.goodsinfo.goods_spec ? get_data.goodsinfo.goods_spec : '';
+                          item_map.gift_original_img = get_data.goodsinfo.original_img;
+                          item_map.gift_limit_num = get_data.limit_num;
+                          item_map.gift_storecount = get_data.gift_storecount;
+                          item_map.gift_weight = get_data.goodsinfo.weight;
+                          item_map.gift_exp_sum_type = get_data.goodsinfo.exp_sum_type;
+                      }
                       item_map.s_libao = get_data.libao;
                       item_map.s_lb_num = get_data.lb_num;
                     }
@@ -2485,7 +2487,7 @@ Page({
         }
       }).then(res=>{
           if(res.data.code==0){
-            var get_data=res.data.data[0];
+            var get_data=res.data.data;
             arr.is_bz=get_data.is_bz;         //是不是倍增
             arr.is_xz_yh=get_data.is_xz_yh;   //是不是优惠
             arr.bs=get_data.bs;               //是不是倍数
@@ -2531,10 +2533,12 @@ Page({
         var th=this;
         var pickid=item.pick_id;
         var map=th.data.prom_goods_map;
+        var obj=map[pickid];
+
         if(map[pickid]){
             if(map[pickid][item.prom_id]){
                 var ob=map[pickid][item.prom_id];
-                ob.price+=item.goods_price;
+                ob.price+=item.goods_price*item.goods_num;
                 ob.goods_num+=item.goods_num;
             }else{
                 var prom=null;
@@ -2543,7 +2547,7 @@ Page({
                 })
                 var ob={};
                 ob.prom_id=item.prom_id;
-                ob.price=item.goods_price;
+                ob.price=item.goods_price*item.goods_num;
                 ob.goods_num=item.goods_num;
                 ob.is_bz=prom.is_bz;
                 map[pickid][item.prom_id]=ob;
@@ -2555,12 +2559,13 @@ Page({
                 if(res.data.code==0){ prom=res.data.data; }
             })
             ob.prom_id=item.prom_id;
-            ob.price=item.goods_price;
+            ob.price=item.goods_price*item.goods_num;
             ob.goods_num=item.goods_num;
             ob.is_bz=prom.is_bz;
             var obj={};
             obj[item.prom_id]=ob;
             map[pickid]=obj;
+
         }
     },
 
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index 885d613..acf59e9 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -443,7 +443,7 @@
             <!-- 中间显示层 -->
             <view style="margin-top: 36rpx">
                 <view class="cx_show_view flex fs28" wx:for="{{prom_goods}}">
-                    <view class="prom_condition">消费满{{item.condition}}件</view>
+                    <view class="prom_condition">消费满{{item.condition}}<text wx:if="{{item.prom_type==1}}">件</text><text wx:else>元</text></view>
                     <view class="word {{is_more_cx?'':'ellipsis-1'}}">
                             <text wx:if="{{item.money>0}}">减价{{item.money}}元;</text>
 							<text wx:if="{{item.sale>0}}">打{{item.sale}}折;</text>
--
libgit2 0.21.4