From e20fc951411018cb7066ec059733935afeca89c5 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Tue, 9 Apr 2024 13:32:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E9=99=84=E8=BF=91?=
 =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E4=BF=AE=E6=94=B9=E4=B8=BA=E5=90=88?=
 =?UTF-8?q?=E4=BD=9C=E4=BC=81=E4=B8=9A=EF=BC=9B=E9=99=84=E8=BF=91=E5=95=86?=
 =?UTF-8?q?=E5=AE=B6=E9=A1=B5=E9=9D=A2=20=E6=A0=B9=E6=8D=AE=E5=95=86?=
 =?UTF-8?q?=E6=88=B7=E7=B1=BB=E5=9E=8B=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E9=80=89=E4=B8=AD=E5=BA=95=E9=83=A8=E5=AF=BC=E8=88=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/store/shopStreet/index.vue | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pages/store/shopStreet/index.vue b/pages/store/shopStreet/index.vue
index 29f6938..c02af04 100644
--- a/pages/store/shopStreet/index.vue
+++ b/pages/store/shopStreet/index.vue
@@ -272,12 +272,16 @@
         activeRouter: '',
 			};
 		},
-    onShow: function() {
+    onShow(options) {
       let that = this
       let routes = getCurrentPages();
-      let curRoute = routes[routes.length - 1].route
-      this.activeRouter = '/' + curRoute
-      this.getNav();
+      let curInfo = routes[routes.length - 1] || {};
+      let curRoute = curInfo.route;
+      let merchantType = curInfo.options.merchant_type || 0;
+
+      if(merchantType <= 0) that.activeRouter = '/' + curRoute
+      else that.activeRouter = '/' + curRoute + '?merchant_type=' + merchantType
+      that.getNav();
     },
 		onLoad(options) {
 			this.sotreParam.type_id = options.type_id && options.type_id.split(',').toString() || ''
@@ -286,7 +290,7 @@
       let merchantType = options.merchant_type || 0;
       this.sotreParam.merchant_type = merchantType
       uni.setNavigationBarTitle({
-        title: merchantType == 0 ? '附近商家' : (merchantType == 1 ? '附近酒道馆' : '附近供应商')
+        title: merchantType == 0 ? '附近商家' : (merchantType == 1 ? '附近酒道馆' : '合作企业')
       })
 			this.storeList = [];
 			if(this.mer_location)this.selfLocation()