+
+
![]()
-
-
+
+
![]()
-
-
+
+
-
-
+
@@ -548,7 +645,7 @@
+
+
+
-
+
+
+
-
+
+
+
+
+ {{ WDays }}Day
-
- {{ WHours }}
- :
- {{ WMinutes }}
- :
- {{ WSeconds }}
+
+
+
+
+
-
+
+
+ ![]()
+
+
+
+
+
+
+ {{ listItem?.rank }}
+
+
+
+
+
+
+
+ {{ $t('user_id_prefix') }} {{ listItem?.account }}
+
+
+ 
+
+
+
+ {{ listItem?.quantity }}
+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+ {{ WDays }}Day
+
+ {{ WHours }}
+ :
+ {{ WMinutes }}
+ :
+ {{ WSeconds }}
+
@@ -476,47 +614,6 @@
-
-
-
-
-
-
-
-
- ![]()
-
-
-
-
- {{ formatRewardDisplay(reward.type, reward) }}
-
-
+
+
+
+
@@ -1114,6 +1277,7 @@ import { formatRewardDisplay } from '@/utils/rewardFormatter.js'
import {
getRankingListAndMyRanking, // 获取排行榜和当前用户排名
getThisWeekRewardsAndGifts, // 获取本周奖励和礼物
+ getOverallRanking, // 获取总榜
} from '@/api/activity.js'
import {
getMyInviteCode, // 获取我的邀请码
@@ -1144,7 +1308,7 @@ const getImgName = (filename) => {
}
// 获取OSS图片URL的函数
-const imageUrl = (filename) => getPngUrl('invitation/inviteNewUser/', filename)
+const imageUrl = (filename) => getPngUrl('invitation/inviteNewUserNew/', filename)
const { copy, isSupported } = useClipboard()
@@ -1168,25 +1332,34 @@ const myRanking = ref({}) // 我的排名
const RankingLoadmore = ref(null) //触底模块
const rankingPageNo = ref(1) //分页页码
const rankingAdd = ref([]) //加载排行榜项
+
+const OverallRanking = ref([]) // 总榜
+
// 完整排行榜
const rankingTotal = computed(() => {
- return [...Ranking.value, ...rankingAdd.value]
+ if (rankAllShow.value) {
+ return OverallRanking.value
+ }
+ if (rankWeekShow.value) {
+ return [...Ranking.value, ...rankingAdd.value]
+ }
})
const showModule = ref('income') //显示模块
-const rankShow = ref(true) //排行榜显示
+const rankAllShow = ref(true) //总榜显示
+const rankWeekShow = ref(false) //周榜显示
const rewardShow = ref(false) //前三奖励显示
// 栏目切换
const changeTag = (tag) => {
switch (tag) {
- case 'rank':
- rankShow.value = true
- rewardShow.value = false
+ case 'rankWeek':
+ rankWeekShow.value = true
+ rankAllShow.value = false
break
- case 'reward':
- rankShow.value = false
- rewardShow.value = true
+ case 'rankAll':
+ rankWeekShow.value = false
+ rankAllShow.value = true
break
}
}
@@ -1198,7 +1371,7 @@ const incomeShow = ref(false) //收益详情弹窗
const tipShow = ref(false) //提示弹窗
// 遮罩层展示
const maskLayerShow = computed(() => {
- return helpInfoShow.value || enterCodeShow.value || incomeShow.value
+ return helpInfoShow.value || enterCodeShow.value || incomeShow.value || rewardShow.value
})
// 关闭弹窗
@@ -1206,6 +1379,7 @@ const closedPopup = () => {
helpInfoShow.value = false
enterCodeShow.value = false
incomeShow.value = false
+ rewardShow.value = false
}
// 倒计时相关数据
@@ -1423,6 +1597,19 @@ const getRanking = async () => {
}
}
+// 获取总榜
+const getOverallList = async () => {
+ let data = {
+ activityType: 14,
+ }
+ const resRanking = await getOverallRanking(100, data)
+ if (resRanking.status && resRanking.body) {
+ OverallRanking.value = resRanking.body || []
+ } else {
+ OverallRanking.value = []
+ }
+}
+
// 获取每周奖励列表
const getRewardsAndGifts = async () => {
const resRewardsAndGifts = await getThisWeekRewardsAndGifts('2029443922744954881')
@@ -1450,27 +1637,27 @@ const preloadCriticalImages = async () => {
imageUrl('bg2'),
imageUrl('bg3'),
imageUrl('BtBg'),
- imageUrl('copy'),
imageUrl(getImgName('myCode')),
+ imageUrl('copy'),
imageUrl(getImgName('incomeBtActive')),
imageUrl(getImgName('incomeBt')),
imageUrl(getImgName('earningsRankingBtActive')),
imageUrl(getImgName('earningsRankingBt')),
- imageUrl('incomeBg'),
+ imageUrl(getImgName('incomeBg')),
imageUrl(getImgName('example')),
+ imageUrl(getImgName('listBt')),
imageUrl(getImgName('rankBt')),
imageUrl(getImgName('rewardBt')),
imageUrl('rankingBg'),
imageUrl('timeBg'),
imageUrl('rankItemBg'),
- imageUrl('rewardTop1Bg'),
- imageUrl('rewardTop2Bg'),
- imageUrl('rewardTop3Bg'),
+
imageUrl(getImgName('inviteFriendsBt')),
- imageUrl('rankItemBg'),
imageUrl(getImgName('helpInfo')),
imageUrl(getImgName('enterCodeBg')),
+ imageUrl(getImgName('confirmBt')),
imageUrl(getImgName('incomeListBg')),
+ imageUrl(getImgName('weekRewardBg')),
]
await preloadImages(criticalImages)
@@ -1486,6 +1673,7 @@ const initData = async () => {
getBindingUserRewards(), // 绑定用户奖励
getRanking(), //获取排行榜
+ getOverallList(), //获取总榜
getRewardsAndGifts(), //获取每周奖励列表
getRechargeRewards(), //获取充值奖励
])
@@ -1543,7 +1731,7 @@ onUnmounted(() => {
}
.timeBox {
- margin-top: 1vw;
+ // margin-top: 1vw;
width: 80%;
display: flex;
justify-content: space-around;
@@ -1552,7 +1740,7 @@ onUnmounted(() => {
.timeText {
color: #fff;
font-weight: 590;
- font-size: 2em;
+ font-size: 1.7em;
}
.timeGap {
+
+
+
+
+
+ ![]()
+
+
+
+
+
+
+ {{ formatRewardDisplay(reward.type, reward) }}
+
+