svo

2023-03-22 17:31:29 +08:00
parent 923e46421d e70ca29794
commit a45b14f132
47 changed files with 4557 additions and 69 deletions
--- a/pages.json
+++ b/pages.json
@@ -19,6 +19,7 @@
 			}
 		},
 		{
+<<<<<<< HEAD
 			"path": "pages/management/AgvOutError",
 			"style": {
 				"navigationStyle": "custom"
@@ -32,4 +33,25 @@
 		"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
 }