diff --git a/activeFt/summer/index.html b/activeFt/summer/index.html index 589e292..a5ba2a4 100644 --- a/activeFt/summer/index.html +++ b/activeFt/summer/index.html @@ -307,7 +307,7 @@ </body> <script src="lib/jquery-3.1.1.min.js"></script> <script src="layer-v3.1.0/layer/layer.js"></script> -<script src="lib/default.js?v='2024061702'"></script> +<script src="lib/default.js?v='2024071701'"></script> <script src="lib/clipboard.js"></script> <script src="lib/swiper.min.js"></script> <script> @@ -417,6 +417,13 @@ var scoreRankTxt="嘉年華積分" $("iframe").attr("src","https://activity.yazhaiyabo.com/games/fruitTurntable/main.html"+location.search+""+"&roomid=868902") } }) + if(sessionStorage.jumptype==2){ + $(".top-btn1").addClass("top-btn2") + $(".mc-box").hide() + $(".user-box").fadeIn(200) + task() + $("iframe").attr("src","https://activity.yazhaiyabo.com/games/fruitTurntable/main.html"+location.search+""+"&roomid=868902") + } $(".rule-btn").on("click",function(){ window.location.href="rule.html"+location.search }) diff --git a/activeFt/summer/lib/default.js b/activeFt/summer/lib/default.js index 1c8423f..83ada5c 100644 --- a/activeFt/summer/lib/default.js +++ b/activeFt/summer/lib/default.js @@ -23,6 +23,7 @@ sessionStorage.cid='web_gw' sessionStorage.os='WEB' sessionStorage.appname=data.appname sessionStorage.popType=data.popType +sessionStorage.jumpType=data.jumpType if (data.roomID != undefined && data.roomID != 'undefined') { sessionStorage.roomId = data.roomID; } @@ -36,7 +37,6 @@ else if(data.roomid != undefined && data.roomid != 'undefined'){ if(sessionStorage.roomId=='undefined')sessionStorage.roomId=0 sessionStorage.act_entry=data.act_entry -sessionStorage.jump=data.jump sessionStorage.isShowHalf=data.isShowHalf if(sessionStorage.open==undefined)sessionStorage.open=1 diff --git a/activeFt/summer/oldView.html b/activeFt/summer/oldView.html index e49d29b..d3c6544 100644 --- a/activeFt/summer/oldView.html +++ b/activeFt/summer/oldView.html @@ -44,6 +44,7 @@ <script type="text/javascript" src="https://app.ixiulive.com/static/js/socket.io.js"></script> <script> $(function(){ + var jumpType=1 if(sessionStorage.lang!=2){ $("body").addClass("bg-en") $(".act-room-tips1").text("the one ahead") @@ -56,7 +57,7 @@ $(function(){ "data": { "msg": '跳转集合功能', "jumptype": 3, - "url": $url + "/activeFt/summer/index.html" + location.search, + "url": $url + "/activeFt/summer/index.html" + location.search+'&jumpType='+jumpType, } } var obj2 = JSON.stringify(obj); @@ -72,7 +73,10 @@ $(function(){ success:function(data){ console.log('获取主播信息',data) if(data.result.userData.signReceive!=0&&data.result.roomData.rank!=-1)$(".act-room-bg1").removeClass("act-room-bg2") - else $(".act-room-bg1").addClass("act-room-bg2") + else { + jumpType=2 + $(".act-room-bg1").addClass("act-room-bg2") + } $(".act-room-p1").text(data.result.roomData.diffPreScore) $(".act-room-p2").text(data.result.roomData.rank) if(data.result.roomData.rank==1){