Commit af61bdeb8d930374fc16b7567ca7ed83760e258e
Merge branch 'test' into 'qa'
Test See merge request !1150
Showing
1 changed file
with
23 additions
and
1 deletions
pages/goods/goodsInfo/buy_com_pop.wxml
| ... | ... | @@ -97,6 +97,8 @@ |
| 97 | 97 | <text wx:if="{{hui_condition.lb_id>0}}">，送礼包</text> |
| 98 | 98 | <text wx:if="{{hui_condition.zxlb_id>0}}">，送专享礼包</text> |
| 99 | 99 | </view> |
| 100 | + | |
| 101 | + | |
| 100 | 102 | <!-- 按钮部分 --> |
| 101 | 103 | <view class="spec-cart-btns"> |
| 102 | 104 | |
| ... | ... | @@ -134,11 +136,31 @@ |
| 134 | 136 | </view> |
| 135 | 137 | </block> |
| 136 | 138 | <block wx:else> |
| 137 | - <block wx:if="{{data.store_count<=0}}"> | |
| 139 | + <block wx:if="{{sales_rules>=2 && !sele_g.whsle_id}}"> | |
| 140 | + <view wx:if="{{!def_pick_store.CanOutQty}}" class="spec-cart-btn fs32" data-action="add" | |
| 141 | + style="background-color: #dcdcdc;color: #999">库存不足 | |
| 142 | + </view> | |
| 143 | + <block wx:else> | |
| 144 | + <view class="flex jc_sb"> | |
| 145 | + <view class="spec-cart-btn spec-buy w40" bindtap="addCart" | |
| 146 | + data-action="add" style="background-color: #ffb03f;">加入购物车 | |
| 147 | + </view> | |
| 148 | + <view class="spec-cart-btn spec-buy w40" bindtap="addCart" | |
| 149 | + data-action="buy">立即购买 | |
| 150 | + </view> | |
| 151 | + </view> | |
| 152 | + </block> | |
| 153 | + </block> | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + <block wx:elif="{{data.store_count<=0}}"> | |
| 138 | 158 | <view class="spec-cart-btn fs32" data-action="add" |
| 139 | 159 | style="background-color: #dcdcdc;color: #999">库存不足 |
| 140 | 160 | </view> |
| 141 | 161 | </block> |
| 162 | + | |
| 163 | + | |
| 142 | 164 | <block wx:else> |
| 143 | 165 | <view class="flex jc_sb"> |
| 144 | 166 | <view class="spec-cart-btn spec-buy w40" bindtap="addCart" | ... | ... |