From ec73f99005a8793d3ff40b2bc9b3da3f26b7aade Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Fri, 28 Mar 2025 15:24:57 +0800
Subject: [PATCH] 1

---
 src/App.vue    | 4 ++++
 src/pages.json | 7 ++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index d920756..f36f9e9 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -65,7 +65,11 @@ export default {
 	methods: {
 		_initTabbar() {
 			console.log("环境判断")
+			const url = uni.getLaunchOptionsSync().path
 			console.log(uni.getLaunchOptionsSync())
+			if (url == "pages/tabbar/coopMerchant") {
+				console.log("xxx")
+			}
 
 			let appEnv = 1 // 1:浙政钉 2:诗画
 
diff --git a/src/pages.json b/src/pages.json
index afb6bee..6e78d20 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -314,13 +314,13 @@
 				"selectedIconPath": ""
 			},
 			{
-				"pagePath": "pages/tabbar/shop",
+				"pagePath": "pages/tabbar/selfMerchant",
 				"text": "",
 				"iconPath": "",
 				"selectedIconPath": ""
 			},
 			{
-				"pagePath": "pages/tabbar/coopShop",
+				"pagePath": "pages/tabbar/coopMerchant",
 				"text": "",
 				"iconPath": "",
 				"selectedIconPath": ""
@@ -373,21 +373,18 @@
 			// 	"iconPath": "static/tabbar/order.png",
 			// 	"selectedIconPath": "static/tabbar/order-select.png"
 			// },
-
 			// {
 			// 	"pagePath": "pages/tabbar/flowStatistics",
 			// 	"text": "流水统计",
 			// 	"iconPath": "static/tabbar/order.png",
 			// 	"selectedIconPath": "static/tabbar/order-select.png"
 			// },
-
 			// {
 			// 	"pagePath": "pages/tabbar/individualOrder",
 			// 	"text": "订单",
 			// 	"iconPath": "static/tabbar/order.png",
 			// 	"selectedIconPath": "static/tabbar/order-select.png"
 			// },
-
 			// {
 			// 	"pagePath": "pages/tabbar/my",
 			// 	"text": "我的",