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() }