Merge branch 'master' of https://e.coding.net/ctcdevteam/cma_search

client_mp/.hbuilderx/launch.json

@@ -2,10 +2,15 @@
   // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
     "version": "0.0",
     "configurations": [{
-            "type": "uniCloud",
-            "default": {
-                "launchtype": "remote"
-            }
-        }
+     	"default" : 
+     	{
+     		"launchtype" : "remote"
+     	},
+     	"mp-weixin" : 
+     	{
+     		"launchtype" : "remote"
+     	},
+     	"type" : "uniCloud"
+     }
     ]
 }

client_mp/pages.json

@@ -147,12 +147,12 @@
 				"selectedIconPath": "static/common/homec.png",
 				"text": "主页"
 			},
-			{
+			/* {
 				"pagePath": "pages/vod/video",
 				"iconPath": "static/common/play.png",
 				"selectedIconPath": "static/common/playc.png",
 				"text": "点播"
-			},
+			}, */
 			{
 				"pagePath": "pages/my/my",
 				"iconPath": "static/common/me.png",