Commit 80c45767 by libai

测试

parent 9dd1fb36
.login-box { .login-box {
width: 10rem; width: 10rem;
position: fixed; position: fixed;
bottom: -13rem; bottom: 0;
height: 12.55rem; height: 12.55rem;
border-radius: 0.2rem 0.2rem 0 0; border-radius: 0.2rem 0.2rem 0 0;
background: #FBFCFC; background: #FBFCFC;
box-shadow: 0 0 0.3rem rgba(0, 0, 0, 0.2); box-shadow: 0 0 0.3rem rgba(0, 0, 0, 0.2);
z-index: 800; z-index: 800;
transition: 0.35s all; transition: 0.35s all;
-webkit-transition: 0.35s all;
transform: translateY(13rem);
} }
.login-close { .login-close {
color: #999999; color: #999999;
......
.login-box{ .login-box{
width: 10rem; width: 10rem;
position: fixed; position: fixed;
bottom: -13rem; // bottom: -13rem;
// bottom: 0; bottom: 0;
height: 12.55rem; height: 12.55rem;
border-radius: 0.2rem 0.2rem 0 0; border-radius: 0.2rem 0.2rem 0 0;
background: #FBFCFC; background: #FBFCFC;
box-shadow: 0 0 0.3rem rgba(0,0,0,0.2); box-shadow: 0 0 0.3rem rgba(0,0,0,0.2);
z-index: 800; z-index: 800;
transition: 0.35s all; transition: 0.35s all;
-webkit-transition:0.35s all;
transform: translateY(13rem);
} }
.login-close{ .login-close{
color: #999999; color: #999999;
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<link rel="apple-touch-icon-precomposed" href="icon/fox-icon.png"> <link rel="apple-touch-icon-precomposed" href="icon/fox-icon.png">
<script src="lib/jquery-3.1.1.min.js"></script> <script src="lib/jquery-3.1.1.min.js"></script>
<script src="lib/spark-md5.min.js"></script> <script src="lib/spark-md5.min.js"></script>
<script src="lib/default.js?v=2023041801"></script> <script src="lib/default.js?v=2023051701"></script>
<meta name="viewport" content="width=device-width,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no"/> <meta name="viewport" content="width=device-width,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no"/>
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"> <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
<meta content="telephone=no" name="format-detection"> <meta content="telephone=no" name="format-detection">
...@@ -402,7 +402,7 @@ ...@@ -402,7 +402,7 @@
</body> </body>
<script src="layer-v3.1.0/layer/layer.js"></script> <script src="layer-v3.1.0/layer/layer.js"></script>
<!-- <script src="lib/fingerprint2.js"></script> --> <!-- <script src="lib/fingerprint2.js"></script> -->
<script src="lib/login.js?v=2023050601"></script> <script src="lib/login.js?v=2023051702"></script>
<script src="index.js?v=2022122201" defer=""></script> <script src="index.js?v=2022122201" defer=""></script>
<script src="lib/phoneLang.js?v=2023050602"></script> <script src="lib/phoneLang.js?v=2023050602"></script>
<!-- <script src="lib/mobileLoginLang.js"></script> --> <!-- <script src="lib/mobileLoginLang.js"></script> -->
......
...@@ -13,6 +13,7 @@ else{ ...@@ -13,6 +13,7 @@ else{
$ip='http://cpapitest.yabolive.net:81/' $ip='http://cpapitest.yabolive.net:81/'
$ip2="http://ceshi.yabolive.tv/web" $ip2="http://ceshi.yabolive.tv/web"
$ws = "ws://47.242.178.187:12308/" $ws = "ws://47.242.178.187:12308/"
// localStorage.canvasCode='phone'
} }
if(bbb.indexOf("userRoom.html")==-1){ if(bbb.indexOf("userRoom.html")==-1){
sessionStorage.lastUrl=bbb sessionStorage.lastUrl=bbb
......
...@@ -295,13 +295,13 @@ var areaJson={ ...@@ -295,13 +295,13 @@ var areaJson={
} }
} }
$(".login-close").on("click",function(){ $(".login-close").on("click",function(){
$(".login-box").css("bottom","-15rem") $(".login-box").css("transform","translateY(13rem)")
$(".nav-shadow").hide() $(".nav-shadow").hide()
$(".layer-shadow").hide() $(".layer-shadow").hide()
}) })
$(".nav-shadow").on("click",function(){ $(".nav-shadow").on("click",function(){
//關閉所有彈窗 //關閉所有彈窗
$(".login-box").css("bottom","-15rem") $(".login-box").css("transform","translateY(13rem)")
$(".right-nav").css("right","-8rem") $(".right-nav").css("right","-8rem")
$(".nav-shadow").hide() $(".nav-shadow").hide()
}) })
...@@ -571,7 +571,7 @@ function loginPage(){ ...@@ -571,7 +571,7 @@ function loginPage(){
} }
}) })
$(".right-nav").css("right","-8rem") $(".right-nav").css("right","-8rem")
$(".login-box").css("bottom","0rem") $(".login-box").css("transform","translateY(0rem)")
$(".login1,.login2,.register,.reset").hide() $(".login1,.login2,.register,.reset").hide()
$(".login-show").show() $(".login-show").show()
googleLogin() googleLogin()
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
<script async defer src="lib/hello.js"></script> <script async defer src="lib/hello.js"></script>
<link rel="stylesheet" href="css/base.css"> <link rel="stylesheet" href="css/base.css">
<link rel="stylesheet" href="css/layer.css"> <link rel="stylesheet" href="css/layer.css">
<link rel="stylesheet" href="css/index.css?v=20222805"> <link rel="stylesheet" href="css/index.css?v=2023051701">
<link rel="stylesheet" href="css/login.css"> <link rel="stylesheet" href="css/login.css">
<style> <style>
.layui-layer-shade { .layui-layer-shade {
......
...@@ -40,6 +40,10 @@ ...@@ -40,6 +40,10 @@
background: url(../images/sound-tips-en.png) no-repeat !important; background: url(../images/sound-tips-en.png) no-repeat !important;
background-size: 100% 100% !important; background-size: 100% 100% !important;
} }
.body-lang1 .sound-tips2 {
background: url(../images/sound-tips-en2.png) no-repeat !important;
background-size: 100% 100% !important;
}
.body-lang1 .guard-layer-content { .body-lang1 .guard-layer-content {
background: url(../images/En/guard-layer.png) no-repeat; background: url(../images/En/guard-layer.png) no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
...@@ -57,6 +61,14 @@ ...@@ -57,6 +61,14 @@
.body-lang1 .ticker-buy-tips { .body-lang1 .ticker-buy-tips {
width: 3.1rem; width: 3.1rem;
} }
.body-lang1 .guard-layer-btn {
background: url(../images/guard-layer-btn-en.png) no-repeat;
background-size: 100% 100%;
}
.body-lang1 .guard-layer-btn-yes {
background: url(../images/guard-layer-btn2-en.png) no-repeat;
background-size: 100% 100%;
}
.room-top { .room-top {
width: 10rem; width: 10rem;
height: 1.85rem; height: 1.85rem;
...@@ -1874,6 +1886,8 @@ ...@@ -1874,6 +1886,8 @@
.sound-tips2 { .sound-tips2 {
width: 3.26rem; width: 3.26rem;
height: 0.96rem; height: 0.96rem;
top: 0.2rem;
left: 0.2rem;
background: url(../images/sound-tips2.png) no-repeat; background: url(../images/sound-tips2.png) no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
} }
...@@ -1917,7 +1931,7 @@ ...@@ -1917,7 +1931,7 @@
background: rgba(0, 0, 0, 0.55); background: rgba(0, 0, 0, 0.55);
position: absolute; position: absolute;
bottom: 1.35rem; bottom: 1.35rem;
z-index: 500; z-index: 400;
display: none; display: none;
} }
.ticket-box1 { .ticket-box1 {
...@@ -2036,7 +2050,7 @@ ...@@ -2036,7 +2050,7 @@
width: 9.2rem; width: 9.2rem;
height: 1.95rem; height: 1.95rem;
border-radius: 0.4rem; border-radius: 0.4rem;
border: 2px solid #E63986; border: 1px solid #E63986;
margin: 0 auto; margin: 0 auto;
margin-top: 0.23rem; margin-top: 0.23rem;
} }
...@@ -2489,3 +2503,118 @@ ...@@ -2489,3 +2503,118 @@
bottom: 0.7rem; bottom: 0.7rem;
right: 0.6rem; right: 0.6rem;
} }
.secret-ing-content {
width: 100vw;
height: 100vh;
display: none;
position: absolute;
z-index: 50;
top: 0;
left: 0;
background: rgba(0, 0, 0, 0.1);
color: #fff;
}
.secret-ing-p1 {
font-size: 0.5rem;
font-weight: 700;
text-align: center;
}
.secret-ing-p2 {
font-size: 0.4rem;
text-align: center;
}
.secret-ing-p3 {
font-size: 0.4rem;
padding-top: 0.45rem;
text-align: center;
}
.secret-ing-p3 span {
font-size: 0.55rem;
font-weight: 700;
color: #E53985;
}
.secret-ing-p4 {
font-size: 0.35rem;
text-align: center;
padding-top: 0.25rem;
}
.secret-ing-p5 {
width: 4.8rem;
height: 1.3rem;
background: rgba(255, 255, 255, 0.4);
margin: 0 auto;
border-radius: 0.2rem;
margin-top: 0.4rem;
position: relative;
line-height: 1.3rem;
font-size: 0;
}
.secret-ing-p5 > img {
vertical-align: middle;
width: 0.8rem;
margin-left: 0.3rem;
}
.secret-ing-p5 > span {
font-size: 0.3rem;
height: 1.3rem;
line-height: 1.3rem;
right: 0.3rem;
top: 0;
position: absolute;
}
.secret-ing-p5 > span img {
width: 0.4rem;
vertical-align: middle;
margin-top: -0.1rem;
margin-right: 0.1rem;
}
.secret-ing-tips {
height: 5rem;
width: 10rem;
position: absolute;
top: 50%;
margin-top: -2.5rem;
}
.secret-face {
width: 2rem;
height: 2rem;
border-radius: 50%;
left: 50%;
margin-left: -1rem;
top: -3rem;
position: absolute;
}
.secret-bottom-box {
color: #fff;
width: 10rem;
height: 3rem;
position: absolute;
bottom: 1.4rem;
z-index: 101;
display: none;
}
.secret-bottom-tips {
display: none;
font-size: 0.35rem;
text-align: center;
line-height: 0.6rem;
height: 0.6rem;
margin-top: 0.3rem;
}
.secret-bottom-tips img {
vertical-align: middle;
margin-top: -0.18rem;
width: 0.6rem;
margin-left: 0.07rem;
margin-right: 0.07rem;
}
.secret-bottom {
height: 1.1rem;
width: 4.8rem;
background: #E53985;
margin: 0 auto;
text-align: center;
line-height: 1.1rem;
border-radius: 1rem;
font-size: 0.4rem;
}
...@@ -41,6 +41,10 @@ ...@@ -41,6 +41,10 @@
background: url(../images/sound-tips-en.png)no-repeat !important; background: url(../images/sound-tips-en.png)no-repeat !important;
background-size: 100% 100% !important; background-size: 100% 100% !important;
} }
.sound-tips2{
background: url(../images/sound-tips-en2.png)no-repeat !important;
background-size: 100% 100% !important;
}
.guard-layer-content{ .guard-layer-content{
background: url(../images/En/guard-layer.png)no-repeat; background: url(../images/En/guard-layer.png)no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
...@@ -58,6 +62,16 @@ ...@@ -58,6 +62,16 @@
.ticker-buy-tips{ .ticker-buy-tips{
width: 3.1rem; width: 3.1rem;
} }
.guard-layer-btn{
background: url(../images/guard-layer-btn-en.png)no-repeat;
background-size: 100% 100%;
}
.guard-layer-btn-yes{
background: url(../images/guard-layer-btn2-en.png)no-repeat;
background-size: 100% 100%;
}
} }
.room-top{ .room-top{
width: 10rem; width: 10rem;
...@@ -918,6 +932,7 @@ ...@@ -918,6 +932,7 @@
width: 10rem; width: 10rem;
left: 0; left: 0;
bottom: 3rem; bottom: 3rem;
} }
.room-bg{ .room-bg{
width: 10rem; width: 10rem;
...@@ -1930,6 +1945,8 @@ ...@@ -1930,6 +1945,8 @@
.sound-tips2{ .sound-tips2{
width: 3.26rem; width: 3.26rem;
height: 0.96rem; height: 0.96rem;
top: 0.2rem;
left: 0.2rem;
background: url(../images/sound-tips2.png) no-repeat; background: url(../images/sound-tips2.png) no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
} }
...@@ -1975,7 +1992,7 @@ ...@@ -1975,7 +1992,7 @@
background: rgba(0,0,0,0.55); background: rgba(0,0,0,0.55);
position: absolute; position: absolute;
bottom: 1.35rem; bottom: 1.35rem;
z-index: 500; z-index: 400;
display: none; display: none;
} }
.ticket-box1{ .ticket-box1{
...@@ -2094,7 +2111,7 @@ ...@@ -2094,7 +2111,7 @@
width: 9.2rem; width: 9.2rem;
height: 1.95rem; height: 1.95rem;
border-radius: 0.4rem; border-radius: 0.4rem;
border: 2px solid #E63986; border: 1px solid #E63986;
// border: 2px solid #e639872d; // border: 2px solid #e639872d;
margin: 0 auto; margin: 0 auto;
margin-top: 0.23rem; margin-top: 0.23rem;
...@@ -2555,3 +2572,122 @@ ...@@ -2555,3 +2572,122 @@
bottom: 0.7rem; bottom: 0.7rem;
right: 0.6rem; right: 0.6rem;
} }
.secret-ing-content{
width: 100vw;
height: 100vh;
display: none;
position: absolute;
z-index: 50;
top: 0;
left: 0;
background: rgba(0,0,0,0.1);
color: #fff;
}
.secret-ing-p1{
font-size: 0.5rem;
font-weight: 700;
text-align: center;
}
.secret-ing-p2{
font-size: 0.4rem;
text-align: center;
}
.secret-ing-p3{
font-size: 0.4rem;
padding-top: 0.45rem;
text-align: center;
span{
font-size: 0.55rem;
font-weight: 700;
color:#E53985;
}
}
.secret-ing-p4{
text-align: center;
font-size: 0.35rem;
text-align: center;
padding-top: 0.25rem;
}
.secret-ing-p5{
width: 4.8rem;
height: 1.3rem;
background: rgba(255,255,255,0.4);
margin: 0 auto;
border-radius: 0.2rem;
margin-top: 0.4rem;
position: relative;
line-height: 1.3rem;
font-size: 0;
>img{
vertical-align: middle;
width: 0.8rem;
margin-left: 0.3rem;
}
>span{
font-size: 0.3rem;
height: 1.3rem;
line-height: 1.3rem;
right: 0.3rem;
top: 0;
position: absolute;
img{
width: 0.4rem;
vertical-align: middle;
margin-top: -0.1rem;
margin-right: 0.1rem;
}
}
}
.secret-ing-tips{
height: 5rem;
width: 10rem;
position: absolute;
top: 50%;
margin-top: -2.5rem;
}
.secret-face{
width: 2rem;
height: 2rem;
border-radius: 50%;
left: 50%;
margin-left: -1rem;
top: -3rem;
position: absolute;
}
.secret-bottom-box{
color: #fff;
width: 10rem;
height: 3rem;
position: absolute;
bottom: 1.4rem;
z-index: 101;
display: none;
}
.secret-bottom-tips{
display: none;
font-size: 0.35rem;
text-align: center;
line-height: 0.6rem;
height: 0.6rem;
margin-top: 0.3rem;
img{
vertical-align: middle;
margin-top: -0.18rem;
width: 0.6rem;
margin-left: 0.07rem;
margin-right: 0.07rem;
}
}
.secret-bottom{
height: 1.1rem;
width: 4.8rem;
background: #E53985;
margin: 0 auto;
text-align: center;
line-height: 1.1rem;
border-radius: 1rem;
font-size: 0.4rem;
}
\ No newline at end of file
...@@ -56,7 +56,7 @@ var langRoom=[ ...@@ -56,7 +56,7 @@ var langRoom=[
roomJsTxt19:"backpack is empty", roomJsTxt19:"backpack is empty",
roomJsTxt20:"Updating gift resources", roomJsTxt20:"Updating gift resources",
roomJsTxt21:"Send", roomJsTxt21:"Send",
roomJsTxt22:"come in, come from", roomJsTxt22:"come in, come from ",
roomJsTxt23:"Light up the live room, pop index +1", roomJsTxt23:"Light up the live room, pop index +1",
roomJsTxt24:"Follow broadcaster", roomJsTxt24:"Follow broadcaster",
roomJsTxt25:"The live paused", roomJsTxt25:"The live paused",
...@@ -90,16 +90,19 @@ var langRoom=[ ...@@ -90,16 +90,19 @@ var langRoom=[
ticketLang12:'Already have', ticketLang12:'Already have',
ticketLang13:'buy tickets', ticketLang13:'buy tickets',
ticketLang14:'Countdown', ticketLang14:'Countdown',
ticketLang15:'ing', ticketLang15:'show',
ticketLang16:'consume', ticketLang16:'consume',
ticketLang17:'join success', ticketLang17:'join success',
ticketLang18:'Cancel', ticketLang18:'Cancel',
ticketLang19:'Sure', ticketLang19:'Sure',
ticketLang20:'system hint', ticketLang20:'system hint',
ticketLang21:'s', ticketLang21:'s',
ticketLang22:'show time', ticketLang22:'Show Time',
ticketLang23:'min', ticketLang23:'min',
ticketLang24:'Start immediately', ticketLang24:'Start immediately',
ticketLang25:'package remaining',
ticketLang26:'in show',
ticketLang27:'Join Now',
imgSrc1:'images/En/guard-tips.png', imgSrc1:'images/En/guard-tips.png',
}, },
{ {
...@@ -199,6 +202,9 @@ var langRoom=[ ...@@ -199,6 +202,9 @@ var langRoom=[
ticketLang22:'表演時長', ticketLang22:'表演時長',
ticketLang23:'分鐘', ticketLang23:'分鐘',
ticketLang24:'立即開始', ticketLang24:'立即開始',
ticketLang25:'背包剩余',
ticketLang26:'表演中',
ticketLang27:'購票看秀',
imgSrc1:'images/guard-tips.png', imgSrc1:'images/guard-tips.png',
} }
] ]
...@@ -35,8 +35,8 @@ ...@@ -35,8 +35,8 @@
<script src="../lib/fsize.js"></script> <script src="../lib/fsize.js"></script>
<link rel="stylesheet" href="../css/base.css?v=2023050601"> <link rel="stylesheet" href="../css/base.css?v=2023050601">
<link rel="stylesheet" href="../css/layer.css"> <link rel="stylesheet" href="../css/layer.css">
<link rel="stylesheet" href="css/liveRoom.css?v=2023050604"> <link rel="stylesheet" href="css/liveRoom.css?v=2023051714">
<link rel="stylesheet" href="../css/login.css?v=2023050601"> <link rel="stylesheet" href="../css/login.css?v=2023051710">
<link rel="manifest" href="../manifest.webmanifest?v=2023050601" /> <link rel="manifest" href="../manifest.webmanifest?v=2023050601" />
<link rel="stylesheet" href="css/liMarquee.css"> <link rel="stylesheet" href="css/liMarquee.css">
<script src="../lib/hello.js" async defer></script> <script src="../lib/hello.js" async defer></script>
...@@ -138,6 +138,25 @@ ...@@ -138,6 +138,25 @@
</div> </div>
<div class="room-bg"> <div class="room-bg">
<div class="secret-ing-content">
<img class="room-close" src="images/close.png" alt="">
<div class="secret-ing-tips">
<img class="secret-face" src="https://zhibocdn.yabolive.net/comm/stscli/prod/4106446166423916818508c02555a3a647828c50948d55f57692.jpg?x-oss-process=image/resize,w_150" alt="">
<div class="secret-ing-p1">TICKET ROOM</div>
<div class="secret-ing-p2">表演中</div>
<div class="secret-ing-p3">剩余时间 <span>15:26</span></div>
<div class="secret-ing-p4">付费可以看我胸口碎大石哦!</div>
<div class="secret-ing-p5">
<img src="images/card.png" alt="">
<span><img src="images/diamond.png" alt="">200</span>
</div>
</div>
</div>
<div class="secret-bottom-box">
<div class="secret-bottom">購票看秀</div>
<p class="secret-bottom-tips">背包剩餘<img src="images/card.png">5</p>
</div>
<img class="play-icon" src="../images/play-icon.png" alt=""> <img class="play-icon" src="../images/play-icon.png" alt="">
<div class="touch-box"></div> <div class="touch-box"></div>
<div class="layer-shadow"></div> <div class="layer-shadow"></div>
...@@ -209,7 +228,7 @@ ...@@ -209,7 +228,7 @@
<div class="interac-list-box"><img src="images/interac.png" alt=""><i></i> <span>></span></div> <div class="interac-list-box"><img src="images/interac.png" alt=""><i></i> <span>></span></div>
<div class="guard-btn">守護TA</div> <div class="guard-btn">守護TA</div>
</div> </div>
<div style="display: none;" class="ticketRoom-tips-box"><img src="images/suo.png"> <span>Count</span></div> <!-- <div style="display: none;" class="ticketRoom-tips-box"><img src="images/suo.png"> <span>Count</span></div> -->
</div> </div>
<div class="room-gift-box"> <div class="room-gift-box">
<!-- <div class="gift-bar-box"> <!-- <div class="gift-bar-box">
...@@ -259,7 +278,7 @@ ...@@ -259,7 +278,7 @@
</div> </div>
<div class="ticket-box3"> <div class="ticket-box3">
<p class="ticket-box3-p1"><i class="ticketLang22">表演時長</i>: <span>20</span><i class="ticketLang23">分鐘</i></p> <p class="ticket-box3-p1"><i class="ticketLang22">表演時長</i>: <span>20</span><i class="ticketLang23">分鐘</i></p>
<div class="ticket-box3-btn">Ticker 1</div> <div class="ticket-box3-btn">ticket 1</div>
</div> </div>
</div> </div>
<div class="room-bottom"> <div class="room-bottom">
...@@ -300,7 +319,7 @@ ...@@ -300,7 +319,7 @@
</div> </div>
</li> </li>
</ul> </ul>
<div class="ticker-buy-btn"><i class="roomJsTxt35">送出</i></div> <div class="ticker-buy-btn"><i class="roomJsTxt35">購票看秀</i></div>
</div> </div>
</div> </div>
<div class="hot-list-layer"> <div class="hot-list-layer">
...@@ -433,7 +452,8 @@ ...@@ -433,7 +452,8 @@
<div class="exc-tips">1<img src="images/diamond.png">⇋100<img class="dew-icon" src="images/dew.png"></div> <div class="exc-tips">1<img src="images/diamond.png">⇋100<img class="dew-icon" src="images/dew.png"></div>
</div> </div>
<div class="keyboard-box"> <div class="keyboard-box">
<input enterkeyhint="send" class="keyboard-input" placeholder="和所有人聊天" type="text"> <input style="display: none;" type="text">
<input enterkeyhint="send" autocomplete="off" class="keyboard-input" placeholder="和所有人聊天" type="text">
<div class="keyboard-btn">發送</div> <div class="keyboard-btn">發送</div>
</div> </div>
<div class="login-box"> <div class="login-box">
...@@ -591,7 +611,7 @@ ...@@ -591,7 +611,7 @@
<p class="ticker-send-p3">開始表演</p> <p class="ticker-send-p3">開始表演</p>
<!-- <p class="ticker-send-p4">已有 <img src="images/card.png"> 1</p> --> <!-- <p class="ticker-send-p4">已有 <img src="images/card.png"> 1</p> -->
<p class="ticker-send-p4">送出ticket <img style="height: 0.4rem;margin-top: -0.1rem;" src="images/diamond.png"> 200 </p> <p class="ticker-send-p4">送出ticket <img style="height: 0.4rem;margin-top: -0.1rem;" src="images/diamond.png"> 200 </p>
<div class="ticker-send-btn">送出</div> <div class="ticker-send-btn">購票看秀</div>
</div> </div>
</div> </div>
<div class="ticker-tips-box"> <div class="ticker-tips-box">
...@@ -635,13 +655,13 @@ ...@@ -635,13 +655,13 @@
</body> </body>
<script src="../lib/jquery-3.1.1.min.js"></script> <script src="../lib/jquery-3.1.1.min.js"></script>
<script src="../lib/spark-md5.min.js"></script> <script src="../lib/spark-md5.min.js"></script>
<script src="../lib/default.js?v=20230504"></script> <script src="../lib/default.js?v=2023051701"></script>
<script src="../layer-v3.1.0/layer/layer.js"></script> <script src="../layer-v3.1.0/layer/layer.js"></script>
<script src="../lib/login.js?v=2023032401"></script> <script src="../lib/login.js?v=2023051702"></script>
<script src="../lib/flv.js"></script> <script src="../lib/flv.js"></script>
<script src="../index.js?v=2023050601" defer=""></script> <script src="../index.js?v=2023050601" defer=""></script>
<script src="lib/circleChart.min.js"></script> <script src="lib/circleChart.min.js"></script>
<script src="lib/phoneRoomLang.js?v=2023050601"></script> <script src="lib/phoneRoomLang.js?v=202301713"></script>
<script src="lib/liMarquee.js"></script> <script src="lib/liMarquee.js"></script>
<script> <script>
$(function(){ $(function(){
...@@ -701,12 +721,14 @@ $(function(){ ...@@ -701,12 +721,14 @@ $(function(){
$(".ticker-send-p3").text(langRoom[sessionStorage.lang].ticketLang9) $(".ticker-send-p3").text(langRoom[sessionStorage.lang].ticketLang9)
$(".ticketLang22").text(langRoom[sessionStorage.lang].ticketLang22) $(".ticketLang22").text(langRoom[sessionStorage.lang].ticketLang22)
$(".ticketLang23").text(langRoom[sessionStorage.lang].ticketLang23) $(".ticketLang23").text(langRoom[sessionStorage.lang].ticketLang23)
$(".ticker-send-btn").text(langRoom[sessionStorage.lang].roomJsTxt35) $(".ticker-send-btn").text(langRoom[sessionStorage.lang].ticketLang27)
$(".roomJsTxt35").text(langRoom[sessionStorage.lang].roomJsTxt35) $(".roomJsTxt35").text(langRoom[sessionStorage.lang].ticketLang27)
$(".ticket-ing").text(langRoom[sessionStorage.lang].ticketLang15) $(".ticket-ing").text(langRoom[sessionStorage.lang].ticketLang15)
$(".room-txt29").text(langRoom[sessionStorage.lang].room29) $(".room-txt29").text(langRoom[sessionStorage.lang].room29)
$(".room-txt30").text(langRoom[sessionStorage.lang].room30) $(".room-txt30").text(langRoom[sessionStorage.lang].room30)
$(".room-txt31").text(langRoom[sessionStorage.lang].room31) $(".room-txt31").text(langRoom[sessionStorage.lang].room31)
$(".secret-ing-p2").text(langRoom[sessionStorage.lang].ticketLang26)
$(".secret-bottom").text(langRoom[sessionStorage.lang].ticketLang27)
} }
// hotList() // hotList()
liveList(1) liveList(1)
...@@ -777,6 +799,7 @@ $(function(){ ...@@ -777,6 +799,7 @@ $(function(){
$(".room-content-loading").show() $(".room-content-loading").show()
$(".room-bottom").show() $(".room-bottom").show()
$(".user-msg-box").css("opacity","1") $(".user-msg-box").css("opacity","1")
$(".secret-face").attr("src","https://zhibocdn.yabolive.net/comm"+data.room.face.split('?')[0]+"?x-oss-process=image/resize,w_150")
$(".loading-face").show().attr("src","https://zhibocdn.yabolive.net/comm"+data.room.face.split('?')[0]+"?x-oss-process=image/resize,w_350") $(".loading-face").show().attr("src","https://zhibocdn.yabolive.net/comm"+data.room.face.split('?')[0]+"?x-oss-process=image/resize,w_350")
var loadNum=1 var loadNum=1
loadT=setInterval(function(){ loadT=setInterval(function(){
...@@ -1154,7 +1177,6 @@ $(function(){ ...@@ -1154,7 +1177,6 @@ $(function(){
// $(".room-bg").css("") // $(".room-bg").css("")
$(".layer-shadow").show() $(".layer-shadow").show()
$(".keyboard-box").show() $(".keyboard-box").show()
$(".keyboard-input").focus() $(".keyboard-input").focus()
}) })
$(".gift-layer-ul li").unbind("click").on("click",function(){ $(".gift-layer-ul li").unbind("click").on("click",function(){
...@@ -1215,7 +1237,7 @@ $(function(){ ...@@ -1215,7 +1237,7 @@ $(function(){
$(".layer-shadow").hide() $(".layer-shadow").hide()
$(".keyboard-box").hide() $(".keyboard-box").hide()
fixScroll() fixScroll()
$(".login-box").css("bottom","-15rem") $(".login-box").css("transform","translateY(13rem)")
$(".rich-list-layer").css("bottom","-9.1rem") $(".rich-list-layer").css("bottom","-9.1rem")
$(".hot-list-layer").css("bottom","-10.9rem") $(".hot-list-layer").css("bottom","-10.9rem")
$(".more-layer").css("bottom","-4.4rem") $(".more-layer").css("bottom","-4.4rem")
...@@ -1399,20 +1421,25 @@ $(function(){ ...@@ -1399,20 +1421,25 @@ $(function(){
success:function(data){ success:function(data){
// console.log('获取TicketRoom信息',data) // console.log('获取TicketRoom信息',data)
if(localStorage.uid!=undefined&&localStorage.uid!='undefined')myDiamond() if(localStorage.uid!=undefined&&localStorage.uid!='undefined')myDiamond()
if(data.progressBar.state>3){ if(data.progressBar.state>3){
$(".user-msg-box").css('bottom','1.4rem') $(".user-msg-box").css('bottom','1.4rem')
$(".ticket-box").hide() $(".ticket-box").hide()
$("#myVideo").css("filter","blur(0px)") $("#myVideo").css("filter","blur(0px)")
$(".new-msg").css("bottom","1.5rem") $(".new-msg").css("bottom","1.5rem")
$(".room-top,.user-msg-box,.new-msg,.room-bottom").show()
return return
} }
$(".ticket-box2-p2,.ticker-buy-content1-p2").html(data.progressBar.showTopic) $(".ticket-box2-p2,.ticker-buy-content1-p2").html(data.progressBar.showTopic)
if(data.progressBar.showTopic.length>=15) $(".ticket-box2-p2,.ticker-buy-content1-p2").liMarquee() if(data.progressBar.showTopic.length>=15) $(".ticket-box2-p2,.ticker-buy-content1-p2").liMarquee({
drag:true,
circular:false,
})
$(".ticket-box3-p1").show()
$(".ticket-box3 .ticket-box3-btn").css("margin-top","0rem")
$(".ticket-box3-p1 span,.ticker-buy-time span").text(Math.floor(data.tollconfig.showTime/60000)) $(".ticket-box3-p1 span,.ticker-buy-time span").text(Math.floor(data.tollconfig.showTime/60000))
$(".ticketRoom-tips-box").show() // $(".ticketRoom-tips-box").show()
TicketStage=data.progressBar.state TicketStage=data.progressBar.state
turnNumberOk=true; turnNumberOk=true;
clearInterval(ticketTerval) clearInterval(ticketTerval)
...@@ -1421,14 +1448,14 @@ $(function(){ ...@@ -1421,14 +1448,14 @@ $(function(){
$(".circleChart1-p,.circleChart2-p").html('<span>0</span>/5').css("color","#fff") $(".circleChart1-p,.circleChart2-p").html('<span>0</span>/5').css("color","#fff")
if(sessionStorage.lang==2)$(".ticket-box2-p1,.ticker-buy-content1-p1").html("Ticket Room <span>"+add0(Math.floor(data.progressBar.leftTime/60000))+":"+add0(Math.floor(data.progressBar.leftTime%60000/1000))+"</span> 后開始") if(sessionStorage.lang==2)$(".ticket-box2-p1,.ticker-buy-content1-p1").html("Ticket Room <span>"+add0(Math.floor(data.progressBar.leftTime/60000))+":"+add0(Math.floor(data.progressBar.leftTime%60000/1000))+"</span> 后開始")
else $(".ticket-box2-p1,.ticker-buy-content1-p1").html("Ticket Room start in <span>"+add0(Math.floor(data.progressBar.leftTime/60000))+":"+add0(Math.floor(data.progressBar.leftTime%60000/1000))+"</span>") else $(".ticket-box2-p1,.ticker-buy-content1-p1").html("Ticket Room start in <span>"+add0(Math.floor(data.progressBar.leftTime/60000))+":"+add0(Math.floor(data.progressBar.leftTime%60000/1000))+"</span>")
$(".ticketRoom-tips-box span").text('Count '+add0(Math.floor(data.progressBar.leftTime/60000))+':'+add0(Math.floor(data.progressBar.leftTime%60000/1000))+'') // $(".ticketRoom-tips-box span").text('Count '+add0(Math.floor(data.progressBar.leftTime/60000))+':'+add0(Math.floor(data.progressBar.leftTime%60000/1000))+'')
$(".ticketRoom-tips-box").css("color","#F0257C") // $(".ticketRoom-tips-box").css("color","#F0257C")
$(".ticket-box").show() $(".ticket-box").show()
$(".user-msg-box").css('bottom','2.9rem') $(".user-msg-box").css('bottom','2.9rem')
$(".new-msg").css("bottom","3rem") $(".new-msg").css("bottom","3rem")
$(".ticket-box2-p1 span").text(''+add0(Math.floor(data.progressBar.leftTime/60000))+':'+add0(Math.floor(data.progressBar.leftTime%60000/1000))+'') $(".ticket-box2-p1 span").text(''+add0(Math.floor(data.progressBar.leftTime/60000))+':'+add0(Math.floor(data.progressBar.leftTime%60000/1000))+'')
$(".ticker-buy-content1-p1 span").text(''+add0(Math.floor(data.progressBar.leftTime/60000))+':'+add0(Math.floor(data.progressBar.leftTime%60000/1000))+'') $(".ticker-buy-content1-p1 span").text(''+add0(Math.floor(data.progressBar.leftTime/60000))+':'+add0(Math.floor(data.progressBar.leftTime%60000/1000))+'')
$(".ticket-box3-btn").text('Ticker '+data.progressBar.succ+'') $(".ticket-box3-btn").text(langRoom[sessionStorage.lang].ticketLang27)
if(data.inBuyTotal==0)$(".circleChart2-p span").text(data.progressBar.succ) if(data.inBuyTotal==0)$(".circleChart2-p span").text(data.progressBar.succ)
else{ else{
$(".circleChart2-p").text(langRoom[sessionStorage.lang].ticketLang10).css("color","#24FE90").css("font-size","0.3rem") $(".circleChart2-p").text(langRoom[sessionStorage.lang].ticketLang10).css("color","#24FE90").css("font-size","0.3rem")
...@@ -1462,8 +1489,8 @@ $(function(){ ...@@ -1462,8 +1489,8 @@ $(function(){
return; return;
} }
if(data.progressBar.leftTime<0)data.progressBar.leftTime=0 if(data.progressBar.leftTime<0)data.progressBar.leftTime=0
if(data.progressBar.leftTime<60000)$(".ticketRoom-tips-box").css("color","#FBD91C") // if(data.progressBar.leftTime<60000)$(".ticketRoom-tips-box").css("color","#FBD91C")
$(".ticketRoom-tips-box span").text('Count '+add0(Math.floor(data.progressBar.leftTime/60000))+':'+add0(Math.floor(data.progressBar.leftTime%60000/1000))) // $(".ticketRoom-tips-box span").text('Count '+add0(Math.floor(data.progressBar.leftTime/60000))+':'+add0(Math.floor(data.progressBar.leftTime%60000/1000)))
$(".ticket-box2-p1 span").text(''+add0(Math.floor(data.progressBar.leftTime/60000))+':'+add0(Math.floor(data.progressBar.leftTime%60000/1000))+'') $(".ticket-box2-p1 span").text(''+add0(Math.floor(data.progressBar.leftTime/60000))+':'+add0(Math.floor(data.progressBar.leftTime%60000/1000))+'')
$(".ticker-buy-content1-p1 span").text(''+add0(Math.floor(data.progressBar.leftTime/60000))+':'+add0(Math.floor(data.progressBar.leftTime%60000/1000))+'') $(".ticker-buy-content1-p1 span").text(''+add0(Math.floor(data.progressBar.leftTime/60000))+':'+add0(Math.floor(data.progressBar.leftTime%60000/1000))+'')
if(data.progressBar.leftTime<6000){ if(data.progressBar.leftTime<6000){
...@@ -1492,7 +1519,7 @@ $(function(){ ...@@ -1492,7 +1519,7 @@ $(function(){
}) })
var sendClockNum=data.progressBar.leftTime var sendClockNum=data.progressBar.leftTime
sendClock=setInterval(function(){ sendClock=setInterval(function(){
sendClockNum-=20 sendClockNum-=30
if(sendClockNum<0){ if(sendClockNum<0){
clearInterval(sendClock) clearInterval(sendClock)
layer.closeAll() layer.closeAll()
...@@ -1506,42 +1533,47 @@ $(function(){ ...@@ -1506,42 +1533,47 @@ $(function(){
if(data.progressBar.state==3){ if(data.progressBar.state==3){
if(data.inBuyTotal>0){ if(data.inBuyTotal>0){
$(".ticker-buy-box").css("bottom","-10rem") $(".ticker-buy-box").css("bottom","-10rem")
$(".layer-shadow").hide() $("#myVideo").css("filter","blur(0px)")
$('.secret-ing-content').hide()
$(".secret-bottom-box").hide()
$(".room-top,.user-msg-box,.room-bottom").show()
$(".ticket-box").show()
$(".ticket-box3-btn").text('ticket '+data.progressBar.succ+'')
}else{
$(".ticker-buy-box").css("bottom","-10rem")
$(".keyboard-box").hide()
$(".sound-tips").addClass("sound-tips2")
$(".room-top,.user-msg-box,.room-bottom,.new-msg").hide()
$('.secret-ing-content').show()
$(".secret-bottom-box").show()
$(".ticket-box").hide()
$("#myVideo").css("filter","blur(14px)")
} }
//5月16日新樣式
// $(".ticketRoom-tips-box span").text('ing...')
// $(".ticketRoom-tips-box").css("color","#24FE90")
//購買按鈕
/****5月9日修改样式****/ /****5月9日修改样式****/
$(".ticket-box3-p1").hide() $(".ticket-box3-p1").hide()
$(".ticker-buy-time").css("font-size","0")
$(".ticket-box3 .ticket-box3-btn").css("margin-top","0.38rem") $(".ticket-box3 .ticket-box3-btn").css("margin-top","0.38rem")
$(".touch-box").unbind("click").on("click",function(){ // $(".touch-box").unbind("click").on("click",function(){
if(localStorage.token==undefined||localStorage.token=='undefined'){ // if(localStorage.token==undefined||localStorage.token=='undefined'){
$(".layer-shadow").show() // $(".layer-shadow").show()
loginPage() // loginPage()
return; // return;
} // }
ticketBackpack(chId,rId) // ticketBackpack(chId,rId)
$(".ticker-buy-box").css("bottom","0rem") // $(".ticker-buy-box").css("bottom","0rem")
$(".layer-shadow").show() // $(".layer-shadow").show()
}) // })
/****/ /****/
$(".ticketRoom-tips-box span").text('ing...') // $(".ticket-box").show()
$(".ticketRoom-tips-box").css("color","#24FE90")
var buyTicket=true;
$(".ticket-box").show()
$(".user-msg-box").css('bottom','2.9rem') $(".user-msg-box").css('bottom','2.9rem')
$(".new-msg").css("bottom","3rem") $(".new-msg").css("bottom","3rem")
if(data.inBuyTotal==0){
$("#myVideo").css("filter","blur(18px)")
$(".ticket-box3-btn").text(langRoom[sessionStorage.lang].ticketLang13)
$(".ticker-buy-box").css("bottom","0rem")
$(".layer-shadow").show()
}
else{
setTimeout(function(){$(".ticket-box").unbind("click")},500)
$(".ticket-box3-btn").text(langRoom[sessionStorage.lang].ticketLang11)
}
$(".ticket-box1-content2").show() $(".ticket-box1-content2").show()
$(".ticker-buy-content1-p1").html(""+langRoom[sessionStorage.lang].ticketLang14+" <span style='color:#24FE90'>"+add0(Math.floor(data.progressBar.leftTime/60000))+":"+add0(Math.floor(data.progressBar.leftTime%60000/1000))+"</span>") $(".secret-ing-p3").html(""+langRoom[sessionStorage.lang].ticketLang14+" <span >"+add0(Math.floor(data.progressBar.leftTime/60000))+":"+add0(Math.floor(data.progressBar.leftTime%60000/1000))+"</span>")
$(".ticket-box2-p1").html(""+langRoom[sessionStorage.lang].ticketLang14+" <span style='color:#24FE90'>"+add0(Math.floor(data.progressBar.leftTime/60000))+":"+add0(Math.floor(data.progressBar.leftTime%60000/1000))+"</span>") $(".ticket-box2-p1").html(""+langRoom[sessionStorage.lang].ticketLang14+" <span style='color:#24FE90'>"+add0(Math.floor(data.progressBar.leftTime/60000))+":"+add0(Math.floor(data.progressBar.leftTime%60000/1000))+"</span>")
ticketTerval=setInterval(function(){ ticketTerval=setInterval(function(){
data.progressBar.leftTime-=1000 data.progressBar.leftTime-=1000
...@@ -1551,18 +1583,28 @@ $(function(){ ...@@ -1551,18 +1583,28 @@ $(function(){
$(".ticket-box").hide() $(".ticket-box").hide()
$("#myVideo").css("filter","blur(0px)") $("#myVideo").css("filter","blur(0px)")
$(".new-msg").css("bottom","1.5rem") $(".new-msg").css("bottom","1.5rem")
$(".ticketRoom-tips-box").hide() // $(".ticketRoom-tips-box").hide()
$('.secret-ing-content').hide()
$(".secret-bottom-box").hide()
$(".room-top,.user-msg-box,.room-bottom").show()
$(".sound-tips").hide()
return; return;
} }
// $(".ticketRoom-tips-box span").text('ing...') // $(".ticketRoom-tips-box span").text('ing...')
$(".ticker-tips-span").text(add0(Math.floor(data.progressBar.leftTime/60000))+":"+add0(Math.floor(data.progressBar.leftTime%60000/1000))) $(".ticker-tips-span").text(add0(Math.floor(data.progressBar.leftTime/60000))+":"+add0(Math.floor(data.progressBar.leftTime%60000/1000)))
$(".ticker-buy-content1-p1").html(""+langRoom[sessionStorage.lang].ticketLang14+" <span style='color:#24FE90'>"+add0(Math.floor(data.progressBar.leftTime/60000))+":"+add0(Math.floor(data.progressBar.leftTime%60000/1000))+"</span>") $(".secret-ing-p3").html(""+langRoom[sessionStorage.lang].ticketLang14+" <span >"+add0(Math.floor(data.progressBar.leftTime/60000))+":"+add0(Math.floor(data.progressBar.leftTime%60000/1000))+"</span>")
$(".ticket-box2-p1").html(""+langRoom[sessionStorage.lang].ticketLang14+" <span style='color:#24FE90'>"+add0(Math.floor(data.progressBar.leftTime/60000))+":"+add0(Math.floor(data.progressBar.leftTime%60000/1000))+"</span>") $(".ticket-box2-p1").html(""+langRoom[sessionStorage.lang].ticketLang14+" <span style='color:#24FE90'>"+add0(Math.floor(data.progressBar.leftTime/60000))+":"+add0(Math.floor(data.progressBar.leftTime%60000/1000))+"</span>")
if(data.progressBar.leftTime<6000){ if(data.progressBar.leftTime<6000){
if(sendClockOk==false)return; if(sendClockOk==false)return;
if(data.inBuyTotal!=0)turnNumber(3) if(data.inBuyTotal!=0)turnNumber(3)
} }
$(".ticker-buy-btn").unbind("click").on("click",function(){
$(".secret-bottom").unbind("click").on("click",function(){
if(localStorage.uid==undefined){
$(".layer-shadow").show()
loginPage()
return;
}
if(data.progressBar.state==3&&data.progressBar.leftTime<120000){ if(data.progressBar.state==3&&data.progressBar.leftTime<120000){
layer.open({ layer.open({
type: 1, type: 1,
...@@ -1584,7 +1626,7 @@ $(function(){ ...@@ -1584,7 +1626,7 @@ $(function(){
}) })
}else{ }else{
buyTicker(chId,rId,n) buyTicker(chId,rId,1)
} }
}) })
},1000) },1000)
...@@ -1592,7 +1634,15 @@ $(function(){ ...@@ -1592,7 +1634,15 @@ $(function(){
//初始化购票 //初始化购票
$(".circleChart1-p span").text(data.progressBar.succ) $(".circleChart1-p span").text(data.progressBar.succ)
if(data.progressBar.state==3){ if(data.progressBar.state==3){
$(".circleChart1-p").html('<div class="ticket-ing2">'+langRoom[sessionStorage.lang].ticketLang15+'</div>') // $(".circleChart1-p").html('<div class="ticket-ing2">'+langRoom[sessionStorage.lang].ticketLang15+'</div>')
$(".secret-ing-p4").text(data.progressBar.showTopic)
if(data.backpack>0){
$(".secret-ing-p5 span").html("X1")
$(".secret-bottom-tips").show().html(''+langRoom[sessionStorage.lang].ticketLang25+'<img src="images/card.png">'+data.backpack+'')
}else{
$(".secret-bottom-tips").hide()
$(".secret-ing-p5 span").html('<img src="images/diamond.png" alt="">'+data.tollconfig.tollPrice+'')
}
} }
else{ else{
var valueNum2=data.progressBar.succ*20 var valueNum2=data.progressBar.succ*20
...@@ -1675,6 +1725,7 @@ $(function(){ ...@@ -1675,6 +1725,7 @@ $(function(){
}) })
$(".ticket-box").unbind("click").on("click",function(){ $(".ticket-box").unbind("click").on("click",function(){
if(data.progressBar.state>2)return;
if(localStorage.token==undefined||localStorage.token=='undefined'){ if(localStorage.token==undefined||localStorage.token=='undefined'){
$(".layer-shadow").show() $(".layer-shadow").show()
loginPage() loginPage()
...@@ -1923,7 +1974,8 @@ $(function(){ ...@@ -1923,7 +1974,8 @@ $(function(){
if(data.vipRoomList.length>j){ if(data.vipRoomList.length>j){
for(var i=0;i<data.vipRoomList.length-j;i++){ for(var i=0;i<data.vipRoomList.length-j;i++){
list2=data.vipRoomList[j+i] list2=data.vipRoomList[j+i]
if(i==0)newList+=(','+JSON.stringify(list2)) if(i==0&&data.normalRoomList[i].length==0)newList+=(JSON.stringify(list2))
else if(i==0)newList+=(','+JSON.stringify(list2))
else if((i+j+1)==data.vipRoomList.length)newList+=(','+JSON.stringify(list2)) else if((i+j+1)==data.vipRoomList.length)newList+=(','+JSON.stringify(list2))
else newList+=(JSON.stringify(list2)+',') else newList+=(JSON.stringify(list2)+',')
} }
...@@ -2879,7 +2931,7 @@ $(function(){ ...@@ -2879,7 +2931,7 @@ $(function(){
$(".ticket-box").hide() $(".ticket-box").hide()
$("#myVideo").css("filter","blur(0px)") $("#myVideo").css("filter","blur(0px)")
$(".new-msg").css("bottom","1.5rem") $(".new-msg").css("bottom","1.5rem")
$(".ticketRoom-tips-box").hide() // $(".ticketRoom-tips-box").hide()
sendClockOk=true; sendClockOk=true;
clearInterval(ticketTerval) clearInterval(ticketTerval)
$(".ticker-buy-box").css("bottom","-10rem") $(".ticker-buy-box").css("bottom","-10rem")
...@@ -2904,9 +2956,9 @@ $(function(){ ...@@ -2904,9 +2956,9 @@ $(function(){
if (/iphone|ipad|ipod/.test(ua)) { if (/iphone|ipad|ipod/.test(ua)) {
if(myMsg){ if(myMsg){
$(".user-msg-box").scrollTop(0) $(".user-msg-box").scrollTop(0)
return; // return;
} }
if(Math.abs($(".user-msg-box").scrollTop())<50){ if(Math.abs($(".user-msg-box").scrollTop())<80){
$(".user-msg-box").scrollTop(0) $(".user-msg-box").scrollTop(0)
}else{ }else{
$(".new-msg").show() $(".new-msg").show()
...@@ -2914,9 +2966,9 @@ $(function(){ ...@@ -2914,9 +2966,9 @@ $(function(){
} else if (/android/.test(ua)) { } else if (/android/.test(ua)) {
if(myMsg){ if(myMsg){
$(".user-msg-box").scrollTop(Math.abs($(".user-msg-box").height()-$(".user-msg-big").height())) $(".user-msg-box").scrollTop(Math.abs($(".user-msg-box").height()-$(".user-msg-big").height()))
return; // return;
} }
if($(".user-msg-big").height()-(Math.abs($(".user-msg-box").scrollTop())+$(".user-msg-box").height())<50){ if($(".user-msg-big").height()-(Math.abs($(".user-msg-box").scrollTop())+$(".user-msg-box").height())<80){
$(".user-msg-box").scrollTop(Math.abs($(".user-msg-box").height()-$(".user-msg-big").height())) $(".user-msg-box").scrollTop(Math.abs($(".user-msg-box").height()-$(".user-msg-big").height()))
}else{ }else{
$(".new-msg").show() $(".new-msg").show()
...@@ -2975,7 +3027,7 @@ $(function(){ ...@@ -2975,7 +3027,7 @@ $(function(){
$(".user-msg-box").scrollTop(Math.abs($(".user-msg-box").height()-$(".user-msg-big").height())) $(".user-msg-box").scrollTop(Math.abs($(".user-msg-box").height()-$(".user-msg-big").height()))
}) })
$(".user-msg-box").on("scroll",function(){ $(".user-msg-box").on("scroll",function(){
if($(".user-msg-big").height()-(Math.abs($(".user-msg-box").scrollTop())+$(".user-msg-box").height())<50){ if($(".user-msg-big").height()-(Math.abs($(".user-msg-box").scrollTop())+$(".user-msg-box").height())<80){
$(".new-msg").hide() $(".new-msg").hide()
} }
}) })
...@@ -3135,13 +3187,17 @@ $(function(){ ...@@ -3135,13 +3187,17 @@ $(function(){
return; return;
} }
if(data.code==1){ if(data.code==1){
$(".keyboard-input").val("")
var ua = window.navigator.userAgent.toLowerCase();
if (/android/.test(ua)) {
$(".keyboard-box").hide() $(".keyboard-box").hide()
fixScroll() fixScroll()
$(".layer-shadow").hide() $(".layer-shadow").hide()
$(".keyboard-input").val("")
document.activeElement.blur(); document.activeElement.blur();
} }
} }
}
}) })
} }
var lastTouchEnd = 0 //更新手指弹起的时间 var lastTouchEnd = 0 //更新手指弹起的时间
...@@ -3340,6 +3396,7 @@ $(function(){ ...@@ -3340,6 +3396,7 @@ $(function(){
return return
} }
var _self=$(this) var _self=$(this)
$(".layer-shadow").show()
$(".keyboard-box").show() $(".keyboard-box").show()
$(".keyboard-input").focus() $(".keyboard-input").focus()
$(".keyboard-input").val('@'+_self.attr("data-type")+';') $(".keyboard-input").val('@'+_self.attr("data-type")+';')
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<link rel="stylesheet" href="css2/base.css"> <link rel="stylesheet" href="css2/base.css">
<link rel="stylesheet" href="css2/layer.css"> <link rel="stylesheet" href="css2/layer.css">
<link rel="stylesheet" href="css2/daily.css"> <link rel="stylesheet" href="css2/daily.css">
<link rel="stylesheet" href="css2/index.css?v=2022120702"> <link rel="stylesheet" href="css2/index.css?v=2023051701">
<script src="lib/flv.js"></script> <script src="lib/flv.js"></script>
<style> <style>
.recommend-swiper{ .recommend-swiper{
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
<script src="layer-v3.1.0/layer/layer.js"></script> <script src="layer-v3.1.0/layer/layer.js"></script>
<script src="../lib/keywords.js"></script> <script src="../lib/keywords.js"></script>
<script src="lib/spark-md5.min.js"></script> <script src="lib/spark-md5.min.js"></script>
<script src="lib/default.js?v=2023041801"></script> <script src="lib/default.js?v=2023051701"></script>
<script> <script>
</script> </script>
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<link rel="stylesheet" href="css2/base.css"> <link rel="stylesheet" href="css2/base.css">
<link rel="stylesheet" href="css2/layer.css"> <link rel="stylesheet" href="css2/layer.css">
<link rel="stylesheet" href="css/login.css"> <link rel="stylesheet" href="css/login.css">
<link rel="stylesheet" href="css2/index.css?v=2022121201"> <link rel="stylesheet" href="css2/index.css?v=2023051701">
<script async defer src="lib/hello.js"></script> <script async defer src="lib/hello.js"></script>
<script src="https://accounts.google.com/gsi/client" async defer></script> <script src="https://accounts.google.com/gsi/client" async defer></script>
<script async defer crossorigin="anonymous" src="https://connect.facebook.net/en_US/sdk.js"></script> <script async defer crossorigin="anonymous" src="https://connect.facebook.net/en_US/sdk.js"></script>
...@@ -321,8 +321,8 @@ ...@@ -321,8 +321,8 @@
</body> </body>
<script src="layer-v3.1.0/layer/layer.js"></script> <script src="layer-v3.1.0/layer/layer.js"></script>
<script src="lib/login.js?v=2022111801"></script> <script src="lib/login.js?v=2023051701"></script>
<script src="lib/phoneLang.js?v=2023050601"></script> <script src="lib/phoneLang.js?v=2023051701"></script>
<script> <script>
$(function(){ $(function(){
var browserLang = navigator.language var browserLang = navigator.language
......
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