From 282e032b5771da13d224214d3b0b71f3efde9a42 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 25 八月 2023 18:45:42 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmMes

---
 minipro_standard/pages.json |  139 +++++++++++++++++++++++++++++----------------
 1 files changed, 89 insertions(+), 50 deletions(-)

diff --git a/minipro_standard/pages.json b/minipro_standard/pages.json
index cb37cc6..b77d9e9 100644
--- a/minipro_standard/pages.json
+++ b/minipro_standard/pages.json
@@ -1,65 +1,104 @@
 {
 	"pages": [
-		{
-			"path": "pages/workbench/workbench",
-			"style": {
-				"navigationBarTitleText": "宸ヤ綔鍙�",
-				"enablePullDownRefresh": false
-			}
-		},
+		// {
+		// 	"path": "pages/workbench/workbench",
+		// 	"style": {
+		// 		"navigationBarTitleText": "宸ヤ綔鍙�",
+		// 		"enablePullDownRefresh": false
+		// 	}
+		// },
 		{
 			"path": "pages/index/index",
 			"style": {
-				"navigationBarTitleText": "寰呭姙"
-			}
-		},  {
-			"path": "pages/mine/mine",
-			"style": {
-				"navigationBarTitleText": "鎴戠殑",
-				"enablePullDownRefresh": false
+				"navigationBarTitleText": "",
+				"navigationStyle": "custom"
 			}
 		}
-	    ,{
-            "path" : "pages/login/login",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "鐧诲綍",
-                "enablePullDownRefresh": false,
-				"navigationStyle": "custom"
-            }
-        }
+		// ,  {
+		// 	"path": "pages/mine/mine",
+		// 	"style": {
+		// 		"navigationBarTitleText": "鎴戠殑",
+		// 		"enablePullDownRefresh": false
+		// 	}
+		// }
+	 //    ,{
+  //           "path" : "pages/login/login",
+  //           "style" :                                                                                    
+  //           {
+  //               "navigationBarTitleText": "鐧诲綍",
+  //               "enablePullDownRefresh": false,
+		// 		"navigationStyle": "custom"
+  //           }
+  //       }
+  //       ,{
+  //           "path" : "pages/personal/personal",
+  //           "style" :                                                                                    
+  //           {
+  //               "navigationBarTitleText": "涓汉淇℃伅",
+  //               "enablePullDownRefresh": false
+  //           }
+            
+  //       }
+  //       ,{
+  //           "path" : "pages/changePassword/changePassword",
+  //           "style" :                                                                                    
+  //           {
+  //               "navigationBarTitleText": "淇敼瀵嗙爜",
+  //               "enablePullDownRefresh": false
+  //           }
+            
+  //       }
+  //       ,{
+  //           "path" : "pages/updatePhone/updatePhone",
+  //           "style" :                                                                                    
+  //           {
+  //               "navigationBarTitleText": "鏇存柊鎵嬫満鍙�",
+  //               "enablePullDownRefresh": false
+  //           }
+            
+  //       }
+  //       ,{
+  //           "path" : "pages/updateMailbox/updateMailbox",
+  //           "style" :                                                                                    
+  //           {
+  //               "navigationBarTitleText": "鏇存柊閭鍙�",
+  //               "enablePullDownRefresh": false
+  //           }
+            
+  //       }
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uni-app",
 		"navigationBarBackgroundColor": "#ffffff",
-		"backgroundColor": "#ffffff"
+		"backgroundColor": "#ffffff",
+		"navigationStyle": "custom"
 	},
-	"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": "鎴戠殑"
-			}
-		]
-	},
+	// "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