From dd355fcde6922a2d6fb99bf2178cb2c377329690 Mon Sep 17 00:00:00 2001
From: libai <libai@yazhai.co>
Date: Fri, 1 Nov 2024 11:45:41 +0800
Subject: [PATCH] ft活动上线

---
 activeFt/luckyFly/css/index.css  |  6 ++++++
 activeFt/luckyFly/css/index.less |  6 ++++++
 activeFt/luckyFly/oldView.html   | 14 ++++++++++----
 activeFt/luckyFly/rule.html      | 12 ++++++------
 4 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/activeFt/luckyFly/css/index.css b/activeFt/luckyFly/css/index.css
index 7006696..ff8abd3 100644
--- a/activeFt/luckyFly/css/index.css
+++ b/activeFt/luckyFly/css/index.css
@@ -107,6 +107,10 @@
   background: url(../images/en/rule-btn.png) no-repeat;
   background-size: 100% 100%;
 }
+.bg-en .act-room-bg2 {
+  background: url(../images/en/act-room-bg2.png) no-repeat;
+  background-size: 100% 100%;
+}
 .rule-bg {
   height: 40.28rem;
   width: 10rem;
@@ -830,6 +834,8 @@ iframe {
   height: 11.4rem;
   width: 10rem;
   margin-top: -2.8rem;
+  position: relative;
+  z-index: 10;
 }
 .fly-task-box {
   width: 9.38rem;
diff --git a/activeFt/luckyFly/css/index.less b/activeFt/luckyFly/css/index.less
index 029b10e..423bc7a 100644
--- a/activeFt/luckyFly/css/index.less
+++ b/activeFt/luckyFly/css/index.less
@@ -110,6 +110,10 @@
     background: url(../images/en/rule-btn.png)no-repeat;
     background-size: 100% 100%;
   }
+  .act-room-bg2{
+    background:url(../images/en/act-room-bg2.png)no-repeat;
+    background-size: 100% 100%;
+  }
 }
 
 .rule-bg{
@@ -840,6 +844,8 @@ iframe{
   width: 10rem;
   // background: pink;
   margin-top: -2.8rem;
+  position: relative;
+  z-index: 10;
 }
 .fly-task-box{
   width: 9.38rem;
diff --git a/activeFt/luckyFly/oldView.html b/activeFt/luckyFly/oldView.html
index 7a3b5f8..fbb93b8 100644
--- a/activeFt/luckyFly/oldView.html
+++ b/activeFt/luckyFly/oldView.html
@@ -42,7 +42,7 @@
 <script>
 $(function(){
     if(sessionStorage.lang!=2){
-        
+        $("body").addClass("bg-en")
     }
     $(".act-room-bg").on("click",function(){
         var obj = {
@@ -69,9 +69,15 @@ $(function(){
                 if(data.result.userData.signReceive!=0){
                     $(".act-room-bg").removeClass("act-room-bg2")
                 }
-                $(".act-room-p1").text('主播積分 : '+data.result.roomData.score+'')
-                if(data.result.roomData.rank!=-1)$(".act-room-p2").text('排名 : '+data.result.roomData.rank+'')
-                else $(".act-room-p2").text('排名 : --')
+                if(sessionStorage.lang==2){
+                    $(".act-room-p1").text('主播積分 : '+data.result.roomData.score+'')
+                    if(data.result.roomData.rank!=-1)$(".act-room-p2").text('排名 : '+data.result.roomData.rank+'')
+                    else $(".act-room-p2").text('排名 : --')
+                }else{
+                    $(".act-room-p1").text('score : '+data.result.roomData.score+'')
+                    if(data.result.roomData.rank!=-1)$(".act-room-p2").text('rank : '+data.result.roomData.rank+'')
+                    else $(".act-room-p2").text('rank : --')
+                }
             }
         })
     }
diff --git a/activeFt/luckyFly/rule.html b/activeFt/luckyFly/rule.html
index 779a550..b77ca1b 100644
--- a/activeFt/luckyFly/rule.html
+++ b/activeFt/luckyFly/rule.html
@@ -44,14 +44,14 @@ $(function(){
 
         $(".rule-bg").addClass("rule-bg-en")
     }
-    // var num=0.995
-    // var num2=0.995
-    // for(var i=0;i<300;i++){
-    //     num=num*(num2-0.00005*i)
+    var num=0.995
+    var num2=0.995
+    for(var i=0;i<299;i++){
+        num=num*(num2-0.00005*i)
       
 
-    // }
-    // console.log(num)
+    }
+    console.log(num)
     if(sessionStorage.lang!=2){
         $("body").addClass("bg-en")
         $("title").text('Journey Through Outer Space')
--
libgit2 0.25.0