From 777d964b50f9cdedc43af3e7c9de41f412d5569b Mon Sep 17 00:00:00 2001
From: hzj <1304805162@qq.com>
Date: Sun, 4 Jan 2026 15:07:34 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=96=B0=E5=B9=B4=E6=B4=BB=E5=8A=A8):=20?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8E=92=E8=A1=8C=E6=A6=9C=E7=9A=84=E4=B8=8A?=
 =?UTF-8?q?=E6=8B=89=E5=8A=A0=E8=BD=BD=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Activities/NewYear/index.vue | 27 ++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/views/Activities/NewYear/index.vue b/src/views/Activities/NewYear/index.vue
index 41ae9e9..3661cde 100644
--- a/src/views/Activities/NewYear/index.vue
+++ b/src/views/Activities/NewYear/index.vue
@@ -1722,8 +1722,12 @@ const formatRechargeAmount = (amount) => {
 
 const RankingLoadmore = ref(null) //触底模块
 const rankingPageNo = ref(1) //分页页码
-const ranking = ref([]) //排行榜
+const ranking = ref([]) //原始排行榜
 const rankingAdd = ref([]) //加载排行榜项
+// 完整排行榜
+const rankingTotal = computed(() => {
+  return [...ranking.value, ...rankingAdd.value]
+})
 const myRanking = ref({}) //我的排名
 const topImg = ref([
   imageUrl('RewardRecharge100'),
@@ -1736,22 +1740,21 @@ const topImg = ref([
 
 // 处理排行榜小于3人时的情况
 const RankingHasTop3 = computed(() => {
-  let RankingFrom4 = [...ranking.value]
-  if (ranking.value.length < 3) {
-    let addNullUser = Array.from({ length: 3 - ranking.value.length }, () => ({
+  let RankingTop3 = [...rankingTotal.value]
+  if (rankingTotal.value.length < 3) {
+    let addNullUser = Array.from({ length: 3 - rankingTotal.value.length }, () => ({
       userAvatar: '',
-      userName: 'aaaaaa',
-      amount: '11111',
+      userName: '',
+      amount: '',
     }))
-    RankingFrom4.push(...addNullUser)
+    RankingTop3.push(...addNullUser)
   }
-  return RankingFrom4
+  return RankingTop3
 })
 
 // 展示用的榜单
 const showRanking = computed(() => {
-  // return ranking.value.filter((_, index) => index >= 3)
-  return [...ranking.value.filter((_, index) => index >= 3), ...rankingAdd.value]
+  return rankingTotal.value.filter((_, index) => index >= 3)
   // return []
 })
 
@@ -2210,7 +2213,7 @@ const getRanking = async () => {
   if (resRanking.status && resRanking.body) {
     myRanking.value = resRanking.body?.currentUser //我的排名信息
 
-    if (resRanking.body.topList.length != 0) {
+    if (resRanking.body.topList.length > 0) {
       if (resRanking.body.topList.length == 20) {
         rankingAdd.value = []
         ranking.value.push(...resRanking.body?.topList)
@@ -2660,7 +2663,7 @@ const debouceGetRanking = useThrottle(() => {
 // IntersectionObserver配置
 const observer = new IntersectionObserver((entries) => {
   entries.forEach((entry) => {
-    if (entry.intersectionRatio > 0 && ranking.value.length != 0) {
+    if (entry.intersectionRatio > 0 && rankingTotal.value.length != 0) {
       console.log('触发RankingLoadmore加载')
       debouceGetRanking()
     }