wxd / MShopWeApp

Commit 2afdecc5c2f5ff60f3263f4200c42eb3add084d4

Authored by yvan.ni
1 parent 1c79e772

该店不可售

Inline Side-by-side
Showing 4 changed files with 6 additions and 6 deletions
packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml
  View file @2afdecc
... ... @@ -72,7 +72,7 @@
72 72 </view>
73 73 </view>
74 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 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 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 78 </view>
... ... @@ -175,8 +175,7 @@
175 175 <block wx:if="{{def_pick_store && def_pick_store.is_no_dis}}">
176 176 <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">配送不匹配</view>
177 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 179 <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">该店不可售</view>
181 180 </block>
182 181  
... ...
packageE/pages/cart/cart2_pt/cart2_pt.js
  View file @2afdecc
... ... @@ -102,6 +102,7 @@ Page({
102 102 },
103 103 onLoad: function (t) {
104 104 this.data.fir_in=1;
  105 + wx.setNavigationBarTitle({ title: "填写订单", })
105 106 var th = this;
106 107 getApp().getConfig2(function (e) {
107 108 th.setData({
... ...
pages/goods/goodsInfo/buy_com_pop.wxml
  View file @2afdecc
... ... @@ -57,7 +57,7 @@
57 57 <view wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(库存不足)</view>
58 58 <block wx:else>
59 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 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 63 </view>
... ... @@ -113,7 +113,7 @@
113 113 配送不匹配
114 114 </view>
115 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 117 <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">
118 118 该店不可售
119 119 </view>
... ...
pages/goods/goodsInfo/buy_pt.wxml
  View file @2afdecc
... ... @@ -72,7 +72,7 @@
72 72 <view wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(库存不足)</view>
73 73 <block wx:else>
74 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 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 77 </block>
78 78 </block>
... ...