From d5017f98537c78c2be024679ccb4648b3e489f3d Mon Sep 17 00:00:00 2001
From: libai <libai@yazhai.co>
Date: Fri, 1 Nov 2024 15:14:45 +0800
Subject: [PATCH] ft活动上线
---
ftIcon/liveData/css/index.css | 51 ++++++++++++++++++---------------------------------
ftIcon/liveData/css/index.less | 52 +++++++++++++++++++---------------------------------
ftIcon/liveData/index.html | 23 +++++++++++++----------
ftIcon/liveData2/css/index.less | 18 +++++++++---------
ftIcon/liveData2/lib/default.js | 4 ++--
5 files changed, 61 insertions(+), 87 deletions(-)
diff --git a/ftIcon/liveData/css/index.css b/ftIcon/liveData/css/index.css
index f8ff121..ec0f9ca 100644
--- a/ftIcon/liveData/css/index.css
+++ b/ftIcon/liveData/css/index.css
@@ -126,46 +126,31 @@ i {
margin-top: 4vw;
}
.act-room-bg {
+ position: relative;
width: 10rem;
- height: 8.563rem;
+ height: 4.252rem;
background: url(../images/act-room-bg.png) no-repeat;
background-size: 100% 100%;
- position: relative;
+}
+.act-room-p1 {
+ color: #fff;
+ font-size: 0.75rem;
+ text-indent: 0.7rem;
+ padding-top: 0.9rem;
+}
+.act-room-p2 {
+ color: #fff;
+ font-size: 0.75rem;
+ text-indent: 0.7rem;
+ padding-top: 0.2rem;
}
.act-room-bg2 {
- width: 10rem;
- height: 5.577rem;
+ position: relative;
+ width: 5.04rem;
+ height: 3.402rem;
background: url(../images/act-room-bg2.png) no-repeat;
background-size: 100% 100%;
}
-.act-room-bg2 > p {
+.act-room-bg2 p {
display: none;
}
-.act-p1 {
- color: #fff;
- text-align: center;
- width: 10rem;
- font-size: 0.8rem;
- position: absolute;
- top: 1.2rem;
-}
-.act-p1 span {
- width: 10rem;
- position: absolute;
- color: #FFF337;
- top: 2.3rem;
- left: 0;
- font-size: 1rem;
- font-weight: 700;
-}
-.act-p2 {
- color: #fff;
- text-align: center;
- width: 10rem;
- font-size: 0.8rem;
- position: absolute;
- top: 6rem;
-}
-.act-p2 span {
- color: #FFF337;
-}
diff --git a/ftIcon/liveData/css/index.less b/ftIcon/liveData/css/index.less
index d7cd635..14d7058 100644
--- a/ftIcon/liveData/css/index.less
+++ b/ftIcon/liveData/css/index.less
@@ -143,46 +143,32 @@ i{
}
//活動
.act-room-bg{
+ position: relative;
width: 10rem;
- height: 8.563rem;
+ height: 4.252rem;
background: url(../images/act-room-bg.png)no-repeat;
background-size: 100% 100%;
- position: relative;
+
+}
+.act-room-p1{
+ color: #fff;
+ font-size: 0.75rem;
+ text-indent: 0.7rem;
+ padding-top: 0.9rem;
+}
+.act-room-p2{
+ color: #fff;
+ font-size: 0.75rem;
+ text-indent: 0.7rem;
+ padding-top: 0.2rem;
}
.act-room-bg2{
- width: 10rem;
- height: 5.577rem;
+ position: relative;
+ width: 5.04rem;
+ height: 3.402rem;
background: url(../images/act-room-bg2.png)no-repeat;
background-size: 100% 100%;
- >p{
+ p{
display: none;
}
-}
-.act-p1{
- color: #fff;
- text-align: center;
- width: 10rem;
- font-size: 0.8rem;
- position: absolute;
- top: 1.2rem;
- span{
- width: 10rem;
- position: absolute;
- color: #FFF337;
- top: 2.3rem;
- left: 0;
- font-size: 1rem;
- font-weight: 700;
- }
-}
-.act-p2{
- color: #fff;
- text-align: center;
- width: 10rem;
- font-size: 0.8rem;
- position: absolute;
- top: 6rem;
- span{
- color: #FFF337;
- }
}
\ No newline at end of file
diff --git a/ftIcon/liveData/index.html b/ftIcon/liveData/index.html
index 10d7bfc..34ddde2 100644
--- a/ftIcon/liveData/index.html
+++ b/ftIcon/liveData/index.html
@@ -31,9 +31,9 @@
</style>
</head>
<body c style="background:rgba(0,0,0,0)">
- <div style="display: none;" class="act-room-bg act-room-bg2">
- <p class="act-p1"><i class="en-txt1">主播積分</i>: <span>8000</span></p>
- <p class="act-p2"><i class="en-txt2">進度</i>: <span class="act-span2" style="margin-right: 0.5rem;">18%</span> <i class="en-txt3">排名</i>: <span class="act-span3">5</span></p>
+ <div class="act-room-bg ">
+ <p class="act-room-p1">主播積分 : 8000</p>
+ <p class="act-room-p2">排名 : 5</p>
</div>
<div class="room-bg1">
<div class="room-bg-top">人氣</div>
@@ -99,15 +99,18 @@ $(function(){
function ActView(){
$.ajax({
- url:$ip+'/actLucky777/getRoomPartData.html',
+ url:$ip+'/actSpaceOdyssey/getRoomPartData.html',
success:function(data){
console.log('圖標數據',data)
- jump=2
- $(".act-room-bg").removeClass("act-room-bg2").fadeIn(200)
- $(".act-p1 span").text(data.result.roomData.score)
- $(".act-span2").text(Math.floor(data.result.roomData.score/15000*100)+'%')
- if(data.result.roomData.rank==-1)$(".act-span3").text('--')
- else $(".act-span3").text(data.result.roomData.rank)
+ 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/ftIcon/liveData2/css/index.less b/ftIcon/liveData2/css/index.less
index 809fcf0..4892420 100644
--- a/ftIcon/liveData2/css/index.less
+++ b/ftIcon/liveData2/css/index.less
@@ -164,15 +164,15 @@
.act-room-bg{
- position: relative;
- width: 8rem;
- height: 3.402rem;
- background: url(../images/act-room-bg.png) no-repeat;
- background-size: 100% 100%;
- float: right;
- transform: scale(0.33);
- top: -2.55rem;
- left: 2.3rem;
+ position: relative;
+ width: 8rem;
+ height: 3.402rem;
+ background: url(../images/act-room-bg.png) no-repeat;
+ background-size: 100% 100%;
+ float: right;
+ transform: scale(0.33);
+ top: -2.55rem;
+ left: 2.3rem;
}
.act-room-p1{
color: #fff;
diff --git a/ftIcon/liveData2/lib/default.js b/ftIcon/liveData2/lib/default.js
index bc30f35..43d6e31 100644
--- a/ftIcon/liveData2/lib/default.js
+++ b/ftIcon/liveData2/lib/default.js
@@ -45,9 +45,9 @@ if (bbb.indexOf("http://localhost:63342") > -1) {
}
if (bbb.indexOf("file:///") > -1) {
sessionStorage.lang=1
- sessionStorage.uid = 174003;
+ sessionStorage.uid = 210102;
sessionStorage.token = 'debug'
- sessionStorage.roomId=174003;
+ sessionStorage.roomId=210102;
sessionStorage.version=8890
sessionStorage.cid='web'
sessionStorage.pkg='h5'
--
libgit2 0.25.0