Merge branch 'feature/guangDev' into release/5.8

@@ -6,7 +6,7 @@
 
 module.exports = (url, width, height) => {
     width = width || 750;
-    height = height || 420;
+    height = height || 300;
     return `<div class="video-wrap">
         <a href="javascript:;" class="video-close-btn"></a>
         <object id="video_0" codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab"
@@ -18,7 +18,7 @@ module.exports = (url, width, height) => {
         <param name="allowFullScreen" value="true">
         <param value="always" name="allowScriptAccess">
         <param value="transparent" name="wmode">
-        <embed style="width: ${width}px;height: ${height}px; display:block; margin:0 auto;" id="flash" align="middle" pluginspage="http://www.macromedia.com/go/getflashplayer"
+        <embed style="width: ${width}px;height: ${height}px; display:block; margin:0 auto;" id="flash" align="absbottom" pluginspage="http://www.macromedia.com/go/getflashplayer"
     type="application/x-shockwave-flash" allowfullscreen="true" allowscriptaccess="always" loop="false"
     play="true" bgcolor="#ffffff" quality="high" wmode="transparent" name="vMessage"
     src="http://rescdn.yohoboys.com/res/new/boys/swf/util/VideoPlayerNew.swf?id=video_0&amp;url=${url}&amp;language=1&amp;sharepic=http://img01.yohoboys.com/contentimg/2016/06/12/14/0183fabea5332c5902cdd1d0d7fb63df04.jpg?imageMogr2/thumbnail/738x424|watermark/1/image/aHR0cDovL3Jlc2Nkbi55b2hvYm95cy5jb20vcmVzL25ldy9ib3lzL2ltYWdlcy9iYW5uZXJwbGF5LnBuZw==/dissolve/100/gravity/Center/dx/10/dy/10&amp;title1=Meet...Cody Sanderson &amp;shareurl=http://www.yohoboys.com/channel/detail/index/id/10657/time/1478052894&amp;coverpic=${url}?vframe/jpg/offset/0">

@@ -781,7 +781,7 @@ module.exports = class extends global.yoho.BaseModel {
                     video: []
                 };
 
-                result.video.push(videoPlayerTpl(data.src, 640, 480));
+                result.video.push(videoPlayerTpl(data.src, 640, 350));
 
                 return result;
             },