From 563e568a242cbe4446f8e1bc82e46676818fd07e Mon Sep 17 00:00:00 2001
From: libai <libai@yazhai.co>
Date: Wed, 29 May 2024 19:18:03 +0800
Subject: [PATCH] ft活动上线
---
activeFt/hotGirl/css/index.css | 40 ++++++++++++++++++++++++++++++++++++++--
activeFt/hotGirl/css/index.less | 40 ++++++++++++++++++++++++++++++++++++++--
activeFt/hotGirl/images/back.png | Bin 0 -> 2330 bytes
activeFt/hotGirl/images/gift-box.png | Bin 41216 -> 0 bytes
activeFt/hotGirl/images/list-box1.png | Bin 136133 -> 0 bytes
activeFt/hotGirl/images/list-box2.png | Bin 133248 -> 0 bytes
activeFt/hotGirl/images/ref.png | Bin 0 -> 2127 bytes
activeFt/hotGirl/images/rule-bg.png | Bin 0 -> 263459 bytes
activeFt/hotGirl/images/rule-btn.png | Bin 0 -> 2585 bytes
activeFt/hotGirl/images/最辣榜 .png | Bin 0 -> 2661 bytes
activeFt/hotGirl/index.html | 14 +++++++++++---
activeFt/hotGirl/lib/default.js | 4 +++-
activeFt/hotGirl/oldView.html | 24 +++++++++++++++---------
activeFt/hotGirl/rule.html | 4 ++--
ftIcon/liveData/index.html | 14 ++++++++------
15 files changed, 115 insertions(+), 25 deletions(-)
create mode 100644 activeFt/hotGirl/images/back.png
create mode 100644 activeFt/hotGirl/images/ref.png
create mode 100644 activeFt/hotGirl/images/rule-bg.png
create mode 100644 activeFt/hotGirl/images/rule-btn.png
create mode 100644 activeFt/hotGirl/images/最辣榜 .png
diff --git a/activeFt/hotGirl/css/index.css b/activeFt/hotGirl/css/index.css
index bc722ec..472fb3c 100644
--- a/activeFt/hotGirl/css/index.css
+++ b/activeFt/hotGirl/css/index.css
@@ -3,6 +3,40 @@
margin: 0 auto;
position: relative;
}
+.ref {
+ width: 0.72rem;
+ position: fixed;
+ top: 5rem;
+ left: 0;
+ z-index: 500;
+}
+.rule-bg {
+ width: 10rem;
+ height: 21.973rem;
+ background: url(../images/rule-bg.png) no-repeat;
+ background-size: 100% 100%;
+ margin: 0 auto;
+}
+.callKF {
+ width: 10rem;
+ position: absolute;
+ bottom: 0.3rem;
+ height: 0.8rem;
+}
+.rule-btn {
+ width: 1.72rem;
+ position: fixed;
+ top: 5rem;
+ right: 0;
+ z-index: 500;
+}
+.back {
+ width: 1.72rem;
+ position: fixed;
+ top: 5rem;
+ right: 0;
+ z-index: 500;
+}
.bg-bottom {
width: 10rem;
height: 54.946rem;
@@ -15,7 +49,7 @@
}
.bg2 {
position: absolute;
- top: 23.7rem;
+ top: 25.7rem;
z-index: -1;
width: 10rem;
height: 5.706rem;
@@ -31,7 +65,7 @@
}
.gift-box {
width: 9.81rem;
- height: 6.69rem;
+ height: 8.93rem;
background: url(../images/gift-box.png) no-repeat;
background-size: 100% 100%;
margin: 0 auto;
@@ -64,6 +98,7 @@
position: absolute;
left: 2.3rem;
top: 0.6rem;
+ border-radius: 1rem;
}
.king1-p1 {
text-align: center;
@@ -98,6 +133,7 @@
position: absolute;
right: 2.3rem;
top: 0.6rem;
+ border-radius: 1rem ;
}
.king2-p1 {
text-align: center;
diff --git a/activeFt/hotGirl/css/index.less b/activeFt/hotGirl/css/index.less
index fabc519..c2b8a7c 100644
--- a/activeFt/hotGirl/css/index.less
+++ b/activeFt/hotGirl/css/index.less
@@ -3,6 +3,40 @@
margin: 0 auto;
position: relative;
}
+.ref{
+ width: 0.72rem;
+ position: fixed;
+ top: 5rem;
+ left: 0;
+ z-index: 500;
+}
+.rule-bg{
+ width: 10rem;
+ height: 21.973rem;
+ background: url(../images/rule-bg.png)no-repeat;
+ background-size: 100% 100%;
+ margin: 0 auto;
+}
+.callKF{
+ width: 10rem;
+ position: absolute;
+ bottom: 0.3rem;
+ height: 0.8rem;
+}
+.rule-btn{
+ width: 1.72rem;
+ position: fixed;
+ top: 5rem;
+ right: 0;
+ z-index: 500;
+}
+.back{
+ width: 1.72rem;
+ position: fixed;
+ top: 5rem;
+ right: 0;
+ z-index: 500;
+}
.bg-bottom{
width: 10rem;
height: 54.946rem;
@@ -15,7 +49,7 @@
}
.bg2{
position: absolute;
- top: 23.7rem;
+ top: 25.7rem;
z-index: -1;
width: 10rem;
height: 5.706rem;
@@ -31,7 +65,7 @@
}
.gift-box{
width: 9.81rem;
- height: 6.69rem;
+ height: 8.93rem;
background: url(../images/gift-box.png)no-repeat;
background-size: 100% 100%;
margin: 0 auto;
@@ -65,6 +99,7 @@
position: absolute;
left: 2.3rem;
top: 0.6rem;
+ border-radius: 1rem;
}
.king1-p1{
text-align: center;
@@ -100,6 +135,7 @@
position: absolute;
right: 2.3rem;
top: 0.6rem;
+ border-radius: 1rem ;
}
.king2-p1{
text-align: center;
diff --git a/activeFt/hotGirl/images/back.png b/activeFt/hotGirl/images/back.png
new file mode 100644
index 0000000..1629fe2
Binary files /dev/null and b/activeFt/hotGirl/images/back.png differ
diff --git a/activeFt/hotGirl/images/gift-box.png b/activeFt/hotGirl/images/gift-box.png
index 2f0be3f..2dd65fe 100644
Binary files a/activeFt/hotGirl/images/gift-box.png and b/activeFt/hotGirl/images/gift-box.png differ
diff --git a/activeFt/hotGirl/images/list-box1.png b/activeFt/hotGirl/images/list-box1.png
index 617ce97..70a079f 100644
Binary files a/activeFt/hotGirl/images/list-box1.png and b/activeFt/hotGirl/images/list-box1.png differ
diff --git a/activeFt/hotGirl/images/list-box2.png b/activeFt/hotGirl/images/list-box2.png
index 3c5b2d7..559aa4a 100644
Binary files a/activeFt/hotGirl/images/list-box2.png and b/activeFt/hotGirl/images/list-box2.png differ
diff --git a/activeFt/hotGirl/images/ref.png b/activeFt/hotGirl/images/ref.png
new file mode 100644
index 0000000..53a7daf
Binary files /dev/null and b/activeFt/hotGirl/images/ref.png differ
diff --git a/activeFt/hotGirl/images/rule-bg.png b/activeFt/hotGirl/images/rule-bg.png
new file mode 100644
index 0000000..6d7e3c8
Binary files /dev/null and b/activeFt/hotGirl/images/rule-bg.png differ
diff --git a/activeFt/hotGirl/images/rule-btn.png b/activeFt/hotGirl/images/rule-btn.png
new file mode 100644
index 0000000..6ee7f50
Binary files /dev/null and b/activeFt/hotGirl/images/rule-btn.png differ
diff --git "a/activeFt/hotGirl/images/\346\234\200\350\276\243\346\246\234 .png" "b/activeFt/hotGirl/images/\346\234\200\350\276\243\346\246\234 .png"
new file mode 100644
index 0000000..e0a1179
Binary files /dev/null and "b/activeFt/hotGirl/images/\346\234\200\350\276\243\346\246\234 .png" differ
diff --git a/activeFt/hotGirl/index.html b/activeFt/hotGirl/index.html
index 299044d..8a7aa89 100644
--- a/activeFt/hotGirl/index.html
+++ b/activeFt/hotGirl/index.html
@@ -33,12 +33,14 @@
<div style="display: none;" class="layer-rule1"></div>
<div style="display: none;" class="layer-rule2"></div>
<div class="bg">
+ <img class="ref" src="images/ref.png" alt="">
+ <a href="rule.html"><img class="rule-btn" src="images/rule-btn.png" alt=""></a>
<div class="bg-bottom"></div>
<div class="bg2"></div>
<div class="banner"></div>
<div class="gift-box"></div>
<div class="task-box">
- <div class="task-top-title">火辣女生榜</div>
+ <div class="task-top-title">每日驚喜福利</div>
<img class="question1" src="images/question.png" alt="">
<div class="task-tips1">(儲值任意金額后福利翻一番！)</div>
<div class="task-box1">
@@ -236,9 +238,11 @@ $(function(){
})
}
else if(data.result.todayWatchTask.status==1){
- $("taks2-btn").unbind("click").on("click",function(){
+ $(".task2-btn").unbind("click").on("click",function(){
getTack(2)
})
+ }else if(data.result.todayWatchTask.status==2){
+ $(".task2-btn").unbind("click").addClass("task-btn-end")
}
//直播間輸入口令
$(".task-box3-p2").text(data.result.todaySpeakTask.speakMsg)
@@ -307,7 +311,7 @@ $(".list2-btn1 div").on("click",function(){
},
success:function(data){
console.log("獲取榜單數據",data)
- type==1?scoreName='心動值' : scoreName='富豪值'
+ type==1?scoreName='火辣指數' : scoreName='富豪值數'
if(data.result.rankList[0]==undefined){
$(".list-top-box"+type+"").html('<h2>暫無數據~</h2>')
$(".list-ul"+type+"").html('')
@@ -364,6 +368,7 @@ $(".list2-btn1 div").on("click",function(){
})
}
$(".king2-img2").attr("src","https://big.bgp.ourpow.com/comm"+data.result.userRichData.face+"?x-oss-process=image/resize,w_110")
+ $(".king2-p2").text(data.result.userRichData.nickName)
$(".king2-img1").unbind("click").on("click",function(){
window.location.href='yazhai://_' + data.result.userRichData.uid + '_zone'
})
@@ -371,6 +376,7 @@ $(".list2-btn1 div").on("click",function(){
$(".king2-like-btn").addClass("like2")
}else{
$(".king2-like-btn").removeClass("like2").unbind("click").on("click",function(){
+ console.log(121212)
likeMc(data.result.userRichData.uid)
})
}
@@ -387,6 +393,8 @@ $(".list2-btn1 div").on("click",function(){
if(data.code==1){
layer.msg("關注成功")
topMc()
+ }else{
+ layer.msg(data.msg)
}
}
})
diff --git a/activeFt/hotGirl/lib/default.js b/activeFt/hotGirl/lib/default.js
index a4c36d2..2a65fac 100644
--- a/activeFt/hotGirl/lib/default.js
+++ b/activeFt/hotGirl/lib/default.js
@@ -5,10 +5,12 @@
if (bbb.indexOf("https://activity.yazhaiyabo.com/") > -1) {
$ip = "https://webserver.yabolive.net";
_url3 = 'https://webserver.yabolive.net';
+ $url='1'
}
else{
$ip = 'http://ceshi.yabolive.tv/web';
_url3 = 'http://ceshi.yabolive.tv';
+ $url='2'
}
var bbb = location.href;
var data = url_get_params(bbb)
@@ -65,7 +67,7 @@ else{
}
if (bbb.indexOf("file:///D:/") > -1) {
sessionStorage.lang=2
- sessionStorage.uid = 155100;
+ sessionStorage.uid = 11145312;
sessionStorage.token = 'debug'
sessionStorage.roomId=11145272;
sessionStorage.version=8890
diff --git a/activeFt/hotGirl/oldView.html b/activeFt/hotGirl/oldView.html
index 11e9e5e..ccc91c5 100644
--- a/activeFt/hotGirl/oldView.html
+++ b/activeFt/hotGirl/oldView.html
@@ -73,15 +73,17 @@ $(function(){
$(".room-bg1").on("click",function(){
- var myJson = {
- "cid": 31,
+ var obj = {
+ "cid": 12,
+ "reqCode": new Date().getTime(),
"data": {
- popupType: 1,
- url:'http://test.ybact.yazhaiyabo.com/activeFt/hotGirl/index.html',
+ "msg": '跳转集合功能',
+ "jumptype": 3,
+ "url": $url + "/activeFt/hotGirl/index.html" + location.search,
}
}
- var obj=JSON.stringify(myJson);
- appCollaboration(obj)
+ var obj2 = JSON.stringify(obj);
+ appCollaboration(obj2);
})
function getData(roomid) {
var opts = {
@@ -99,9 +101,13 @@ $(function(){
socket.on('ThatGirl', function (msg) {
var data=JSON.parse(msg)
- $(".room-bg1").show()
- $(".room-bg-p1 span").text(data.score)
- $(".room-bg-p2 span").text(data.rank)
+ if(data.rank>0){
+ $(".room-bg1").show()
+ $(".room-bg-p1 span").text(data.score)
+ $(".room-bg-p2 span").text(data.rank)
+ }else{
+ $(".room-bg1").hide()
+ }
});
socket.on('disconnect', function () {
diff --git a/activeFt/hotGirl/rule.html b/activeFt/hotGirl/rule.html
index f7b1ff0..b5639e0 100644
--- a/activeFt/hotGirl/rule.html
+++ b/activeFt/hotGirl/rule.html
@@ -8,7 +8,7 @@
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
<meta content="telephone=no" name="format-detection">
<meta name="wap-font-scale" content="no">
- <title></title>
+ <title>辣個女生-活動規則</title>
<script src="lib/fsize.js"></script>
<link rel="stylesheet" href="css/base.css">
<link rel="stylesheet" href="css/layer.css">
@@ -29,7 +29,7 @@
</style>
</head>
<script src="lib/lottie-player.js"></script>
-<body style="background: rgba(0, 0, 0, 0);">
+<body style="background: #B1DCFF;">
<div class="rule-bg">
<a href="javascript:history.go(-1);"><img class="back" src="images/back.png" alt=""></a>
<div class="callKF"></div>
diff --git a/ftIcon/liveData/index.html b/ftIcon/liveData/index.html
index 560781d..b351a7b 100644
--- a/ftIcon/liveData/index.html
+++ b/ftIcon/liveData/index.html
@@ -75,15 +75,17 @@ $(function(){
//活動
getData()
$(".r1").on("click",function(){
- var myJson = {
- "cid": 31,
+ var obj = {
+ "cid": 12,
+ "reqCode": new Date().getTime(),
"data": {
- popupType: 1,
- url:'http://test.ybact.yazhaiyabo.com/activeFt/hotGirl/index.html',
+ "msg": '跳转集合功能',
+ "jumptype": 3,
+ "url": $url + "/activeFt/hotGirl/index.html" + location.search,
}
}
- var obj=JSON.stringify(myJson);
- appCollaboration(obj)
+ var obj2 = JSON.stringify(obj);
+ appCollaboration(obj2);
})
function getData() {
var opts = {
--
libgit2 0.25.0