Commit 891322c1 by libai

测试

parent fbbe3722
......@@ -7,7 +7,7 @@
$ip = "https://cpapi.footseen.xyz/";
$ip2="https://webserver.yabolive.net"
$ws = "wss://websocket.footseen.xyz:12308/"
checkIp()
// checkIp()
}
else{
$ip='http://cpapitest.yabolive.net:81/'
......@@ -15,6 +15,9 @@ else{
$ws = "ws://47.242.178.187:12308/"
// localStorage.canvasCode='phone'
}
$ip='http://cpapitest.yabolive.net:81/'
$ip2="http://ceshi.yabolive.tv/web"
$ws = "ws://47.242.178.187:12308/"
if(bbb.indexOf("userRoom.html")==-1){
sessionStorage.lastUrl=bbb
}
......
......@@ -692,6 +692,8 @@ $(function(){
var startTimer1=null
var startTimer2=null
var startTimer3=null
//發言條數
var sendNum=0
$(".room-bg").css("height",dHeight+'px')
$(".video-box").css("height",dHeight+'px')
$(".room-content-loading").css("height",dHeight+'px')
......@@ -1176,6 +1178,13 @@ $(function(){
layer.msg(langRoom[sessionStorage.lang].roomJsTxt3)
$(".room-mc-box").css("transition","0.3s all")
$(".room-mc-box").addClass("room-mc-box2")
if(sessionStorage.firstReg==1){
$(".active-room-shadow").show()
$(".active-room-box").show()
var html=[];
html+='<iframe src="https://activity.yazhaiyabo.com/activeFt/newCharge/index.html?uid='+localStorage.uid+'&token='+localStorage.token+'&lang='+sessionStorage.lang+'&roomid='+sessionStorage.roomId+'" frameborder="0"></iframe>'
$(".active-room-box").html(html).css("bottom","0rem")
}
}else{
layer.msg(data.msg)
}
......@@ -1498,15 +1507,16 @@ $(function(){
lang:sessionStorage.lang
},
success:function(data){
// console.log('首充活动',data)
console.log('首充活动',data)
if(data.dataList.is_show==1){
sessionStorage.firstReg=1
$(".room-reg-icon").fadeIn(350)
$(".room-reg-icon").unbind("click").on("click",function(){
$(".active-room-shadow").show()
$(".active-room-box").show()
var html=[];
html+='<iframe src="https://activity.yazhaiyabo.com/activeFt/firstCharge/phone/index.html?uid='+localStorage.uid+'&token='+localStorage.token+'&lang='+sessionStorage.lang+'&roomid='+sessionStorage.roomId+'" frameborder="0"></iframe>'
html+='<iframe src="https://activity.yazhaiyabo.com/activeFt/newCharge/index.html?uid='+localStorage.uid+'&token='+localStorage.token+'&lang='+sessionStorage.lang+'&roomid='+sessionStorage.roomId+'&pageID='+localStorage.canvasCode+'" frameborder="0"></iframe>'
$(".active-room-box").html(html).css("bottom","0rem")
})
$(".active-room-shadow").unbind("click").on("click",function(){
......@@ -3419,7 +3429,17 @@ $(function(){
return;
}
if(data.code==1){
sendNum++
if(sessionStorage.firstReg==1&&sendNum==3){
setTimeout(function() {
$(".active-room-shadow").show()
$(".active-room-box").show()
var html=[];
html+='<iframe src="https://activity.yazhaiyabo.com/activeFt/newCharge/index.html?uid='+localStorage.uid+'&token='+localStorage.token+'&lang='+sessionStorage.lang+'&roomid='+sessionStorage.roomId+'" frameborder="0"></iframe>'
$(".active-room-box").html(html).css("bottom","0rem")
}, 1000);
}
$(".keyboard-input").val("")
var ua = window.navigator.userAgent.toLowerCase();
if (/android/.test(ua)) {
......
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