Commit 3da4e0b1f585b37d111138da6467eb018b622a41
1 parent
899061b6
CART2解决冲突
Showing
1 changed file
with
5 additions
and
4 deletions
packageE/pages/cart/cart2/cart2.wxml
| ... | ... | @@ -171,10 +171,10 @@ |
| 171 | 171 | </block> |
| 172 | 172 | </block> |
| 173 | 173 | |
| 174 | - <block wx:if="{{!items.is_gift}}"> | |
| 175 | 174 | <!-- 如果不是点击使用订单促销的话 --> |
| 176 | - <block wx:if="{{!can_use_ord_prom[item.pickup_id]}}"> | |
| 175 | + <block wx:if="{{!can_use_ord_prom[item.pickup_id] && !items.is_gift}}"> | |
| 177 | 176 | <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) }}"> |
| 177 | + | |
| 178 | 178 | <view class="use-item" data-pidx="{{pidx}}" data-can_cx_idx="{{items.goods_id}}" bindtap='no_cj_prom'> |
| 179 | 179 | <icon color="{{!item.show_can_cx[items.goods_id].no_cj_prom?'red':'gray'}}" size="16" type="success"></icon> |
| 180 | 180 | <view class="yu_er">参与优惠活动</view> |
| ... | ... | @@ -182,6 +182,7 @@ |
| 182 | 182 | </view> |
| 183 | 183 | </block> |
| 184 | 184 | |
| 185 | + | |
| 185 | 186 | </block> |
| 186 | 187 | |
| 187 | 188 | <!--此时是多个商品参与活动的切换 验证活动是不是多个，要不要显示切换，同时要最后一个商品显示 --> |
| ... | ... | @@ -236,9 +237,9 @@ |
| 236 | 237 | </block> |
| 237 | 238 | |
| 238 | 239 | |
| 239 | - | |
| 240 | + | |
| 240 | 241 | <block wx:if="{{!can_use_ord_prom[item.pickup_id]}}"> |
| 241 | - <view class="set-mes" wx:if="{{pitem.is_duo_gd && pitem.sele_prom_type==3 && util.check_is_last(index,items.goods_id) }}"> | |
| 242 | + <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 }}"> | |
| 242 | 243 | <view class="use-item" data-pidx="{{pidx}}" data-can_cx_idx="{{index}}" bindtap='no_cj_prom'> |
| 243 | 244 | <icon color="{{!pitem.no_cj_prom?'red':'gray'}}" size="16" type="success"></icon> |
| 244 | 245 | <view class="yu_er">参与优惠活动</view> | ... | ... |