Commit e4148280 by libai

测试

parent 46e1b0b6
Showing with 4 additions and 5 deletions
...@@ -2342,8 +2342,6 @@ $(function () { ...@@ -2342,8 +2342,6 @@ $(function () {
html+=''+list.content.uid_nick+'</span>'; html+=''+list.content.uid_nick+'</span>';
// if(list.content.live_lv>0)html+='<span class="online-lv">'+list.content.live_lv+'</span>'; // if(list.content.live_lv>0)html+='<span class="online-lv">'+list.content.live_lv+'</span>';
if(list.content.medal!="")html+='<img class="medal-icon" src="https://zhibocdn.yabolive.net/comm'+list.content.medal+'?x-oss-process=image/resize,w_24">'; if(list.content.medal!="")html+='<img class="medal-icon" src="https://zhibocdn.yabolive.net/comm'+list.content.medal+'?x-oss-process=image/resize,w_24">';
html+=': '+list.content.content+''; html+=': '+list.content.content+'';
html+='</li>'; html+='</li>';
$(".live-msg-ul").append(html); $(".live-msg-ul").append(html);
...@@ -2367,9 +2365,7 @@ $(function () { ...@@ -2367,9 +2365,7 @@ $(function () {
$(".live-msg-ul").append(html); $(".live-msg-ul").append(html);
} }
if($(".live-msg-ul").height()-($(".msg-big-box").scrollTop()+$(".msg-big-box").height())<120){
$(".msg-big-box").scrollTop($(".live-msg-ul").height()-$(".msg-big-box").height()+30)
}
$(".name-span").unbind("click").on("click",function(){ $(".name-span").unbind("click").on("click",function(){
var _self=$(this) var _self=$(this)
cardUp( _self.attr("data-type")) cardUp( _self.attr("data-type"))
...@@ -2459,6 +2455,9 @@ $(function () { ...@@ -2459,6 +2455,9 @@ $(function () {
alert("您已被移出直播,暫時不能進入") alert("您已被移出直播,暫時不能進入")
window.location.href="../pc.html" window.location.href="../pc.html"
} }
if($(".live-msg-ul").height()-($(".msg-big-box").scrollTop()+$(".msg-big-box").height())<150){
$(".msg-big-box").scrollTop($(".live-msg-ul").height()-$(".msg-big-box").height()+30)
}
}; };
ws.onclose = function () { ws.onclose = function () {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment