Commit ae200e6d42437f4092d4065700284c673d243ebb
1 parent
6076844a
拼团的卡项的普通购买优化
Showing
3 changed files
with
17 additions
and
9 deletions
packageA/pages/serviceCard_pd/goodsInfo/buy_pt.wxml
| ... | ... | @@ -55,7 +55,7 @@ |
| 55 | 55 | <view hidden="{{has_def && sys_switch.is_pricing_open_store}}" class="red-co fs28" bindtap="choice_store" >更多门店<text class="right-arrow"></text></view> |
| 56 | 56 | </view> |
| 57 | 57 | <view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(该店不可售)</view> |
| 58 | - <view class="no_store" wx:elif="{{def_pick_store.is_no_dis_act}}">(该店不可售)</view> | |
| 58 | + <view class="no_store" wx:elif="{{def_pick_store.is_no_dis_act && !is_normal}}">(该店不可售)</view> | |
| 59 | 59 | <view class="no_store" wx:elif="{{is_normal && def_pick_store && def_pick_store.CanOutQty<=0}}">(库存不足)</view> |
| 60 | 60 | <view class="fs24 xc-ash-9f xc-distance-top" wx:if="{{def_pick_store && def_pick_store.pickup_name}}">地址:{{def_pick_store.fulladdress}}</view> |
| 61 | 61 | </view> |
| ... | ... | @@ -147,7 +147,7 @@ |
| 147 | 147 | <view class="spec-cart-btns"> |
| 148 | 148 | <!-- 根本就找不到门店 --> |
| 149 | 149 | <block wx:if="{{def_pick_store && def_pick_store.is_no_dis}}"> |
| 150 | - <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">配送不匹配</view> | |
| 150 | + <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">该店不可售</view> | |
| 151 | 151 | </block> |
| 152 | 152 | <block wx:else> |
| 153 | 153 | |
| ... | ... | @@ -183,7 +183,6 @@ |
| 183 | 183 | </block> |
| 184 | 184 | </block> |
| 185 | 185 | </view> |
| 186 | - | |
| 187 | 186 | </block> |
| 188 | 187 | <block wx:else> |
| 189 | 188 | <!-- 根本就找不到门店 --> | ... | ... |
packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js
| ... | ... | @@ -992,9 +992,6 @@ Page({ |
| 992 | 992 | |
| 993 | 993 | } |
| 994 | 994 | |
| 995 | - | |
| 996 | - | |
| 997 | - | |
| 998 | 995 | }, |
| 999 | 996 | |
| 1000 | 997 | |
| ... | ... | @@ -1003,6 +1000,7 @@ Page({ |
| 1003 | 1000 | openSpecModal: !1, |
| 1004 | 1001 | openSpecModal_pt: !1, |
| 1005 | 1002 | openSpecModal_flash_normal: !1, |
| 1003 | + is_normal:0 | |
| 1006 | 1004 | }); |
| 1007 | 1005 | }, |
| 1008 | 1006 | |
| ... | ... | @@ -1218,6 +1216,17 @@ Page({ |
| 1218 | 1216 | get_sto(e) { |
| 1219 | 1217 | var is_normal=e; |
| 1220 | 1218 | var th = this, that = this; |
| 1219 | + | |
| 1220 | + if (e == 1) { | |
| 1221 | + th.setData({ | |
| 1222 | + is_normal: 1 | |
| 1223 | + }) | |
| 1224 | + } else { | |
| 1225 | + th.setData({ | |
| 1226 | + is_normal: 0 | |
| 1227 | + }) | |
| 1228 | + } | |
| 1229 | + | |
| 1221 | 1230 | var timer_get = setInterval(function () { |
| 1222 | 1231 | if (th.data.is_get_local_ok == 0) return false; |
| 1223 | 1232 | if (!th.data.fir_def_store) return false; | ... | ... |
packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml
| ... | ... | @@ -673,7 +673,7 @@ |
| 673 | 673 | <block wx:if="{{tool.is_no_dis(sele_g.storageId,item.keyid)}}"> |
| 674 | 674 | <text class="no_store">(该店不可售)</text> |
| 675 | 675 | </block> |
| 676 | - <text wx:elif="{{item.is_no_dis_act}}" class="no_store">(该店不可售)</text> | |
| 676 | + <text wx:elif="{{item.is_no_dis_act && !is_normal}}" class="no_store">(该店不可售)</text> | |
| 677 | 677 | </view> |
| 678 | 678 | </view> |
| 679 | 679 | <view> |
| ... | ... | @@ -704,7 +704,7 @@ |
| 704 | 704 | <block wx:if="{{tool.is_no_dis(sele_g.storageId,item.keyid)}}"> |
| 705 | 705 | <text class="no_store">(该店不可售)</text> |
| 706 | 706 | </block> |
| 707 | - <text wx:elif="{{item.is_no_dis_act}}" class="no_store">(该店不可售)</text> | |
| 707 | + <text wx:elif="{{item.is_no_dis_act && !is_normal}}" class="no_store">(该店不可售)</text> | |
| 708 | 708 | </view> |
| 709 | 709 | </view> |
| 710 | 710 | <view> |
| ... | ... | @@ -737,7 +737,7 @@ |
| 737 | 737 | <block wx:if="{{tool.is_no_dis(sele_g.storageId,item.keyid)}}"> |
| 738 | 738 | <text class="no_store">(该店不可售)</text> |
| 739 | 739 | </block> |
| 740 | - <text wx:elif="{{item.is_no_dis_act}}" class="no_store">(该店不可售)</text> | |
| 740 | + <text wx:elif="{{item.is_no_dis_act && !is_normal}}" class="no_store">(该店不可售)</text> | |
| 741 | 741 | </view> |
| 742 | 742 | </view> |
| 743 | 743 | <view> | ... | ... |