From 3dd12d913b5d9c2096e53f9d14475c534b813e6b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 22 四月 2025 08:06:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 h5/pages.json |   48 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 47 insertions(+), 1 deletions(-)

diff --git a/h5/pages.json b/h5/pages.json
index f5d1194..970d179 100644
--- a/h5/pages.json
+++ b/h5/pages.json
@@ -7,6 +7,7 @@
 			"path": "pages/index/index",
 			"style": {
 				"navigationBarTitleText": "妫�鏌�",
+				"navigationStyle": "custom",
 				"navigationBarBackgroundColor": "#ffffff"
 			}
 		},
@@ -15,6 +16,7 @@
 			"style" : 
 			{
 				"navigationBarTitleText" : "鎴戠殑宸ュ崟",
+				"navigationStyle": "custom",
 				"navigationBarBackgroundColor": "#ffffff"
 			}
 		},
@@ -23,6 +25,7 @@
 			"style" : 
 			{
 				"navigationBarTitleText" : "鎴戠殑涓婃姤",
+				"navigationStyle": "custom",
 				"navigationBarBackgroundColor": "#ffffff"
 			}
 		},
@@ -31,6 +34,7 @@
 			"style" : 
 			{
 				"navigationBarTitleText" : "鍥捐〃",
+				"navigationStyle": "custom",
 				"navigationBarBackgroundColor": "#ffffff"
 			}
 		},
@@ -39,6 +43,7 @@
 			"style" : 
 			{
 				"navigationBarTitleText" : "SHE浜嬩欢涓婃姤",
+				"navigationStyle": "custom",
 				"navigationBarBackgroundColor": "#ffffff"
 			}
 		},
@@ -47,6 +52,7 @@
 			"style" : 
 			{
 				"navigationBarTitleText" : "璇︽儏",
+				"navigationStyle": "custom",
 				"navigationBarBackgroundColor": "#ffffff"
 			}
 		},
@@ -55,6 +61,7 @@
 			"style" : 
 			{
 				"navigationBarTitleText" : "璺岀粖婊戦闄╀笂鎶�",
+				"navigationStyle": "custom",
 				"navigationBarBackgroundColor": "#ffffff"
 			}
 		},
@@ -63,6 +70,7 @@
 			"style" : 
 			{
 				"navigationBarTitleText" : "璇︽儏",
+				"navigationStyle": "custom",
 				"navigationBarBackgroundColor": "#ffffff"
 			}
 		},
@@ -71,6 +79,7 @@
 			"style" : 
 			{
 				"navigationBarTitleText" : "DCA瑙傚療涓婃姤",
+				"navigationStyle": "custom",
 				"navigationBarBackgroundColor": "#ffffff"
 			}
 		},
@@ -79,6 +88,43 @@
 			"style" : 
 			{
 				"navigationBarTitleText" : "DCA绫诲瀷閫夋嫨",
+				"navigationStyle": "custom",
+				"navigationBarBackgroundColor": "#ffffff"
+			}
+		},
+		{
+			"path" : "pages/details_dca/details_dca",
+			"style" : 
+			{
+				"navigationBarTitleText" : "DCA瑙傚療涓婃姤",
+				"navigationStyle": "custom",
+				"navigationBarBackgroundColor": "#ffffff"
+			}
+		},
+		{
+			"path" : "pages/workOrder_she/workOrder_she",
+			"style" : 
+			{
+				"navigationBarTitleText" : "璇︽儏",
+				"navigationStyle": "custom",
+				"navigationBarBackgroundColor": "#ffffff"
+			}
+		},
+		{
+			"path" : "pages/workOrder_dca/workOrder_dca",
+			"style" : 
+			{
+				"navigationBarTitleText" : "璇︽儏",
+				"navigationStyle": "custom",
+				"navigationBarBackgroundColor": "#ffffff"
+			}
+		},
+		{
+			"path" : "pages/chart_details/chart_details",
+			"style" : 
+			{
+				"navigationBarTitleText" : "鍥捐〃",
+				"navigationStyle": "custom",
 				"navigationBarBackgroundColor": "#ffffff"
 			}
 		}
@@ -104,7 +150,7 @@
 			{
 				"pagePath": "pages/workOrder/workOrder",
 				"iconPath": "static/tabbar/nav_gongdan@2x.png",
-				"selectedIconPath": "static/tabbar/nav_jiancha_sel@2x.png",
+				"selectedIconPath": "static/tabbar/nav_gongdan_sel@2x.png",
 				"text": "鎴戠殑宸ュ崟"
 			},
 			{

--
Gitblit v1.9.3