Merge remote-tracking branch 'origin/master'

# Conflicts:
#	pages.json

pages.json

@@ -17,7 +17,8 @@
 		{
 			"path": "pages/my/my",
 			"style": {
-				"navigationBarTitleText": "我的"
+				"navigationBarTitleText": "我的",
+				"navigationStyle": "custom"
 			}
 		},
 		{
@@ -36,7 +37,6 @@
 				"enablePullDownRefresh": true
 			}
 		},
-		
 		{
 			"path": "pages/finance/finance",
 			"style": {
@@ -44,7 +44,7 @@
 				"navigationStyle": "custom"
 			}
 		},
-		
+
 {
 			"path":"pages/finance/production",
 			"style": {
@@ -52,7 +52,7 @@
 				"navigationStyle": "custom"
 			}
 		},
-		
+
 		{
 					"path":"pages/finance/service",
 					"style": {
@@ -60,7 +60,7 @@
 						"navigationStyle": "custom"
 					}
 				},
-		
+
 		{
 			"path": "pages/register/register",
 			"style": {
@@ -119,12 +119,6 @@
 				}
 			}
 		}
-	
-		
-		
-		
-		
-		
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",