From db16c0207818437ddd711bcc0778667ba8d9fcc4 Mon Sep 17 00:00:00 2001
From: 展杰 <1240968267@qq.com>
Date: 星期三, 03 七月 2024 14:14:44 +0800
Subject: [PATCH] Merge branch 'master' of https://gitcode.net/csddngb/hk_pda_vue

---
 pages.json |   73 ++++++++++++++++++++++++++++++++----
 1 files changed, 64 insertions(+), 9 deletions(-)

diff --git a/pages.json b/pages.json
index baec03d..825b6d7 100644
--- a/pages.json
+++ b/pages.json
@@ -8,7 +8,8 @@
 		{
 			"path": "pages/index/index",
 			"style": {
-				"navigationBarTitleText": "MES-绉诲姩缁堢"
+				"navigationBarTitleText": "MES-绉诲姩缁堢",
+				"enablePullDownRefresh": false
 			}
 		}, {
 			"path": "pages/main/main",
@@ -20,24 +21,78 @@
 		}, {
 			"path": "pages/inspection/inspectionList",
 			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
+				"navigationBarTitleText": "宸℃妫�楠屽垪琛�",
+				"enablePullDownRefresh": true
 			}
 
-		}, {
+		},{
+			"path": "pages/inspection/firstInspectionList",
+			"style": {
+				"navigationBarTitleText": "棣栨妫�楠屽垪琛�",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
 			"path": "pages/inspection/inspectionInfo",
 			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
+				"navigationBarTitleText": "妫�楠屼俊鎭綍鍏�",
+				"enablePullDownRefresh": false,
+				"app-plus": {
+					"titleNView": {
+						"buttons": [
+							{
+								"float": "right",
+								"fontSize": "25px",
+								"fontSrc": "/static/fonts/uniicons.ttf",
+								"text": "\ue658"
+							}
+						]
+					}
+				}
 			}
 
 		}
-	],
+	    ,{
+            "path" : "pages/work_reporting/work_reporting",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/marchine_start/marchine_start",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        },
+        {
+        	"path" : "pages/eqSpotCheck/eqSpotCheckList",
+        	"style" : 
+        	{
+        		"navigationBarTitleText" : "璁惧鐐规璁″垝鍒楄〃",
+        		"enablePullDownRefresh" : true
+        	}
+        },
+		{
+			"path" : "pages/eqSpotCheck/eqSpotCheckInfo",
+			"style" : 
+			{
+				"navigationBarTitleText" : "璁惧鐐规椤圭洰褰曞叆",
+				"enablePullDownRefresh" : false
+			}
+		}
+    ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uni-app",
-		"navigationBarBackgroundColor": "#F8F8F8",
-		"backgroundColor": "#F8F8F8"
+		"navigationBarBackgroundColor": "#f1f1f1",
+		"enablePullDownRefresh": true,
+		"backgroundColor": "#efefef"
 	},
 	"uniIdRouter": {}
 }
\ No newline at end of file

--
Gitblit v1.9.3