Commit 7f91778a47bc75c26681ec83a0a21db81acce6bb
1 parent
aedf9e9a
优惠促销在切换的bug优化
Showing
1 changed file
with
9 additions
and
6 deletions
packageE/pages/cart/cart2/cart2.wxml
| ... | ... | @@ -171,12 +171,14 @@ |
| 171 | 171 | </block> |
| 172 | 172 | </block> |
| 173 | 173 | |
| 174 | - <view class="set-mes" wx:if="{{items.prom_type==3 || (items.prom_type==0 && item.show_can_cx[items.goods_id].no_cj_prom) }}"> | |
| 175 | - <view class="use-item" data-pidx="{{pidx}}" data-can_cx_idx="{{items.goods_id}}" bindtap='no_cj_prom'> | |
| 176 | - <icon color="{{!item.show_can_cx[items.goods_id].no_cj_prom?'red':'gray'}}" size="16" type="success"></icon> | |
| 177 | - <view class="yu_er">参与优惠活动</view> | |
| 174 | + <block wx:if="{{!items.is_gift}}"> | |
| 175 | + <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) }}"> | |
| 176 | + <view class="use-item" data-pidx="{{pidx}}" data-can_cx_idx="{{items.goods_id}}" bindtap='no_cj_prom'> | |
| 177 | + <icon color="{{!item.show_can_cx[items.goods_id].no_cj_prom?'red':'gray'}}" size="16" type="success"></icon> | |
| 178 | + <view class="yu_er">参与优惠活动</view> | |
| 179 | + </view> | |
| 178 | 180 | </view> |
| 179 | - </view> | |
| 181 | + </block> | |
| 180 | 182 | |
| 181 | 183 | </block> |
| 182 | 184 | |
| ... | ... | @@ -231,7 +233,8 @@ |
| 231 | 233 | </view> |
| 232 | 234 | </block> |
| 233 | 235 | |
| 234 | - <view class="set-mes" wx:if="{{pitem.is_duo_gd && pitem.sele_prom_type==3 && util.check_is_last(index,items.goods_id) }}"> | |
| 236 | + | |
| 237 | + <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 }}"> | |
| 235 | 238 | <view class="use-item" data-pidx="{{pidx}}" data-can_cx_idx="{{index}}" bindtap='no_cj_prom'> |
| 236 | 239 | <icon color="{{!pitem.no_cj_prom?'red':'gray'}}" size="16" type="success"></icon> |
| 237 | 240 | <view class="yu_er">参与优惠活动</view> | ... | ... |