Commit 2afdecc5c2f5ff60f3263f4200c42eb3add084d4
1 parent
1c79e772
该店不可售
Showing
4 changed files
with
6 additions
and
6 deletions
packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml
| @@ -72,7 +72,7 @@ | @@ -72,7 +72,7 @@ | ||
| 72 | </view> | 72 | </view> |
| 73 | </view> | 73 | </view> |
| 74 | <view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(配送不匹配)</view> | 74 | <view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(配送不匹配)</view> |
| 75 | - <view class="no_store" wx:elif="{{def_pick_store.is_no_dis_nor && is_normal}}">(门店不可售)</view> | 75 | + <view class="no_store" wx:elif="{{def_pick_store.is_no_dis_nor && is_normal}}">(该店不可售)</view> |
| 76 | <view class="no_store" wx:elif="{{is_normal && def_pick_store && def_pick_store.CanOutQty<=0 && !filters.is_virtual_gd(sele_g.is_virtual) }}">(库存不足)</view> | 76 | <view class="no_store" wx:elif="{{is_normal && def_pick_store && def_pick_store.CanOutQty<=0 && !filters.is_virtual_gd(sele_g.is_virtual) }}">(库存不足)</view> |
| 77 | <view class="fs24 xc-ash-9f xc-distance-top " wx:if="{{def_pick_store && def_pick_store.pickup_name}}">地址:{{def_pick_store.fulladdress}}</view> | 77 | <view class="fs24 xc-ash-9f xc-distance-top " wx:if="{{def_pick_store && def_pick_store.pickup_name}}">地址:{{def_pick_store.fulladdress}}</view> |
| 78 | </view> | 78 | </view> |
| @@ -175,8 +175,7 @@ | @@ -175,8 +175,7 @@ | ||
| 175 | <block wx:if="{{def_pick_store && def_pick_store.is_no_dis}}"> | 175 | <block wx:if="{{def_pick_store && def_pick_store.is_no_dis}}"> |
| 176 | <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">配送不匹配</view> | 176 | <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">配送不匹配</view> |
| 177 | </block> | 177 | </block> |
| 178 | - | ||
| 179 | - <block wx:elif="{{def_pick_store && def_pick_store.is_no_dis_nor && is_normal}}"> | 178 | + <block wx:elif="{{def_pick_store && def_pick_store.is_no_dis_nor}}"> |
| 180 | <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">该店不可售</view> | 179 | <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">该店不可售</view> |
| 181 | </block> | 180 | </block> |
| 182 | 181 |
packageE/pages/cart/cart2_pt/cart2_pt.js
| @@ -102,6 +102,7 @@ Page({ | @@ -102,6 +102,7 @@ Page({ | ||
| 102 | }, | 102 | }, |
| 103 | onLoad: function (t) { | 103 | onLoad: function (t) { |
| 104 | this.data.fir_in=1; | 104 | this.data.fir_in=1; |
| 105 | + wx.setNavigationBarTitle({ title: "填写订单", }) | ||
| 105 | var th = this; | 106 | var th = this; |
| 106 | getApp().getConfig2(function (e) { | 107 | getApp().getConfig2(function (e) { |
| 107 | th.setData({ | 108 | th.setData({ |
pages/goods/goodsInfo/buy_com_pop.wxml
| @@ -57,7 +57,7 @@ | @@ -57,7 +57,7 @@ | ||
| 57 | <view wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(库存不足)</view> | 57 | <view wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(库存不足)</view> |
| 58 | <block wx:else> | 58 | <block wx:else> |
| 59 | <view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(配送不匹配)</view> | 59 | <view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(配送不匹配)</view> |
| 60 | - <view class="no_store" wx:elif="{{def_pick_store.is_no_dis_nor}}">(该店不可售)</view> | 60 | + <view class="no_store" wx:elif="{{def_pick_store.is_no_dis_nor && is_normal}}">(该店不可售)</view> |
| 61 | <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && !filters.is_virtual_gd(sele_g.is_virtual) && sales_rules>=2}}"> | 61 | <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && !filters.is_virtual_gd(sele_g.is_virtual) && sales_rules>=2}}"> |
| 62 | (库存不足) | 62 | (库存不足) |
| 63 | </view> | 63 | </view> |
| @@ -113,7 +113,7 @@ | @@ -113,7 +113,7 @@ | ||
| 113 | 配送不匹配 | 113 | 配送不匹配 |
| 114 | </view> | 114 | </view> |
| 115 | </block> | 115 | </block> |
| 116 | - <block wx:elif="{{def_pick_store && def_pick_store.is_no_dis_nor}}"> | 116 | + <block wx:elif="{{def_pick_store && def_pick_store.is_no_dis_nor && is_normal}}"> |
| 117 | <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;"> | 117 | <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;"> |
| 118 | 该店不可售 | 118 | 该店不可售 |
| 119 | </view> | 119 | </view> |
pages/goods/goodsInfo/buy_pt.wxml
| @@ -72,7 +72,7 @@ | @@ -72,7 +72,7 @@ | ||
| 72 | <view wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(库存不足)</view> | 72 | <view wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(库存不足)</view> |
| 73 | <block wx:else> | 73 | <block wx:else> |
| 74 | <view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(配送不匹配)</view> | 74 | <view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(配送不匹配)</view> |
| 75 | - <view class="no_store" wx:elif="{{def_pick_store.is_no_dis_nor}}">(该店不可售)</view> | 75 | + <view class="no_store" wx:elif="{{def_pick_store.is_no_dis_nor && is_normal}}">(该店不可售)</view> |
| 76 | <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && !filters.is_virtual_gd(sele_g.is_virtual) && sales_rules>=2 && is_normal}}">(库存不足)</view> | 76 | <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && !filters.is_virtual_gd(sele_g.is_virtual) && sales_rules>=2 && is_normal}}">(库存不足)</view> |
| 77 | </block> | 77 | </block> |
| 78 | </block> | 78 | </block> |