From 891322c14eb90250d8865b2dce49e56b9f359b3f Mon Sep 17 00:00:00 2001
From: libai <libai@yazhai.co>
Date: Thu, 3 Aug 2023 16:25:13 +0800
Subject: [PATCH] 测试
---
mTest/mobile/lib/default.js | 5 ++++-
mTest/mobile/room/liveRoom.html | 24 ++++++++++++++++++++++--
2 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/mTest/mobile/lib/default.js b/mTest/mobile/lib/default.js
index cc025fe..90ffb55 100644
--- a/mTest/mobile/lib/default.js
+++ b/mTest/mobile/lib/default.js
@@ -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
}
diff --git a/mTest/mobile/room/liveRoom.html b/mTest/mobile/room/liveRoom.html
index eb6ee84..1b7328d 100644
--- a/mTest/mobile/room/liveRoom.html
+++ b/mTest/mobile/room/liveRoom.html
@@ -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)) {
--
libgit2 0.25.0