diff --git a/mTest/index.html b/mTest/index.html index 5c68a25..dedd9cd 100644 --- a/mTest/index.html +++ b/mTest/index.html @@ -17,7 +17,7 @@ <meta name="apple-mobile-web-app-capable" content="yes"> <link rel="apple-touch-icon-precomposed" href="icon/fox-icon.png"> <script src="lib/jquery-3.1.1.min.js"></script> - <script src="lib/default.js?v=2022112403"></script> + <script src="lib/default.js?v=2022112501"></script> <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 content="telephone=no" name="format-detection"> @@ -745,7 +745,7 @@ $(function(){ var html=[]; for(var i=0;i<data.roomList.length;i++){ var list=data.roomList[i] - html+='<a href="room/liveRoom.html?roomId='+list.roomId+'&sound=1&v=2022112501"><li data-type="https://zhibocdn.yabolive.net/comm'+list.face.split("?")[0]+'?x-oss-process=image/resize,w_180">'; + html+='<a href="room/liveRoom.html?roomId='+list.roomId+'&sound=1&v=2022112501&back=1"><li data-type="https://zhibocdn.yabolive.net/comm'+list.face.split("?")[0]+'?x-oss-process=image/resize,w_180">'; if(list.liveScope==3)html+='<img class="secret" src="images/Lock-no.png" alt="">'; if(list.onlinenum)html+='<div class="hot-num-box"><img src="images/hot.png"><span>'+list.onlinenum+'</span></div>'; diff --git a/mTest/lib/default.js b/mTest/lib/default.js index adcc557..a7cd4f1 100644 --- a/mTest/lib/default.js +++ b/mTest/lib/default.js @@ -28,6 +28,7 @@ sessionStorage.tag=data.tag sessionStorage.qd=data.qd sessionStorage.type=data.type; var mySound=data.sound; +if(data.back!=undefined)backGo=data.back; if(sessionStorage.open==undefined)sessionStorage.open=1 var ua = window.navigator.userAgent.toLowerCase(); try { diff --git a/mTest/room/liveRoom.html b/mTest/room/liveRoom.html index 894d61c..86dbfd3 100644 --- a/mTest/room/liveRoom.html +++ b/mTest/room/liveRoom.html @@ -132,7 +132,7 @@ <div class="touch-box"></div> <div class="layer-shadow"></div> <div style="display: none;" class="mc-out-box"> - <a href="javascript:history.back(-1);"><img class="room-close" src="images/close.png" alt=""></a> + <img class="room-close" src="images/close.png" alt=""> <div class="room-out-shadow"></div> <div class="mc-out-mcBox"> <!-- <img class="room-mc-face" src="https://zhibocdn.yabolive.net/comm/stscli/prod/4106446166423916818508c02555a3a647828c50948d55f57692.jpg?x-oss-process=image/resize,w_80" alt=""> @@ -159,7 +159,7 @@ </div> </div> <div style="display: none;" class="room-secret"> - <a href="javascript:history.back(-1);"><img class="room-close" src="images/close.png" alt=""></a> + <img class="room-close" src="images/close.png" alt=""> <div class="room-secret-mc"> <!-- <img src="https://zhibocdn.yabolive.net/comm/stscli/prod/4106446166423916818508c02555a3a647828c50948d55f57692.jpg?x-oss-process=image/resize,w_100" alt=""> <p>主播昵称预留</p> --> @@ -191,8 +191,7 @@ <!-- <li><img src="https://zhibocdn.yabolive.net/comm/stscli/prod/4106446166423916818508c02555a3a647828c50948d55f57692.jpg?x-oss-process=image/resize,w_78" alt=""></li> --> </ul> </div> - - <a href="javascript:history.go(https://www.footseen.xyz/mTest/index.html);"><img class="room-close" src="images/close.png" alt=""></a> + <img class="room-close" src="images/close.png" alt=""> </div> <div class="rich-tips-box"> <div class="room-hot-box"><img src="images/fire.png" alt=""><span>--</span></div> @@ -572,7 +571,7 @@ </body> <script src="../lib/jquery-3.1.1.min.js"></script> -<script src="../lib/default.js?v=2022112403"></script> +<script src="../lib/default.js?v=2022112501"></script> <script src="../layer-v3.1.0/layer/layer.js"></script> <!-- <script src="../lib/inobounce.js"></script> --> <!-- <script src="lib/fingerprint2.js"></script> --> @@ -1022,7 +1021,12 @@ $(function(){ msgSend($(".keyboard-input").val()) }) $(".room-close").on("click",function(){ - // window.location.href="../index.html?v=2022112301" + if(backGo!=undefined){ + history.back(-1) + }else{ + window.location.href="../index.html" + } + }) $(".exc-layer .exc-btn").on("click",function(){ $.ajax({