From 3696830fbaf2fd97d98020087abf20917e491bdc Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 23 四月 2026 20:06:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 app/pages.json |  101 ++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 92 insertions(+), 9 deletions(-)

diff --git a/app/pages.json b/app/pages.json
index fa7332b..cca6f7c 100644
--- a/app/pages.json
+++ b/app/pages.json
@@ -4,17 +4,88 @@
 	},
 	"pages": [
 		{
+			"path": "pages/guide-page/guide-page",
+			"style": {
+				"app-plus": {
+					"titleNView": false
+				}
+			}
+		},
+		{
 			"path": "pages/index/index",
 			"style": {
-				"navigationBarTitleText": "棣栭〉",
-				"navigationBarBackgroundColor": "#ffffff"
+				"navigationStyle": "custom",
+				"app-plus": {
+					"titleNView": false
+				}
 			}
 		},
 		{
 			"path": "pages/mine/mine",
 			"style": {
-				"navigationBarTitleText": "鎴戠殑",
-				"navigationBarBackgroundColor": "#ffffff"
+				"navigationStyle": "custom",
+				"app-plus": {
+					"titleNView": false
+				}
+			}
+		},
+		{
+			"path": "pages/order/order",
+			"style": {
+				"navigationStyle": "custom",
+				"app-plus": {
+					"titleNView": false
+				}
+			}
+		},
+		{
+			"path": "pages/order-detail/order-detail",
+			"style": {
+				"navigationStyle": "custom",
+				"app-plus": {
+					"titleNView": false
+				}
+			}
+		},
+		{
+			"path": "pages/message/message",
+			"style": {
+				"navigationStyle": "custom",
+				"app-plus": {
+					"titleNView": false
+				}
+			}
+		},
+		{
+			"path": "pages/login/login",
+			"style": {
+				"app-plus": {
+					"titleNView": false
+				}
+			}
+		},
+		{
+			"path": "pages/settings/settings",
+			"style": {
+				"navigationBarTitleText": "璁剧疆"
+			}
+		},
+		{
+			"path": "pages/change-password/change-password",
+			"style": {
+				"navigationBarTitleText": "淇敼瀵嗙爜"
+			}
+		},
+		{
+			"path": "pages/driver-certification/driver-certification",
+			"style": {
+				"navigationBarTitleText": "鍙告満璁よ瘉"
+			}
+		},
+		{
+			"path": "pages/certification-details/certification-details",
+			"style": {
+				"navigationBarTitleText": "鍙告満璁よ瘉"
 			}
 		}
 	],
@@ -32,14 +103,26 @@
 		"list": [
 			{
 				"pagePath": "pages/index/index",
-				"iconPath": "static/tabbar/nav_jiancha@2x.png",
-				"selectedIconPath": "static/tabbar/nav_jiancha_sel@2x.png",
-				"text": "棣栭〉"
+				"iconPath": "static/tabbar/nav_home_sel@2x.png",
+				"selectedIconPath": "static/tabbar/nav_home_sel@2x1.png",
+				"text": "澶у巺"
+			},
+			{
+				"pagePath": "pages/order/order",
+				"iconPath": "static/tabbar/nav_order@2x.png",
+				"selectedIconPath": "static/tabbar/nav_order@2x1.png",
+				"text": "璁㈠崟"
+			},
+			{
+				"pagePath": "pages/message/message",
+				"iconPath": "static/tabbar/nav_xiaoxi@2x.png",
+				"selectedIconPath": "static/tabbar/nav_xiaoxi@2x1.png",
+				"text": "娑堟伅"
 			},
 			{
 				"pagePath": "pages/mine/mine",
-				"iconPath": "static/tabbar/nav_jiancha@2x.png",
-				"selectedIconPath": "static/tabbar/nav_jiancha_sel@2x.png",
+				"iconPath": "static/tabbar/nav_mine@2x.png",
+				"selectedIconPath": "static/tabbar/nav_mine@2x1.png",
 				"text": "鎴戠殑"
 			}
 		]

--
Gitblit v1.9.3