diff --git a/view/yinmeng/activity/2023-year/css/index.css b/view/yinmeng/activity/2023-year/css/index.css index 6916ba9..4884c2d 100644 --- a/view/yinmeng/activity/2023-year/css/index.css +++ b/view/yinmeng/activity/2023-year/css/index.css @@ -3211,6 +3211,53 @@ body { width: 100%; } +.actOut { + position: fixed; + left: 0; + top: 0; + bottom: 0; + right: 0; + z-index: 99; + background: rgba(0, 0, 0, 0.4); + display: none; +} + +.actOut .actOut_in { + position: relative; + left: 50%; + top: 50%; + transform: translate(-50%, -50%); + background: url(../images/actOutBg.png) no-repeat; + background-size: 100% 100%; + width: 6.44rem; + height: 4.61333rem; +} + +.actOut .actOut_in p { + width: 100%; + text-align: center; + position: absolute; + top: 1.44rem; + left: 0; + color: #78613E; + font-size: 0.44rem; +} + +.actOut .actOut_in .but { + width: 2.41333rem; + height: 0.90667rem; + line-height: 0.90667rem; + text-align: center; + background: url(../images/actOutBut.png) no-repeat; + background-size: 100% 100%; + color: #fff; + font-size: 0.37333rem; + position: absolute; + left: 50%; + transform: translateX(-50%); + top: 2.53333rem; +} + ::-webkit-scrollbar { display: none; } diff --git a/view/yinmeng/activity/2023-year/css/index.scss b/view/yinmeng/activity/2023-year/css/index.scss index 7264d87..9c74c4d 100644 --- a/view/yinmeng/activity/2023-year/css/index.scss +++ b/view/yinmeng/activity/2023-year/css/index.scss @@ -1615,7 +1615,7 @@ body { width: 75%; transform: translateX(-50%); - + } span { @@ -3228,6 +3228,53 @@ body { } } +.actOut { + position: fixed; + left: 0; + top: 0; + bottom: 0; + right: 0; + z-index: 99; + background: rgba(0, 0, 0, .4); + display: none; + + .actOut_in { + position: relative; + left: 50%; + top: 50%; + transform: translate(-50%, -50%); + background: url(../images/actOutBg.png) no-repeat; + background-size: 100% 100%; + width: px2rem(483); + height: px2rem(346); + + p { + width: 100%; + text-align: center; + position: absolute; + top: px2rem(108); + left: 0; + color: #78613E; + font-size: px2rem(33); + } + + .but { + width: px2rem(181); + height: px2rem(68); + line-height: px2rem(68); + text-align: center; + background: url(../images/actOutBut.png) no-repeat; + background-size: 100% 100%; + color: #fff; + font-size: px2rem(28); + position: absolute; + left: 50%; + transform: translateX(-50%); + top: px2rem(190); + } + } +} + ::-webkit-scrollbar { display: none; } \ No newline at end of file diff --git a/view/yinmeng/activity/2023-year/images/actOutBg.png b/view/yinmeng/activity/2023-year/images/actOutBg.png new file mode 100644 index 0000000..31ff3d2 Binary files /dev/null and b/view/yinmeng/activity/2023-year/images/actOutBg.png differ diff --git a/view/yinmeng/activity/2023-year/images/actOutBut.png b/view/yinmeng/activity/2023-year/images/actOutBut.png new file mode 100644 index 0000000..2104def Binary files /dev/null and b/view/yinmeng/activity/2023-year/images/actOutBut.png differ diff --git a/view/yinmeng/activity/2023-year/images/popularity.png b/view/yinmeng/activity/2023-year/images/popularity.png new file mode 100644 index 0000000..07c445d Binary files /dev/null and b/view/yinmeng/activity/2023-year/images/popularity.png differ diff --git a/view/yinmeng/activity/2023-year/images/rule21.png b/view/yinmeng/activity/2023-year/images/rule21.png index 1089025..e445dae 100644 Binary files a/view/yinmeng/activity/2023-year/images/rule21.png and b/view/yinmeng/activity/2023-year/images/rule21.png differ diff --git a/view/yinmeng/activity/2023-year/images/rule22.png b/view/yinmeng/activity/2023-year/images/rule22.png index 8bf7025..06a5098 100644 Binary files a/view/yinmeng/activity/2023-year/images/rule22.png and b/view/yinmeng/activity/2023-year/images/rule22.png differ diff --git a/view/yinmeng/activity/2023-year/images/rule231.png b/view/yinmeng/activity/2023-year/images/rule231.png index 04d7bb2..95f6a99 100644 Binary files a/view/yinmeng/activity/2023-year/images/rule231.png and b/view/yinmeng/activity/2023-year/images/rule231.png differ diff --git a/view/yinmeng/activity/2023-year/images/rule232.png b/view/yinmeng/activity/2023-year/images/rule232.png index a2f9baf..a2bdd16 100644 Binary files a/view/yinmeng/activity/2023-year/images/rule232.png and b/view/yinmeng/activity/2023-year/images/rule232.png differ diff --git a/view/yinmeng/activity/2023-year/images/rule24.png b/view/yinmeng/activity/2023-year/images/rule24.png index 811cbcb..0f1d5fc 100644 Binary files a/view/yinmeng/activity/2023-year/images/rule24.png and b/view/yinmeng/activity/2023-year/images/rule24.png differ diff --git a/view/yinmeng/activity/2023-year/images/rule25.png b/view/yinmeng/activity/2023-year/images/rule25.png index 40abeb0..6eca1be 100644 Binary files a/view/yinmeng/activity/2023-year/images/rule25.png and b/view/yinmeng/activity/2023-year/images/rule25.png differ diff --git a/view/yinmeng/activity/2023-year/images/rule44.png b/view/yinmeng/activity/2023-year/images/rule44.png index 9573e4e..b440718 100644 Binary files a/view/yinmeng/activity/2023-year/images/rule44.png and b/view/yinmeng/activity/2023-year/images/rule44.png differ diff --git a/view/yinmeng/activity/2023-year/images/rule45.png b/view/yinmeng/activity/2023-year/images/rule45.png index 0ce9be1..b2926f0 100644 Binary files a/view/yinmeng/activity/2023-year/images/rule45.png and b/view/yinmeng/activity/2023-year/images/rule45.png differ diff --git a/view/yinmeng/activity/2023-year/images/taksmp11.png b/view/yinmeng/activity/2023-year/images/taksmp11.png new file mode 100644 index 0000000..b1fdde0 Binary files /dev/null and b/view/yinmeng/activity/2023-year/images/taksmp11.png differ diff --git a/view/yinmeng/activity/2023-year/images/taksmp12.png b/view/yinmeng/activity/2023-year/images/taksmp12.png new file mode 100644 index 0000000..35afb88 Binary files /dev/null and b/view/yinmeng/activity/2023-year/images/taksmp12.png differ diff --git a/view/yinmeng/activity/2023-year/images/taksmp13.png b/view/yinmeng/activity/2023-year/images/taksmp13.png new file mode 100644 index 0000000..a8f678c Binary files /dev/null and b/view/yinmeng/activity/2023-year/images/taksmp13.png differ diff --git a/view/yinmeng/activity/2023-year/images/taksmp21.png b/view/yinmeng/activity/2023-year/images/taksmp21.png new file mode 100644 index 0000000..480e351 Binary files /dev/null and b/view/yinmeng/activity/2023-year/images/taksmp21.png differ diff --git a/view/yinmeng/activity/2023-year/images/taksmp22.png b/view/yinmeng/activity/2023-year/images/taksmp22.png new file mode 100644 index 0000000..9881009 Binary files /dev/null and b/view/yinmeng/activity/2023-year/images/taksmp22.png differ diff --git a/view/yinmeng/activity/2023-year/images/taksqp11.png b/view/yinmeng/activity/2023-year/images/taksqp11.png new file mode 100644 index 0000000..d9ec400 Binary files /dev/null and b/view/yinmeng/activity/2023-year/images/taksqp11.png differ diff --git a/view/yinmeng/activity/2023-year/images/taksqp12.png b/view/yinmeng/activity/2023-year/images/taksqp12.png new file mode 100644 index 0000000..81af7b1 Binary files /dev/null and b/view/yinmeng/activity/2023-year/images/taksqp12.png differ diff --git a/view/yinmeng/activity/2023-year/images/taksqp13.png b/view/yinmeng/activity/2023-year/images/taksqp13.png new file mode 100644 index 0000000..d660f86 Binary files /dev/null and b/view/yinmeng/activity/2023-year/images/taksqp13.png differ diff --git a/view/yinmeng/activity/2023-year/images/taksqp23.png b/view/yinmeng/activity/2023-year/images/taksqp23.png new file mode 100644 index 0000000..1437fa7 Binary files /dev/null and b/view/yinmeng/activity/2023-year/images/taksqp23.png differ diff --git a/view/yinmeng/activity/2023-year/images/taksqp24.png b/view/yinmeng/activity/2023-year/images/taksqp24.png new file mode 100644 index 0000000..221db08 Binary files /dev/null and b/view/yinmeng/activity/2023-year/images/taksqp24.png differ diff --git a/view/yinmeng/activity/2023-year/images/taksts21.png b/view/yinmeng/activity/2023-year/images/taksts21.png new file mode 100644 index 0000000..9e53adc Binary files /dev/null and b/view/yinmeng/activity/2023-year/images/taksts21.png differ diff --git a/view/yinmeng/activity/2023-year/images/taksts22.png b/view/yinmeng/activity/2023-year/images/taksts22.png new file mode 100644 index 0000000..e9056a0 Binary files /dev/null and b/view/yinmeng/activity/2023-year/images/taksts22.png differ diff --git a/view/yinmeng/activity/2023-year/images/taksts23.png b/view/yinmeng/activity/2023-year/images/taksts23.png new file mode 100644 index 0000000..8f2691a Binary files /dev/null and b/view/yinmeng/activity/2023-year/images/taksts23.png differ diff --git a/view/yinmeng/activity/2023-year/images/taksts24.png b/view/yinmeng/activity/2023-year/images/taksts24.png new file mode 100644 index 0000000..2a992c7 Binary files /dev/null and b/view/yinmeng/activity/2023-year/images/taksts24.png differ diff --git a/view/yinmeng/activity/2023-year/images/zlk12.png b/view/yinmeng/activity/2023-year/images/zlk12.png new file mode 100644 index 0000000..b3ff4c4 Binary files /dev/null and b/view/yinmeng/activity/2023-year/images/zlk12.png differ diff --git a/view/yinmeng/activity/2023-year/images/zlk13.png b/view/yinmeng/activity/2023-year/images/zlk13.png new file mode 100644 index 0000000..572554e Binary files /dev/null and b/view/yinmeng/activity/2023-year/images/zlk13.png differ diff --git a/view/yinmeng/activity/2023-year/images/zlk21.png b/view/yinmeng/activity/2023-year/images/zlk21.png new file mode 100644 index 0000000..d045406 Binary files /dev/null and b/view/yinmeng/activity/2023-year/images/zlk21.png differ diff --git a/view/yinmeng/activity/2023-year/images/zlk22.png b/view/yinmeng/activity/2023-year/images/zlk22.png new file mode 100644 index 0000000..b9964de Binary files /dev/null and b/view/yinmeng/activity/2023-year/images/zlk22.png differ diff --git a/view/yinmeng/activity/2023-year/images/zlk23.png b/view/yinmeng/activity/2023-year/images/zlk23.png new file mode 100644 index 0000000..e6fe013 Binary files /dev/null and b/view/yinmeng/activity/2023-year/images/zlk23.png differ diff --git a/view/yinmeng/activity/2023-year/index.html b/view/yinmeng/activity/2023-year/index.html index ef6c302..a544095 100644 --- a/view/yinmeng/activity/2023-year/index.html +++ b/view/yinmeng/activity/2023-year/index.html @@ -82,7 +82,9 @@
用户昵称
用户昵称
-

xxxx友谊值

当前排名xxx
+
+

xxxx友谊值

当前排名xxx +
@@ -185,7 +187,8 @@
-

当前赛季倒计时 0000

+

当前赛季倒计时 0000

@@ -268,7 +271,8 @@
-

当前赛季倒计时 0000

+

当前赛季倒计时 0000

@@ -570,6 +574,14 @@ + + +
+
+

该活动已结束~

+
查看榜单
+
+
diff --git a/view/yinmeng/activity/2023-year/js/index.js b/view/yinmeng/activity/2023-year/js/index.js index 6ee4b98..e8decd4 100644 --- a/view/yinmeng/activity/2023-year/js/index.js +++ b/view/yinmeng/activity/2023-year/js/index.js @@ -110,7 +110,7 @@ var taskGiftList1 = { nick: '全民星探气泡', dec: '15天' }, { - img: './images/taksqp12.png', + img: './images/zlk12.png', nick: '全民星探资料卡', dec: '10天' }, ], @@ -129,7 +129,7 @@ var taskGiftList1 = { nick: '明星星探气泡', dec: '15天' }, { - img: './images/taksqp13.png', + img: './images/zlk13.png', nick: '明星星探资料卡', dec: '10天' }, ], @@ -148,8 +148,8 @@ var taskGiftList1 = { nick: '明星星探气泡', dec: '30天' }, { - img: './images/taksqp13.png', - nick: '全明星星探资料卡', dec: '30天' + img: './images/zlk13.png', + nick: '明星星探资料卡', dec: '30天' }, ], };//任务奖励列表 @@ -167,7 +167,7 @@ var taskGiftList2 = { ], 2: [ { - img: './images/taksmp21.png', + img: './images/taksts21.png', nick: '娱乐新秀头饰', dec: '3天', value: 5000 }, @@ -178,7 +178,7 @@ var taskGiftList2 = { ], 3: [ { - img: './images/taksmp21.png', + img: './images/taksts21.png', nick: '娱乐新秀头饰', dec: '5天', value: 10000 }, @@ -189,7 +189,7 @@ var taskGiftList2 = { ], 4: [ { - img: './images/taksmp21.png', + img: './images/taksts21.png', nick: '娱乐新秀头饰', dec: '20天', value: 50000 }, @@ -198,13 +198,13 @@ var taskGiftList2 = { nick: '人气票', dec: '20张' }, { - img: './images/taksqp21.png', + img: './images/taksmp21.png', nick: '娱乐新秀铭牌', dec: '5天' }, ], 5: [ { - img: './images/taksmp22.png', + img: './images/taksts22.png', nick: '人气小花头饰', dec: '25天', value: 100000 }, @@ -213,13 +213,13 @@ var taskGiftList2 = { nick: '人气票', dec: '40张' }, { - img: './images/taksqp22.png', + img: './images/taksmp22.png', nick: '人气小花铭牌', dec: '10天' }, ], 6: [ { - img: './images/taksmp22.png', + img: './images/taksts22.png', nick: '人气小花头饰', dec: '30天', value: 300000 }, @@ -228,17 +228,17 @@ var taskGiftList2 = { nick: '人气票', dec: '90张' }, { - img: './images/taksqp22.png', + img: './images/taksmp22.png', nick: '人气小花铭牌', dec: '15天' }, { - img: './images/taksqp22.png', + img: './images/zlk21.png', nick: '人气小花资料卡', dec: '10天' }, ], 7: [ { - img: './images/taksmp23.png', + img: './images/taksts23.png', nick: '当红小花头饰', dec: '30天', value: 600000 }, @@ -251,13 +251,13 @@ var taskGiftList2 = { nick: '当红小花气泡', dec: '15天' }, { - img: './images/taksqp23.png', + img: './images/zlk22.png', nick: '当红小花资料卡', dec: '10天' }, ], 8: [ { - img: './images/taksmp23.png', + img: './images/taksts24.png', nick: '娱乐巨星头饰', dec: '90天', value: 1000000 }, @@ -266,11 +266,11 @@ var taskGiftList2 = { nick: '人气票', dec: '300张' }, { - img: './images/taksqp23.png', + img: './images/taksqp24.png', nick: '娱乐巨星气泡', dec: '30天' }, { - img: './images/taksqp23.png', + img: './images/zlk23.png', nick: '娱乐巨星资料卡', dec: '30天' }, ], @@ -561,6 +561,11 @@ function getTask () { data: { type: taskType }, success (res) { if (res.code === 200) { + console.log(res.data.endTime, res.timestamp); + if (res.data.endTime <= res.timestamp) { + $('.actOut').show(); + bodyScroolFun(true); + } // 处理自己 $('.celebrationTask .celebrationTask_in .user .tx').attr('src', res.data.avatar); $('.celebrationTask .celebrationTask_in .user .score .sp1 b').text(unitProcessing(res.data.score, 10000, 1, 'w')) @@ -600,11 +605,11 @@ function getTask () { } } else { $('.celebrationTask .celebrationTask_in .tabBox2 .celebrationTaskBox .giftBox div').remove(); - $('.celebrationTask .celebrationTask_in .tabBox2 .celebrationTaskBox p b').text(taskGiftList1[taskListIndex1 + 1][0].value); + $('.celebrationTask .celebrationTask_in .tabBox2 .celebrationTaskBox p b').text(taskGiftList2[taskListIndex2 + 1][0].value); $('.celebrationTask .celebrationTask_in .tabBox2 .celebrationTaskBox .title').text(`LV1`); $('.celebrationTask .celebrationTask_in .tabBox2 .celebrationTaskBox i').text(`1/8`); var str = '' - taskGiftList1[taskListIndex1 + 1].forEach((res, i) => { + taskGiftList2[taskListIndex2 + 1].forEach((res, i) => { str += `
@@ -793,8 +798,9 @@ function popularGetRank () { if (res.code === 200) { // 人气倒计时 if (popularGetRankRound == null || popularGetRankRound == undefined) { - console.log(res.data.roundList[res.data.curRound - 1].endTime - res.timestamp); - popularGetRankCountup(res.data.roundList[res.data.curRound - 1].endTime - res.timestamp); + if ((res.data.roundList[res.data.curRound - 1].endTime - res.timestamp) > 0) { + popularGetRankCountup(res.data.roundList[res.data.curRound - 1].endTime - res.timestamp); + } } // 渲染赛事时间 roundList = res.data.roundList ? res.data.roundList : roundList; @@ -1069,7 +1075,7 @@ $('.page4 .page3tabBox .tabBox .tab').click(function () { // } roomGetRank(); }) -// 获取人气榜 +// 获取房间帮榜 function roomGetRank () { showLoading() networkRequest({ @@ -1078,10 +1084,12 @@ function roomGetRank () { data: { round: roomGetRankRound }, success (res) { if (res.code === 200) { - // 人气倒计时 + // 房间帮倒计时 if (roomGetRankRound == null || roomGetRankRound == undefined) { console.log(res.data.roundList[res.data.curRound - 1].endTime - res.timestamp); - roomGetRankCountup(res.data.roundList[res.data.curRound - 1].endTime - res.timestamp); + if (res.data.roundList[res.data.curRound - 1].endTime - res.timestamp > 0) { + roomGetRankCountup(res.data.roundList[res.data.curRound - 1].endTime - res.timestamp); + } } if (res.data.rankType == 4) { $('.page4_pop .page3_pop_in .page4_popTop').attr('src', './images/page4_popTop.png') @@ -1364,4 +1372,15 @@ function getzf (num) { num = '0' + num; } return num; -} \ No newline at end of file +} +// 关闭活动结束 +$('.actOut .actOut_in .but').click(function () { + $('.actOut').hide(); + $('.celebrationTask').hide(); + roomGetRank(); + $('.header .tab').removeClass('act'); + $('.header .tab').eq(3).addClass('act') + $('.page1,.page2,.page3,.page4,.page5').hide(); + $('.page4').show(); + bodyScroolFun(false); +}) \ No newline at end of file