更新master前的版本

pages.json

@@ -32,6 +32,19 @@
 				"enablePullDownRefresh": false
 			}
 		},
+		{
+			"path": "pages/otherApp/index",
+			"style": {
+				"navigationBarTitleText": "小时达",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/otherApp/webView",
+			"style": {
+				"enablePullDownRefresh": false
+			}
+		},
 		{
 			"path": "pages/activity/detail",
 			"style": {
@@ -783,6 +796,12 @@
 				"text": "活动",
 				"pagePath": "pages/activity/index"
 			},
+			{
+				"iconPath": "static/activity_off.png",
+				"selectedIconPath": "static/activity_on.png",
+				"text": "小时达",
+				"pagePath": "pages/otherApp/index"
+			},
 			{
 				"iconPath": "static/my_off.png",
 				"selectedIconPath": "static/my_on.png",