From 5fdd6b91c82e0de0e3ea570103b40396f33f5093 Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Wed, 22 Mar 2023 17:37:57 +0800
Subject: [PATCH] pages

---
 pages.json | 36 +++++++++++++-----------------------
 1 file changed, 13 insertions(+), 23 deletions(-)

diff --git a/pages.json b/pages.json
index 5d08b11..9726c1d 100644
--- a/pages.json
+++ b/pages.json
@@ -12,6 +12,12 @@
 				"navigationStyle": "custom"
 			}
 		},
+		{
+			"path": "pages/management/AgvOutError",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
 		{
 			"path": "pages/management/inscanerror",
 			"style": {
@@ -19,8 +25,13 @@
 			}
 		},
 		{
-<<<<<<< HEAD
-			"path": "pages/management/AgvOutError",
+			"path": "pages/management/outscanerror",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/management/hcxcheck",
 			"style": {
 				"navigationStyle": "custom"
 			}
@@ -33,25 +44,4 @@
 		"backgroundColor": "#F8F8F8"
 	},
 	"uniIdRouter": {}
-=======
-			"path": "pages/management/outscanerror",
-			"style": {
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/management/hcxcheck",
-			"style": {
-				"navigationStyle": "custom"
-			}
-		}
-	],
-	"globalStyle": {
-		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "uni-app",
-		"navigationBarBackgroundColor": "#F8F8F8",
-		"backgroundColor": "#F8F8F8"
-	},
-	"uniIdRouter": {}
->>>>>>> e70ca29794a795a200ed9459ba0246b876f6ba1a
 }