Merge branch 'master' of http://git.luyuan.tk/luyuan/demingshangjia into xbx

pages.json

@@ -2,7 +2,19 @@
 	"easycom": {
 		"^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
 	},
-	"pages": [
+	"pages": [ 
+		{
+			"path": "pages/release/tosign",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationStyle": "custom",
+				"app-plus": {
+					"titleNView": false,
+					"backgroundColor": "#f00",
+					"animationType": "slide-in-bottom"
+				}
+			}
+		},
 		{
 			"path": "pages/index/index",
 			"style": {
@@ -25,8 +37,46 @@
 					}
 				}
 			}
-		}
-		,
+		},
+		{
+			"path": "pages/login/login",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationStyle": "custom",
+				"app-plus": {
+					"titleNView": false,
+					"animationType": "slide-in-bottom"
+				}
+			}
+		},
+		{
+			"path": "pages/release/video",
+			"style": {
+				"navigationBarTitleText": "发布视频",
+				"app-plus": {
+					"titleSize": "36px",
+					"titleColor": "#333333",
+					"titleNView": {
+						"backgroundColor": "#FFFFFF"
+					}
+				}
+			}
+		},
+		{
+			"path": "pages/release/index",
+			"style": {
+				"navigationBarTitleText": "发布图文",
+				"app-plus": {
+					"titleSize": "36px",
+					"titleColor": "#333333",
+					"titleNView": {
+						"backgroundColor": "#FFFFFF"
+					}
+				}
+			}
+		
+		},
+		
 		{
 			"path": "pages/user/index",
 			"style": {
@@ -50,6 +100,77 @@
 					}
 				}
 			}
+		},
+		{
+			"path": "pages/user/updatePassword",
+			"style": {
+				"navigationBarTitleText": "修改密码",
+				"app-plus": {
+                    "titleNView": {
+						"backgroundColor": "#FFFFFF",
+                        "titleColor": "#333333"
+					}
+				}
+			}
+		},
+		{
+			"path": "pages/user/fans",
+			"style": {
+				"navigationBarTitleText": "我的粉丝",
+				"app-plus": {
+                    "titleNView": {
+						"backgroundColor": "#FFFFFF",
+                        "titleColor": "#333333"
+					}
+				}
+			}
+		},
+		{
+			"path": "pages/user/content",
+			"style": {
+				"navigationBarTitleText": "内容管理",
+				"app-plus": {
+                    "titleNView": {
+						"backgroundColor": "#FFFFFF",
+                        "titleColor": "#333333"
+					}
+				}
+			}
+		},
+		{
+			"path": "pages/user/contentDetails",
+			"style": {
+				"app-plus": {
+                    "titleNView": {
+						"backgroundColor": "#FFFFFF",
+                        "titleColor": "#333333"
+					}
+				}
+			}
+		},
+		{
+			"path": "pages/user/complaint",
+			"style": {
+				"navigationBarTitleText": "骑手投诉",
+				"app-plus": {
+                    "titleNView": {
+						"backgroundColor": "#FFFFFF",
+                        "titleColor": "#333333"
+					}
+				}
+			}
+		},
+		{
+			"path": "pages/user/complaintDetails",
+			"style": {
+				"navigationBarTitleText": "骑手投诉详情",
+				"app-plus": {
+                    "titleNView": {
+						"backgroundColor": "#FFFFFF",
+                        "titleColor": "#333333"
+					}
+				}
+			}
 		}
 	],
 	"globalStyle": {