Commit 2ae97899ac7b34e101c120c285c1d929f6e30803
1 parent
31665ced
库存不足的显示优化
Showing
4 changed files
with
38 additions
and
21 deletions
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
| @@ -436,8 +436,7 @@ | @@ -436,8 +436,7 @@ | ||
| 436 | <view class="no_store" wx:if="{{def_pick_store && def_pick_store.is_no_dis}}"> | 436 | <view class="no_store" wx:if="{{def_pick_store && def_pick_store.is_no_dis}}"> |
| 437 | (配送不匹配) | 437 | (配送不匹配) |
| 438 | </view> | 438 | </view> |
| 439 | - <view class="no_store" wx:elif="{{def_pick_store && !def_pick_store.CanOutQty | ||
| 440 | - && !filters.is_virtual_gd(sele_g.is_virtual) && sales_rules>=2 && prom_type==0}}"> | 439 | + <view class="no_store" wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && !filters.is_virtual_gd(sele_g.is_virtual) && sales_rules>=2 && prom_type==0}}"> |
| 441 | (库存不足) | 440 | (库存不足) |
| 442 | </view> | 441 | </view> |
| 443 | </block> | 442 | </block> |
pages/goods/goodsInfo/buy_com_pop.wxml
| @@ -33,8 +33,8 @@ | @@ -33,8 +33,8 @@ | ||
| 33 | <!-- 选择门店模块 --> | 33 | <!-- 选择门店模块 --> |
| 34 | <view class="flex-space-between address ai_end xc-width "> | 34 | <view class="flex-space-between address ai_end xc-width "> |
| 35 | 35 | ||
| 36 | - <view class="flex ai_end" wx:if="{{def_pick_store && def_pick_store.pickup_name}}"> | ||
| 37 | - <text class="fs30 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text> | 36 | + <view class="flex" wx:if="{{def_pick_store && def_pick_store.pickup_name}}"> |
| 37 | + <text class="fs30 xc-black3 shop_name {{def_pick_store.distance!=null?'max':''}} ">{{def_pick_store.pickup_name}}</text> | ||
| 38 | <view class="distance fs24 xc-ash" wx:if="{{def_pick_store.distance!=null}}"> | 38 | <view class="distance fs24 xc-ash" wx:if="{{def_pick_store.distance!=null}}"> |
| 39 | 距离:{{def_pick_store.distance > 1000 ? filters.toFix(def_pick_store.distance / 1000, 2) + "km" : filters.toFix(def_pick_store.distance, 0) + "m"}} | 39 | 距离:{{def_pick_store.distance > 1000 ? filters.toFix(def_pick_store.distance / 1000, 2) + "km" : filters.toFix(def_pick_store.distance, 0) + "m"}} |
| 40 | 40 |
pages/goods/goodsInfo/buy_integral.wxml
| @@ -26,8 +26,8 @@ | @@ -26,8 +26,8 @@ | ||
| 26 | <!-- 选择门店模块 --> | 26 | <!-- 选择门店模块 --> |
| 27 | <view class="flex-space-between address ai_end xc-width "> | 27 | <view class="flex-space-between address ai_end xc-width "> |
| 28 | 28 | ||
| 29 | - <view class="flex ai_end" wx:if="{{def_pick_store && def_pick_store.pickup_name}}"> | ||
| 30 | - <text class="fs30 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text> | 29 | + <view class="flex" wx:if="{{def_pick_store && def_pick_store.pickup_name}}"> |
| 30 | + <text class="fs30 xc-black3 shop_name bold {{def_pick_store.distance!=null?'max':''}} ">{{def_pick_store.pickup_name}}</text> | ||
| 31 | <view class="distance fs24 xc-ash" wx:if="{{def_pick_store.distance!=null}}"> | 31 | <view class="distance fs24 xc-ash" wx:if="{{def_pick_store.distance!=null}}"> |
| 32 | 距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}} | 32 | 距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}} |
| 33 | 33 |
pages/goods/goodsInfo/buy_pt.wxml
| @@ -25,8 +25,10 @@ | @@ -25,8 +25,10 @@ | ||
| 25 | <view class="flex"> | 25 | <view class="flex"> |
| 26 | <view class="spec-goods-stock">已售：{{sele_g.sales_sum}}</view> | 26 | <view class="spec-goods-stock">已售：{{sele_g.sales_sum}}</view> |
| 27 | <block wx:if="{{sales_rules>=2}}"> | 27 | <block wx:if="{{sales_rules>=2}}"> |
| 28 | - <view class="spec-goods-stock" wx:if="{{def_pick_store && def_pick_store.CanOutQty}}">可售：{{def_pick_store.CanOutQty}}</view> | ||
| 29 | - <view class="spec-goods-stock" wx:else>可售:0</view> | 28 | + <block wx:if="{{!filters.is_virtual_gd(sele_g.is_virtual)}}"> |
| 29 | + <view class="spec-goods-stock" wx:if="{{def_pick_store && def_pick_store.CanOutQty}}">可售：{{def_pick_store.CanOutQty}}</view> | ||
| 30 | + <view class="spec-goods-stock" wx:else>可售:0</view> | ||
| 31 | + </block> | ||
| 30 | </block> | 32 | </block> |
| 31 | <block wx:else><view class="spec-goods-stock">可售：{{sele_g.store_count}}</view></block> | 33 | <block wx:else><view class="spec-goods-stock">可售：{{sele_g.store_count}}</view></block> |
| 32 | </view> | 34 | </view> |
| @@ -47,11 +49,11 @@ | @@ -47,11 +49,11 @@ | ||
| 47 | <view style="margin-top: 20rpx"> | 49 | <view style="margin-top: 20rpx"> |
| 48 | <view class="flex-space-between address ai_end xc-width "> | 50 | <view class="flex-space-between address ai_end xc-width "> |
| 49 | 51 | ||
| 50 | - <view class="flex ai_end" wx:if="{{def_pick_store && def_pick_store.pickup_name}}"> | ||
| 51 | - <text class="fs30 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text> | 52 | + <view class="flex" wx:if="{{def_pick_store && def_pick_store.pickup_name}}"> |
| 53 | + <text class="fs30 xc-black3 shop_name {{def_pick_store.distance!=null?'max':''}} ">{{def_pick_store.pickup_name}}</text> | ||
| 52 | 54 | ||
| 53 | 55 | ||
| 54 | - <view class="distance fs24 xc-ash"wx:if="{{def_pick_store.distance!=null}}"> | 56 | + <view class="distance fs24 xc-ash" wx:if="{{def_pick_store.distance!=null}}"> |
| 55 | 距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}} | 57 | 距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}} |
| 56 | 58 | ||
| 57 | </view> | 59 | </view> |
| @@ -176,16 +178,32 @@ | @@ -176,16 +178,32 @@ | ||
| 176 | <block wx:else> | 178 | <block wx:else> |
| 177 | <block wx:if="{{!def_pick_store}}"> | 179 | <block wx:if="{{!def_pick_store}}"> |
| 178 | <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">请先选择门店</view> | 180 | <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">请先选择门店</view> |
| 179 | - </block> | ||
| 180 | - <block wx:else> | ||
| 181 | - <block wx:if="{{data.store_count<=0}}"> | ||
| 182 | - <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view> | ||
| 183 | - </block> | ||
| 184 | - <block wx:else> | ||
| 185 | - <view bindtap="addCart_pt" class="spec-cart-btn spec-buy" data-action="buy">立即购买</view> | ||
| 186 | - </block> | ||
| 187 | - | ||
| 188 | - </block> | 181 | + </block> |
| 182 | + | ||
| 183 | + <block wx:else> | ||
| 184 | + <!-- 如果是线下库存购买的时候,且是普通商品购买的时候 --> | ||
| 185 | + <block wx:if="{{sales_rules>=2 && !sele_g.whsle_id && !filters.is_virtual_gd(sele_g.is_virtual) }}"> | ||
| 186 | + <block wx:if="{{!def_pick_store.CanOutQty}}"> | ||
| 187 | + <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999"> | ||
| 188 | + 库存不足 | ||
| 189 | + </view> | ||
| 190 | + </block> | ||
| 191 | + <block wx:else> | ||
| 192 | + <view bindtap="addCart_pt" class="spec-cart-btn spec-buy" data-action="buy">立即购买</view> | ||
| 193 | + </block> | ||
| 194 | + </block> | ||
| 195 | + <!-- 线上销售 --> | ||
| 196 | + <block wx:else> | ||
| 197 | + <block wx:if="{{sele_g.store_count<=0 && is_no_new}}"> | ||
| 198 | + <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999"> | ||
| 199 | + 库存不足 | ||
| 200 | + </view> | ||
| 201 | + </block> | ||
| 202 | + <block wx:else> | ||
| 203 | + <view bindtap="addCart_pt" class="spec-cart-btn spec-buy" data-action="buy">立即购买</view> | ||
| 204 | + </block> | ||
| 205 | + </block> | ||
| 206 | + </block> | ||
| 189 | </block> | 207 | </block> |
| 190 | </block> | 208 | </block> |
| 191 | </block> | 209 | </block> |