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

---
 pages.json |   84 ++++++++++++++++++++++++++++++-----------
 1 files changed, 61 insertions(+), 23 deletions(-)

diff --git a/pages.json b/pages.json
index 442c72b..5b2d98a 100644
--- a/pages.json
+++ b/pages.json
@@ -1,18 +1,16 @@
 {
 	"pages": [ //pages鏁扮粍涓涓�椤硅〃绀哄簲鐢ㄥ惎鍔ㄩ〉锛屽弬鑰冿細https://uniapp.dcloud.io/collocation/pages
-	{
-		"path": "pages/tabbar-page/index-tabbar/index-tabbar",
-		"style": {
-			"navigationBarTitleText": "棣栭〉",
-			"enablePullDownRefresh": true,
-			"navigationStyle": "custom"
-		}
-
-	},
 		{
 			"path": "pages/login/login",
 			"style": {
 				"navigationBarTitleText": "鐧诲綍",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/login/resetPassword/resetPassword",
+			"style": {
+				"navigationBarTitleText": "淇敼瀵嗙爜",
 				"enablePullDownRefresh": false
 			}
 		},
@@ -54,15 +52,7 @@
 				"enablePullDownRefresh": false
 			}
 
-		}, {
-			"path": "pages/driver-page/driver-index/driver-index",
-			"style": {
-				"navigationBarTitleText": "棣栭〉",
-				"enablePullDownRefresh": true,
-				"navigationStyle": "custom"
-			}
-
-		}, {
+		},  {
 			"path": "pages/driver-page/drvier-my/drvier-my",
 			"style": {
 				"navigationBarTitleText": "鎴戠殑",
@@ -119,7 +109,7 @@
 		// 		"navigationBarTitleText": "杞彂",
 		// 		"enablePullDownRefresh": false
 		// 	}
-		// }, 
+		// },
 		// {
 		// 	"path": "pages/driver-page/appointment/appointment",
 		// 	"style": {
@@ -127,7 +117,7 @@
 		// 		"enablePullDownRefresh": false
 		// 	}
 
-		// }, 
+		// },
 		{
 			"path": "pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails",
 			"style": {
@@ -183,7 +173,29 @@
 
 			}
 
-		}, {
+		}, 
+		// {
+		// 	"path": "pages/driver-page/driver-index/bill-of-lading-details/historicalOrders/index",
+		// 	"style": {
+		// 		"navigationBarTitleText": "鍘嗗彶璁㈠崟",
+		// 		"enablePullDownRefresh": false
+		// 	}
+		// },
+		// {
+		// 	"path": "pages/driver-page/driver-index/bill-of-lading-details/cooperationBase/index",
+		// 	"style": {
+		// 		"navigationBarTitleText": "鍚堜綔鍩哄湴",
+		// 		"enablePullDownRefresh": false
+		// 	}
+		// },
+		{
+			"path": "pages/driver-page/driver-index/bill-of-lading-details/BaseMapDetail/index",
+			"style": {
+				"navigationBarTitleText": "鍚堜綔鍩哄湴璇︽儏",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
 			"path": "pages/customer-page/customer-my/userMange/userMange",
 			"style": {
 				"navigationBarTitleText": "",
@@ -287,7 +299,33 @@
 					"enablePullDownRefresh": false
 				}
 
-			}]
+			},{
+				"path": "aboutus/index",
+				"style": {
+					"navigationBarTitleText": "鍏充簬鎴戜滑",
+					"enablePullDownRefresh": false
+				}
+			},{
+				"path": "dataStatistics/index",
+				"style": {
+					"navigationBarTitleText": "鏁版嵁缁熻",
+					"enablePullDownRefresh": false
+				}
+			},
+		{
+			"path": "cooperationBase/index",
+				"style": {
+					"navigationBarTitleText": "鍚堜綔鍩哄湴",
+					"enablePullDownRefresh": false
+				}
+		},
+	{
+		"path": "historicalOrders/index",
+				"style": {
+					"navigationBarTitleText": "鍘嗗彶璁㈠崟",
+					"enablePullDownRefresh": false
+				}
+	}]
 		}, {
 			"root": "pages/driver-page/appointment",
 			"pages": [{
@@ -405,4 +443,4 @@
 			"query": "" //鍚姩鍙傛暟锛屽湪椤甸潰鐨刼nLoad鍑芥暟閲岄潰寰楀埌
 		}]
 	}
-}
\ No newline at end of file
+}

--
Gitblit v1.9.1