From 2e6f381d09669635473faf5dd4a3f01b5797d97e Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 27 五月 2024 16:25:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 h5/pages.json |   45 ++++++++++++++++++++++-----------------------
 1 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/h5/pages.json b/h5/pages.json
index 51f2613..35dbba4 100644
--- a/h5/pages.json
+++ b/h5/pages.json
@@ -6,8 +6,7 @@
 			"path": "pages/notice/notice",
 			"style": {
 				"navigationBarTitleText": "鍏ュ洯椤荤煡",
-				"enablePullDownRefresh": false,
-				"navigationStyle": "custom"
+				"enablePullDownRefresh": false
 			}
 		},
 		{
@@ -321,38 +320,38 @@
 		}
 	    ,{
             "path" : "pages/driver/queueUpRecord",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "浣滀笟涓溅杈�",
-                "enablePullDownRefresh": false
-            }
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "浣滀笟涓溅杈�",
+                "enablePullDownRefresh": false
+            }
             
         }
         ,{
             "path" : "pages/driver/taskDetail",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "浠诲姟璇︽儏",
-                "enablePullDownRefresh": false
-            }
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "浠诲姟璇︽儏",
+                "enablePullDownRefresh": false
+            }
             
         }
         ,{
             "path" : "pages/driver/reservedDetail",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "璁垮瀹℃壒",
-                "enablePullDownRefresh": false
-            }
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "璁垮瀹℃壒",
+                "enablePullDownRefresh": false
+            }
             
         }
         ,{
             "path" : "pages/driver/taskConfirm",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "纭浠诲姟",
-                "enablePullDownRefresh": false
-            }
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "纭浠诲姟",
+                "enablePullDownRefresh": false
+            }
             
         }
     ],
@@ -455,4 +454,4 @@
 		"backgroundColor": "#ffffff"
 	},
 	"uniIdRouter": {}
-}
+}

--
Gitblit v1.9.3