Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp into master

pages.json

@@ -18,12 +18,6 @@
 		{
 			"path": "pages/cats/cats"
 		},
-		{
-			"path": "pages/favorite/favorite"
-		},
-		{
-			"path": "pages/favorite/favoriteKotra"
-		},
 		{
 			"path": "pages/card/index/index"
 		},
@@ -38,6 +32,13 @@
 		}
 	],
 	"subPackages": [{
+			"root": "pages/favorite",
+			"pages": [{
+				"path": "favorite"
+			},{
+				"path":"favoriteKotra"
+			}]
+		},{
 			"root": "pages/foot",
 			"pages": [{
 				"path": "index/index"
@@ -85,12 +86,12 @@
 		},
 		{
 			"root": "pages/live", //赞羊、甲鹤、罗演的杂货铺
-			// "plugins": {
-			//     "live-player-plugin": {
-			//         "version": "1.3.2",
-			//         "provider": "wx2b03c6e691cd7370"
-			//     }
-			// },
+			"plugins": {
+			    "live-player-plugin": {
+			        "version": "1.3.2",
+			        "provider": "wx2b03c6e691cd7370"
+			    }
+			},
 			"pages": [{
 				"path": "index"
 			}, {