From a8fb7ae2dbb61a94141ed5e73d3bb2632b7b84df Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期日, 28 九月 2025 15:25:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
h5/pages.json | 119 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 107 insertions(+), 12 deletions(-)
diff --git a/h5/pages.json b/h5/pages.json
index a7a6648..4a75021 100644
--- a/h5/pages.json
+++ b/h5/pages.json
@@ -9,6 +9,13 @@
"navigationBarTitleText": "閫夋嫨韬唤",
"enablePullDownRefresh": false
}
+ },
+ {
+ "path": "pages/auth/auth",
+ "style": {
+ "navigationBarTitleText": "寰俊鎺堟潈",
+ "enablePullDownRefresh": false
+ }
},
{
"path": "pages/index/index",
@@ -254,7 +261,7 @@
{
"path": "pages/staff/task/visitorApprove",
"style": {
- "navigationBarTitleText": "璁垮瀹℃壒",
+ "navigationBarTitleText": "鍏ュ洯瀹℃壒",
"enablePullDownRefresh": false
}
},
@@ -310,7 +317,7 @@
{
"path": "pages/driver/reserved",
"style": {
- "navigationBarTitleText": "鍏ュ洯棰勭害",
+ "navigationBarTitleText": "鍏ュ洯鍗歌揣棰勭害",
"enablePullDownRefresh": false
}
},
@@ -352,7 +359,7 @@
{
"path": "pages/driver/reservedDetail",
"style": {
- "navigationBarTitleText": "璁垮瀹℃壒",
+ "navigationBarTitleText": "鍏ュ洯瀹℃壒",
"enablePullDownRefresh": false
}
},
@@ -360,13 +367,6 @@
"path": "pages/driver/taskConfirm",
"style": {
"navigationBarTitleText": "纭浠诲姟",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/auth/auth",
- "style": {
- "navigationBarTitleText": "寰俊鎺堟潈",
"enablePullDownRefresh": false
}
},
@@ -422,6 +422,101 @@
"enablePullDownRefresh": false
}
+ }
+ ,{
+ "path" : "pages/driver/forgetPsd",
+ "style" :
+ {
+ "navigationBarTitleText": "鎵惧洖瀵嗙爜",
+ "enablePullDownRefresh": false
+ }
+
+ }
+ ,{
+ "path" : "pages/staff/task/driver",
+ "style" :
+ {
+ "navigationBarTitleText": "鍏ュ洯瀹℃壒",
+ "enablePullDownRefresh": false
+ }
+
+ },
+ {
+ "path" : "pages/driver/notice",
+ "style" :
+ {
+ "navigationBarTitleText" : "鍏ュ洯椤荤煡"
+ }
+ },
+ {
+ "path" : "pages/waybill/waybillDetail",
+ "style" :
+ {
+ "navigationBarTitleText" : "杩愬崟鏌ヨ"
+ }
+ },
+ {
+ "path" : "pages/staff/signin",
+ "style" :
+ {
+ "navigationBarTitleText" : "鎴戠殑鑰冨嫟"
+ }
+ },
+ {
+ "path" : "pages/waybill/home",
+ "style" :
+ {
+ "navigationBarTitleText" : "杩愬崟鏌ヨ"
+ }
+ },
+ {
+ "path" : "pages/waybill/list",
+ "style" :
+ {
+ "navigationBarTitleText" : "杩愬崟鏌ヨ"
+ }
+ },
+ {
+ "path" : "pages/wdata/home",
+ "style" :
+ {
+ "navigationBarTitleText" : "鍙告満鎻愭姤"
+ }
+ },
+ {
+ "path" : "pages/wdata/list",
+ "style" :
+ {
+ "navigationBarTitleText" : "鎴戠殑浠诲姟"
+ }
+ },
+ {
+ "path" : "pages/wdata/detail",
+ "style" :
+ {
+ "navigationBarTitleText" : "浠诲姟鎿嶄綔鏄庣粏"
+ }
+ },
+ {
+ "path" : "pages/visitorApplication/memberSel",
+ "style" :
+ {
+ "navigationBarTitleText" : "閫夋嫨琚浜�"
+ }
+ },
+ {
+ "path" : "pages/appointment/appointment",
+ "style" :
+ {
+ "navigationBarTitleText" : "棰勭害"
+ }
+ },
+ {
+ "path" : "pages/loading/loading",
+ "style" :
+ {
+ "navigationBarTitleText" : "鎺堟潈"
+ }
}
],
"subPackages": [
@@ -520,8 +615,8 @@
}
],
"globalStyle": {
- "navigationBarTextStyle": "black",
- "navigationBarTitleText": "",
+ "navigationBarTextStyle": "black",
+ "navigationStyle": "custom",
"navigationBarBackgroundColor": "#ffffff",
"backgroundColor": "#ffffff"
},
--
Gitblit v1.9.3