Commit d861c3c3 by libai

测试

parent 8240e689
...@@ -14,11 +14,22 @@ body::-webkit-scrollbar { ...@@ -14,11 +14,22 @@ body::-webkit-scrollbar {
width: 1440px; width: 1440px;
margin: 0 auto; margin: 0 auto;
} }
.more-live {
color: #666;
font-size: 16px;
position: absolute;
right: 0;
top: 10px;
cursor: pointer;
}
.more-live:hover {
color: #E53985;
}
.box-title { .box-title {
position: relative; position: relative;
height: 70px; height: 70px;
line-height: 70px; line-height: 70px;
margin-top: 10px; margin-top: 15px;
font-size: 0; font-size: 0;
} }
.box-title > img { .box-title > img {
...@@ -154,7 +165,7 @@ body::-webkit-scrollbar { ...@@ -154,7 +165,7 @@ body::-webkit-scrollbar {
.images-box-ul .video-title { .images-box-ul .video-title {
color: #333333; color: #333333;
font-size: 14px; font-size: 14px;
text-indent: 56px; text-indent: 12px;
padding-top: 10px; padding-top: 10px;
width: 330px; width: 330px;
text-overflow: ellipsis; text-overflow: ellipsis;
...@@ -163,7 +174,7 @@ body::-webkit-scrollbar { ...@@ -163,7 +174,7 @@ body::-webkit-scrollbar {
} }
.video-box-ul .video-tag-box, .video-box-ul .video-tag-box,
.images-box-ul .video-tag-box { .images-box-ul .video-tag-box {
margin-left: 54px; margin-left: 10px;
margin-top: 4px; margin-top: 4px;
} }
.video-box-ul .video-tag-box > div, .video-box-ul .video-tag-box > div,
...@@ -280,10 +291,11 @@ body::-webkit-scrollbar { ...@@ -280,10 +291,11 @@ body::-webkit-scrollbar {
} }
.video-more-btn { .video-more-btn {
position: relative; position: relative;
color: #E53985; color: #666;
font-size: 16px; font-size: 16px;
position: absolute; position: absolute;
right: 0; right: 0;
cursor: pointer;
top: 5px; top: 5px;
} }
.video-more-btn img { .video-more-btn img {
...@@ -292,6 +304,9 @@ body::-webkit-scrollbar { ...@@ -292,6 +304,9 @@ body::-webkit-scrollbar {
position: relative; position: relative;
top: 1px; top: 1px;
} }
.video-more-btn:hover {
color: #E53985;
}
.video-more-layer { .video-more-layer {
display: none; display: none;
width: 386px; width: 386px;
......
...@@ -33,13 +33,22 @@ ...@@ -33,13 +33,22 @@
width: 1440px; width: 1440px;
margin: 0 auto; margin: 0 auto;
} }
.more-live{
color: #666;
font-size: 16px;
position: absolute;
right: 0;
top: 10px;
cursor: pointer;
}
.more-live:hover{
color: #E53985;
}
.box-title{ .box-title{
position: relative; position: relative;
height: 70px; height: 70px;
line-height: 70px; line-height: 70px;
margin-top: 10px; margin-top: 15px;
font-size: 0; font-size: 0;
>img{ >img{
vertical-align:middle; vertical-align:middle;
...@@ -167,7 +176,7 @@ ...@@ -167,7 +176,7 @@
.video-title{ .video-title{
color: #333333; color: #333333;
font-size: 14px; font-size: 14px;
text-indent: 56px; text-indent: 12px;
padding-top: 10px; padding-top: 10px;
width: 330px; width: 330px;
text-overflow: ellipsis; text-overflow: ellipsis;
...@@ -175,7 +184,7 @@ ...@@ -175,7 +184,7 @@
overflow: hidden; overflow: hidden;
} }
.video-tag-box{ .video-tag-box{
margin-left: 54px; margin-left: 10px;
margin-top: 4px; margin-top: 4px;
>div{ >div{
min-width: 42px; min-width: 42px;
...@@ -298,10 +307,11 @@ ...@@ -298,10 +307,11 @@
} }
.video-more-btn{ .video-more-btn{
position: relative; position: relative;
color: #E53985; color: #666;
font-size: 16px; font-size: 16px;
position: absolute; position: absolute;
right: 0; right: 0;
cursor: pointer;
top: 5px; top: 5px;
img{ img{
width: 20px; width: 20px;
...@@ -310,6 +320,9 @@ ...@@ -310,6 +320,9 @@
top: 1px; top: 1px;
} }
} }
.video-more-btn:hover{
color: #E53985;
}
.video-more-layer{ .video-more-layer{
display: none; display: none;
width: 386px; width: 386px;
......
...@@ -60,7 +60,7 @@ sessionStorage.like=data.like; ...@@ -60,7 +60,7 @@ sessionStorage.like=data.like;
lang:2, lang:2,
os:'pc_web', os:'pc_web',
cid:'ftsweb', cid:'ftsweb',
webVersion:'0.01' webVersion:'100'
}, },
dataType: "JSON" dataType: "JSON"
}) })
......
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
<div class="m-box"> <div class="m-box">
<div style="height: 60px;"></div> <div style="height: 60px;"></div>
<div class="mc-list-box"> <div class="mc-list-box">
<h2 class="box-title"><img src="images/front/category1.png" alt=""><span>在線美女</span></h2> <h2 class="box-title"><img src="images/front/category1.png" alt=""><span>在線美女</span><div class="more-live">觀看更多 ></div></h2>
<ul class="live-box-ul clearfix"> <ul class="live-box-ul clearfix">
<!-- <li> <!-- <li>
<div class="live-top-box"> <div class="live-top-box">
...@@ -353,7 +353,7 @@ $(function(){ ...@@ -353,7 +353,7 @@ $(function(){
} }
fp.get(function(result, components) { fp.get(function(result, components) {
localStorage.canvasCode=result localStorage.canvasCode=result
liveList(1) liveList(1,1)
getTags() getTags()
getTopics(1,typeNum,tagNum,timeNum,sortNum,dayNum) getTopics(1,typeNum,tagNum,timeNum,sortNum,dayNum)
}); });
...@@ -365,6 +365,17 @@ $(function(){ ...@@ -365,6 +365,17 @@ $(function(){
getTopics(pageNumber,typeNum,tagNum,timeNum,sortNum,dayNum) getTopics(pageNumber,typeNum,tagNum,timeNum,sortNum,dayNum)
} }
}) })
$(".more-live").on("click",function(){
$(".neck-nav-ul li").removeClass("neck-nav-li-click")
$(".neck-nav-ul li").eq(1).addClass("neck-nav-li-click")
$(".images-list-box").hide()
$(".video-list-box").hide()
$(".mc-list-box").show()
$(".tag-big-box").hide()
$(".like-box").hide()
liveList(1,2)
$(".more-live").hide()
})
$(".layer-more-btn1").on("click",function(){ $(".layer-more-btn1").on("click",function(){
timeNum=-1 timeNum=-1
sortNum=-1 sortNum=-1
...@@ -416,73 +427,6 @@ $(function(){ ...@@ -416,73 +427,6 @@ $(function(){
$(".video-more-layer").fadeOut(350) $(".video-more-layer").fadeOut(350)
$(".video-more-btn").removeClass("video-more-btn-all") $(".video-more-btn").removeClass("video-more-btn-all")
}) })
$(".side-nav-sort").on("click",function(){
var _self=$(this);
for(var i=0;i<6;i++){
$(".side-icon").eq(i).attr("src","images/front/icon"+(i+1)+".png")
}
_self.children(".side-icon").attr("src",'images/front/icon'+_self.attr("data-type")+'-click.png')
$(".side-nav-sort").removeClass("side-nav-sort-click")
_self.addClass("side-nav-sort-click")
if(_self.attr("data-type")==1){
$(".images-list-box").hide()
$(".like-box").hide()
$(".mc-list-box").show()
$(".video-list-box").show()
pageNumber=1
typeNum=1
tagNum=''
timeNum=-1
sortNum=-1
dayNum=-1
$(".tag-big-box").show()
$(".side-tag-ul li").removeClass("tag-click")
liveList(1)
getTopics(1,typeNum,tagNum,timeNum,sortNum,dayNum)
}
else if(_self.attr("data-type")==2){
$(".images-list-box").hide()
$(".video-list-box").hide()
$(".mc-list-box").show()
$(".tag-big-box").hide()
$(".like-box").hide()
liveList(1)
}
else if(_self.attr("data-type")==3){
$(".tag-big-box").hide()
$(".mc-list-box").hide()
$(".video-list-box").hide()
$(".images-list-box").hide()
$(".like-box").show()
likeList()
}
else if(_self.attr("data-type")==4){
typeNum=1
tagNum=''
$(".tag-big-box").show()
$(".side-tag-ul li").removeClass("tag-click")
$(".mc-list-box").hide()
$(".images-list-box").hide()
$(".like-box").hide()
$(".video-list-box").show()
getTopics(1,typeNum,tagNum,timeNum,sortNum,dayNum)
}
else if(_self.attr("data-type")==5){
typeNum=2
tagNum=''
$(".tag-big-box").show()
$(".side-tag-ul li").removeClass("tag-click")
$(".mc-list-box").hide()
$(".video-list-box").hide()
$(".like-box").hide()
$(".images-list-box").show()
getTopics(1,typeNum,tagNum,timeNum,sortNum,dayNum)
}
else if(_self.attr("data-type")==6){
}
})
var oneVideo=true; var oneVideo=true;
var oneImg=true; var oneImg=true;
$(".neck-nav-ul li").on("click",function(){ $(".neck-nav-ul li").on("click",function(){
...@@ -504,6 +448,7 @@ $(function(){ ...@@ -504,6 +448,7 @@ $(function(){
$(".like-box").hide() $(".like-box").hide()
$(".mc-list-box").show() $(".mc-list-box").show()
$(".video-list-box").show() $(".video-list-box").show()
$(".more-live").show()
pageNumber=1 pageNumber=1
typeNum=1 typeNum=1
tagNum='' tagNum=''
...@@ -512,7 +457,7 @@ $(function(){ ...@@ -512,7 +457,7 @@ $(function(){
// dayNum=-1 // dayNum=-1
$(".tag-big-box").show() $(".tag-big-box").show()
$(".side-tag-ul li").removeClass("tag-click") $(".side-tag-ul li").removeClass("tag-click")
liveList(1) liveList(1,1)
// getTopics(1,typeNum,tagNum,timeNum,sortNum,dayNum) // getTopics(1,typeNum,tagNum,timeNum,sortNum,dayNum)
} }
else if(_self.attr("data-type")==2){ else if(_self.attr("data-type")==2){
...@@ -522,7 +467,7 @@ $(function(){ ...@@ -522,7 +467,7 @@ $(function(){
$(".mc-list-box").show() $(".mc-list-box").show()
$(".tag-big-box").hide() $(".tag-big-box").hide()
$(".like-box").hide() $(".like-box").hide()
liveList(1) liveList(1,2)
} }
else if(_self.attr("data-type")==3){ else if(_self.attr("data-type")==3){
...@@ -621,7 +566,7 @@ $(function(){ ...@@ -621,7 +566,7 @@ $(function(){
} }
}) })
} }
function liveList(e){ function liveList(e,type){
$.ajax({ $.ajax({
url:$ip+'frontPage/queryLiveUsers', url:$ip+'frontPage/queryLiveUsers',
data:{ data:{
...@@ -634,12 +579,15 @@ $(function(){ ...@@ -634,12 +579,15 @@ $(function(){
console.log('直播列表',data) console.log('直播列表',data)
if(data.code==-5008){ if(data.code==-5008){
setTimeout(function() { setTimeout(function() {
liveList(e) liveList(e,type)
}, 500); }, 500);
return; return;
} }
var html=[]; var html=[];
for(var i=0;i<data.roomList.length;i++){ if(type==1) listNum=10
else listNum=data.roomList.length
for(var i=0;i<listNum;i++){
if(data.roomList[i]==undefined)break;
var list=data.roomList[i] var list=data.roomList[i]
html+='<li>'; html+='<li>';
html+='<a href="room/liveRoom.html?roomId='+list.roomId+'"><div style="background: url(https://zhibocdn.yabolive.net/comm'+list.face.split('?')[0]+'?x-oss-process=image/resize,w_368) no-repeat;background-size: cover;" class="live-top-box">'; html+='<a href="room/liveRoom.html?roomId='+list.roomId+'"><div style="background: url(https://zhibocdn.yabolive.net/comm'+list.face.split('?')[0]+'?x-oss-process=image/resize,w_368) no-repeat;background-size: cover;" class="live-top-box">';
...@@ -652,6 +600,7 @@ $(function(){ ...@@ -652,6 +600,7 @@ $(function(){
html+='</li>'; html+='</li>';
} }
$(".live-box-ul").html(html); $(".live-box-ul").html(html);
} }
}) })
} }
...@@ -731,14 +680,14 @@ $(function(){ ...@@ -731,14 +680,14 @@ $(function(){
var videoList=JSON.parse(list.content) var videoList=JSON.parse(list.content)
html+='<a href="room/videoRoom.html?topicId='+list.topicId+'&tag='+tagNum+'">' html+='<a href="room/videoRoom.html?topicId='+list.topicId+'&tag='+tagNum+'">'
html+='<li>'; html+='<li>';
html+='<div style="background: url(https://zhibocdn.yabolive.net/comm'+videoList.videos[0].cover.split('?')[0]+'?x-oss-process=video/snapshot,t_0,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 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 class="live-cursor-shadow"></div>'; html+='<div class="live-cursor-shadow"></div>';
html+='<img class="play-icon" src="images/front/play-icon.png">' html+='<img class="play-icon" src="images/front/play-icon.png">'
html+='<div class="video-top-shadow"></div>'; html+='<div class="video-top-shadow"></div>';
html+='<span class="video-time">'+add0(Math.floor(videoList.videos[0].duration/1000/60))+':'+add0(Math.floor(videoList.videos[0].duration/1000)%60)+'</span>'; html+='<span class="video-time">'+add0(Math.floor(videoList.videos[0].duration/1000/60))+':'+add0(Math.floor(videoList.videos[0].duration/1000)%60)+'</span>';
html+='</div>'; html+='</div>';
html+='<div class="video-name-box">'; html+='<div class="video-name-box">';
html+='<img class="video-face" src="https://zhibocdn.yabolive.net/comm'+list.face+'?x-oss-process=image/resize,w_40" alt="">'; // html+='<img class="video-face" src="https://zhibocdn.yabolive.net/comm'+list.face+'?x-oss-process=image/resize,w_40" alt="">';
html+='<p class="video-title">'+videoList.title+'</p>'; html+='<p class="video-title">'+videoList.title+'</p>';
html+='<div class="video-tag-box">'; html+='<div class="video-tag-box">';
for(var j=0;j<list.tags.length;j++){ for(var j=0;j<list.tags.length;j++){
...@@ -770,7 +719,7 @@ $(function(){ ...@@ -770,7 +719,7 @@ $(function(){
html+='<div class="video-top-shadow"></div>'; html+='<div class="video-top-shadow"></div>';
html+='</div>'; html+='</div>';
html+='<div class="video-name-box">'; html+='<div class="video-name-box">';
html+='<img class="video-face" src="https://zhibocdn.yabolive.net/comm'+list.face+'?x-oss-process=image/resize,w_40" alt="">'; // html+='<img class="video-face" src="https://zhibocdn.yabolive.net/comm'+list.face+'?x-oss-process=image/resize,w_40" alt="">';
html+='<p class="video-title">'+imgList.title+'</p>'; html+='<p class="video-title">'+imgList.title+'</p>';
html+='<div class="video-tag-box">'; html+='<div class="video-tag-box">';
for(var j=0;j<list.tags.length;j++){ for(var j=0;j<list.tags.length;j++){
...@@ -796,7 +745,8 @@ $(function(){ ...@@ -796,7 +745,8 @@ $(function(){
$(".mc-list-box").show() $(".mc-list-box").show()
$(".tag-big-box").hide() $(".tag-big-box").hide()
$(".like-box").hide() $(".like-box").hide()
liveList(1) liveList(1,2)
$(".more-live").hide()
} }
if(data.jump==3){ if(data.jump==3){
if(localStorage.uid==undefined){ if(localStorage.uid==undefined){
......
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