CART2解决冲突

WXD-SEASON\season
1 parent 899061b6
Showing 1 changed file with 5 additions and 4 deletions
packageE/pages/cart/cart2/cart2.wxml
@@ -171,10 +171,10 @@
                    </block>
                </block>
-               <block wx:if="{{!items.is_gift}}">                 
                <!-- 如果不是点击使用订单促销的话 -->
-               <block wx:if="{{!can_use_ord_prom[item.pickup_id]}}">
+               <block wx:if="{{!can_use_ord_prom[item.pickup_id] && !items.is_gift}}">
                 <view class="set-mes" wx:if="{{items.prom_type==3 || (items.prom_type==0 && item.show_can_cx[items.goods_id].no_cj_prom && item.show_can_cx[items.goods_id].sele_prom_type==3) }}">
+
                    <view class="use-item" data-pidx="{{pidx}}" data-can_cx_idx="{{items.goods_id}}"  bindtap='no_cj_prom'>
                      <icon color="{{!item.show_can_cx[items.goods_id].no_cj_prom?'red':'gray'}}" size="16" type="success"></icon>
                      <view class="yu_er">参与优惠活动</view>
@@ -182,6 +182,7 @@
                  </view>
                </block>
+
              </block>
              <!--此时是多个商品参与活动的切换 验证活动是不是多个，要不要显示切换，同时要最后一个商品显示 -->
@@ -236,9 +237,9 @@
                         </block>
-
+                       
                         <block wx:if="{{!can_use_ord_prom[item.pickup_id]}}">
-                          <view class="set-mes" wx:if="{{pitem.is_duo_gd && pitem.sele_prom_type==3 && util.check_is_last(index,items.goods_id) }}">
+                          <view class="set-mes" wx:if="{{pitem.is_duo_gd && pitem.sele_prom_type==3 && util.check_is_last(index,items.goods_id)  && !items.is_gift }}">
                             <view class="use-item" data-pidx="{{pidx}}" data-can_cx_idx="{{index}}"  bindtap='no_cj_prom'>
                               <icon color="{{!pitem.no_cj_prom?'red':'gray'}}" size="16" type="success"></icon>
                               <view class="yu_er">参与优惠活动</view>