diff --git a/activeFt/newMan/index.html b/activeFt/newMan/index.html
index 17be282..c711848 100644
--- a/activeFt/newMan/index.html
+++ b/activeFt/newMan/index.html
@@ -198,6 +198,7 @@ $(function(){
area: ["9.58rem", "6.56rem"],
content: $(".layer-card-ok"),
end: function () {
+ task()
$(".layui-layer-shade").hide()
}
})
diff --git a/ftIcon/action2/css/index.css b/ftIcon/action2/css/index.css
index d6dcff1..31e1562 100644
--- a/ftIcon/action2/css/index.css
+++ b/ftIcon/action2/css/index.css
@@ -1,58 +1,65 @@
-.bg-en .act-room-bg {
- background: url(../images/en/act-room-bg.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%;
-}
.act-room-bg {
width: 10rem;
- height: 5.972rem;
+ height: 5.646rem;
background: url(../images/act-room-bg.png) no-repeat;
background-size: 100% 100%;
- position: relative;
- margin-top: -0.3rem;
}
.act-room-bg2 {
width: 8rem;
+ height: 4.393rem;
float: right;
- height: 5.972rem;
background: url(../images/act-room-bg2.png) no-repeat;
background-size: 100% 100%;
- position: relative;
- margin-top: 0;
}
-.act-room-bg2 p {
- display: none;
+.act-room-bg2 > div,
+.act-room-bg2 > p {
+ font-size: 0;
}
.act-room-p1 {
- font-size: 0.78rem;
- color: #CA9FFF;
+ width: 5rem;
+ text-align: center;
+ color: #467EEE;
+ font-size: 0.8rem;
position: absolute;
- top: 2.2rem;
- left: 1rem;
-}
-.act-room-p1 span {
- color: #F83FFF;
+ top: 1.85rem;
+ left: 0.5rem;
}
.act-room-p2 {
- font-size: 0.78rem;
- color: #CA9FFF;
+ width: 5rem;
+ text-align: left;
+ color: #FF5000;
+ font-size: 0.8rem;
position: absolute;
- top: 3.7rem;
- left: 1rem;
-}
-.act-room-p2 span {
- color: #F83FFF;
+ top: 1.9rem;
+ left: 4.9rem;
+ font-weight: 700;
}
.act-room-p3 {
- font-size: 0.78rem;
- color: #CA9FFF;
+ 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.7rem;
- left: 5.6rem;
+ top: 3.3rem;
+ left: 4.9rem;
+ font-weight: 700;
}
-.act-room-p3 span {
- color: #F83FFF;
+.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;
}
diff --git a/ftIcon/action2/css/index.less b/ftIcon/action2/css/index.less
index e9f5710..6841d90 100644
--- a/ftIcon/action2/css/index.less
+++ b/ftIcon/action2/css/index.less
@@ -1,60 +1,64 @@
-.bg-en{
- .act-room-bg{
- background: url(../images/en/act-room-bg.png)no-repeat;
- background-size: 100% 100%;
- }
- .act-room-bg2{
- background: url(../images/en/act-room-bg2.png)no-repeat;
- background-size: 100% 100%;
- }
-}
.act-room-bg{
width: 10rem;
- height: 5.972rem;
+ height: 5.646rem;
background: url(../images/act-room-bg.png)no-repeat;
background-size: 100% 100%;
- position: relative;
- margin-top: -0.3rem;
}
.act-room-bg2{
width: 8rem;
+ height: 4.393rem;
float: right;
- height: 5.972rem;
background: url(../images/act-room-bg2.png)no-repeat;
background-size: 100% 100%;
- position: relative;
- margin-top: 0;
- p{
- display: none;
+ >div,>p{
+ font-size: 0;
}
}
.act-room-p1{
- font-size: 0.78rem;
- color: #CA9FFF;
+ width: 5rem;
+ text-align: center;
+ color: #467EEE;
+ font-size: 0.8rem;
position: absolute;
- top: 2.2rem;
- left: 1rem;
- span{
- color: #F83FFF;
- }
+ top: 1.85rem;
+ left: 0.5rem;
}
.act-room-p2{
- font-size: 0.78rem;
- color: #CA9FFF;
+ width: 5rem;
+ text-align: left;
+ color: #FF5000;
+ font-size: 0.8rem;
position: absolute;
- top: 3.7rem;
- left: 1rem;
- span{
- color: #F83FFF;
- }
+ top: 1.9rem;
+ left: 4.9rem;
+ font-weight: 700;
}
.act-room-p3{
- font-size: 0.78rem;
- color: #CA9FFF;
+ width: 5rem;
+ text-align: center;
+ color: #467EEE;
+ font-size: 0.8rem;
position: absolute;
- top: 3.7rem;
- left: 5.6rem;
- span{
- color: #F83FFF;
- }
+ 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;
+ 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/action2/images/act-room-bg.png b/ftIcon/action2/images/act-room-bg.png
index 82e595d..1468879 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 ade23ae..95fabd7 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/index.html b/ftIcon/action2/index.html
index 6d13cbb..2ba91ba 100644
--- a/ftIcon/action2/index.html
+++ b/ftIcon/action2/index.html
@@ -31,9 +31,11 @@
<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">
- <p class="act-room-p1"><i class="txt1">主播積分</i> : <span>80000</span></p>
- <p class="act-room-p2"><i class="txt2">進度</i> : <span>18%</span></p>
- <p class="act-room-p3"><i class="txt3">排名</i> : <span>5</span></p>
+ <div class="act-title">閃亮新星</div>
+ <p class="act-room-p1">主播積分:</p>
+ <p class="act-room-p2">8000</p>
+ <p class="act-room-p3">目標積分:</p>
+ <p class="act-room-p4">28000</p>
</div>
</body>
<script src="lib/jquery-3.1.1.min.js"></script>
@@ -67,59 +69,147 @@ $(function(){
function view(){
$.ajax({
- url:$ip+'/actTheLuckFairy/getRoomPartData.html',
+ url:$ip+'/actStarSearchTour/getRoomPartData.html',
success:function(data){
console.log('圖標數據',data)
- if(data.result.userData.signReceive==0){
- $(".act-room-bg").addClass("act-room-bg2").show()
- return;
+ 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){
+ $(".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){
+ 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(){
+
+ }
+ })
+ }, 10000);
+ }
+ }
+
+ }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){
+ 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(){
+
+ }
+ })
+ }, 10000);
+ }
+
+
}
- $(".act-room-bg").removeClass("act-room-bg2").show()
- $(".act-room-p1 span").text(data.result.roomData.score)
- $(".act-room-p2 span").text(Math.floor(data.result.roomData.score/10000*100))
- $(".act-room-p3 span").text(data.result.roomData.rank)
+ $(".act-title").text(titleName[data.result.roomData.level])
+ $(".act-room-p2").text(data.result.roomData.score)
+ $(".act-room-p4").text(data.result.roomData.levelScore)
}
})
+
}
view()
setInterval(function(){
view()
},60000)
- 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(){
- }
- })
- }
- },30000)
- $(".act-room-bg").on("click",function(){
- var obj = {
- "cid": 31,
- "reqCode": new Date().getTime(),
- "data": {
- "popupType":2,
- // "width":314,
- "url":''+$url+'activeFt/luckyGod/index.html',
- "heightR":140,
- "clickBlank":1,
- "bottom":'0',
- }
- }
- var obj2 = JSON.stringify(obj);
- appCollaboration(obj2);
- })
+ // $(".act-room-bg").on("click",function(){
+ // var obj = {
+ // "cid": 31,
+ // "reqCode": new Date().getTime(),
+ // "data": {
+ // "popupType":2,
+ // // "width":314,
+ // "url":''+$url+'activeFt/luckyGod/index.html',
+ // "heightR":140,
+ // "clickBlank":1,
+ // "bottom":'0',
+ // }
+ // }
+ // var obj2 = JSON.stringify(obj);
+ // appCollaboration(obj2);
+ // })
function getData(roomid) {
var opts = {
reconnectionDelay: 5000,