From 4a56f001882ed615179ba2f3aa6cd14fac86191d Mon Sep 17 00:00:00 2001
From: libai <libai@yazhai.co>
Date: Fri, 27 Sep 2024 16:52:23 +0800
Subject: [PATCH] ft活动上线
---
activeFt/lucky777/css/index.css | 25 +++++++++++++++++++++++++
activeFt/lucky777/css/index.less | 25 +++++++++++++++++++++++--
activeFt/lucky777/images/en/banner.png | Bin 0 -> 157670 bytes
activeFt/lucky777/images/pop-btn.png | Bin 0 -> 12194 bytes
activeFt/lucky777/images/pop.png | Bin 0 -> 81181 bytes
activeFt/lucky777/index.html | 1 +
activeFt/lucky777/oldView.html | 23 +++++++++++++++++++++--
activeFt/lucky777/pop.html | 59 +++++++++++++++--------------------------------------------
ftIcon/action2/css/index.css | 73 ++++++++++++++++++++-----------------------------------------------------
ftIcon/action2/css/index.less | 87 ++++++++++++++++++++++++++++-----------------------------------------------------------
ftIcon/action2/images/act-room-bg.png | Bin 19677 -> 0 bytes
ftIcon/action2/images/act-room-bg2.png | Bin 14063 -> 0 bytes
ftIcon/action2/images/en/act-room-bg2.png | Bin 15592 -> 0 bytes
ftIcon/action2/index.html | 179 +++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------------------------------------------
ftIcon/liveData/css/index.css | 54 ++++++++++++++++++------------------------------------
ftIcon/liveData/css/index.less | 63 +++++++++++++++++++++++----------------------------------------
ftIcon/liveData/images/act-room-bg.png | Bin 27888 -> 0 bytes
ftIcon/liveData/images/act-room-bg2.png | Bin 14063 -> 0 bytes
ftIcon/liveData/images/en/act-room-bg.png | Bin 27888 -> 0 bytes
ftIcon/liveData/images/en/act-room-bg2.png | Bin 15592 -> 0 bytes
ftIcon/liveData/index.html | 34 +++++++++++++++++-----------------
ftIcon/liveData2/css/index.css | 73 ++++++++++++++++---------------------------------------------------------
ftIcon/liveData2/css/index.less | 86 +++++++++++++++++++++++---------------------------------------------------------------
ftIcon/liveData2/images/act-room-bg.png | Bin 19677 -> 0 bytes
ftIcon/liveData2/images/act-room-bg2.png | Bin 14063 -> 0 bytes
ftIcon/liveData2/images/en/act-room-bg.png | Bin 19677 -> 0 bytes
ftIcon/liveData2/images/en/act-room-bg2.png | Bin 14063 -> 0 bytes
ftIcon/liveData2/index.html | 49 ++++++++++++++++++++++++++++++-------------------
28 files changed, 311 insertions(+), 520 deletions(-)
create mode 100644 activeFt/lucky777/images/en/banner.png
create mode 100644 activeFt/lucky777/images/pop-btn.png
create mode 100644 activeFt/lucky777/images/pop.png
delete mode 100644 ftIcon/liveData/images/en/act-room-bg.png
delete mode 100644 ftIcon/liveData2/images/act-room-bg2.png
delete mode 100644 ftIcon/liveData2/images/en/act-room-bg.png
delete mode 100644 ftIcon/liveData2/images/en/act-room-bg2.png
diff --git a/activeFt/lucky777/css/index.css b/activeFt/lucky777/css/index.css
index 44bca74..5b59230 100644
--- a/activeFt/lucky777/css/index.css
+++ b/activeFt/lucky777/css/index.css
@@ -1,3 +1,7 @@
+.bg-en .banner {
+ background: url(../images/en/banner.png) no-repeat;
+ background-size: 100% 100%;
+}
.bg-en .top-btn1 {
background: url(../images/en/top-btn1.png) no-repeat;
background-size: 100% 100%;
@@ -115,6 +119,27 @@
left: -3.5rem !important;
top: 0.43rem !important;
}
+.bg-en .act-room-bg2 {
+ background: url(../images/en/act-room-bg2.png) no-repeat;
+ background-size: 100% 100%;
+}
+.pop {
+ position: relative;
+ width: 9.1rem;
+ height: 7.21rem;
+ background: url(../images/pop.png) no-repeat;
+ background-size: 100% 100%;
+ margin: 0 auto;
+}
+.pop-btn {
+ position: absolute;
+ width: 4.44rem;
+ height: 1.506rem;
+ background: url(../images/pop-btn.png) no-repeat;
+ background-size: 100% 100%;
+ top: 4.6rem;
+ left: 2.25rem;
+}
.callKF {
width: 10rem;
position: absolute;
diff --git a/activeFt/lucky777/css/index.less b/activeFt/lucky777/css/index.less
index ff1f6ae..7aa3763 100644
--- a/activeFt/lucky777/css/index.less
+++ b/activeFt/lucky777/css/index.less
@@ -1,7 +1,7 @@
.bg-en{
.banner{
- // background: url(../images/en/banner.png) no-repeat;
- // background-size: 100% 100%;
+ background: url(../images/en/banner.png) no-repeat;
+ background-size: 100% 100%;
}
.top-btn1{
background: url(../images/en/top-btn1.png) no-repeat;
@@ -120,6 +120,27 @@
left: -3.5rem !important;
top: 0.43rem !important;
}
+ .act-room-bg2{
+ background: url(../images/en/act-room-bg2.png)no-repeat;
+ background-size: 100% 100%;
+ }
+}
+.pop{
+ position: relative;
+ width: 9.1rem;
+ height: 7.21rem;
+ background: url(../images/pop.png)no-repeat;
+ background-size: 100% 100%;
+ margin: 0 auto;
+}
+.pop-btn{
+ position: absolute;
+ width: 4.44rem;
+ height: 1.506rem;
+ background: url(../images/pop-btn.png) no-repeat;
+ background-size: 100% 100%;
+ top: 4.6rem;
+ left: 2.25rem;
}
.callKF{
width: 10rem;
diff --git a/activeFt/lucky777/images/en/banner.png b/activeFt/lucky777/images/en/banner.png
new file mode 100644
index 0000000..73434bc
Binary files /dev/null and b/activeFt/lucky777/images/en/banner.png differ
diff --git a/activeFt/lucky777/images/pop-btn.png b/activeFt/lucky777/images/pop-btn.png
new file mode 100644
index 0000000..f76972c
Binary files /dev/null and b/activeFt/lucky777/images/pop-btn.png differ
diff --git a/activeFt/lucky777/images/pop.png b/activeFt/lucky777/images/pop.png
new file mode 100644
index 0000000..3688fab
Binary files /dev/null and b/activeFt/lucky777/images/pop.png differ
diff --git a/activeFt/lucky777/index.html b/activeFt/lucky777/index.html
index dc035d1..b54d7cf 100644
--- a/activeFt/lucky777/index.html
+++ b/activeFt/lucky777/index.html
@@ -140,6 +140,7 @@ $(function(){
if(sessionStorage.lang!=2){
$("body").addClass("bg-en")
$(".top-like").attr("src","images/en/like.png")
+ $(".top-p2").text("Not yet")
}
list()
top()
diff --git a/activeFt/lucky777/oldView.html b/activeFt/lucky777/oldView.html
index 3152b20..334ee17 100644
--- a/activeFt/lucky777/oldView.html
+++ b/activeFt/lucky777/oldView.html
@@ -42,7 +42,7 @@
<script>
$(function(){
if(sessionStorage.lang!=2){
- // $("body").addClass("bg-en")
+ $("body").addClass("bg-en")
// $(".act-room-p1").text("score:")
// $(".act-room-p3").text("goal:")
$(".en-txt1").text("score")
@@ -90,7 +90,26 @@ $(function(){
setInterval(function(){
view()
},60000)
-
+ setTimeout(function(){
+ if(sessionStorage.lang==2)return;
+ if(localStorage.lucky777==undefined||localStorage.lucky777<new Date().getTime()){
+ // localStorage.lucky777=(Number(new Date().getTime())+86400000)
+ $.ajax({
+ url:$ip+'/actSecretGarden/openPopup.html',
+ data:{
+ width:'0',
+ popupUrl:$url + "/activeFt/lucky777/pop.html",
+ height:'0.5',
+ heightR:'75',
+ x:'0',
+ y:'0.5',
+ },
+ success:function(){
+
+ }
+ })
+ }
+ },30000)
function getData(roomid) {
var opts = {
reconnectionDelay: 5000,
diff --git a/activeFt/lucky777/pop.html b/activeFt/lucky777/pop.html
index 30fdff8..219b967 100644
--- a/activeFt/lucky777/pop.html
+++ b/activeFt/lucky777/pop.html
@@ -35,8 +35,8 @@
<script src="lib/lottie-player.js"></script>
<body style="background:rgba(0,0,0,0.5);">
- <div style="margin-top: 0;" class="one-gift-box2">
- <div class="one-gift-send btn-Pulse"></div>
+ <div style="margin-top: 0;" class="pop">
+ <div class="pop-btn"></div>
</div>
</body>
<script src="lib/jquery-3.1.1.min.js"></script>
@@ -53,54 +53,25 @@ $(function(){
buy(2)
})
- function buy(type){
+ $(".pop-btn").on("click",function(){
$.ajax({
- url:$ip+'/actStarSearchTour/userBuyGoods.html',
+ url:$ip+'/actSecretGarden/openPopup.html',
data:{
- goodsType:type
+ width:'0',
+ popupUrl: "http://test.ybact.yazhaiyabo.com/active2020/superDew/index.html"+location.search+""+"&roomid=999996",
+ height:'0.5',
+ heightR:'102',
+ x:'0',
+ y:'0.5',
},
- success:function(data){
- console.log("购买月卡/壁咚",data)
- if(data.code==-100){
- if(sessionStorage.lang==2)layer.msg("寶石不足,即將跳轉儲值")
- else layer.msg("Insufficient GEMs")
- setTimeout(function(){
- var obj = {
- "cid": 12,
- "reqCode": new Date().getTime(),
- "data": {
- "msg": '去儲值',
- "jumptype": 16, //16: 去储值 18: 跳转到座驾 3：跳转集合功能 28:跳转直播间 29：空间 26:设置 40:半屏宝石储值 41：礼物列表 42：背包列表 // 43: 跳转新人主播引导
- "hideTitle": 0 // 1隐藏头部，0 不隐藏， 默认为0
- }
- }
- var obj2 = JSON.stringify(obj);
- appCollaboration(obj2);
- },800)
- return;
- }
- if(data.code!=1){
- layer.msg(data.msg)
- return;
- }
- var obj = {
- "cid": 14,
- "reqCode": new Date().getTime(),
- }
- var obj2 = JSON.stringify(obj);
- appCollaboration(obj2);
- }
+ success:function(){
+
+ }
})
- }
- $(".pop-btn").on("click",function(){
+
var obj = {
- "cid": 12,
+ "cid": 14,
"reqCode": new Date().getTime(),
- "data": {
- "msg": '跳转集合功能',
- "jumptype": 3,
- "url": $url + "/activeFt/newMan/index.html" + location.search+'&jump=1',
- }
}
var obj2 = JSON.stringify(obj);
appCollaboration(obj2);
diff --git a/ftIcon/action2/css/index.css b/ftIcon/action2/css/index.css
index cf126ea..8a49143 100644
--- a/ftIcon/action2/css/index.css
+++ b/ftIcon/action2/css/index.css
@@ -1,70 +1,37 @@
.bg-en .act-room-bg2 {
background: url(../images/en/act-room-bg2.png) no-repeat;
background-size: 100% 100%;
- width: 8.5rem;
-}
-.act-room-bg {
- width: 10rem;
- height: 5.646rem;
- background: url(../images/act-room-bg.png) no-repeat;
- background-size: 100% 100%;
}
.act-room-bg2 {
- width: 8rem;
- height: 4.393rem;
- float: right;
+ width: 10rem;
+ height: 5.577rem;
background: url(../images/act-room-bg2.png) no-repeat;
background-size: 100% 100%;
}
-.act-room-bg2 > div,
.act-room-bg2 > p {
- font-size: 0;
+ display: none;
}
-.act-room-p1 {
- width: 5rem;
- text-align: center;
- color: #467EEE;
- font-size: 0.8rem;
- position: absolute;
- top: 1.85rem;
- left: 0.5rem;
+.act-room-bg {
+ width: 10rem;
+ height: 5.577rem;
+ background: url(../images/act-room-bg.png) no-repeat;
+ background-size: 100% 100%;
}
-.act-room-p2 {
- width: 5rem;
- text-align: left;
- color: #FF5000;
+.act-room-bg .act-p1 {
+ text-indent: 1.2rem;
font-size: 0.8rem;
- position: absolute;
- top: 1.9rem;
- left: 4.9rem;
- font-weight: 700;
+ color: #fff;
+ padding-top: 1rem;
}
-.act-room-p3 {
- width: 5rem;
- text-align: center;
- color: #467EEE;
- font-size: 0.8rem;
- position: absolute;
- top: 3.3rem;
- left: 0.5rem;
+.act-room-bg .act-p1 span {
+ color: #FFF337;
}
-.act-room-p4 {
- width: 5rem;
- text-align: left;
- color: #FF5000;
+.act-room-bg .act-p2 {
+ text-indent: 1.2rem;
font-size: 0.8rem;
- position: absolute;
- top: 3.3rem;
- left: 4.9rem;
- font-weight: 700;
+ color: #fff;
+ padding-top: 0.3rem;
}
-.act-title {
- position: absolute;
- top: 0.2rem;
- width: 10rem;
- text-align: center;
- font-size: 0.8rem;
- font-weight: 700;
- color: #FFFFFF;
- text-shadow: -0.06rem 0.06rem 0.06rem #1B55EC, -0.06rem 0.06rem 0.06rem #1B55EC, -0.06rem 0.06rem 0.06rem #1B55EC;
+.act-room-bg .act-p2 span {
+ color: #FFF337;
}
diff --git a/ftIcon/action2/css/index.less b/ftIcon/action2/css/index.less
index a0d41b3..4603073 100644
--- a/ftIcon/action2/css/index.less
+++ b/ftIcon/action2/css/index.less
@@ -2,70 +2,39 @@
.act-room-bg2{
background: url(../images/en/act-room-bg2.png)no-repeat;
background-size: 100% 100%;
- width: 8.5rem;
+
}
}
-.act-room-bg{
- width: 10rem;
- height: 5.646rem;
- background: url(../images/act-room-bg.png)no-repeat;
- background-size: 100% 100%;
-}
.act-room-bg2{
- width: 8rem;
- height: 4.393rem;
- float: right;
+ width: 10rem;
+ height: 5.577rem;
background: url(../images/act-room-bg2.png)no-repeat;
background-size: 100% 100%;
- >div,>p{
- font-size: 0;
+ >p{
+ display: none;
}
}
-.act-room-p1{
- width: 5rem;
- text-align: center;
- color: #467EEE;
- font-size: 0.8rem;
- position: absolute;
- top: 1.85rem;
- left: 0.5rem;
-}
-.act-room-p2{
- width: 5rem;
- text-align: left;
- color: #FF5000;
- font-size: 0.8rem;
- position: absolute;
- top: 1.9rem;
- left: 4.9rem;
- font-weight: 700;
-}
-.act-room-p3{
- width: 5rem;
- text-align: center;
- color: #467EEE;
- font-size: 0.8rem;
- position: absolute;
- top: 3.3rem;
- left: 0.5rem;
-}
-.act-room-p4{
- width: 5rem;
- text-align: left;
- color: #FF5000;
- font-size: 0.8rem;
- position: absolute;
- top: 3.3rem;
- left: 4.9rem;
- font-weight: 700;
-}
-.act-title{
- position: absolute;
- top: 0.2rem;
+.act-room-bg{
width: 10rem;
- text-align: center;
- font-size: 0.8rem;
- font-weight: 700;
- color: #FFFFFF;
- text-shadow: -0.06rem 0.06rem 0.06rem #1B55EC,-0.06rem 0.06rem 0.06rem #1B55EC,-0.06rem 0.06rem 0.06rem #1B55EC;
-}
\ No newline at end of file
+ height: 5.577rem;
+ background: url(../images/act-room-bg.png)no-repeat;
+ background-size: 100% 100%;
+ .act-p1{
+ text-indent: 1.2rem;
+ font-size: 0.8rem;
+ color: #fff;
+ padding-top: 1rem;
+ span{
+ color: #FFF337;
+ }
+ }
+ .act-p2{
+ text-indent: 1.2rem;
+ font-size: 0.8rem;
+ color: #fff;
+ padding-top: 0.3rem;
+ span{
+ color: #FFF337;
+ }
+ }
+}
diff --git a/ftIcon/action2/images/act-room-bg.png b/ftIcon/action2/images/act-room-bg.png
index 1468879..fbfcc18 100644
Binary files a/ftIcon/action2/images/act-room-bg.png and b/ftIcon/action2/images/act-room-bg.png differ
diff --git a/ftIcon/action2/images/act-room-bg2.png b/ftIcon/action2/images/act-room-bg2.png
index 95fabd7..43eb13a 100644
Binary files a/ftIcon/action2/images/act-room-bg2.png and b/ftIcon/action2/images/act-room-bg2.png differ
diff --git a/ftIcon/action2/images/en/act-room-bg2.png b/ftIcon/action2/images/en/act-room-bg2.png
index 8d31ad4..163100a 100644
Binary files a/ftIcon/action2/images/en/act-room-bg2.png and b/ftIcon/action2/images/en/act-room-bg2.png differ
diff --git a/ftIcon/action2/index.html b/ftIcon/action2/index.html
index e602266..dd54794 100644
--- a/ftIcon/action2/index.html
+++ b/ftIcon/action2/index.html
@@ -31,11 +31,8 @@
<script src="lib/lottie-player.js"></script>
<body style="background: rgba(0, 0, 0, 0)">
<div style="display: none;" class="act-room-bg act-room-bg2">
- <div class="act-title"></div>
- <p class="act-room-p1">主播積分:</p>
- <p class="act-room-p2"></p>
- <p class="act-room-p3">目標積分:</p>
- <p class="act-room-p4"></p>
+ <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>
</body>
<script src="lib/jquery-3.1.1.min.js"></script>
@@ -48,9 +45,26 @@ $(function(){
var wsTimer=null
if(sessionStorage.lang!=2){
$("body").addClass("bg-en")
- $(".act-room-p1").text("score:")
- $(".act-room-p3").text("goal:")
+ // $(".act-room-p1").text("score:")
+ // $(".act-room-p3").text("goal:")
+ $(".en-txt1").text("score")
+ $(".en-txt2").text("PROG")
+ $(".en-txt3").text("rank")
}
+ var jump=1
+ $(".act-room-bg").on("click",function(){
+ var obj = {
+ "cid": 12,
+ "reqCode": new Date().getTime(),
+ "data": {
+ "msg": '跳转集合功能',
+ "jumptype": 3,
+ "url": $url + "/activeFt/lucky777/index.html" + location.search+'&jump='+jump+'',
+ }
+ }
+ var obj2 = JSON.stringify(obj);
+ appCollaboration(obj2);
+ })
var obj = {
"cid": 43,
"reqCode": new Date().getTime(),
@@ -58,104 +72,29 @@ $(function(){
"type":1,
// "width":314,
"width":120,
- "height":69,
+ "height":68,
'unit':2,
"position":1
}
}
var obj2 = JSON.stringify(obj);
appCollaboration(obj2);
- if(sessionStorage.lang==2)var titleName=['','新秀出道','閃亮新星','星光熠熠','璀璨佳人','風華絕代','傾國傾城']
- else var titleName=['','Lv.1','Lv.2','Lv.3','Lv.4','Lv.5','Lv.6']
+
function view(){
$.ajax({
- url:$ip+'/actStarSearchTour/getRoomPartData.html',
+ url:$ip+'/actLucky777/getRoomPartData.html',
success:function(data){
console.log('圖標數據',data)
- if(data.result.userData.isPaid==0||data.result.userData.isNewUserGiftVoucher==1){
- //進入新人流程
- if(data.result.userData.newUserAwardTaskNum<5){
- $(".act-room-bg").fadeIn(200)
- if(data.result.userData.isNewUserGiftSend==0){
- goPop=2
- $(".act-room-bg").unbind("click").on("click",function(){
- $.ajax({
- url:$ip+'/actSecretGarden/openPopup.html',
- data:{
- width:'0',
- popupUrl:$url + "/activeFt/newMan/pop.html" + location.search+'',
- height:'0.5',
- heightR:'70',
- x:'0',
- y:'0.5',
- },
- success:function(){
-
- }
- })
- })
- }
- else{
- $(".act-room-bg").unbind("click").on("click",function(){
- var obj = {
- "cid": 12,
- "reqCode": new Date().getTime(),
- "data": {
- "msg": '跳转集合功能',
- "jumptype": 3,
- "url": $url + "/activeFt/newMan/index.html" + location.search+'&jump=1',
- }
- }
- var obj2 = JSON.stringify(obj);
- appCollaboration(obj2);
- })
- }
- }
- //已經完成了五個任務
- else{
- $(".act-room-bg").fadeIn(200).removeClass("act-room-bg2")
- $(".act-room-bg").unbind("click").on("click",function(){
- var obj = {
- "cid": 12,
- "reqCode": new Date().getTime(),
- "data": {
- "msg": '跳转集合功能',
- "jumptype": 3,
- "url": $url + "/activeFt/newMan/index.html" + location.search+'&',
- }
- }
- var obj2 = JSON.stringify(obj);
- appCollaboration(obj2);
- })
- if(data.result.userData.isBuyMonthlyCard==0){
- goPop=1
- }
- }
-
- }else{
- $(".act-room-bg").fadeIn(200).removeClass("act-room-bg2")
- $(".act-room-bg").unbind("click").on("click",function(){
- var obj = {
- "cid": 12,
- "reqCode": new Date().getTime(),
- "data": {
- "msg": '跳转集合功能',
- "jumptype": 3,
- "url": $url + "/activeFt/newMan/index.html" + location.search+'&',
- }
- }
- var obj2 = JSON.stringify(obj);
- appCollaboration(obj2);
- })
- if(data.result.userData.isBuyMonthlyCard==0){
- goPop=1
- }
-
-
+ if(data.result.userData.signReceive==0){
+ $(".act-room-bg").fadeIn(200)
+ return;
}
- $(".act-title").text(titleName[data.result.roomData.level])
- $(".act-room-p2").text(data.result.roomData.score)
- $(".act-room-p4").text(data.result.roomData.levelScore)
+ 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)
}
})
}
@@ -163,42 +102,26 @@ $(function(){
setInterval(function(){
view()
},60000)
- setTimeout(function() {
- if(goPop==2){
- setTimeout(function() {
- $.ajax({
- url:$ip+'/actStarSearchTour/triggerOpenPopup.html',
- data:{
- },
- success:function(){
-
- }
- })
- }, 300000);
- }
- if(goPop==1){
- if(localStorage.newManLayer==undefined||localStorage.newManLayer<new Date().getTime()){
- localStorage.newManLayer=(Number(new Date().getTime())+86400000)
- setTimeout(function() {
- $.ajax({
- url:$ip+'/actSecretGarden/openPopup.html',
- data:{
- width:'0',
- popupUrl:$url + "/activeFt/newMan/pop2.html" + location.search+'',
- height:'0.5',
- heightR:'110',
- x:'0',
- y:'0.5',
- },
- success:function(){
-
- }
- })
- }, 60000);
- }
+ setTimeout(function(){
+ if(sessionStorage.lang==2)return;
+ if(localStorage.lucky777==undefined||localStorage.lucky777<new Date().getTime()){
+ // localStorage.lucky777=(Number(new Date().getTime())+86400000)
+ $.ajax({
+ url:$ip+'/actSecretGarden/openPopup.html',
+ data:{
+ width:'0',
+ popupUrl:$url + "/activeFt/lucky777/pop.html",
+ height:'0.5',
+ heightR:'75',
+ x:'0',
+ y:'0.5',
+ },
+ success:function(){
+ }
+ })
}
- }, 3000);
+ },30000)
function getData(roomid) {
var opts = {
reconnectionDelay: 5000,
diff --git a/ftIcon/liveData/css/index.css b/ftIcon/liveData/css/index.css
index 33e91b8..f8ff121 100644
--- a/ftIcon/liveData/css/index.css
+++ b/ftIcon/liveData/css/index.css
@@ -127,63 +127,45 @@ i {
}
.act-room-bg {
width: 10rem;
- height: 10.079rem;
+ height: 8.563rem;
background: url(../images/act-room-bg.png) no-repeat;
background-size: 100% 100%;
position: relative;
}
.act-room-bg2 {
- width: 8rem;
- height: 4.393rem;
- float: right;
+ width: 10rem;
+ height: 5.577rem;
background: url(../images/act-room-bg2.png) no-repeat;
background-size: 100% 100%;
}
-.act-room-bg2 > div,
.act-room-bg2 > p {
- font-size: 0;
+ display: none;
}
-.act-room-p1 {
- width: 10rem;
+.act-p1 {
+ color: #fff;
text-align: center;
- color: #467EEE;
+ width: 10rem;
font-size: 0.8rem;
position: absolute;
- top: 2.4rem;
+ top: 1.2rem;
}
-.act-room-p2 {
+.act-p1 span {
width: 10rem;
- text-align: center;
- color: #FF5000;
- font-size: 0.8rem;
position: absolute;
- top: 3.95rem;
+ color: #FFF337;
+ top: 2.3rem;
+ left: 0;
+ font-size: 1rem;
font-weight: 700;
}
-.act-room-p3 {
- width: 10rem;
+.act-p2 {
+ color: #fff;
text-align: center;
- color: #467EEE;
- font-size: 0.8rem;
- position: absolute;
- top: 5.6rem;
-}
-.act-room-p4 {
width: 10rem;
- text-align: center;
- color: #FF5000;
font-size: 0.8rem;
position: absolute;
- top: 7.25rem;
- font-weight: 700;
+ top: 6rem;
}
-.act-title {
- position: absolute;
- top: 0.2rem;
- width: 10rem;
- text-align: center;
- font-size: 0.8rem;
- font-weight: 700;
- color: #FFFFFF;
- text-shadow: -0.06rem 0.06rem 0.06rem #1B55EC, -0.06rem 0.06rem 0.06rem #1B55EC, -0.06rem 0.06rem 0.06rem #1B55EC;
+.act-p2 span {
+ color: #FFF337;
}
diff --git a/ftIcon/liveData/css/index.less b/ftIcon/liveData/css/index.less
index 636ff38..d7cd635 100644
--- a/ftIcon/liveData/css/index.less
+++ b/ftIcon/liveData/css/index.less
@@ -144,62 +144,45 @@ i{
//活動
.act-room-bg{
width: 10rem;
- height: 10.079rem;
+ height: 8.563rem;
background: url(../images/act-room-bg.png)no-repeat;
background-size: 100% 100%;
position: relative;
}
.act-room-bg2{
- width: 8rem;
- height: 4.393rem;
- float: right;
+ width: 10rem;
+ height: 5.577rem;
background: url(../images/act-room-bg2.png)no-repeat;
background-size: 100% 100%;
- >div,>p{
- font-size: 0;
+ >p{
+ display: none;
}
}
-.act-room-p1{
- width: 10rem;
+.act-p1{
+ color: #fff;
text-align: center;
- color: #467EEE;
- font-size: 0.8rem;
- position: absolute;
- top: 2.4rem;
-}
-.act-room-p2{
width: 10rem;
- text-align: center;
- color: #FF5000;
font-size: 0.8rem;
position: absolute;
- top: 3.95rem;
- font-weight: 700;
+ top: 1.2rem;
+ span{
+ width: 10rem;
+ position: absolute;
+ color: #FFF337;
+ top: 2.3rem;
+ left: 0;
+ font-size: 1rem;
+ font-weight: 700;
+ }
}
-.act-room-p3{
- width: 10rem;
+.act-p2{
+ color: #fff;
text-align: center;
- color: #467EEE;
- font-size: 0.8rem;
- position: absolute;
- top: 5.6rem;
-}
-.act-room-p4{
width: 10rem;
- text-align: center;
- color: #FF5000;
font-size: 0.8rem;
position: absolute;
- top: 7.25rem;
- font-weight: 700;
-}
-.act-title{
- position: absolute;
- top: 0.2rem;
- width: 10rem;
- text-align: center;
- font-size: 0.8rem;
- font-weight: 700;
- color: #FFFFFF;
- text-shadow: -0.06rem 0.06rem 0.06rem #1B55EC,-0.06rem 0.06rem 0.06rem #1B55EC,-0.06rem 0.06rem 0.06rem #1B55EC;
+ top: 6rem;
+ span{
+ color: #FFF337;
+ }
}
\ No newline at end of file
diff --git a/ftIcon/liveData/images/act-room-bg.png b/ftIcon/liveData/images/act-room-bg.png
index 1388582..fee712e 100644
Binary files a/ftIcon/liveData/images/act-room-bg.png and b/ftIcon/liveData/images/act-room-bg.png differ
diff --git a/ftIcon/liveData/images/act-room-bg2.png b/ftIcon/liveData/images/act-room-bg2.png
index 95fabd7..163100a 100644
Binary files a/ftIcon/liveData/images/act-room-bg2.png and b/ftIcon/liveData/images/act-room-bg2.png differ
diff --git a/ftIcon/liveData/images/en/act-room-bg.png b/ftIcon/liveData/images/en/act-room-bg.png
deleted file mode 100644
index 1388582..0000000
Binary files a/ftIcon/liveData/images/en/act-room-bg.png and /dev/null differ
diff --git a/ftIcon/liveData/images/en/act-room-bg2.png b/ftIcon/liveData/images/en/act-room-bg2.png
index 8d31ad4..163100a 100644
Binary files a/ftIcon/liveData/images/en/act-room-bg2.png and b/ftIcon/liveData/images/en/act-room-bg2.png differ
diff --git a/ftIcon/liveData/index.html b/ftIcon/liveData/index.html
index 72ca683..4eb624e 100644
--- a/ftIcon/liveData/index.html
+++ b/ftIcon/liveData/index.html
@@ -31,13 +31,9 @@
</style>
</head>
<body c style="background:rgba(0,0,0,0)">
- <div class="act-room-bg">
- <div class="act-title"></div>
- <p class="act-room-p1">主播積分:</p>
- <p class="act-room-p2">--</p>
- <p class="act-room-p3">目標積分:</p>
- <p class="act-room-p4">--</p>
-
+ <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>
<div class="room-bg1">
<div class="room-bg-top">人氣</div>
@@ -80,10 +76,13 @@ $(function(){
var socketOk=null
if(sessionStorage.lang!=2){
$("body").addClass("bg-en")
- $(".act-room-p1").text("score:")
- $(".act-room-p3").text("goal:")
+ $(".en-txt1").text("score")
+ $(".en-txt2").text("PROG")
+ $(".en-txt3").text("rank")
}
//活動
+ var jump=1
+
$(".act-room-bg").on("click",function(){
var obj = {
"cid": 12,
@@ -91,23 +90,24 @@ $(function(){
"data": {
"msg": '跳转集合功能',
"jumptype": 3,
- "url": $url + "/activeFt/newMan/index.html" + location.search+'&jump=1',
+ "url": $url + "/activeFt/lucky777/index.html" + location.search+'&jump='+jump+'',
}
}
var obj2 = JSON.stringify(obj);
appCollaboration(obj2);
})
- if(sessionStorage.lang==2)var titleName=['','新秀出道','閃亮新星','星光熠熠','璀璨佳人','風華絕代','傾國傾城']
- else var titleName=['','Lv.1','Lv.2','Lv.3','Lv.4','Lv.5','Lv.6']
+
function ActView(){
-
$.ajax({
- url:$ip+'/actStarSearchTour/getRoomPartData.html',
+ url:$ip+'/actLucky777/getRoomPartData.html',
success:function(data){
console.log('圖標數據',data)
- $(".act-title").text(titleName[data.result.roomData.level])
- $(".act-room-p2").text(data.result.roomData.score)
- $(".act-room-p4").text(data.result.roomData.levelScore)
+ 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)
}
})
diff --git a/ftIcon/liveData2/css/index.css b/ftIcon/liveData2/css/index.css
index 7c51017..a55a977 100644
--- a/ftIcon/liveData2/css/index.css
+++ b/ftIcon/liveData2/css/index.css
@@ -141,71 +141,30 @@
top: -0.95vw;
}
.act-room-bg {
- position: absolute;
- right: -33.5vw;
- top: -18.5vw;
- transform: scale(0.33);
width: 10rem;
- height: 5.646rem;
+ height: 5.577rem;
background: url(../images/act-room-bg.png) no-repeat;
background-size: 100% 100%;
-}
-.act-room-bg2 {
- width: 8rem;
- height: 4.393rem;
- float: right;
- background: url(../images/act-room-bg2.png) no-repeat;
- background-size: 100% 100%;
-}
-.act-room-bg2 > div,
-.act-room-bg2 > p {
- font-size: 0;
-}
-.act-room-p1 {
- width: 5rem;
- text-align: center;
- color: #467EEE;
- font-size: 0.8rem;
+ transform: scale(0.33);
position: absolute;
- top: 1.85rem;
- left: 0.5rem;
+ top: -19vw;
+ left: 33.2vw;
}
-.act-room-p2 {
- width: 5rem;
- text-align: left;
- color: #FF5000;
+.act-room-bg .act-p1 {
+ text-indent: 1.2rem;
font-size: 0.8rem;
- position: absolute;
- top: 1.9rem;
- left: 4.9rem;
- font-weight: 700;
+ color: #fff;
+ padding-top: 1rem;
}
-.act-room-p3 {
- width: 5rem;
- text-align: center;
- color: #467EEE;
- font-size: 0.8rem;
- position: absolute;
- top: 3.3rem;
- left: 0.5rem;
+.act-room-bg .act-p1 span {
+ color: #FFF337;
}
-.act-room-p4 {
- width: 5rem;
- text-align: left;
- color: #FF5000;
+.act-room-bg .act-p2 {
+ text-indent: 1.2rem;
font-size: 0.8rem;
- position: absolute;
- top: 3.3rem;
- left: 4.9rem;
- font-weight: 700;
+ color: #fff;
+ padding-top: 0.3rem;
}
-.act-title {
- position: absolute;
- top: 0.2rem;
- width: 10rem;
- text-align: center;
- font-size: 0.8rem;
- font-weight: 700;
- color: #FFFFFF;
- text-shadow: -0.06rem 0.06rem 0.06rem #1B55EC, -0.06rem 0.06rem 0.06rem #1B55EC, -0.06rem 0.06rem 0.06rem #1B55EC;
+.act-room-bg .act-p2 span {
+ color: #FFF337;
}
diff --git a/ftIcon/liveData2/css/index.less b/ftIcon/liveData2/css/index.less
index 7498a46..8052f9d 100644
--- a/ftIcon/liveData2/css/index.less
+++ b/ftIcon/liveData2/css/index.less
@@ -161,70 +161,30 @@
//活動
.act-room-bg{
- position: absolute;
- right: -33.5vw;
- top: -18.5vw;
- transform: scale(0.33);
width: 10rem;
- height: 5.646rem;
- background: url(../images/act-room-bg.png)no-repeat;
- background-size: 100% 100%;
-}
-.act-room-bg2{
- width: 8rem;
- height: 4.393rem;
- float: right;
- background: url(../images/act-room-bg2.png)no-repeat;
+ height: 5.577rem;
+ background: url(../images/act-room-bg.png) no-repeat;
background-size: 100% 100%;
- >div,>p{
- font-size: 0;
- }
-}
-.act-room-p1{
- width: 5rem;
- text-align: center;
- color: #467EEE;
- font-size: 0.8rem;
- position: absolute;
- top: 1.85rem;
- left: 0.5rem;
-}
-.act-room-p2{
- width: 5rem;
- text-align: left;
- color: #FF5000;
- font-size: 0.8rem;
- position: absolute;
- top: 1.9rem;
- left: 4.9rem;
- font-weight: 700;
-}
-.act-room-p3{
- width: 5rem;
- text-align: center;
- color: #467EEE;
- font-size: 0.8rem;
- position: absolute;
- top: 3.3rem;
- left: 0.5rem;
-}
-.act-room-p4{
- width: 5rem;
- text-align: left;
- color: #FF5000;
- font-size: 0.8rem;
+ transform: scale(0.33);
position: absolute;
- top: 3.3rem;
- left: 4.9rem;
- font-weight: 700;
+ top: -19vw;
+ left: 33.2vw;
+ .act-p1{
+ text-indent: 1.2rem;
+ font-size: 0.8rem;
+ color: #fff;
+ padding-top: 1rem;
+ span{
+ color: #FFF337;
+ }
+ }
+ .act-p2{
+ text-indent: 1.2rem;
+ font-size: 0.8rem;
+ color: #fff;
+ padding-top: 0.3rem;
+ span{
+ color: #FFF337;
+ }
+ }
}
-.act-title{
- position: absolute;
- top: 0.2rem;
- width: 10rem;
- text-align: center;
- font-size: 0.8rem;
- font-weight: 700;
- color: #FFFFFF;
- text-shadow: -0.06rem 0.06rem 0.06rem #1B55EC,-0.06rem 0.06rem 0.06rem #1B55EC,-0.06rem 0.06rem 0.06rem #1B55EC;
-}
\ No newline at end of file
diff --git a/ftIcon/liveData2/images/act-room-bg.png b/ftIcon/liveData2/images/act-room-bg.png
index 1468879..fbfcc18 100644
Binary files a/ftIcon/liveData2/images/act-room-bg.png and b/ftIcon/liveData2/images/act-room-bg.png differ
diff --git a/ftIcon/liveData2/images/act-room-bg2.png b/ftIcon/liveData2/images/act-room-bg2.png
deleted file mode 100644
index 95fabd7..0000000
Binary files a/ftIcon/liveData2/images/act-room-bg2.png and /dev/null differ
diff --git a/ftIcon/liveData2/images/en/act-room-bg.png b/ftIcon/liveData2/images/en/act-room-bg.png
deleted file mode 100644
index 1468879..0000000
Binary files a/ftIcon/liveData2/images/en/act-room-bg.png and /dev/null differ
diff --git a/ftIcon/liveData2/images/en/act-room-bg2.png b/ftIcon/liveData2/images/en/act-room-bg2.png
deleted file mode 100644
index 95fabd7..0000000
Binary files a/ftIcon/liveData2/images/en/act-room-bg2.png and /dev/null differ
diff --git a/ftIcon/liveData2/index.html b/ftIcon/liveData2/index.html
index 763dce3..7076180 100644
--- a/ftIcon/liveData2/index.html
+++ b/ftIcon/liveData2/index.html
@@ -69,13 +69,9 @@
</div>
- <div class="act-room-bg">
- <div class="act-title"></div>
- <p class="act-room-p1">主播積分:</p>
- <p class="act-room-p2">--</p>
- <p class="act-room-p3">目標積分:</p>
- <p class="act-room-p4">--</p>
-
+ <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>
</body>
<script src="lib/jquery-3.1.1.min.js"></script>
@@ -86,11 +82,26 @@
$(function(){
if(sessionStorage.lang!=2){
$("body").addClass("bg-en")
- $(".act-room-p1").text("score:")
- $(".act-room-p3").text("goal:")
+ // $(".act-room-p1").text("score:")
+ // $(".act-room-p3").text("goal:")
+ $(".en-txt1").text("score")
+ $(".en-txt2").text("PROG")
+ $(".en-txt3").text("rank")
}
- var wsTimer=null
- var socketOk=null
+ var jump=1
+ $(".act-room-bg").on("click",function(){
+ var obj = {
+ "cid": 12,
+ "reqCode": new Date().getTime(),
+ "data": {
+ "msg": '跳转集合功能',
+ "jumptype": 3,
+ "url": $url + "/activeFt/lucky777/index.html" + location.search+'&jump='+jump+'',
+ }
+ }
+ var obj2 = JSON.stringify(obj);
+ appCollaboration(obj2);
+ })
//活動
var obj = {
"cid": 43,
@@ -106,19 +117,19 @@ $(function(){
}
var obj2 = JSON.stringify(obj);
appCollaboration(obj2); //活動
- if(sessionStorage.lang!=2){
- $("body").addClass("bg-en")
- }
- if(sessionStorage.lang==2)var titleName=['','新秀出道','閃亮新星','星光熠熠','璀璨佳人','風華絕代','傾國傾城']
- else var titleName=['','Lv.1','Lv.2','Lv.3','Lv.4','Lv.5','Lv.6']
+
+
function actView(){
$.ajax({
url:$ip+'/actStarSearchTour/getRoomPartData.html',
success:function(data){
console.log('圖標數據',data)
- $(".act-title").text(titleName[data.result.roomData.level])
- $(".act-room-p2").text(data.result.roomData.score)
- $(".act-room-p4").text(data.result.roomData.levelScore)
+ 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)
}
})
}
--
libgit2 0.25.0