From 72ae3dbb48ddcd16b2311f5346120b178302a5a1 Mon Sep 17 00:00:00 2001
From: YOS-DRVOGPU6U78\Administrator <chenky0613@qq.com>
Date: 星期三, 19 七月 2023 10:58:54 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/chenky/pda_uni_app

---
 pages.json |   55 ++++++++++++++++++++++++-------------------------------
 1 files changed, 24 insertions(+), 31 deletions(-)

diff --git a/pages.json b/pages.json
index 6ae53ab..baec03d 100644
--- a/pages.json
+++ b/pages.json
@@ -1,6 +1,5 @@
 {
-	"pages": [
-		{
+	"pages": [{
 			"path": "pages/login/login",
 			"style": {
 				"navigationBarTitleText": "鐧诲綍"
@@ -11,35 +10,29 @@
 			"style": {
 				"navigationBarTitleText": "MES-绉诲姩缁堢"
 			}
+		}, {
+			"path": "pages/main/main",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/inspection/inspectionList",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/inspection/inspectionInfo",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+
 		}
-	    ,{
-            "path" : "pages/main/main",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/inspection/inspectionList",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/inspection/inspectionInfo",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-    ],
+	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uni-app",
@@ -47,4 +40,4 @@
 		"backgroundColor": "#F8F8F8"
 	},
 	"uniIdRouter": {}
-}
+}
\ No newline at end of file

--
Gitblit v1.9.3