Commit e333bc2a by libai

ft活动上线

parent bb2a991a
...@@ -161,7 +161,7 @@ ...@@ -161,7 +161,7 @@
</body> </body>
<script src="lib/jquery-3.1.1.min.js"></script> <script src="lib/jquery-3.1.1.min.js"></script>
<script src="layer-v3.1.0/layer/layer.js"></script> <script src="layer-v3.1.0/layer/layer.js"></script>
<script src="lib/default.js?v='2024061401'"></script> <script src="lib/default.js?v='2023120901'"></script>
<script src="lib/clipboard.js"></script> <script src="lib/clipboard.js"></script>
<script> <script>
$(function(){ $(function(){
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
if (bbb.indexOf("https://fsactive.fusi.club/") > -1) { if (bbb.indexOf("https://fsactive.fusi.club/") > -1) {
$ip = "https://webserver.yabolive.net"; $ip = "https://webserver.yabolive.net";
_url3 = 'https://webserver.yabolive.net'; _url3 = 'https://webserver.yabolive.net';
$url='https://fsActive.fusi.club' $url='http://fsActive.fusi.club'
} }
else{ else{
$ip = 'http://ceshi.yabolive.tv/web'; $ip = 'http://ceshi.yabolive.tv/web';
...@@ -69,9 +69,9 @@ if(sessionStorage.open==undefined)sessionStorage.open=1 ...@@ -69,9 +69,9 @@ if(sessionStorage.open==undefined)sessionStorage.open=1
} }
if (bbb.indexOf("file:///E:") > -1) { if (bbb.indexOf("file:///E:") > -1) {
sessionStorage.lang=1 sessionStorage.lang=1
sessionStorage.uid =155100; sessionStorage.uid =210102;
sessionStorage.token = 'debug' sessionStorage.token = 'debug'
sessionStorage.roomId=11134747; sessionStorage.roomId=210102;
sessionStorage.version=8890 sessionStorage.version=8890
sessionStorage.cid='web' sessionStorage.cid='web'
sessionStorage.pkg='h5' sessionStorage.pkg='h5'
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
<script type="text/javascript" src="https://app.ixiulive.com/static/js/socket.io.js"></script> <script type="text/javascript" src="https://app.ixiulive.com/static/js/socket.io.js"></script>
<script> <script>
$(function(){ $(function(){
var socketOk=null var wsTimer=null
setTimeout(function(){ setTimeout(function(){
$.ajax({ $.ajax({
url:$ip+'/actRaisingBeautifulGril/sustainLogin.html', url:$ip+'/actRaisingBeautifulGril/sustainLogin.html',
...@@ -59,6 +59,33 @@ $(function(){ ...@@ -59,6 +59,33 @@ $(function(){
$(".en-t2").html("PROG") $(".en-t2").html("PROG")
$(".en-t3").html("rank") $(".en-t3").html("rank")
} }
setTimeout(function() {
wsTimer=setInterval(function(){
view()
},60000)
view()
}, 2000);
function view(){
$.ajax({
url:$ip+'/actRaisingBeautifulGril/getRoomPartData.html',
success:function(data){
console.log(data)
if(data.result.rank>0){
console.log(data)
$(".room-bg1").show()
$(".room-title").text(titleArr[data.result.targetData.stage])
$(".room-bg-p1 span").text(data.result.score)
var barWidth=Math.floor(data.result.score/data.result.targetData.stageScore*100)
$(".room-bg-p2 span").text(barWidth+'%')
$(".room-bg-p3 span").text(data.result.rank)
}else{
$(".room-bg1").hide()
clearInterval(wsTimer)
}
}
})
}
// getData() // getData()
$(".room-bg1").on("click",function(){ $(".room-bg1").on("click",function(){
var obj = { var obj = {
...@@ -74,7 +101,6 @@ $(function(){ ...@@ -74,7 +101,6 @@ $(function(){
appCollaboration(obj2); appCollaboration(obj2);
}) })
function getData(roomid) { function getData(roomid) {
console.log("开始连接")
var opts = { var opts = {
query: { query: {
'uid': sessionStorage.uid, 'uid': sessionStorage.uid,
...@@ -86,7 +112,6 @@ $(function(){ ...@@ -86,7 +112,6 @@ $(function(){
socket = io.connect(_url3 + '/default', opts); socket = io.connect(_url3 + '/default', opts);
socket.on('connect', function () { socket.on('connect', function () {
console.log("连接成功"); console.log("连接成功");
clearTimeout(socketOk)
}); });
socket.on('RaisingBeautifulGril', function (msg) { socket.on('RaisingBeautifulGril', function (msg) {
...@@ -106,7 +131,7 @@ $(function(){ ...@@ -106,7 +131,7 @@ $(function(){
}); });
socket.on('disconnect', function () { socket.on('disconnect', function () {
socketOk=setTimeout(function(){ setTimeout(function(){
getData() getData()
},3000) },3000)
console.log("已下线!"); console.log("已下线!");
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
/* padding-top: 0.4rem; */ /* padding-top: 0.4rem; */
position: absolute; position: absolute;
top: 3.9rem; top: 3.9rem;
left: 4.5rem; left: 4.9rem;
} }
.room-bg-p3 span { .room-bg-p3 span {
color: #F83AFF; color: #F83AFF;
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
/* padding-top: 0.4rem; */ /* padding-top: 0.4rem; */
position: absolute; position: absolute;
top: 3.9rem; top: 3.9rem;
left: 4.5rem; left: 4.9rem;
span{ span{
color: #F83AFF; color: #F83AFF;
} }
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
<script type="text/javascript" src="https://app.ixiulive.com/static/js/socket.io.js"></script> <script type="text/javascript" src="https://app.ixiulive.com/static/js/socket.io.js"></script>
<script> <script>
$(function(){ $(function(){
var socketOk=null var wsTimer=null
var titleArr=['','新秀出道','嶄露頭角','光芒萬丈'] var titleArr=['','新秀出道','嶄露頭角','光芒萬丈']
if(sessionStorage.lang!=2){ if(sessionStorage.lang!=2){
var titleArr=['','First level','Second level','Third level'] var titleArr=['','First level','Second level','Third level']
...@@ -52,6 +52,31 @@ $(function(){ ...@@ -52,6 +52,31 @@ $(function(){
$(".en-t2").html("PROG") $(".en-t2").html("PROG")
$(".en-t3").html("rank") $(".en-t3").html("rank")
} }
setTimeout(function() {
RoomView()
wsTimer=setInterval(function(){
RoomView()
},60000)
}, 2000);
function RoomView(){
$.ajax({
url:$ip+'/actRaisingBeautifulGril/getRoomPartData.html',
success:function(data){
console.log(data)
if(data.result.rank>0){
$(".room-bg1").show()
$(".room-title").text(titleArr[data.result.targetData.stage])
$(".room-bg-p1 span").text(data.result.score)
var barWidth=Math.floor(data.result.score/data.result.targetData.stageScore*100)
$(".room-bg-p2 span").text(barWidth+'%')
$(".room-bg-p3 span").text(data.result.rank)
}else{
$(".room-bg1").hide()
clearInterval(wsTimer)
}
}
})
}
// getData() // getData()
setTimeout(function(){ setTimeout(function(){
...@@ -108,7 +133,6 @@ $(function(){ ...@@ -108,7 +133,6 @@ $(function(){
socket = io.connect(_url3 + '/default', opts); socket = io.connect(_url3 + '/default', opts);
socket.on('connect', function () { socket.on('connect', function () {
console.log("连接成功"); console.log("连接成功");
clearTimeout(socketOk)
}); });
socket.on('RaisingBeautifulGril', function (msg) { socket.on('RaisingBeautifulGril', function (msg) {
...@@ -128,9 +152,9 @@ $(function(){ ...@@ -128,9 +152,9 @@ $(function(){
}); });
socket.on('disconnect', function () { socket.on('disconnect', function () {
socketOk=setTimeout(function(){ setTimeout(function(){
getData() getData()
},3000) },3000)
console.log("已下线!"); console.log("已下线!");
}); });
......
...@@ -44,7 +44,7 @@ if (uid.indexOf("http://localhost:63342") > -1) { ...@@ -44,7 +44,7 @@ if (uid.indexOf("http://localhost:63342") > -1) {
} }
if (uid.indexOf("file:///") > -1) { if (uid.indexOf("file:///") > -1) {
sessionStorage.lang=2 sessionStorage.lang=2
sessionStorage.uid = 10007; sessionStorage.uid = 210102;
sessionStorage.token = 'debug' sessionStorage.token = 'debug'
sessionStorage.roomId=210102; sessionStorage.roomId=210102;
sessionStorage.version=8890 sessionStorage.version=8890
......
...@@ -174,7 +174,7 @@ ...@@ -174,7 +174,7 @@
/* padding-top: 0.4rem; */ /* padding-top: 0.4rem; */
position: absolute; position: absolute;
top: 12.987vw; top: 12.987vw;
left: 14.985vw; left: 17.8vw;
} }
.act-room-bg1 .room-bg-p3 span { .act-room-bg1 .room-bg-p3 span {
color: #F83AFF; color: #F83AFF;
......
...@@ -191,7 +191,7 @@ ...@@ -191,7 +191,7 @@
/* padding-top: 0.4rem; */ /* padding-top: 0.4rem; */
position: absolute; position: absolute;
top: 12.987vw; top: 12.987vw;
left: 14.985vw; left: 17.8vw;
span{ span{
color: #F83AFF; color: #F83AFF;
} }
......
...@@ -76,6 +76,7 @@ ...@@ -76,6 +76,7 @@
<script type="text/javascript" src="https://app.ixiulive.com/static/js/socket.io.js"></script> <script type="text/javascript" src="https://app.ixiulive.com/static/js/socket.io.js"></script>
<script> <script>
$(function(){ $(function(){
var wsTimer=null
var socketOk=null var socketOk=null
//活動 //活動
var titleArr=['','新秀出道','嶄露頭角','光芒萬丈'] var titleArr=['','新秀出道','嶄露頭角','光芒萬丈']
...@@ -84,8 +85,34 @@ $(function(){ ...@@ -84,8 +85,34 @@ $(function(){
$(".en-t1").html('score') $(".en-t1").html('score')
$(".en-t2").html("PROG") $(".en-t2").html("PROG")
$(".en-t3").html("rank") $(".en-t3").html("rank")
}
setTimeout(function() {
RoomView()
wsTimer=setInterval(function(){
RoomView()
},60000)
}, 2000);
function RoomView(){
$.ajax({
url:$ip+'/actRaisingBeautifulGril/getRoomPartData.html',
success:function(data){
console.log(data)
if(data.result.rank>0){
console.log(data)
$(".act-room-bg1").show()
$(".room-title").text(titleArr[data.result.targetData.stage])
$(".room-bg-p1 span").text(data.result.score)
var barWidth=Math.floor(data.result.score/data.result.targetData.stageScore*100)
$(".room-bg-p2 span").text(barWidth+'%')
$(".room-bg-p3 span").text(data.result.rank)
}else{
$(".act-room-bg1").hide()
clearInterval(wsTimer)
}
}
})
} }
// getData() // getData()
function getData() { function getData() {
......
...@@ -45,9 +45,9 @@ if (bbb.indexOf("http://localhost:63342") > -1) { ...@@ -45,9 +45,9 @@ if (bbb.indexOf("http://localhost:63342") > -1) {
} }
if (bbb.indexOf("file:///") > -1) { if (bbb.indexOf("file:///") > -1) {
sessionStorage.lang=1 sessionStorage.lang=1
sessionStorage.uid = 11134747; sessionStorage.uid = 210102;
sessionStorage.token = 'debug' sessionStorage.token = 'debug'
sessionStorage.roomId=11134747; sessionStorage.roomId=210102;
sessionStorage.version=8890 sessionStorage.version=8890
sessionStorage.cid='web' sessionStorage.cid='web'
sessionStorage.pkg='h5' sessionStorage.pkg='h5'
......
...@@ -70,10 +70,11 @@ ...@@ -70,10 +70,11 @@
</body> </body>
<script src="lib/jquery-3.1.1.min.js"></script> <script src="lib/jquery-3.1.1.min.js"></script>
<script src="layer-v3.1.0/layer/layer.js"></script> <script src="layer-v3.1.0/layer/layer.js"></script>
<script src="lib/default.js?v='2024061601'"></script> <script src="lib/default.js?v='2024052001'"></script>
<script type="text/javascript" src="https://app.ixiulive.com/static/js/socket.io.js"></script> <script type="text/javascript" src="https://app.ixiulive.com/static/js/socket.io.js"></script>
<script> <script>
$(function(){ $(function(){
var wsTimer=null
var socketOk=null var socketOk=null
//活動 //活動
var titleArr=['','新秀出道','嶄露頭角','光芒萬丈'] var titleArr=['','新秀出道','嶄露頭角','光芒萬丈']
...@@ -83,6 +84,32 @@ $(function(){ ...@@ -83,6 +84,32 @@ $(function(){
$(".en-t2").html("PROG") $(".en-t2").html("PROG")
$(".en-t3").html("rank") $(".en-t3").html("rank")
} }
setTimeout(function() {
RoomView()
wsTimer=setInterval(function(){
RoomView()
},60000)
}, 2000);
function RoomView(){
$.ajax({
url:$ip+'/actRaisingBeautifulGril/getRoomPartData.html',
success:function(data){
console.log(data)
if(data.result.rank>0){
console.log(data)
$(".act-room-bg1").show()
$(".room-title").text(titleArr[data.result.targetData.stage])
$(".room-bg-p1 span").text(data.result.score)
var barWidth=Math.floor(data.result.score/data.result.targetData.stageScore*100)
$(".room-bg-p2 span").text(barWidth+'%')
$(".room-bg-p3 span").text(data.result.rank)
}else{
$(".act-room-bg1").hide()
clearInterval(wsTimer)
}
}
})
}
// getData() // getData()
$(".act-room-bg1").on("click",function(){ $(".act-room-bg1").on("click",function(){
var obj = { var obj = {
......
...@@ -5,7 +5,7 @@ var bbb = location.href; ...@@ -5,7 +5,7 @@ var bbb = location.href;
if (bbb.indexOf("https://fsactive.fusi.club/") > -1) { if (bbb.indexOf("https://fsactive.fusi.club/") > -1) {
$ip = "https://webserver.yabolive.net"; $ip = "https://webserver.yabolive.net";
_url3 = 'https://webserver.yabolive.net'; _url3 = 'https://webserver.yabolive.net';
$url='https://fsActive.fusi.club' $url='http://fsActive.fusi.club'
} }
else{ else{
$ip = 'http://ceshi.yabolive.tv/web'; $ip = 'http://ceshi.yabolive.tv/web';
...@@ -58,9 +58,9 @@ if (bbb.indexOf("http://localhost:63342") > -1) { ...@@ -58,9 +58,9 @@ if (bbb.indexOf("http://localhost:63342") > -1) {
} }
if (bbb.indexOf("file:///") > -1) { if (bbb.indexOf("file:///") > -1) {
sessionStorage.lang=2 sessionStorage.lang=2
sessionStorage.uid = 11134747; sessionStorage.uid = 210102;
sessionStorage.token = 'debug' sessionStorage.token = 'debug'
sessionStorage.roomId=11134747; sessionStorage.roomId=210102;
sessionStorage.version=8890 sessionStorage.version=8890
sessionStorage.cid='web' sessionStorage.cid='web'
sessionStorage.pkg='h5' sessionStorage.pkg='h5'
......
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