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 | 142 +++++++++++++++++++++++++++++++++-------------
1 files changed, 101 insertions(+), 41 deletions(-)
diff --git a/pages.json b/pages.json
index 542652c..5b2d98a 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":{
@@ -21,15 +28,7 @@
// "enablePullDownRefresh": false
// }
// },
- {
- "path": "pages/tabbar-page/index-tabbar/index-tabbar",
- "style": {
- "navigationBarTitleText": "棣栭〉",
- "enablePullDownRefresh": true,
- "navigationStyle": "custom"
- }
-
- }, {
+ {
"path": "pages/tabbar-page/myPage-tabbar/myPage-tabbar",
"style": {
"navigationBarTitleText": "鎴戠殑",
@@ -53,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": "鎴戠殑",
@@ -93,7 +84,7 @@
{
"path": "pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details",
"style": {
- "navigationBarTitleText": "鎻愮叅鍗曡鎯�",
+ "navigationBarTitleText": "閫氱煡鍗曡鎯�",
"enablePullDownRefresh": false
}
},
@@ -118,7 +109,7 @@
// "navigationBarTitleText": "杞彂",
// "enablePullDownRefresh": false
// }
- // },
+ // },
// {
// "path": "pages/driver-page/appointment/appointment",
// "style": {
@@ -126,7 +117,7 @@
// "enablePullDownRefresh": false
// }
- // },
+ // },
{
"path": "pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails",
"style": {
@@ -138,7 +129,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 +138,7 @@
"path": "pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice",
"style": {
"navigationBarTitleText": "绉伴噸",
- "enablePullDownRefresh": false
+ "enablePullDownRefresh": true
}
},
@@ -162,27 +153,49 @@
{
"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"
}
- }, {
+ },
+ // {
+ // "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": "",
@@ -210,17 +223,29 @@
"enablePullDownRefresh": false
}
+ }, {
+ "path": "pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail",
+ "style": {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": false
+ }
+
+ }, {
+ "path": "pages/driver-page/driver-index/bill-of-lading-details/selectOrderPlan/selectOrderPlan",
+ "style": {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": false
+ }
+
+ }, {
+ "path": "pages/login/PrivacyAgreementText/PrivacyAgreementText",
+ "style": {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": false
+ }
+
}
- ,{
- "path" : "pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail",
- "style" :
- {
- "navigationBarTitleText": "",
- "enablePullDownRefresh": false
- }
-
- }
- ],
+ ],
"subPackages": [{
"root": "pages/register",
"pages": [{
@@ -246,7 +271,7 @@
"enablePullDownRefresh": true
}
- }, {
+ },{
"path": "messageDetails/messageDetails",
"style": {
"navigationBarTitleText": "娑堟伅璇︽儏",
@@ -267,13 +292,46 @@
"enablePullDownRefresh": false
}
- }]
+ }, {
+ "path": "selectSpecifications/selectSpecifications",
+ "style": {
+ "navigationBarTitleText": "",
+ "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": [{
"path": "appointment",
"style": {
- "navigationBarTitleText": "鏃舵",
+ "navigationBarTitleText": "棰勭害鏃舵",
"enablePullDownRefresh": false
}
}]
@@ -361,6 +419,8 @@
"pagePath": "pages/customer-page/customer-my/faYunstatistics/faYunstatistics"
},
{
+ "pagePath": "pages/driver-page/driver-index/bill-of-lading-details/selectOrderPlan/selectOrderPlan"
+ }, {
"pagePath": "pages/tabbar-page/myPage-tabbar/myPage-tabbar"
// "iconPath": "static/tabBar-icon/Gmine10.png",
// "selectedIconPath": "static/tabBar-icon/Bmine57.png",
@@ -383,4 +443,4 @@
"query": "" //鍚姩鍙傛暟锛屽湪椤甸潰鐨刼nLoad鍑芥暟閲岄潰寰楀埌
}]
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.1