Commit 4fc8f1f1e394b8e9290c168f1466c750f9cf3ff9

Authored by yvan.ni
1 parent 2e9f4bfe

组合购计算价钱

pages/cart/cart/cart.wxml
@@ -108,7 +108,7 @@ @@ -108,7 +108,7 @@
108 <view class="specifications ellipsis-1"> 108 <view class="specifications ellipsis-1">
109 <view wx:if="{{items.goods_color || items.goods_spec}}"> 109 <view wx:if="{{items.goods_color || items.goods_spec}}">
110 {{items.goods_color}}{{items.goods_color?"/":''}}{{items.goods_spec}}</view> 110 {{items.goods_color}}{{items.goods_color?"/":''}}{{items.goods_spec}}</view>
111 - <view wx:else>规格1{{items.buyqty}}--{{items.zh_b_num}}</view> 111 + <view wx:else>规格1</view>
112 </view> 112 </view>
113 <block wx:if="{{items.is_gift}}"> 113 <block wx:if="{{items.is_gift}}">
114 <view>{{items.goods_num}}件</view> 114 <view>{{items.goods_num}}件</view>
pages/cart/cart2/cart2.js
@@ -1258,8 +1258,8 @@ Page({ @@ -1258,8 +1258,8 @@ Page({
1258 if(item[j].prom_type!=7){ 1258 if(item[j].prom_type!=7){
1259 o_price_no_zh += item[j].goods_price * item[j].goods_num; 1259 o_price_no_zh += item[j].goods_price * item[j].goods_num;
1260 } 1260 }
1261 - //组合购的商品,且没有订单优惠的叠加,is_orderyh就是优惠叠加  
1262 - if(zh_prom_goods && zh_prom_goods[item[j].prom_id] && !zh_prom_goods[item[j].prom_id].act.is_orderyh ) 1261 + //组合购的商品,且有订单优惠的叠加,is_orderyh就是优惠叠加
  1262 + else if(zh_prom_goods && zh_prom_goods[item[j].prom_id] && zh_prom_goods[item[j].prom_id].act.is_orderyh )
1263 { 1263 {
1264 o_price_no_zh += item[j].goods_price * item[j].goods_num; 1264 o_price_no_zh += item[j].goods_price * item[j].goods_num;
1265 } 1265 }