Merge branch 'master' of http://git.ringzle.com:3000/htcwl/hotelHomestayWx

pages.json

@@ -1,19 +1,6 @@
 {
 	"pages": [
-		// {
-		// 	"path": "pages/login/index",
-		// 	"style": {
-		// 		"navigationBarTitleText": "登录",
-		// 		"navigationStyle": "custom"
-		// 	}
-		// },
-		// {
-		// 	"path": "pages/login/forgot",
-		// 	"style": {
-		// 		"navigationBarTitleText": "忘记密码",
-		// 		"navigationStyle": "custom"
-		// 	}
-		// },
+		//首页
 		{
 			"path": "pages/home/index",
 			"style": {
@@ -35,7 +22,21 @@
 				"navigationStyle": "custom"
 			}
 		},
-
+		//登录
+		{
+			"path": "pages/login/index",
+			"style": {
+				"navigationBarTitleText": "登录",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/login/forgot",
+			"style": {
+				"navigationBarTitleText": "忘记密码",
+				"navigationStyle": "custom"
+			}
+		},
 		{
 			"path": "pages/login/select",
 			"style": {