Merge branch 'test' of https://e.coding.net/g-cphe0354/duanju/new_app into gaohao

pages.json

@@ -28,7 +28,7 @@
 				"navigationBarTitleText": "",
 				"navigationStyle": "custom"
 			}
-		}, 
+		},
 		{
 			"path": "pages/task/index",
 			"style": {
@@ -42,13 +42,47 @@
 				"enablePullDownRefresh": true
 			}
 		}, {
-			"path": "pages/watching_history/watching_history"
+			"path": "pages/watching_history/watching_history",
+			"style": {
+				"enablePullDownRefresh": true
+			}
 		}, {
 			"path": "pages/me/index",
 			"style": {
 				"navigationBarTitleText": "",
 				"navigationStyle": "custom"
 			}
+		}, {
+			"path": "pages/me/contact",
+			"style": {
+				"navigationBarTitleText": "联系客服"
+			}
+		}, {
+			"path": "pages/me/gold_record",
+			"style": {
+				"navigationBarTitleText": "金币明细",
+				"enablePullDownRefresh": true
+			}
+		}, {
+			"path": "pages/me/feedback",
+			"style": {
+				"navigationBarTitleText": "意见反馈"
+			}
+		}, {
+			"path": "pages/me/help_center",
+			"style": {
+				"navigationBarTitleText": "帮助中心"
+			}
+		}, {
+			"path": "pages/me/setting",
+			"style": {
+				"navigationBarTitleText": "设置"
+			}
+		}, {
+			"path": "pages/me/help_center_detail",
+			"style": {
+				"navigationBarTitleText": ""
+			}
 		}, {
 			"path": "pages/login/login",
 			"style": {