From 5486de22c04f660b4fea68dc67b5898f2cd770ff Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 02 十二月 2022 14:17:26 +0800
Subject: [PATCH] #

---
 Monitor-APP/pages.json |   22 ++++++++++++----------
 1 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/Monitor-APP/pages.json b/Monitor-APP/pages.json
index e59ea61..15bdaf2 100644
--- a/Monitor-APP/pages.json
+++ b/Monitor-APP/pages.json
@@ -1,17 +1,23 @@
 {
 	"pages": [ //pages鏁扮粍涓涓�椤硅〃绀哄簲鐢ㄥ惎鍔ㄩ〉锛屽弬鑰冿細https://uniapp.dcloud.io/collocation/pages
 		{
+			"path": "pages/home/home",
+			"style": {
+				"navigationStyle":"home",
+				// 鍘绘帀椤堕儴瀵艰埅鏍�
+				"app-plus": {
+					"titleNView": false
+				}
+			}
+		},
+		{
 			"path": "pages/index/index",
 			"style": {
-<<<<<<< HEAD
-				"navigationStyle":"custom"
-=======
 				"navigationStyle":"custom",
 				// 鍘绘帀椤堕儴瀵艰埅鏍�
 				"app-plus": {
 					"titleNView": false
 				}
->>>>>>> 2af3829f6276675ebe120cda94d628c49c429536
 			}
 		},
 		{
@@ -21,13 +27,9 @@
 			}
 		},
 		{
-			"path": "pages/home/home",
+			"path": "pages/home/test",
 			"style": {
-				"navigationStyle":"home",
-				// 鍘绘帀椤堕儴瀵艰埅鏍�
-				"app-plus": {
-					"titleNView": false
-				}
+				"navigationStyle":"custom"
 			}
 		}
 		

--
Gitblit v1.9.1