From 7f91778a47bc75c26681ec83a0a21db81acce6bb Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Thu, 22 Feb 2024 16:21:31 +0800
Subject: [PATCH] 优惠促销在切换的bug优化

---
 packageE/pages/cart/cart2/cart2.wxml | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/packageE/pages/cart/cart2/cart2.wxml b/packageE/pages/cart/cart2/cart2.wxml
index 1c395ed..0952a49 100644
--- a/packageE/pages/cart/cart2/cart2.wxml
+++ b/packageE/pages/cart/cart2/cart2.wxml
@@ -171,12 +171,14 @@
                    </block>
                </block>
 
-               <view class="set-mes" wx:if="{{items.prom_type==3 || (items.prom_type==0 && item.show_can_cx[items.goods_id].no_cj_prom) }}">
-                 <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>
+               <block wx:if="{{!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>
+                   </view>
                  </view>
-               </view>
+               </block>
 
              </block>
 
@@ -231,7 +233,8 @@
                           </view>
                         </block>
 
-                        <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>
--
libgit2 0.21.4