fe / yohobuy-node · Commits

Go to a project

Authored by 杨延青
Commit 045bc1ed02a598a8aa892956f8980c1036cca534 2 parents 174fd6cc dd58f76d

Merge branch 'feature/guangDev' into 'release/5.8' 

Feature/guang dev



See merge request !132
Inline Side-by-side
Showing 3 changed files with 5 additions and 5 deletions
... ... @@ -54,8 +54,8 @@ exports.index = (req, res, next) => {
guang: {
slider: ret[0],
msgTypes: ret[1],
msgs: (+type === 0 && +page === 1) ?
_.concat(ret[7] && ret[7].msgs, ret[2] && ret[2].msgs) : ret[2] && ret[2].msgs,
msgs: (+type === 0 && +page === 1 && ret[7] && ret[7].msgs) ?
_.concat(ret[7].msgs, ret[2] && ret[2].msgs) : ret[2] && ret[2].msgs,
hotTags: ret[3],
ads: ret[4],
exRecos: ret[5],
... ...
... ... @@ -11,7 +11,7 @@ module.exports = (url, width, height) => {
<a href="javascript:;" class="video-close-btn"></a>
<object id="video_0" codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab"
classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000">
<param value="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=http://img01.yohoboys.com/contentimg/2016/06/12/14/0183fabea5332c5902cdd1d0d7fb63df04.jpg"
<param value="//cdn.yoho.cn/tool/VideoPlayerNew.swf?id=video_0&amp;url=${url}&amp;tuijian=0"
name="movie">
<param value="high" name="quality">
<param value="#ffffff" name="bgcolor">
... ... @@ -21,7 +21,7 @@ module.exports = (url, width, height) => {
<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">
src="//cdn.yoho.cn/tool/VideoPlayerNew.swf?id=video_0&amp;url=${url}&amp;tuijian=0">
</object>
</div> `;
};
... ...
... ... @@ -781,7 +781,7 @@ module.exports = class extends global.yoho.BaseModel {
video: []
};
result.video.push(videoPlayerTpl(data.src, 640, 350));
result.video.push(videoPlayerTpl((data.src).replace(/http:/g, ''), 640, 350));
return result;
},
... ...