Commit 4da2bbab by libai

测试

parent 87e53452
...@@ -253,6 +253,7 @@ body::-webkit-scrollbar { ...@@ -253,6 +253,7 @@ body::-webkit-scrollbar {
color: #E53985; color: #E53985;
} }
.side-tag-ul li { .side-tag-ul li {
cursor: pointer;
width: 135px; width: 135px;
height: 34px; height: 34px;
line-height: 34px; line-height: 34px;
......
...@@ -270,6 +270,7 @@ ...@@ -270,6 +270,7 @@
color: #E53985; color: #E53985;
} }
li{ li{
cursor: pointer;
width: 135px; width: 135px;
height: 34px; height: 34px;
line-height: 34px; line-height: 34px;
......
...@@ -104,7 +104,7 @@ function loginGo(){ ...@@ -104,7 +104,7 @@ function loginGo(){
html+=' <div class="login-code-btn">獲取驗證碼</div>'; html+=' <div class="login-code-btn">獲取驗證碼</div>';
html+=' </div>'; html+=' </div>';
html+=' <div class="login-new-password1">'; html+=' <div class="login-new-password1">';
html+=' <input placeholder="請設置6-16位密碼" maxlength="16" class="login-new-password-input" type="password">'; html+=' <input placeholder="請設置6-16位密碼" oninput="value=value.replace(/[^\\a-\\z\\A-\\Z0-9]/g,\'\')" maxlength="16" class="login-new-password-input" type="password">';
html+=' </div>'; html+=' </div>';
html+=' <div class="login-submit-btn2">創建免費賬戶</div>'; html+=' <div class="login-submit-btn2">創建免費賬戶</div>';
html+=' <p class="login-register-tips">已有賬號,<span>立即登錄</span></p>'; html+=' <p class="login-register-tips">已有賬號,<span>立即登錄</span></p>';
......
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
opentype:8, opentype:8,
authToken:mAutho.id_token, authToken:mAutho.id_token,
nickname:res.name, nickname:res.name,
facepath:res.iss facepath:res.picture
}, },
success:function(data){ success:function(data){
console.log('line',data) console.log('line',data)
...@@ -58,9 +58,7 @@ ...@@ -58,9 +58,7 @@
} }
localStorage.token=data.token localStorage.token=data.token
localStorage.uid=data.uid localStorage.uid=data.uid
console.log(res.iss) window.location.href='pc.html'
// window.location.href='pc.html'
} }
}) })
// window.location.href = "footseenlogin://" + encodeURIComponent("www.firefly.live?token=" + mAutho.id_token + "&name=" + res.name + "&profileImageUrl=" + res.iss + "&id=" + res.sub); // window.location.href = "footseenlogin://" + encodeURIComponent("www.firefly.live?token=" + mAutho.id_token + "&name=" + res.name + "&profileImageUrl=" + res.iss + "&id=" + res.sub);
......
...@@ -483,6 +483,8 @@ $(function(){ ...@@ -483,6 +483,8 @@ $(function(){
} }
}) })
var oneVideo=true;
var oneImg=true;
$(".neck-nav-ul li").on("click",function(){ $(".neck-nav-ul li").on("click",function(){
var _self=$(this); var _self=$(this);
if(localStorage.uid==undefined&&_self.attr("data-type")==3){ if(localStorage.uid==undefined&&_self.attr("data-type")==3){
...@@ -492,9 +494,12 @@ $(function(){ ...@@ -492,9 +494,12 @@ $(function(){
$(".neck-nav-ul li").removeClass("neck-nav-li-click") $(".neck-nav-ul li").removeClass("neck-nav-li-click")
$(".side-nav").hide() $(".side-nav").hide()
_self.addClass("neck-nav-li-click") _self.addClass("neck-nav-li-click")
$(".m-box").show() $(".m-box").show()
$(".down-box").hide() $(".down-box").hide()
if(_self.attr("data-type")==1){ if(_self.attr("data-type")==1){
scrollTo('.m-box',350)
$(".images-list-box").hide() $(".images-list-box").hide()
$(".like-box").hide() $(".like-box").hide()
$(".mc-list-box").show() $(".mc-list-box").show()
...@@ -511,6 +516,7 @@ $(function(){ ...@@ -511,6 +516,7 @@ $(function(){
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){
scrollTo('.m-box',350)
$(".images-list-box").hide() $(".images-list-box").hide()
$(".video-list-box").hide() $(".video-list-box").hide()
$(".mc-list-box").show() $(".mc-list-box").show()
...@@ -542,7 +548,11 @@ $(function(){ ...@@ -542,7 +548,11 @@ $(function(){
$(".images-list-box").hide() $(".images-list-box").hide()
$(".like-box").hide() $(".like-box").hide()
$(".video-list-box").show() $(".video-list-box").show()
if(oneVideo){
getTopics(1,typeNum,tagNum,timeNum,sortNum,dayNum) getTopics(1,typeNum,tagNum,timeNum,sortNum,dayNum)
oneVideo=false
}
} }
else if(_self.attr("data-type")==5){ else if(_self.attr("data-type")==5){
$(".side-nav").show() $(".side-nav").show()
...@@ -559,7 +569,11 @@ $(function(){ ...@@ -559,7 +569,11 @@ $(function(){
$(".video-list-box").hide() $(".video-list-box").hide()
$(".like-box").hide() $(".like-box").hide()
$(".images-list-box").show() $(".images-list-box").show()
if(oneImg){
getTopics(1,typeNum,tagNum,timeNum,sortNum,dayNum) getTopics(1,typeNum,tagNum,timeNum,sortNum,dayNum)
oneImg=false
}
} }
else if(_self.attr("data-type")==6){ else if(_self.attr("data-type")==6){
$(".m-box").hide() $(".m-box").hide()
...@@ -708,7 +722,7 @@ $(function(){ ...@@ -708,7 +722,7 @@ $(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;" 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_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 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>';
...@@ -733,14 +747,17 @@ $(function(){ ...@@ -733,14 +747,17 @@ $(function(){
for(var i=0;i<data.dataList.length;i++){ for(var i=0;i<data.dataList.length;i++){
var list=data.dataList[i]; var list=data.dataList[i];
var imgList=JSON.parse(list.content) var imgList=JSON.parse(list.content)
// console.log(imgList)
if(i==11){
console.log(imgList)
}
if(imgList.images==undefined)continue;
html+='<a href="room/imagesRoom.html?topicId='+list.topicId+'&tag='+tagNum+'">' html+='<a href="room/imagesRoom.html?topicId='+list.topicId+'&tag='+tagNum+'">'
html+='<li>'; html+='<li>';
html+='<div style="background: url(https://zhibocdn.yabolive.net/comm'+imgList.images[0].url.split('?')[0]+'?x-oss-process=image/resize,w_342" class="video-top-box">'; if(imgList.images==undefined){
var mRandom=Math.ceil(Math.random()*10)
console.log(mRandom)
html+='<div style="background: url(https://app.ixiulive.com/static/footVideo/m/m'+mRandom+'.jpg?v=20220614);background-size: cover;" class="video-top-box">';
}
else html+='<div style="background: url(https://zhibocdn.yabolive.net/comm'+imgList.images[0].url.split('?')[0]+'?x-oss-process=image/resize,w_342" class="video-top-box">';
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">';
......
...@@ -506,3 +506,22 @@ ...@@ -506,3 +506,22 @@
color: #E53985; color: #E53985;
cursor: pointer; cursor: pointer;
} }
.images-text-box {
width: 100%;
font-size: 16px !important;
}
.images-text-box .MsoNormal {
width: 100%;
white-space: normal;
margin-bottom: 20px;
}
.images-text-box span {
white-space: normal;
}
.images-text-box h3 {
white-space: normal;
margin-bottom: 20px;
}
.images-text-box p {
margin-bottom: 20px;
}
...@@ -522,3 +522,23 @@ ...@@ -522,3 +522,23 @@
cursor: pointer; cursor: pointer;
} }
} }
.images-text-box{
width: 100%;
font-size: 16px !important;
.MsoNormal{
width: 100%;
white-space: normal;
margin-bottom: 20px;
}
span{
white-space: normal;
}
h3{
white-space: normal;
margin-bottom: 20px;
}
p{
margin-bottom: 20px;
}
}
\ No newline at end of file
...@@ -28,9 +28,9 @@ ...@@ -28,9 +28,9 @@
<p class="left-images-title"></p> <p class="left-images-title"></p>
<div class="images-content-box"> <div class="images-content-box">
<div class="images-content-imgBox"> <div class="images-content-imgBox">
<img src="https://zhibocdn.yabolive.net/comm/stscli/prod/883221/1648095196207/498F890F-33A1-4EE9-9854-9D39A6905E85.jpeg" alt=""> <!-- <img src="https://zhibocdn.yabolive.net/comm/stscli/prod/883221/1648095196207/498F890F-33A1-4EE9-9854-9D39A6905E85.jpeg" alt=""> -->
</div> </div>
<p></p> <p class="images-text-box"></p>
<div class="video-content-box"> <div class="video-content-box">
<div class="video-content-title">視頻是多少</div> <div class="video-content-title">視頻是多少</div>
<div class="video-btn-box"><div><img src="images/icon1.png" alt=""><span>0</span></div><div><img src="images/icon2.png" alt=""><span>0</span></div></div> <div class="video-btn-box"><div><img src="images/icon1.png" alt=""><span>0</span></div><div><img src="images/icon2.png" alt=""><span>0</span></div></div>
...@@ -158,11 +158,20 @@ $(function(){ ...@@ -158,11 +158,20 @@ $(function(){
var imagesList=JSON.parse(data.content); var imagesList=JSON.parse(data.content);
console.log(imagesList) console.log(imagesList)
$(".left-images-title").text(imagesList.title) $(".left-images-title").text(imagesList.title)
if(data.type==1){
var html=[];
html+=imagesList.text;
$(".images-text-box").html(html)
}
if(data.type==2){
var html=[]; var html=[];
for(var i=0;i<imagesList.images.length;i++){ for(var i=0;i<imagesList.images.length;i++){
html+='<img src="https://zhibocdn.yabolive.net/comm'+imagesList.images[i].url+'" alt="">'; html+='<img src="https://zhibocdn.yabolive.net/comm'+imagesList.images[i].url+'" alt="">';
} }
$(".images-content-imgBox").html(html) $(".images-content-imgBox").html(html)
}
$(".video-content-title").text(imagesList.title) $(".video-content-title").text(imagesList.title)
if(data.selfUp==1) var html='<div><img src="images/icon1.png" alt=""><span>'+data.comment+'</span></div><div class="good-box"><img class="good-btn" data-type="1" src="images/icon2-click.png" alt=""><span>'+data.up+'</span></div>'; if(data.selfUp==1) var html='<div><img src="images/icon1.png" alt=""><span>'+data.comment+'</span></div><div class="good-box"><img class="good-btn" data-type="1" src="images/icon2-click.png" alt=""><span>'+data.up+'</span></div>';
else var html='<div><img src="images/icon1.png" alt=""><span>'+data.comment+'</span></div><div class="good-box"><img class="good-btn" data-type="0" src="images/icon2.png" alt=""><span>'+data.up+'</span></div>'; else var html='<div><img src="images/icon1.png" alt=""><span>'+data.comment+'</span></div><div class="good-box"><img class="good-btn" data-type="0" src="images/icon2.png" alt=""><span>'+data.up+'</span></div>';
...@@ -248,6 +257,7 @@ $(function(){ ...@@ -248,6 +257,7 @@ $(function(){
if(localStorage.uid==undefined){ if(localStorage.uid==undefined){
loginLayer() loginLayer()
return;
} }
var _self=$(this) var _self=$(this)
$.ajax({ $.ajax({
...@@ -305,10 +315,14 @@ $(function(){ ...@@ -305,10 +315,14 @@ $(function(){
var list=data.dataList[i]; var list=data.dataList[i];
var videoList=JSON.parse(list.content) var videoList=JSON.parse(list.content)
console.log(videoList.images[0].url)
html+='<a href="imagesRoom.html?topicId='+list.topicId+'&tag='+tagNum+'">' html+='<a href="imagesRoom.html?topicId='+list.topicId+'&tag='+tagNum+'">'
html+='<li>'; html+='<li>';
html+='<div style="background: url(https://zhibocdn.yabolive.net/comm'+videoList.images[0].url+'?x-oss-process=image/resize,w_342)no-repeat;background-size: cover;" class="video-top-box">'; if(videoList.images==undefined){
var mRandom=Math.ceil(Math.random()*10)
html+='<div style="background: url(https://app.ixiulive.com/static/footVideo/m/m'+mRandom+'.jpg?v=20220614)no-repeat;background-size: cover;" class="video-top-box">';
}else html+='<div style="background: url(https://zhibocdn.yabolive.net/comm'+videoList.images[0].url+'?x-oss-process=image/resize,w_342)no-repeat;background-size: cover;" class="video-top-box">';
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>';
...@@ -343,7 +357,7 @@ $(function(){ ...@@ -343,7 +357,7 @@ $(function(){
success:function(data){ success:function(data){
console.log('查看评论列表',data) console.log('查看评论列表',data)
$(".video-msg-h2").text('評論('+data.totalSize+'條)') $(".video-msg-h2").text('評論('+data.totalSize+'條)')
if(data.totalSize==0){ if(data.totalSize==0&&localStorage.uid!=undefined){
$(".video-input").attr("placeholder","快來發表第一條評論") $(".video-input").attr("placeholder","快來發表第一條評論")
} }
var html=[]; var html=[];
......
...@@ -259,7 +259,11 @@ ...@@ -259,7 +259,11 @@
</ul> </ul>
<div class="live-send-box"> <div class="live-send-box">
<input placeholder="請輸入要發送的內容" class="live-send-input" type="text"> <input type="text"
auto-complete='new-password'
autocomplete='off'
autocomplete='new-password'
placeholder="請輸入要發送的內容" class="live-send-input">
<div class="live-send-btn">發送</div> <div class="live-send-btn">發送</div>
</div> </div>
</div> </div>
......
...@@ -334,7 +334,7 @@ $(function(){ ...@@ -334,7 +334,7 @@ $(function(){
success:function(data){ success:function(data){
console.log('查看评论列表',data) console.log('查看评论列表',data)
$(".video-msg-h2").text('評論('+data.totalSize+'條)') $(".video-msg-h2").text('評論('+data.totalSize+'條)')
if(data.totalSize==0){ if(data.totalSize==0&&localStorage.uid!=undefined){
$(".video-input").attr("placeholder","快來發表第一條評論") $(".video-input").attr("placeholder","快來發表第一條評論")
} }
var html=[]; var html=[];
......
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