Authored by 陈轩

fix

... ... @@ -52,7 +52,7 @@
</div>
</div>
<div class="title">
<span>{{title}}</span>
<span>{{watermark}}</span>
</div>
</div>
... ... @@ -107,6 +107,21 @@
</a>
</div>
{{/notBegin}}
{{! footer}}
<div class="float-layer" id="float-layer-app">
<div class="float-layer-left">
<span class="yoho-icon iconfont">&#xe60d;</span>
<p>新用户送惊喜礼包</p>
</div>
<a href="javascript:void(0);" id="float-layer-close" >
<i class="close-icon iconfont">&#xe623;</i>
<div class="circle-rightbottom"></div>
</a>
<a href="http://a.app.qq.com/o/simple.jsp?pkgname=com.yoho" id="float-layer-btn">
立即下载
</a>
</div>
</div>
<script>
var live_start_time = {{live_start_time}};//该直播开始时间
... ...
... ... @@ -15,6 +15,7 @@ $('.live-wrapper').css({
$(function() {
var $share = $('.live-btn-share');
var $appBox = $('#float-layer-app');
if (/MicroMessenger/i.test(navigator.userAgent)) {
$share.show()
... ... @@ -26,5 +27,9 @@ $(function() {
});
});
}
$appBox.on('click', '#float-layer-close', function() {
$appBox.hide();
});
});
... ...
... ... @@ -111,7 +111,7 @@ function init_play_button() {
var v_width = temp_width + 'px';
var v_height = 32.575 * scale + 'rem';
$('.live-loading-container').show(); //显示loading
init_video(video_source, _is_wechat, _is_ios, 'auto', window.innerHeight+'px');
init_video(video_source, _is_wechat, _is_ios, '100%', '100%');
setTimeout(function() {
... ... @@ -820,7 +820,7 @@ $(document).ready(function() {
} else {
is_live = false;
$('.live-time span').eq(0).text('YOHO!回看 ·');
// $('.live-time span').eq(0).text('YOHO!回看 ·');
$('.live-num span').text(replay_user_nums + '人观看');
replay_new_start_time = live_start_time;
get_replay_chat_barrage(live_start_time, replay_chat_interval); //重播获取弹幕
... ...
... ... @@ -113,7 +113,7 @@ YohoVideo.prototype = {
video.appendChild(source);*/
}
var _video_html = '<video id="' + this._video_id + '" webkit-playsinline="true"' + _attributes + ' style="' + _styles + 'background:rgb(0,0,0)" >' +
var _video_html = '<video id="' + this._video_id + '" webkit-playsinline="true"' + _attributes + ' style="' + _styles + 'background:rgb(0,0,0)" webkit-playsinline>' +
_source_html +
'</video>';
//console.log(_video_html);
... ...
... ... @@ -33,39 +33,31 @@
.title {
margin-bottom: 32px;
}
.val {
font-size: 26px;
margin-bottom: 13px;
}
.label,
.name {
font-size: 19px;
}
.audience .val {
font-size: 51px;
}
.duration,
.favorite {
width: 50%;
float: left;
.inner {
text-align: center;
}
}
.duration .inner {
margin-right: 62px;
}
.favorite .inner {
margin-left: 62px;
}
.avatar {
display: block;
width: 112px;
... ... @@ -75,13 +67,11 @@
border: none;
outline: none;
}
.name {
display: inline-block;
font-size: 20px;
margin-bottom: 42px;
}
.title {
max-width: 70%;
font-size: 29px;
... ... @@ -91,7 +81,6 @@
text-overflow: ellipsis;
white-space: nowrap;
}
.begin-time {
font-size: 24px;
}
... ... @@ -112,7 +101,6 @@
.live-btn-close {
z-index: 100;
right: 25px;
.iconfont {
font-size: 38px;
}
... ... @@ -122,9 +110,91 @@
display: none;
z-index: 100;
right: 100px;
.iconfont {
font-size: 28px;
line-height: 46px;
}
}
.live-wrapper {
.float-layer {
height: 128px;
background: rgba(68, 68, 68, 0.95);
position: fixed;
width: 100%;
bottom: 0;
left: 0;
z-index: 9999;
padding: 20px 0;
.float-layer-left {
padding-left: 44px;
overflow: hidden;
float: left;
img {
height: 44px;
float: left;
margin-right: 20px;
}
p {
float: left;
font-size: 32px;
height: 88px;
line-height: 88px;
color: white;
}
.yoho-icon {
float: left;
margin-right: 10px;
font-size: 44px;
line-height: 88px;
width: 88px;
height: 88px;
text-align: center;
color: #fff;
border-radius: 20px;
background-image: linear-gradient(#323232, #0f0f0f);
}
}
}
#float-layer-close {
position: absolute;
left: 0;
top: 0;
width: 100px;
height: 100px;
.close-icon {
position: absolute;
left: 0;
top: 0;
color: #C0C0C0;
z-index: 2;
}
}
#float-layer-btn {
position: absolute;
top: 50%;
right: 15px;
font-size: 32px;
padding: 0 10px;
height: 54px;
line-height: 54px;
background: white;
border-radius: 5px;
margin-top: -26px;
-webkit-tap-highlight-color: rgba(0, 0, 0, 0.5);
&:link,
&:visited,
&:hover,
&:actived {
color: #000;
}
}
.circle-rightbottom {
position: absolute;
width: 50px;
height: 0px;
border: 0 solid #323232;
border-bottom: 50px solid #323232;
border-radius: 0 0 50px 0;
}
}
... ...