Merge branch 'master' of git.yabolive.net:libai/fsActive into master

ftIcon/liveData2/index.html

@@ -13,7 +13,7 @@
     <link rel="stylesheet" href="css/base.css">
     <link rel="stylesheet" href="css/layer.css">
     <link rel="stylesheet" href="css/daily.css">
-    <link rel="stylesheet" href="css/index.css?v=2024080101">
+    <link rel="stylesheet" href="css/index.css?v=2024081701">
     <link rel="stylesheet" href="css/liMarquee.css">
     <style>
         .layui-layer-shade {
@@ -78,7 +78,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='2024081701'"></script>
 <script type="text/javascript" src="https://app.ixiulive.com/static/js/socket.io.js"></script>
 <script>
 $(function(){
@@ -176,23 +176,23 @@ $(function(){
 
     }
     setTimeout(function(){
-        if(localStorage.gardenLayer==undefined||localStorage.gardenLayer<new Date().getTime()){
-            localStorage.gardenLayer=(Number(new Date().getTime())+86400000)
-            $.ajax({
-                url:$ip+'/actSecretGarden/openPopup.html',
-                data:{
-                    width:'0',
-                    popupUrl:$url + "/activeFt/garden/pop.html",
-                    height:'0.5',
-                    heightR:'106',
-                    x:'0',
-                    y:'0.5',
-                },
-                success:function(){
+        // if(localStorage.gardenLayer==undefined||localStorage.gardenLayer<new Date().getTime()){
+        //     localStorage.gardenLayer=(Number(new Date().getTime())+86400000)
+        //     $.ajax({
+        //         url:$ip+'/actSecretGarden/openPopup.html',
+        //         data:{
+        //             width:'0',
+        //             popupUrl:$url + "/activeFt/garden/pop.html",
+        //             height:'0.5',
+        //             heightR:'106',
+        //             x:'0',
+        //             y:'0.5',
+        //         },
+        //         success:function(){
 
-                }
-            })
-        }
+        //         }
+        //     })
+        // }
     },30000)
      $(".act-room-bg2").on("click",function(){
         var obj = {