merge master

pages.json

@@ -13,10 +13,31 @@
 			}
 		}
 	],
+	"subPackages": [
+		{
+			"root": "pageE",
+			"pages": [
+				{
+					"path": "mine/MineIndex",
+					"style": {
+						"navigationBarTitleText": "我的",
+						"app-plus": {
+							"titleSize": "36px",
+							"titleColor": "#333333",
+							"titleNView": {
+								"autoBackButton": false,
+								"backgroundColor": "#FFFFFF"
+							}
+						}
+					}
+				}
+			]
+		}
+	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uni-app",
 		"navigationBarBackgroundColor": "#F8F8F8",
 		"backgroundColor": "#F8F8F8"
 	}
-}
+}