From 4fc8f1f1e394b8e9290c168f1466c750f9cf3ff9 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Wed, 25 Aug 2021 10:01:38 +0800
Subject: [PATCH] 组合购计算价钱

---
 pages/cart/cart/cart.wxml | 2 +-
 pages/cart/cart2/cart2.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pages/cart/cart/cart.wxml b/pages/cart/cart/cart.wxml
index 2b64fb4..6c5197b 100644
--- a/pages/cart/cart/cart.wxml
+++ b/pages/cart/cart/cart.wxml
@@ -108,7 +108,7 @@
               <view class="specifications  ellipsis-1">
                 <view  wx:if="{{items.goods_color || items.goods_spec}}">
                   {{items.goods_color}}{{items.goods_color?"/":''}}{{items.goods_spec}}</view>
-                <view  wx:else>规格1{{items.buyqty}}--{{items.zh_b_num}}</view>
+                <view  wx:else>规格1</view>
               </view>
               <block wx:if="{{items.is_gift}}">
                 <view>{{items.goods_num}}件</view>
diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index 8a327e2..57817a1 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -1258,8 +1258,8 @@ Page({
                         if(item[j].prom_type!=7){
                             o_price_no_zh += item[j].goods_price * item[j].goods_num;
                         }
-                        //组合购的商品，且没有订单优惠的叠加,is_orderyh就是优惠叠加
-                        if(zh_prom_goods && zh_prom_goods[item[j].prom_id] && !zh_prom_goods[item[j].prom_id].act.is_orderyh )
+                        //组合购的商品，且有订单优惠的叠加,is_orderyh就是优惠叠加
+                        else if(zh_prom_goods && zh_prom_goods[item[j].prom_id] && zh_prom_goods[item[j].prom_id].act.is_orderyh )
                         {
                             o_price_no_zh += item[j].goods_price * item[j].goods_num;
                         }
--
libgit2 0.21.4