补齐无聊

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;
 }

view/yinmeng/activity/2023-year/css/index.scss

@@ -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;
 }

view/yinmeng/activity/2023-year/index.html

@@ -82,7 +82,9 @@
                     <img src="./images/logo.png" alt="" class="rtx">
                     <div class="lName">用户昵称</div>
                     <div class="rName">用户昵称</div>
-                    <div class="score"><p>xxxx友谊值</p><span>当前排名xxx</span></div>
+                    <div class="score">
+                        <p>xxxx友谊值</p><span>当前排名xxx</span>
+                    </div>
                 </div>
             </div>
         </div>
@@ -185,7 +187,8 @@
                 </div>
             </div>
             <div class="timeBox">
-                <p>当前赛季倒计时 <span class="sp1">0</span> 天 <span class="sp2">0</span> 时 <span class="sp3">0</span> 分 <span class="sp4">0</span> 秒 </p>
+                <p>当前赛季倒计时 <span class="sp1">0</span> 天 <span class="sp2">0</span> 时 <span class="sp3">0</span> 分 <span
+                        class="sp4">0</span> 秒 </p>
             </div>
         </div>
         <!-- 榜单盒子 -->
@@ -268,7 +271,8 @@
                 </div>
             </div>
             <div class="timeBox">
-                <p>当前赛季倒计时 <span class="sp1">0</span> 天 <span class="sp2">0</span> 时 <span class="sp3">0</span> 分 <span class="sp4">0</span> 秒 </p>
+                <p>当前赛季倒计时 <span class="sp1">0</span> 天 <span class="sp2">0</span> 时 <span class="sp3">0</span> 分 <span
+                        class="sp4">0</span> 秒 </p>
             </div>
         </div>
         <!-- 标题2 -->
@@ -570,6 +574,14 @@
             </ul>
         </div>
     </div>
+
+    <!-- 活动结束 -->
+    <div class="actOut">
+        <div class="actOut_in">
+            <p>该活动已结束~</p>
+            <div class="but">查看榜单</div>
+        </div>
+    </div>
 </body>
 
 </html>

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',
+            img: './images/zlk13.png',
-            nick: '全明星星探资料卡', dec: '30天'
+            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 += `
                             <div>
                                 <img src="${res.img}" alt="">
@@ -793,9 +798,10 @@ function popularGetRank () {
             if (res.code === 200) {
                 // 人气倒计时
                 if (popularGetRankRound == null || popularGetRankRound == undefined) {
-                    console.log(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;
                 roundList.forEach((val, i) => {
@@ -1069,7 +1075,7 @@ $('.page4 .page3tabBox .tabBox .tab').click(function () {
     // }
     roomGetRank();
 })
-// 获取人气榜
+// 获取房间帮榜
 function roomGetRank () {
     showLoading()
     networkRequest({
@@ -1078,11 +1084,13 @@ 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);
+                    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')
                 } else if (res.data.rankType == 5) {
@@ -1365,3 +1373,14 @@ function getzf (num) {
     }
     return num;
 }
+// 关闭活动结束
+$('.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);
+})