Merged
Merge Request #1051 · created by 后端研发-苏明海


积分购


From dev into test

Merged by 后端研发-苏明海

1 participants

pages/goods/goodsInfo/buy_integral_normal.wxml
@@ -101,7 +101,7 @@ @@ -101,7 +101,7 @@
101 <block wx:else> 101 <block wx:else>
102 <!-- 根本就找不到门店 --> 102 <!-- 根本就找不到门店 -->
103 <block wx:if="{{!only_pk && !def_pickpu_list}}"> 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 </block> 105 </block>
106 <block wx:else> 106 <block wx:else>
107 107
@@ -117,9 +117,11 @@ @@ -117,9 +117,11 @@
117 <block wx:if="{{!def_pick_store}}"> 117 <block wx:if="{{!def_pick_store}}">
118 <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">请先选择门店</view> 118 <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">请先选择门店</view>
119 </block> 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 <block wx:if="{{def_pick_store && !def_pick_store.CanOutQty}}"> 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 </block> 125 </block>
124 <block wx:else> 126 <block wx:else>
125 <view class="flex jc_sb"> 127 <view class="flex jc_sb">
@@ -129,6 +131,24 @@ @@ -129,6 +131,24 @@
129 data-action="buy">立即购买</view> 131 data-action="buy">立即购买</view>
130 </view> 132 </view>
131 </block> 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 </block> 153 </block>
134 </block> 154 </block>