Commit 6b82ce5c174af85eb00b82e7c09630cac3e8cef8
1 parent
a6b04cc7
更多门店
Showing
9 changed files
with
21 additions
and
40 deletions
components/diy_store_select/diy_store_select.wxml
... | ... | @@ -25,9 +25,9 @@ |
25 | 25 | <view> |
26 | 26 | <icon bindtap="close_popup" class="modal-closes" color="black" size="22" type="cancel"></icon> |
27 | 27 | </view> |
28 | - <view class="felx choose_more" bindtap="more_store"> | |
29 | - <text class="fs26 red-co" wx:if="{{is_show_sto_cat}}">{{choice_sort_store==0?'更多门店':'返回'}}</text> | |
30 | - <view class="bg_rights" wx:if="{{is_show_sto_cat}}"></view> | |
28 | + <view class="felx choose_more" bindtap="more_store" wx:if="{{is_show_sto_cat}}"> | |
29 | + <text class="fs26 red-co">{{choice_sort_store==0?'更多门店':'返回'}}</text> | |
30 | + <view class="bg_rights"></view> | |
31 | 31 | </view> |
32 | 32 | </view> |
33 | 33 | </view> | ... | ... |
packageA/pages/goodsInfo/goodsInfo.wxml
... | ... | @@ -55,10 +55,7 @@ |
55 | 55 | <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image> |
56 | 56 | <view class="fs30" style="color:black;">选择门店</view> |
57 | 57 | </view> |
58 | - <view class="red_bb fs26"> | |
59 | - 更多门店 | |
60 | - <text class="bg_jj"></text> | |
61 | - </view> | |
58 | + <view class="red_bb fs26">更多门店<text class="bg_jj"></text></view> | |
62 | 59 | </view> |
63 | 60 | |
64 | 61 | <view wx:if="{{def_pick_store && def_pick_store.pickup_name}}"> |
... | ... | @@ -229,10 +226,7 @@ |
229 | 226 | <view class="fs30" style="color:black;">选择门店</view> |
230 | 227 | </view> |
231 | 228 | |
232 | - <view class="red-co fs28" bindtap="choice_store" > | |
233 | - 更多门店 | |
234 | - <text class="right-arrow"></text> | |
235 | - </view> | |
229 | + <view class="red-co fs28" bindtap="choice_store" >更多门店<text class="right-arrow"></text></view> | |
236 | 230 | </view> |
237 | 231 | <view wx:if="{{only_pk && !only_pk.length}}">(库存不足)</view> |
238 | 232 | <block wx:else> | ... | ... |
packageA/pages/prom_list/prom_list.js
... | ... | @@ -1721,7 +1721,15 @@ Page({ |
1721 | 1721 | var gid=e.currentTarget.dataset.gid; |
1722 | 1722 | var url="/pages/goods/goodsInfo/goodsInfo?goods_id="+gid; |
1723 | 1723 | getApp().goto(url); |
1724 | - } | |
1724 | + }, | |
1725 | + | |
1726 | + // 返回按钮 | |
1727 | + returns: function () { | |
1728 | + this.setData({ | |
1729 | + sort_store: 0, | |
1730 | + choice_sort_store: 0 | |
1731 | + }); | |
1732 | + }, | |
1725 | 1733 | |
1726 | 1734 | |
1727 | 1735 | ... | ... |
packageA/pages/prom_list/prom_list.wxml
... | ... | @@ -106,10 +106,7 @@ |
106 | 106 | <view class="fs28 xc-ash-9f">选择门店</view> |
107 | 107 | </view> |
108 | 108 | |
109 | - <view class="red-co fs28" bindtap="choice_store" > | |
110 | - 更多门店 | |
111 | - <text class="right-arrow"></text> | |
112 | - </view> | |
109 | + <view class="red-co fs28" bindtap="choice_store" >更多门店<text class="right-arrow"></text></view> | |
113 | 110 | </view> |
114 | 111 | <view wx:if="{{only_pk && !only_pk.length}}">(库存不足)</view> |
115 | 112 | <block wx:else> | ... | ... |
packageC/pages/presell/goodsInfo/goodsInfo.wxml
... | ... | @@ -138,10 +138,7 @@ |
138 | 138 | <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image> |
139 | 139 | <view class="fs30" style="color:black;">选择门店</view> |
140 | 140 | </view> |
141 | - <view class="red_bb fs26"> | |
142 | - 更多门店 | |
143 | - <text class="bg_jj"></text> | |
144 | - </view> | |
141 | + <view class="red_bb fs26">更多门店<text class="bg_jj"></text></view> | |
145 | 142 | </view> |
146 | 143 | <view wx:if="{{def_pick_store && def_pick_store.pickup_name}}"> |
147 | 144 | <view class="flex-space-between address ai_end pdv10"> |
... | ... | @@ -583,10 +580,7 @@ |
583 | 580 | <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image> |
584 | 581 | <view class="fs30" style="color:black;">选择门店</view> |
585 | 582 | </view> |
586 | - <view class="red-co fs28" bindtap="choice_store"> | |
587 | - 更多门店 | |
588 | - <text class="right-arrow"></text> | |
589 | - </view> | |
583 | + <view class="red-co fs28" bindtap="choice_store">更多门店<text class="right-arrow"></text></view> | |
590 | 584 | </view> |
591 | 585 | <view wx:if="{{only_pk && !only_pk.length}}">(库存不足)</view> |
592 | 586 | <block wx:else> | ... | ... |
pages/goods/goodsInfo/buy_integral.wxml
... | ... | @@ -40,10 +40,7 @@ |
40 | 40 | <view class="fs30" style="color:black;">选择门店</view> |
41 | 41 | </view> |
42 | 42 | |
43 | - <view class="red-co fs28" bindtap="choice_store" > | |
44 | - 更多门店 | |
45 | - <text class="right-arrow"></text> | |
46 | - </view> | |
43 | + <view class="red-co fs28" bindtap="choice_store">更多门店<text class="right-arrow"></text></view> | |
47 | 44 | </view> |
48 | 45 | <view wx:if="{{only_pk && !only_pk.length}}">(库存不足)</view> |
49 | 46 | <block wx:else> | ... | ... |
pages/goods/goodsInfo/buy_integral_normal.wxml
... | ... | @@ -42,10 +42,7 @@ |
42 | 42 | <view class="fs30" style="color:black;">选择门店</view> |
43 | 43 | </view> |
44 | 44 | |
45 | - <view class="red-co fs28" bindtap="choice_store" > | |
46 | - 更多门店 | |
47 | - <text class="right-arrow"></text> | |
48 | - </view> | |
45 | + <view class="red-co fs28" bindtap="choice_store" >更多门店<text class="right-arrow"></text></view> | |
49 | 46 | </view> |
50 | 47 | <view wx:if="{{only_pk && !only_pk.length}}">(库存不足)</view> |
51 | 48 | <block wx:else> | ... | ... |
pages/goods/goodsInfo/buy_pt.wxml
... | ... | @@ -63,10 +63,7 @@ |
63 | 63 | <view class="fs28 xc-ash-9f">选择门店</view> |
64 | 64 | </view> |
65 | 65 | |
66 | - <view class="red-co fs28" bindtap="choice_store" > | |
67 | - 更多门店 | |
68 | - <text class="right-arrow"></text> | |
69 | - </view> | |
66 | + <view class="red-co fs28" bindtap="choice_store" >更多门店<text class="right-arrow"></text></view> | |
70 | 67 | </view> |
71 | 68 | <view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(配送不匹配)</view> |
72 | 69 | <view class="no_store" wx:elif="{{is_normal && def_pick_store && def_pick_store.CanOutQty<=0}}">(库存不足)</view> | ... | ... |
pages/team/team_show/team_show.wxml
... | ... | @@ -229,10 +229,7 @@ |
229 | 229 | <view class="fs28 xc-ash-9f">选择门店</view> |
230 | 230 | </view> |
231 | 231 | |
232 | - <view class="red-co fs28" bindtap="choice_store"> | |
233 | - 更多门店 | |
234 | - <text class="right-arrow"></text> | |
235 | - </view> | |
232 | + <view class="red-co fs28" bindtap="choice_store">更多门店<text class="right-arrow"></text></view> | |
236 | 233 | |
237 | 234 | |
238 | 235 | </view> | ... | ... |