diff --git a/yazhaiTest/pc.html b/yazhaiTest/pc.html
index a09627d..44b54f2 100644
--- a/yazhaiTest/pc.html
+++ b/yazhaiTest/pc.html
@@ -321,6 +321,7 @@
<script>
$(function(){
+ var layzImgNum=0
// var html=[]
// html+='<meta name="google-signin-scope" content="profile email">'
// html+='<meta name="google-signin-client_id" content="534183685500-ag0vai0jh6todldi4rg6lvp0gcsojk0n.apps.googleusercontent.com">'
@@ -380,9 +381,17 @@ $(function(){
getTags()
getTopics(1,typeNum,tagNum,timeNum,sortNum,dayNum)
}
-
-
+ var layzT=true;
$(window).on("scroll",function(){
+ if(layzT==true){
+ console.log(111)
+ layzT=false
+ layzImg()
+ setTimeout(function() {
+ layzT=true;
+ layzImg()
+ }, 300);
+ }
if($(document).height()-$(document).scrollTop()-$(window).height()<=20){
if(scrollOk==false)return;
scrollOk=false
@@ -396,6 +405,7 @@ $(function(){
}else{
$(".side-nav").hide()
}
+
})
$(".more-live").on("click",function(){
$(".neck-nav-ul li").removeClass("neck-nav-li-click")
@@ -473,7 +483,7 @@ $(function(){
$(".neck-nav-ul li").removeClass("neck-nav-li-click")
$(".side-nav").hide()
_self.addClass("neck-nav-li-click")
-
+ layzImgNum=0
$(".m-box").show()
$(".down-box").hide()
@@ -507,7 +517,7 @@ $(function(){
liveList(1,2)
}
else if(_self.attr("data-type")==3){
-
+
$(".tag-big-box").hide()
$(".mc-list-box").hide()
$(".video-list-box").hide()
@@ -517,10 +527,10 @@ $(function(){
}
else if(_self.attr("data-type")==4){
$(".side-nav").show()
- scrollOk=true;
+ // scrollOk=true;
pageNumber=1
typeNum=1
- tagNum=''
+ // tagNum=''
// timeNum=-1
// sortNum=-1
// dayNum=-1
@@ -530,23 +540,19 @@ $(function(){
$(".images-list-box").hide()
$(".like-box").hide()
$(".video-list-box").show()
+ scrollTo('.m-box',350)
if(oneVideo){
getTopics(1,typeNum,tagNum,timeNum,sortNum,dayNum)
oneVideo=false
- }else{
- scrollTo('.m-box',350)
}
}
else if(_self.attr("data-type")==5){
- $(".side-nav").show()
+
scrollOk=true;
pageNumber=1
typeNum=2
- tagNum=''
- timeNum=-1
- sortNum=-1
- dayNum=-1
+ $(".side-nav").hide()
$(".tag-big-box").show()
$(".side-tag-ul li").removeClass("tag-click")
$(".mc-list-box").hide()
@@ -661,6 +667,9 @@ $(function(){
$(".side-tag-ul").html(html);
$(".side-tag-ul li").unbind("click").on("click",function(){
var _self=$(this);
+
+ scrollTo('.m-box',350)
+ layzImgNum=0
if(_self.hasClass("tag-click")){
_self.removeClass('tag-click')
tagNum=''
@@ -690,7 +699,7 @@ $(function(){
pageID:localStorage.canvasCode,
pageNum:e,
type:typeNum,
- pageSize:12,
+ pageSize:32,
language:2,
tag:tagNum,
duration:timeNum,
@@ -718,7 +727,7 @@ $(function(){
var videoList=JSON.parse(list.content)
html+='<a target="_blank" href="room/videoRoom.html?topicId='+list.topicId+'&tag='+tagNum+'">'
html+='<li>';
- html+='<div style="background: url(https://zhibocdn.yabolive.net/comm'+videoList.videos[0].cover.split('?')[0]+'?x-oss-process=video/snapshot,t_90000,f_jpg,w_342,h_0,m_fast,f_jpg)no-repeat;background-size: cover;background-position-y: center;" class="video-top-box">';
+ html+='<div data-type="'+videoList.videos[0].cover.split('?')[0]+'" style="background: pink" class="video-top-box">';
html+='<div class="live-cursor-shadow"></div>';
html+='<img class="play-icon" src="images/front/play-icon.png">'
html+='<div class="video-top-shadow"></div>';
@@ -736,8 +745,13 @@ $(function(){
html+='</li>';
html+='</a>'
}
- if(e==1)$(".video-box-ul").html(html);
+ if(e==1){
+ $(".video-box-ul").html(html);
+ layzImg()
+ }
else $(".video-box-ul").append(html);
+
+
}
if(typeNum==2){
for(var i=0;i<data.dataList.length;i++){
@@ -826,14 +840,10 @@ $(function(){
scrollNav=false
$(".neck-nav-ul li").removeClass("neck-nav-li-click")
$(".neck-nav-ul li").eq(sessionStorage.jump-1).addClass("neck-nav-li-click")
- $(".side-nav").show()
+ $(".side-nav").hide()
scrollOk=true;
pageNumber=1
typeNum=2
- tagNum=''
- timeNum=-1
- sortNum=-1
- dayNum=-1
$(".tag-big-box").show()
$(".side-tag-ul li").removeClass("tag-click")
$(".mc-list-box").hide()
@@ -850,6 +860,23 @@ $(function(){
$(".down-box").show()
}
}
+
+ function layzImg(){
+ if(layzImgNum>50)var iNum=layzImgNum;
+ var iNum=0;
+ for(var i=iNum;i<$(".video-box-ul li").length;i++){
+ if( $(".video-box-ul li .video-top-box").eq(i).attr("data-type2")==1){
+ iNum++
+ continue;
+ }
+ if(($(".video-box-ul li").eq(i).offset().top)-($(window).height()+$(document).scrollTop())<300){
+ $(".video-box-ul li .video-top-box").eq(i).css("background","url(https://zhibocdn.yabolive.net/comm"+$(".video-box-ul li .video-top-box").eq(i).attr("data-type")+"?x-oss-process=video/snapshot,t_90000,f_jpg,w_342,h_0,m_fast,f_jpg)no-repeat")
+ $(".video-box-ul li .video-top-box").eq(i).css("background-size","cover")
+ $(".video-box-ul li .video-top-box").eq(i).css("background-position-y","center")
+ $(".video-box-ul li .video-top-box").eq(i).attr("data-type2",1)
+ }
+ }
+ }
})
</script>
</html>
\ No newline at end of file
diff --git a/yazhaiTest/room/css/index.css b/yazhaiTest/room/css/index.css
index d17cc86..d37b9c9 100644
--- a/yazhaiTest/room/css/index.css
+++ b/yazhaiTest/room/css/index.css
@@ -130,8 +130,6 @@
.video-more-ul .video-top-box {
width: 342px;
height: 192px;
- background: url(https://zhibocdn.yabolive.net/comm/stscli/prod/883221/1648095196207/498F890F-33A1-4EE9-9854-9D39A6905E85.jpeg?x-oss-process=image/resize,w_342) no-repeat;
- background-size: cover;
border-radius: 8px;
position: relative;
overflow: hidden;
diff --git a/yazhaiTest/room/css/index.less b/yazhaiTest/room/css/index.less
index 0fff353..a5e3e1b 100644
--- a/yazhaiTest/room/css/index.less
+++ b/yazhaiTest/room/css/index.less
@@ -136,8 +136,7 @@
.video-top-box{
width: 342px;
height: 192px;
- background: url(https://zhibocdn.yabolive.net/comm/stscli/prod/883221/1648095196207/498F890F-33A1-4EE9-9854-9D39A6905E85.jpeg?x-oss-process=image/resize,w_342)no-repeat;
- background-size: cover;
+
border-radius: 8px;
position: relative;
overflow: hidden;
diff --git a/yazhaiTest/room/liveRoom.html b/yazhaiTest/room/liveRoom.html
index d4e41a1..0165d56 100644
--- a/yazhaiTest/room/liveRoom.html
+++ b/yazhaiTest/room/liveRoom.html
@@ -2300,7 +2300,8 @@ $(function () {
}
for(var i=0;i<$(".gift-track-box").children().length;i++){
if($(".track-content").hasClass('track'+list.content.uuid+'')){
- $('.track'+list.content.uuid+'').attr("data-type",'5000')
+ if(list.content.giftDuration!==0)$('.track'+list.content.uuid+'').attr("data-type",''+list.content.giftDuration*1000+'')
+ else $('.track'+list.content.uuid+'').attr("data-type",'5000')
$('.track'+list.content.uuid+'').children(".track-bar").children('.track-num').html(html)
return;
}