From eee82fc63bf8b0b48bda5d6c89a491974a20bc97 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 18 八月 2023 09:52:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 minipro_standard/pages.json |   91 +++++++++++++++++++++++----------------------
 1 files changed, 47 insertions(+), 44 deletions(-)

diff --git a/minipro_standard/pages.json b/minipro_standard/pages.json
index 018fa73..5641535 100644
--- a/minipro_standard/pages.json
+++ b/minipro_standard/pages.json
@@ -1,64 +1,67 @@
 {
 	"pages": [ //pages鏁扮粍涓涓�椤硅〃绀哄簲鐢ㄥ惎鍔ㄩ〉锛屽弬鑰冿細https://uniapp.dcloud.io/collocation/pages
 		{
-			"path": "pages/projectList/projectList",
+			"path": "pages/workbench/workbench",
 			"style": {
-				"navigationBarTitleText": "椤圭洰鍒楄〃",
-				// "enablePullDownRefresh": true,
-				"navigationStyle": "custom"
+				"navigationBarTitleText": "宸ヤ綔鍙�",
+				"enablePullDownRefresh": false
 			}
 		
-		},{
+		},
+		{
 			"path": "pages/index/index",
 			"style": {
-				"navigationBarTitleText": "uni-app",
-				"navigationStyle": "custom"
+				"navigationBarTitleText": "寰呭姙"
 			}
-		}, {
-			"path": "pages/applyList/applyList",
+		},  {
+			"path": "pages/mine/mine",
 			"style": {
-				"navigationBarTitleText": "浼佷笟鎶ュ悕鍒楄〃",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#F3F6F9"
-			}
-
-		}, {
-			"path": "pages/comApplyList/comApplyList",
-			"style": {
-				"navigationBarTitleText": "浼佷笟鎶ュ悕鍒楄〃",
+				"navigationBarTitleText": "鎴戠殑",
 				"enablePullDownRefresh": false
 			}
-
-		}, {
-			"path": "pages/applyDetail/applyDetail",
-			"style": {
-				"navigationBarTitleText": "浼佷笟鎶ュ悕璇︽儏",
-				"enablePullDownRefresh": false,
-				"navigationStyle": "custom"
-			}
-
-		}, {
-			"path": "pages/uploadServiceData/uploadServiceData",
-			"style": {
-				"navigationBarTitleText": "涓婁紶鏈嶅姟鏁版嵁",
-				"enablePullDownRefresh": false
-
-			}
-
-		}, {
-			"path": "pages/uploadCheckData/uploadCheckData",
-			"style": {
-				"navigationBarTitleText": "涓婁紶璇婃柇鏁版嵁",
-				"enablePullDownRefresh": false
-			}
-
 		}
-	],
+	    ,{
+            "path" : "pages/login/login",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "鐧诲綍",
+                "enablePullDownRefresh": false,
+								"navigationStyle": "custom"
+            }
+            
+        }
+    ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "uni-app",
+		"navigationBarTitleText": "uni-app",
 		"navigationBarBackgroundColor": "#F3F6F9",
 		"backgroundColor": "#F3F6F9"
+	},
+	"tabBar": {
+		"color": "#666666",
+		"selectedColor": "#222222",
+		"borderStyle": "black",
+		"backgroundColor": "#fff",
+		"list": [
+			{
+				"pagePath": "pages/index/index",
+				"iconPath": "static/nav_daiban@2x.png",
+				"selectedIconPath": "static/nav_daiban_sel@2x.png",
+				"text": "寰呭姙"
+			},
+			{
+				"pagePath": "pages/workbench/workbench",
+				"iconPath": "static/nav_gongzuotai@2x.png",
+				"selectedIconPath": "static/nav_gongzuotai_sel@2x.png",
+				"text": "宸ヤ綔鍙�"
+			},
+			{
+				"pagePath": "pages/mine/mine",
+				"iconPath": "static/nav_wode@2x.png",
+				"selectedIconPath": "static/nav_wode_sel@2x.png",
+				"text": "鎴戠殑"
+			}
+		]
 	},
 	"uniIdRouter": {}
 }

--
Gitblit v1.9.3