From 6b82ce5c174af85eb00b82e7c09630cac3e8cef8 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Tue, 9 Nov 2021 11:48:25 +0800
Subject: [PATCH] 更多门店

---
 components/diy_store_select/diy_store_select.wxml |  6 +++---
 packageA/pages/goodsInfo/goodsInfo.wxml           | 10 ++--------
 packageA/pages/prom_list/prom_list.js             | 10 +++++++++-
 packageA/pages/prom_list/prom_list.wxml           |  5 +----
 packageC/pages/presell/goodsInfo/goodsInfo.wxml   | 10 ++--------
 pages/goods/goodsInfo/buy_integral.wxml           |  5 +----
 pages/goods/goodsInfo/buy_integral_normal.wxml    |  5 +----
 pages/goods/goodsInfo/buy_pt.wxml                 |  5 +----
 pages/team/team_show/team_show.wxml               |  5 +----
 9 files changed, 21 insertions(+), 40 deletions(-)

diff --git a/components/diy_store_select/diy_store_select.wxml b/components/diy_store_select/diy_store_select.wxml
index b56406c..2bcffc1 100644
--- a/components/diy_store_select/diy_store_select.wxml
+++ b/components/diy_store_select/diy_store_select.wxml
@@ -25,9 +25,9 @@
            <view>
               <icon bindtap="close_popup" class="modal-closes" color="black" size="22"       type="cancel"></icon>
            </view>
-           <view class="felx choose_more" bindtap="more_store">
-              <text class="fs26 red-co" wx:if="{{is_show_sto_cat}}">{{choice_sort_store==0?'更多门店':'返回'}}</text>
-              <view class="bg_rights" wx:if="{{is_show_sto_cat}}"></view>
+           <view class="felx choose_more" bindtap="more_store"  wx:if="{{is_show_sto_cat}}">
+              <text class="fs26 red-co">{{choice_sort_store==0?'更多门店':'返回'}}</text>
+              <view class="bg_rights"></view>
            </view>
           </view>
        </view>
diff --git a/packageA/pages/goodsInfo/goodsInfo.wxml b/packageA/pages/goodsInfo/goodsInfo.wxml
index 9b55593..70b30e5 100644
--- a/packageA/pages/goodsInfo/goodsInfo.wxml
+++ b/packageA/pages/goodsInfo/goodsInfo.wxml
@@ -55,10 +55,7 @@
                       <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>
                       <view class="fs30" style="color:black;">选择门店</view>
                     </view>
-                    <view class="red_bb fs26">
-                         更多门店
-                         <text class="bg_jj"></text>
-                    </view>
+                    <view class="red_bb fs26">更多门店<text class="bg_jj"></text></view>
                   </view>
 
                   <view wx:if="{{def_pick_store && def_pick_store.pickup_name}}">
@@ -229,10 +226,7 @@
 	                      <view class="fs30" style="color:black;">选择门店</view>						  
 	                 </view>
 	   
-	                 <view class="red-co fs28" bindtap="choice_store" >
-	                    更多门店
-	                    <text class="right-arrow"></text>
-	                 </view>
+	                 <view class="red-co fs28" bindtap="choice_store" >更多门店<text class="right-arrow"></text></view>
 	              </view>
 	   		   <view wx:if="{{only_pk && !only_pk.length}}">(库存不足)</view>
 	   		   <block wx:else>
diff --git a/packageA/pages/prom_list/prom_list.js b/packageA/pages/prom_list/prom_list.js
index e3638ab..59a9bf2 100644
--- a/packageA/pages/prom_list/prom_list.js
+++ b/packageA/pages/prom_list/prom_list.js
@@ -1721,7 +1721,15 @@ Page({
 		var gid=e.currentTarget.dataset.gid;
 		var url="/pages/goods/goodsInfo/goodsInfo?goods_id="+gid;
 		getApp().goto(url);
-	}
+	},
+
+    // 返回按钮
+    returns: function () {
+        this.setData({
+            sort_store: 0,
+            choice_sort_store: 0
+        });
+    },
 	
 
 
diff --git a/packageA/pages/prom_list/prom_list.wxml b/packageA/pages/prom_list/prom_list.wxml
index 6687e41..7beb3c3 100644
--- a/packageA/pages/prom_list/prom_list.wxml
+++ b/packageA/pages/prom_list/prom_list.wxml
@@ -106,10 +106,7 @@
                         <view class="fs28 xc-ash-9f">选择门店</view>
                     </view>
 
-                    <view class="red-co fs28" bindtap="choice_store" >
-                        更多门店
-                        <text class="right-arrow"></text>
-                    </view>
+                    <view class="red-co fs28" bindtap="choice_store" >更多门店<text class="right-arrow"></text></view>
                 </view>
                 <view wx:if="{{only_pk && !only_pk.length}}">(库存不足)</view>
                 <block wx:else>
diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.wxml b/packageC/pages/presell/goodsInfo/goodsInfo.wxml
index 7b80a41..b5d9f66 100644
--- a/packageC/pages/presell/goodsInfo/goodsInfo.wxml
+++ b/packageC/pages/presell/goodsInfo/goodsInfo.wxml
@@ -138,10 +138,7 @@
               <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>
               <view class="fs30" style="color:black;">选择门店</view>
             </view>
-            <view class="red_bb fs26">
-              更多门店
-              <text class="bg_jj"></text>
-            </view>
+            <view class="red_bb fs26">更多门店<text class="bg_jj"></text></view>
           </view>
           <view wx:if="{{def_pick_store && def_pick_store.pickup_name}}">
             <view class="flex-space-between address ai_end pdv10">
@@ -583,10 +580,7 @@
             <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>
             <view class="fs30" style="color:black;">选择门店</view>
           </view>
-          <view class="red-co fs28" bindtap="choice_store">
-            更多门店
-            <text class="right-arrow"></text>
-          </view>
+          <view class="red-co fs28" bindtap="choice_store">更多门店<text class="right-arrow"></text></view>
         </view>
         <view wx:if="{{only_pk && !only_pk.length}}">(库存不足)</view>
         <block wx:else>
diff --git a/pages/goods/goodsInfo/buy_integral.wxml b/pages/goods/goodsInfo/buy_integral.wxml
index 5d268cb..68b7a9b 100644
--- a/pages/goods/goodsInfo/buy_integral.wxml
+++ b/pages/goods/goodsInfo/buy_integral.wxml
@@ -40,10 +40,7 @@
 		                                 <view class="fs30" style="color:black;">选择门店</view>						  
 		                            </view>
 		      
-		                            <view class="red-co fs28" bindtap="choice_store" >
-		                               更多门店
-		                               <text class="right-arrow"></text>
-		                            </view>
+		                            <view class="red-co fs28" bindtap="choice_store">更多门店<text class="right-arrow"></text></view>
 		                         </view>
 		      				   <view wx:if="{{only_pk && !only_pk.length}}">(库存不足)</view>
 		      				   <block wx:else>
diff --git a/pages/goods/goodsInfo/buy_integral_normal.wxml b/pages/goods/goodsInfo/buy_integral_normal.wxml
index b57806c..e729d41 100644
--- a/pages/goods/goodsInfo/buy_integral_normal.wxml
+++ b/pages/goods/goodsInfo/buy_integral_normal.wxml
@@ -42,10 +42,7 @@
 		                                 <view class="fs30" style="color:black;">选择门店</view>						  
 		                            </view>
 		      
-		                            <view class="red-co fs28" bindtap="choice_store" >
-		                               更多门店
-		                               <text class="right-arrow"></text>
-		                            </view>
+		                            <view class="red-co fs28" bindtap="choice_store" >更多门店<text class="right-arrow"></text></view>
 		                         </view>
 		      				   <view wx:if="{{only_pk && !only_pk.length}}">(库存不足)</view>
 		      				   <block wx:else>
diff --git a/pages/goods/goodsInfo/buy_pt.wxml b/pages/goods/goodsInfo/buy_pt.wxml
index 62168aa..662f1f3 100644
--- a/pages/goods/goodsInfo/buy_pt.wxml
+++ b/pages/goods/goodsInfo/buy_pt.wxml
@@ -63,10 +63,7 @@
             <view class="fs28 xc-ash-9f">选择门店</view>
           </view>
 
-          <view class="red-co fs28" bindtap="choice_store" >
-            更多门店
-            <text class="right-arrow"></text>
-          </view>
+          <view class="red-co fs28" bindtap="choice_store" >更多门店<text class="right-arrow"></text></view>
         </view>
 		<view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(配送不匹配)</view>
 		<view class="no_store" wx:elif="{{is_normal && def_pick_store && def_pick_store.CanOutQty<=0}}">(库存不足)</view>
diff --git a/pages/team/team_show/team_show.wxml b/pages/team/team_show/team_show.wxml
index 05e6b00..bbe5d82 100644
--- a/pages/team/team_show/team_show.wxml
+++ b/pages/team/team_show/team_show.wxml
@@ -229,10 +229,7 @@
 								<view class="fs28 xc-ash-9f">选择门店</view>
 					    </view>
 						
-						<view class="red-co fs28" bindtap="choice_store">
-							更多门店
-							<text class="right-arrow"></text>
-						</view>		
+						<view class="red-co fs28" bindtap="choice_store">更多门店<text class="right-arrow"></text></view>
 
 						
 					</view>
--
libgit2 0.21.4