From 46b3a0a0a515edf628ead84f5ed057c59a4eedb7 Mon Sep 17 00:00:00 2001
From: libai <libai@yazhai.co>
Date: Mon, 20 Jun 2022 11:07:54 +0800
Subject: [PATCH] 测试
---
yazhaiTest/css/login.css | 35 +++++++++++++++++++++++++++++++++++
yazhaiTest/css/login.less | 35 +++++++++++++++++++++++++++++++++++
yazhaiTest/css/neck.css | 35 -----------------------------------
yazhaiTest/css/neck.less | 36 +-----------------------------------
yazhaiTest/lib/login.js | 123 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------
yazhaiTest/pc.html | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
yazhaiTest/room/liveRoom.html | 5 +++--
7 files changed, 223 insertions(+), 111 deletions(-)
diff --git a/yazhaiTest/css/login.css b/yazhaiTest/css/login.css
index eae4fe3..bf15d27 100644
--- a/yazhaiTest/css/login.css
+++ b/yazhaiTest/css/login.css
@@ -496,3 +496,38 @@
color: #AAAAAA;
margin-top: 8px;
}
+.neck-nav-ul {
+ width: 498px;
+ height: 60px;
+ margin-left: 235px;
+}
+.neck-nav-ul li {
+ width: 83px;
+ float: left;
+ text-align: center;
+ line-height: 60px;
+ color: #FFFFFF;
+ position: relative;
+ transition: 0.1s all;
+}
+.neck-nav-ul li span {
+ cursor: pointer;
+}
+.neck-nav-ul li > img {
+ position: absolute;
+ bottom: 12px;
+ width: 19px;
+ left: 50%;
+ margin-left: -9px;
+ display: none;
+}
+.neck-nav-ul .neck-nav-li-click {
+ font-size: 20px;
+}
+.neck-nav-ul .neck-nav-li-click > span {
+ position: relative;
+ top: -3px;
+}
+.neck-nav-ul .neck-nav-li-click > img {
+ display: block;
+}
diff --git a/yazhaiTest/css/login.less b/yazhaiTest/css/login.less
index 7eaadfd..97e220c 100644
--- a/yazhaiTest/css/login.less
+++ b/yazhaiTest/css/login.less
@@ -514,4 +514,39 @@
font-size: 14px;
color: #AAAAAA;
margin-top: 8px;
+ }
+ .neck-nav-ul{
+ width: 498px;
+ height: 60px;
+ margin-left: 235px;
+ li{
+ width: 83px;
+ float: left;
+ text-align: center;
+ line-height: 60px;
+ color: #FFFFFF;
+ position: relative;
+ transition: 0.1s all;
+ span{
+ cursor: pointer;
+ }
+ >img{
+ position: absolute;
+ bottom: 12px;
+ width: 19px;
+ left: 50%;
+ margin-left: -9px;
+ display: none;
+ }
+ }
+ .neck-nav-li-click{
+ font-size: 20px;
+ >span{
+ position: relative;
+ top: -3px;
+ }
+ >img{
+ display: block;
+ }
+ }
}
\ No newline at end of file
diff --git a/yazhaiTest/css/neck.css b/yazhaiTest/css/neck.css
index c17bb15..610d8b5 100644
--- a/yazhaiTest/css/neck.css
+++ b/yazhaiTest/css/neck.css
@@ -430,41 +430,6 @@ body::-webkit-scrollbar {
font-size: 18px;
padding-top: 20px;
}
-.neck-nav-ul {
- width: 498px;
- height: 60px;
- margin-left: 235px;
-}
-.neck-nav-ul li {
- width: 83px;
- float: left;
- text-align: center;
- line-height: 60px;
- color: #FFFFFF;
- position: relative;
- transition: 0.1s all;
-}
-.neck-nav-ul li span {
- cursor: pointer;
-}
-.neck-nav-ul li > img {
- position: absolute;
- bottom: 12px;
- width: 19px;
- left: 50%;
- margin-left: -9px;
- display: none;
-}
-.neck-nav-ul .neck-nav-li-click {
- font-size: 20px;
-}
-.neck-nav-ul .neck-nav-li-click > span {
- position: relative;
- top: -3px;
-}
-.neck-nav-ul .neck-nav-li-click > img {
- display: block;
-}
.more-shadow {
width: 100vw;
position: fixed;
diff --git a/yazhaiTest/css/neck.less b/yazhaiTest/css/neck.less
index e17fd20..065955c 100644
--- a/yazhaiTest/css/neck.less
+++ b/yazhaiTest/css/neck.less
@@ -452,41 +452,7 @@
padding-top: 20px;
}
}
-.neck-nav-ul{
- width: 498px;
- height: 60px;
- margin-left: 235px;
- li{
- width: 83px;
- float: left;
- text-align: center;
- line-height: 60px;
- color: #FFFFFF;
- position: relative;
- transition: 0.1s all;
- span{
- cursor: pointer;
- }
- >img{
- position: absolute;
- bottom: 12px;
- width: 19px;
- left: 50%;
- margin-left: -9px;
- display: none;
- }
- }
- .neck-nav-li-click{
- font-size: 20px;
- >span{
- position: relative;
- top: -3px;
- }
- >img{
- display: block;
- }
- }
-}
+
.more-shadow{
width: 100vw;
position: fixed;
diff --git a/yazhaiTest/lib/login.js b/yazhaiTest/lib/login.js
index 6d5d2e2..f81aec2 100644
--- a/yazhaiTest/lib/login.js
+++ b/yazhaiTest/lib/login.js
@@ -1,24 +1,24 @@
function loginGo(){
var html=[];
html+=' <div class="layer-login">';
- html+=' <img class="close" src="https://www.footseen.xyz/yazhaiTest/images/close.png" alt="">';
+ html+=' <img class="close" src="http://test.ybact.ishuaji.cn/active2022/footseen/images/close.png" alt="">';
html+=' <div style="display: none;" class="login-box1">';
html+=' <div class="login-title">登入</div>';
html+=' <div class="phone-login-btn"></div>';
html+=' <div class="google-login-btn"></div>';
- html+=' <div class="more-login"><img src="https://www.footseen.xyz/yazhaiTest/images/more-login.png" alt=""></div>';
+ html+=' <div class="more-login"><img src="http://test.ybact.ishuaji.cn/active2022/footseen/images/more-login.png" alt=""></div>';
html+=' <div class="more-login-box">';
- html+=' <div class="more-login-icon"><img src="https://www.footseen.xyz/yazhaiTest/images/login-icon2.png" alt=""></div>';
- html+=' <div class="more-login-icon"><img src="https://www.footseen.xyz/yazhaiTest/images/login-icon3.png" alt=""></div>';
- html+=' <div class="more-login-icon"><img src="https://www.footseen.xyz/yazhaiTest/images/login-icon4.png" alt=""></div>';
+ html+=' <div class="more-login-icon"><img src="http://test.ybact.ishuaji.cn/active2022/footseen/images/login-icon2.png" alt=""></div>';
+ html+=' <div class="more-login-icon"><img src="http://test.ybact.ishuaji.cn/active2022/footseen/images/login-icon3.png" alt=""></div>';
+ html+=' <div class="more-login-icon"><img src="http://test.ybact.ishuaji.cn/active2022/footseen/images/login-icon4.png" alt=""></div>';
html+=' </div>';
html+=' </div>';
html+=' <div style="display: none;" class="login-box2">';
html+=' <div class="login-title">登入</div>';
html+=' <div data-type="1" class="login-input-area">';
- html+='<div class="nation-search"><img src="https://www.footseen.xyz/yazhaiTest/images/front/search.png""><input placeholder="輸入搜索內容" type="text"></div>'
+ html+='<div class="nation-search"><img src="http://test.ybact.ishuaji.cn/active2022/footseen/images/front/search.png""><input placeholder="輸入搜索內容" type="text"></div>'
html+=' <p class="login-area-p1">國家地區</p>';
- html+=' <p class="login-area-p2"><span>台灣</span> <img src="https://www.footseen.xyz/yazhaiTest/images/arrow.png" alt=""></p>';
+ html+=' <p class="login-area-p2"><span>台灣</span> <img src="http://test.ybact.ishuaji.cn/active2022/footseen/images/arrow.png" alt=""></p>';
html+=' </div>';
html+=' <ul class="login-input-ul"></ul>';
html+=' <div class="login-input-phone">';
@@ -26,20 +26,20 @@ function loginGo(){
html+=' <input oninput="value=value.replace(/[^\\d]/g,\'\')" class="login-input1" maxlength="15" placeholder="請輸入手機號碼" type="text">';
html+=' </div>';
html+=' <div class="login-submit-btn">登入</div>';
- html+=' <div class="more-login"><img src="https://www.footseen.xyz/yazhaiTest/images/more-login.png" alt=""></div>';
+ html+=' <div class="more-login"><img src="http://test.ybact.ishuaji.cn/active2022/footseen/images/more-login.png" alt=""></div>';
html+=' <div class="more-login-box">';
- html+=' <div class="more-login-icon"><img src="https://www.footseen.xyz/yazhaiTest/images/login-icon1.png" alt=""></div>';
- html+=' <div class="more-login-icon"><img src="https://www.footseen.xyz/yazhaiTest/images/login-icon2.png" alt=""></div>';
- html+=' <div class="more-login-icon"><img src="https://www.footseen.xyz/yazhaiTest/images/login-icon3.png" alt=""></div>';
- html+=' <div class="more-login-icon"><img src="https://www.footseen.xyz/yazhaiTest/images/login-icon4.png" alt=""></div>';
+ html+=' <div class="more-login-icon"><img src="http://test.ybact.ishuaji.cn/active2022/footseen/images/login-icon1.png" alt=""></div>';
+ html+=' <div class="more-login-icon"><img src="http://test.ybact.ishuaji.cn/active2022/footseen/images/login-icon2.png" alt=""></div>';
+ html+=' <div class="more-login-icon"><img src="http://test.ybact.ishuaji.cn/active2022/footseen/images/login-icon3.png" alt=""></div>';
+ html+=' <div class="more-login-icon"><img src="http://test.ybact.ishuaji.cn/active2022/footseen/images/login-icon4.png" alt=""></div>';
html+=' </div>';
html+=' </div>';
html+=' <div style="display: none;" class="login-box3">';
html+=' <div style="padding-top: 110px;" class="login-title">登入</div>';
html+=' <div class="login-input-area">';
- html+='<div class="nation-search"><img src="https://www.footseen.xyz/yazhaiTest/images/front/search.png""><input placeholder="輸入搜索內容" type="text"></div>'
+ html+='<div class="nation-search"><img src="http://test.ybact.ishuaji.cn/active2022/footseen/images/front/search.png""><input placeholder="輸入搜索內容" type="text"></div>'
html+=' <p class="login-area-p1">國家地區</p>';
- html+=' <p class="login-area-p2"><span>台灣</span> <img src="https://www.footseen.xyz/yazhaiTest/images/arrow.png" alt=""></p>';
+ html+=' <p class="login-area-p2"><span>台灣</span> <img src="http://test.ybact.ishuaji.cn/active2022/footseen/images/arrow.png" alt=""></p>';
html+=' </div>';
html+=' <ul class="login-input-ul"></ul>';
html+=' <div class="login-input-phone">';
@@ -52,20 +52,20 @@ function loginGo(){
html+=' </div>';
html+=' <span class="login-no-password">忘記密碼</span>';
html+=' <div class="login-submit-btn">登入</div>';
- html+=' <div style="margin-top: 35px;" class="more-login"><img src="https://www.footseen.xyz/yazhaiTest/images/more-login.png" alt=""></div>';
+ html+=' <div style="margin-top: 35px;" class="more-login"><img src="http://test.ybact.ishuaji.cn/active2022/footseen/images/more-login.png" alt=""></div>';
html+=' <div class="more-login-box">';
- html+=' <div class="more-login-icon"><img src="https://www.footseen.xyz/yazhaiTest/images/login-icon1.png" alt=""></div>';
- html+=' <div class="more-login-icon"><img src="https://www.footseen.xyz/yazhaiTest/images/login-icon2.png" alt=""></div>';
- html+=' <div class="more-login-icon"><img src="https://www.footseen.xyz/yazhaiTest/images/login-icon3.png" alt=""></div>';
- html+=' <div class="more-login-icon"><img src="https://www.footseen.xyz/yazhaiTest/images/login-icon4.png" alt=""></div>';
+ html+=' <div class="more-login-icon"><img src="http://test.ybact.ishuaji.cn/active2022/footseen/images/login-icon1.png" alt=""></div>';
+ html+=' <div class="more-login-icon"><img src="http://test.ybact.ishuaji.cn/active2022/footseen/images/login-icon2.png" alt=""></div>';
+ html+=' <div class="more-login-icon"><img src="http://test.ybact.ishuaji.cn/active2022/footseen/images/login-icon3.png" alt=""></div>';
+ html+=' <div class="more-login-icon"><img src="http://test.ybact.ishuaji.cn/active2022/footseen/images/login-icon4.png" alt=""></div>';
html+=' </div>';
html+=' </div>';
html+=' <div style="display: none;" class="login-box4">';
html+=' <div style="padding-top: 110px;" class="login-title">重置密碼</div>';
html+=' <div class="login-input-area">';
- html+='<div class="nation-search"><img src="https://www.footseen.xyz/yazhaiTest/images/front/search.png""><input placeholder="輸入搜索內容" type="text"></div>'
+ html+='<div class="nation-search"><img src="http://test.ybact.ishuaji.cn/active2022/footseen/images/front/search.png""><input placeholder="輸入搜索內容" type="text"></div>'
html+=' <p class="login-area-p1">國家地區</p>';
- html+=' <p class="login-area-p2"><span>香港</span> <img src="https://www.footseen.xyz/yazhaiTest/images/arrow.png" alt=""></p>';
+ html+=' <p class="login-area-p2"><span>香港</span> <img src="http://test.ybact.ishuaji.cn/active2022/footseen/images/arrow.png" alt=""></p>';
html+=' </div>';
html+=' <ul class="login-input-ul"></ul>';
html+=' <div class="login-input-phone">';
@@ -90,9 +90,9 @@ function loginGo(){
html+=' <div class="layer-register-left">';
html+=' <div style="padding-top: 70px;" class="login-title">註冊</div>';
html+=' <div class="login-input-area">';
- html+='<div class="nation-search"><img src="https://www.footseen.xyz/yazhaiTest/images/front/search.png""><input placeholder="輸入搜索內容" type="text"></div>'
+ html+='<div class="nation-search"><img src="http://test.ybact.ishuaji.cn/active2022/footseen/images/front/search.png""><input placeholder="輸入搜索內容" type="text"></div>'
html+=' <p class="login-area-p1">國家地區</p>';
- html+=' <p class="login-area-p2"><span>香港</span> <img src="https://www.footseen.xyz/yazhaiTest/images/arrow.png" alt=""></p>';
+ html+=' <p class="login-area-p2"><span>香港</span> <img src="http://test.ybact.ishuaji.cn/active2022/footseen/images/arrow.png" alt=""></p>';
html+=' </div>';
html+=' <ul class="login-input-ul"></ul>';
html+=' <div class="login-input-phone">';
@@ -115,7 +115,7 @@ function loginGo(){
html+='<div class="login-face-tips1">恭喜完成註冊</div> ';
html+='<div class="login-face-tips2">請上傳您喜歡的頭像和上傳暱稱</div>';
html+='<div class="login-face-imgBox">';
- html+=' <img src="https://www.footseen.xyz/yazhaiTest/images/up-face.png" alt="">';
+ html+=' <img src="http://test.ybact.ishuaji.cn/active2022/footseen/images/up-face.png" alt="">';
html+=' <div>上傳頭像</div>';
html+='</div>';
html+='<div class="login-face-input">';
@@ -146,13 +146,25 @@ function loginGo(){
html+='</div>';
html+='</div>';
$(".nav-login-big-box").html(html);
+ if(typeof(indexOk)=="undefined"){
+ var html=[];
+ html+='<ul class="neck-nav-ul">';
+ html+='<a href="https://www.footseen.xyz/yazhaiTest/pc.html"><li data-type="1"><span>主頁</span> <img src="https://www.footseen.xyz/yazhaiTest/images/front/nack-icon.png" alt=""></li></a>';
+ html+='<a target="_blank" href="https://www.footseen.xyz/yazhaiTest/pc.html?jump=2"><li data-type="2"><span>直播</span> <img src="https://www.footseen.xyz/yazhaiTest/images/front/nack-icon.png" alt=""></li></a>';
+ html+='<a target="_blank" href="https://www.footseen.xyz/yazhaiTest/pc.html?jump=3"><li data-type="3"><span>追蹤</span> <img src="https://www.footseen.xyz/yazhaiTest/images/front/nack-icon.png" alt=""></li></a>';
+ html+='<a target="_blank" href="https://www.footseen.xyz/yazhaiTest/pc.html?jump=4"><li data-type="4"><span>影片</span> <img src="https://www.footseen.xyz/yazhaiTest/images/front/nack-icon.png" alt=""></li></a>';
+ html+='<a target="_blank" href="https://www.footseen.xyz/yazhaiTest/pc.html?jump=5"><li data-type="5"><span>圖文</span> <img src="https://www.footseen.xyz/yazhaiTest/images/front/nack-icon.png" alt=""></li></a>';
+ html+='<a target="_blank" href="https://www.footseen.xyz/yazhaiTest/pc.html?jump=6"><li data-type="6"><span>約會</span> <img src="https://www.footseen.xyz/yazhaiTest/images/front/nack-icon.png" alt=""></li></a>';
+ html+='</ul>';
+ $(".neck-nav-content").append(html)
+ }
if(localStorage.uid!=undefined&&localStorage.uid!="undefined"){
$.ajax({
url:$ip+'user/queryUserBaseInfo',
data:{
uid:localStorage.uid,
token:localStorage.token,
-
+ // pass:true,
pageID:localStorage.canvasCode,
},
success:function(data){
@@ -176,16 +188,16 @@ function loginGo(){
$(".login-more-content-box div").on("click",function(){
var _self=$(this);
if(_self.attr("data-type")==1){
- window.location.href="https://www.footseen.xyz/yazhaiTest/space/myRoom.html"
+ window.location.href="http://test.ybact.ishuaji.cn/active2022/footseen/space/myRoom.html"
}
if(_self.attr("data-type")==2){
- window.location.href="https://www.footseen.xyz/yazhaiTest/reg/index.html"
+ window.location.href="http://test.ybact.ishuaji.cn/active2022/footseen/reg/index.html"
}
if(_self.attr("data-type")==3){
- window.location.href="https://www.footseen.xyz/yazhaiTest/dewExc/index.html"
+ window.location.href="http://test.ybact.ishuaji.cn/active2022/footseen/dewExc/index.html"
}
if(_self.attr("data-type")==4){
- window.location.href="https://www.footseen.xyz/yazhaiTest/space/like.html"
+ window.location.href="http://test.ybact.ishuaji.cn/active2022/footseen/space/like.html"
}
if(_self.attr("data-type")==5){
window.localStorage.removeItem("uid")
@@ -507,7 +519,7 @@ function loginGo(){
data:{
countrycode:phoneNum,
phone:$(".login-box2 .login-input1").val(),
-
+ // pass:true,
pageID:localStorage.canvasCode
},
success:function(data){
@@ -560,7 +572,7 @@ function loginGo(){
countrycode:phoneNum,
phone:$(".login-box3 .login-input1").val(),
pwd:$(".login-box3 .login-input2").val(),
-
+ // pass:true,
pageID:localStorage.canvasCode
},
success:function(data){
@@ -588,7 +600,9 @@ function loginGo(){
var codeOk=true;
var codeTime=60;
var codeT=null
- $(".login-box4 .login-code-btn").on("click",function(){
+ $(".login-box4 .login-code-btn").unbind("click").on("click",function(){
+ if(codeOk==false)return;
+ codeOk=false
$.ajax({
url:$ip+'user/getResetcap',
data:{
@@ -598,10 +612,29 @@ function loginGo(){
},
success:function(data){
console.log('获取重置密码验证码',data)
+ if(data.code!=1){
+ layer.msg(data.msg)
+ return;
+ codeOk=true;
+ }
+ layer.msg("验证码发送成功，请查看")
+ $(".login-box4 .login-code-btn").addClass("login-code-btn-no")
+ $(".login-box4 .login-code-btn").text(''+codeTime+'s后获取')
+ codeT=setInterval(function() {
+ codeTime--
+ $(".login-box4 .login-code-btn").text(''+codeTime+'s后获取')
+ if(codeTime<0){
+ codeTime=60
+ codeOk=true;
+ $(".login-box4 .login-code-btn").removeClass("login-code-btn-no")
+ $(".login-box4 .login-code-btn").text("获取验证码")
+ clearInterval(codeT)
+ }
+ }, 1000);
}
})
})
- $(".layer-register .login-code-btn").on("click",function(){
+ $(".layer-register .login-code-btn").unbind("click").on("click",function(){
if(codeOk==false)return;
codeOk=false
$.ajax({
@@ -635,7 +668,7 @@ function loginGo(){
}
})
})
- $(".login-submit-btn2").on("click",function(){
+ $(".layer-register .login-submit-btn2").on("click",function(){
if($(".layer-register .login-input1").val()==''){
layer.msg("請輸入您的手機號碼")
return;
@@ -645,8 +678,10 @@ function loginGo(){
return;
}
if($(".layer-register .login-new-password-input").val().length<6){
- layer.msg("請輸入您的密碼")
+ layer.msg("請輸入六位數密碼")
+ return;
}
+
$.ajax({
url:$ip+'user/phoneReg',
data:{
@@ -728,6 +763,22 @@ function loginGo(){
})
})
$(".login-box4 .login-submit-btn2").on("click",function(){
+ if($(".login-box4 .login-input1").val()==''){
+ layer.msg("請輸入您的手機號碼")
+ return;
+ }
+ if($(".login-box4 .login-code-input").val()==''){
+ layer.msg("請輸入驗證碼")
+ return;
+ }
+ if($(".login-box4 .login-new-password-input").val().length<6){
+ layer.msg("請輸入六位數密碼")
+ return;
+ }
+ if($(".login-new-password1 .login-new-password-input").val()!=$(".login-new-password2 .login-new-password-input").val()){
+ layer.msg("兩次密碼不一致，請重新輸入")
+ return;
+ }
$.ajax({
url:$ip+'user/resetPwd',
data:{
@@ -774,7 +825,7 @@ function loginGo(){
shadeClose: true,
skin: "face-exc-layer",
area: ["900px", "588px"],
- content:'https://www.footseen.xyz/yazhaiTest/upload/index.html',
+ content:'http://test.ybact.ishuaji.cn/active2022/footseen/upload/index.html',
// content:'upload/index.html',
})
$(".login-face-imgBox img").attr("src","images/up-face.png")
diff --git a/yazhaiTest/pc.html b/yazhaiTest/pc.html
index 145b4b8..7cc382e 100644
--- a/yazhaiTest/pc.html
+++ b/yazhaiTest/pc.html
@@ -1,6 +1,8 @@
<!DOCTYPE html>
<html lang="en">
-
+<script>
+ var indexOk=1;
+</script>
<head>
<meta charset="utf-8"/>
<meta name="viewport" content="width=device-width,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no"/>
@@ -320,6 +322,7 @@ $(function(){
var sortNum=-1
var dayNum=-1
var canvasCode=-1
+ jumpGo()
var fp = new Fingerprint2()
if(sessionStorage.like==1){
$(".tag-big-box").hide()
@@ -411,7 +414,6 @@ $(function(){
$(".like-box").hide()
$(".mc-list-box").show()
$(".video-list-box").show()
-
pageNumber=1
typeNum=1
tagNum=''
@@ -743,7 +745,64 @@ $(function(){
}
})
}
-
+ function jumpGo(){
+ if(data.jump==2){
+ $(".neck-nav-ul li").removeClass("neck-nav-li-click")
+ $(".neck-nav-ul li").eq(data.jump-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)
+ }
+ if(data.jump==3){
+ $(".tag-big-box").hide()
+ $(".mc-list-box").hide()
+ $(".video-list-box").hide()
+ $(".images-list-box").hide()
+ $(".like-box").show()
+ likeList()
+ }
+ if(data.jump==4){
+ $(".side-nav").show()
+ scrollOk=true;
+ pageNumber=1
+ typeNum=1
+ tagNum=''
+ timeNum=-1
+ sortNum=-1
+ dayNum=-1
+ $(".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)
+ }
+ if(data.jump==5){
+ $(".side-nav").show()
+ 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()
+ $(".video-list-box").hide()
+ $(".like-box").hide()
+ $(".images-list-box").show()
+ getTopics(1,typeNum,tagNum,timeNum,sortNum,dayNum)
+ }
+ if(data.jump==6){
+ $(".m-box").hide()
+ $(".down-box").show()
+ }
+ }
})
</script>
</html>
\ No newline at end of file
diff --git a/yazhaiTest/room/liveRoom.html b/yazhaiTest/room/liveRoom.html
index 7491074..8f6e078 100644
--- a/yazhaiTest/room/liveRoom.html
+++ b/yazhaiTest/room/liveRoom.html
@@ -23,6 +23,7 @@
<div class="neck-nav-content">
<a href="https://www.footseen.xyz/yazhaiTest/pc.html"><img class="logo" src="../images/logo.png" alt=""></a>
<div class="nav-login-big-box"></div>
+
</div>
</div>
<div class="live-m">
@@ -680,14 +681,14 @@ $(function () {
var html = [];
html += '<video controls webkit-playsinline ="true" playsinline ="true" autoplay ="" playsinline="true" class="live-video" src="" id="videoElement" loop="" ></video>';
$(".live-content-box-left-roombox").html(html)
- flvPlay(data.pullFlowUrl.replace("http","https"))
+ flvPlay(data.pullFlowUrl)
// Autoplay started!
}).catch(error => {
var myVideo=document.querySelector(".live-video")
var html = [];
html += '<video controls webkit-playsinline ="true" muted playsinline ="true" autoplay ="" playsinline="true" class="live-video" src="" id="videoElement" loop="" ></video>';
$(".live-content-box-left-roombox").html(html)
- flvPlay(data.pullFlowUrl.replace("http","https"))
+ flvPlay(data.pullFlowUrl)
// Autoplay was prevented.
// Show a "Play" button so that user can start playback.
--
libgit2 0.25.0