From 8bedb5a0c09876046b397a94a9b12bb6e805d284 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期三, 19 六月 2024 17:13:23 +0800
Subject: [PATCH] Merge branch 'jlhg' of http://39.96.92.240:10000/r/~fyy/unattended-app into jlhg

---
 pages.json |   44 +++++++++++++++++++++++++++-----------------
 1 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/pages.json b/pages.json
index bc00e87..121aad7 100644
--- a/pages.json
+++ b/pages.json
@@ -1,20 +1,21 @@
 {
 	"pages": [ //pages鏁扮粍涓涓�椤硅〃绀哄簲鐢ㄥ惎鍔ㄩ〉锛屽弬鑰冿細https://uniapp.dcloud.io/collocation/pages
-		// {
-		// 	"path": "pages/login/insideLogin",
-		// 	"style": {
-		// 		"navigationBarTitleText": "鐧诲綍",
-		// 		"enablePullDownRefresh": false,
-		// 		"orientation": "landscape"
-		// 	}
-		// },	
 		{
 			"path": "pages/login/login",
 			"style": {
 				"navigationBarTitleText": "鐧诲綍",
 				"enablePullDownRefresh": false
 			}
-		},{
+		},
+		{
+			"path": "pages/login/insideLogin",
+			"style": {
+				"navigationBarTitleText": "鐧诲綍",
+				"enablePullDownRefresh": false,
+				"orientation": "landscape"
+			}
+		},
+		{
 			"path": "pages/tabbar-page/index-tabbar/index-tabbar",
 			"style": {
 				"navigationBarTitleText": "棣栭〉",
@@ -263,6 +264,14 @@
 			}
 
 		}, {
+			"path": "pages/doorkeeper-page/my-page/my-page",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+
+		}, {
 			"path": "pages/login/PrivacyAgreementText/PrivacyAgreementText",
 			"style": {
 				"navigationBarTitleText": "",
@@ -312,7 +321,15 @@
 				"enablePullDownRefresh": false
 			}
 
-		}, {
+		},
+		{
+			"path": "pages/driver-page/drvier-my/certifiCate/certifiCate",
+			"style": {
+				"navigationBarTitleText": "閬撹矾杩愯緭璇�",
+				"enablePullDownRefresh": false
+			}
+		
+		},{
 			"path": "pages/driver-page/driver-index/bill-of-lading-details/printerStyle/printerStyle",
 			"style": {
 				"navigationBarTitleText": "",
@@ -453,13 +470,6 @@
 				"navigationBarTitleText": "",
 				"enablePullDownRefresh": true,
 				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/login/insideUser",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
 			}
 		}
     ],

--
Gitblit v1.9.1