From b4adf52de27081af626be4fb88c6a11ccdcd7eea Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期五, 28 六月 2024 17:42:20 +0800
Subject: [PATCH] Merge branch 'steels' into feature/steels/yangan

---
 pages.json |   43 ++++++++++++++++++++++++++++++++-----------
 1 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/pages.json b/pages.json
index 537b2a7..249ce66 100644
--- a/pages.json
+++ b/pages.json
@@ -7,6 +7,13 @@
 				"enablePullDownRefresh": false
 			}
 		},
+		{
+			"path": "pages/login/resetPassword/resetPassword",
+			"style": {
+				"navigationBarTitleText": "淇敼瀵嗙爜",
+				"enablePullDownRefresh": false
+			}
+		},
 		// {
 		// 	"path":"pages/login/index",
 		// 	"style":{
@@ -93,7 +100,7 @@
 		{
 			"path": "pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details",
 			"style": {
-				"navigationBarTitleText": "鎻愮叅鍗曡鎯�",
+				"navigationBarTitleText": "閫氱煡鍗曡鎯�",
 				"enablePullDownRefresh": false
 			}
 		},
@@ -118,7 +125,7 @@
 		// 		"navigationBarTitleText": "杞彂",
 		// 		"enablePullDownRefresh": false
 		// 	}
-		// }, 
+		// },
 		// {
 		// 	"path": "pages/driver-page/appointment/appointment",
 		// 	"style": {
@@ -126,7 +133,7 @@
 		// 		"enablePullDownRefresh": false
 		// 	}
 
-		// }, 
+		// },
 		{
 			"path": "pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails",
 			"style": {
@@ -138,7 +145,7 @@
 		{
 			"path": "pages/driver-page/driver-index/bill-of-lading-details/coal-pick-up-bill/coal-pick-up-bill",
 			"style": {
-				"navigationBarTitleText": "鎻愮叅鍗�",
+				"navigationBarTitleText": "閫氱煡鍗�",
 				"enablePullDownRefresh": false
 			}
 
@@ -147,7 +154,7 @@
 			"path": "pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice",
 			"style": {
 				"navigationBarTitleText": "绉伴噸",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": true
 			}
 
 		},
@@ -162,21 +169,21 @@
 		{
 			"path": "pages/driver-page/driver-index/bill-of-lading-details/punchTheClock/punchTheClock",
 			"style": {
-				"navigationBarTitleText": "鐭垮満绛惧埌",
+				"navigationBarTitleText": "浠撳簱绛惧埌",
 				"enablePullDownRefresh": false
 			}
 		},
 		{
 			"path": "pages/customer-page/customer-index/fayunPlanDetails/fayunPlanMore/fayunPlanMore",
 			"style": {
-				"navigationBarTitleText": "鎻愮叅鍗曡鎯�",
+				"navigationBarTitleText": "閫氱煡鍗曡鎯�",
 				"enablePullDownRefresh": false
 			}
 
 		}, {
 			"path": "pages/customer-page/customer-my/faYunstatistics/faYunstatistics",
 			"style": {
-				"navigationBarTitleText": "",
+				"navigationBarTitleText": "鍙戣繍缁熻",
 				"enablePullDownRefresh": false,
 				"navigationStyle": "custom"
 
@@ -224,6 +231,13 @@
 				"enablePullDownRefresh": false
 			}
 
+		}, {
+			"path": "pages/login/PrivacyAgreementText/PrivacyAgreementText",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+
 		}
 	],
 	"subPackages": [{
@@ -251,7 +265,7 @@
 					"enablePullDownRefresh": true
 				}
 
-			}, {
+			},{
 				"path": "messageDetails/messageDetails",
 				"style": {
 					"navigationBarTitleText": "娑堟伅璇︽儏",
@@ -272,13 +286,20 @@
 					"enablePullDownRefresh": false
 				}
 
+			}, {
+				"path": "selectSpecifications/selectSpecifications",
+				"style": {
+					"navigationBarTitleText": "",
+					"enablePullDownRefresh": false
+				}
+
 			}]
 		}, {
 			"root": "pages/driver-page/appointment",
 			"pages": [{
 				"path": "appointment",
 				"style": {
-					"navigationBarTitleText": "鏃舵",
+					"navigationBarTitleText": "棰勭害鏃舵",
 					"enablePullDownRefresh": false
 				}
 			}]
@@ -390,4 +411,4 @@
 			"query": "" //鍚姩鍙傛暟锛屽湪椤甸潰鐨刼nLoad鍑芥暟閲岄潰寰楀埌
 		}]
 	}
-}
\ No newline at end of file
+}

--
Gitblit v1.9.1