wxd / MShopWeApp

Commit e0952543637dfac2f6750e4e52a56c830d724328

Authored by 后端研发-苏明海
2 parents 946f6c1d 50bff30c

Merge branch 'dev' into 'test' 

积分购

See merge request !1051
Inline Side-by-side
Showing 1 changed file with 23 additions and 3 deletions
pages/goods/goodsInfo/buy_integral_normal.wxml
  View file @e095254
... ... @@ -101,7 +101,7 @@
101 101 <block wx:else>
102 102 <!-- 根本就找不到门店 -->
103 103 <block wx:if="{{!only_pk && !def_pickpu_list}}">
104   - <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">库存不足</view>
  104 + <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">库存不足</view>
105 105 </block>
106 106 <block wx:else>
107 107  
... ... @@ -117,9 +117,11 @@
117 117 <block wx:if="{{!def_pick_store}}">
118 118 <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">请先选择门店</view>
119 119 </block>
120   - <block wx:else>
  120 + <block wx:else>
  121 + <!-- 线下库存 -->
  122 + <block wx:if="{{sales_rules==2 && prom_type==0 && !sele_g.whsle_id}}">
121 123 <block wx:if="{{def_pick_store && !def_pick_store.CanOutQty}}">
122   - <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view>
  124 + <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view>
123 125 </block>
124 126 <block wx:else>
125 127 <view class="flex jc_sb">
... ... @@ -129,6 +131,24 @@
129 131 data-action="buy">立即购买</view>
130 132 </view>
131 133 </block>
  134 + </block>
  135 + <!-- 线上库存 -->
  136 + <block wx:else>
  137 + <block wx:if="{{sele_g.store_count<=0}}">
  138 + <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">
  139 + 库存不足5
  140 + </view>
  141 + </block>
  142 + <block wx:else>
  143 + <view class="flex jc_sb">
  144 + <view class="spec-cart-btn spec-buy w40" bindtap="addCart"
  145 + data-action="add" style="background-color: #ffb03f;">加入购物车</view>
  146 + <view class="spec-cart-btn spec-buy w40" bindtap="addCart"
  147 + data-action="buy">立即购买</view>
  148 + </view>
  149 + </block>
  150 +
  151 + </block>
132 152  
133 153 </block>
134 154 </block>
... ...