diff --git a/src/views/Activities/LuckyDollars/Season4/index.vue b/src/views/Activities/LuckyDollars/Season4/index.vue index 3fca868..d024c49 100644 --- a/src/views/Activities/LuckyDollars/Season4/index.vue +++ b/src/views/Activities/LuckyDollars/Season4/index.vue @@ -1664,7 +1664,6 @@ import { useThrottle } from '@/utils/useDebounce' import { getMemberProfile, getUserIdentity } from '@/api/wallet' import { ranklist, //获取排行榜 - validActivity, // 获取有效活动 activityDetail, // 获取活动详情 myRecharge, // 获取充值记录 activityRewardConfigs, // 获取活动奖励配置列表 @@ -1748,8 +1747,10 @@ const maskLayerShow = computed(() => { const barrageList = ref([]) // 弹幕数据 // 活动详情 +const activityId = ref('2007771533988216322') //活动ID +const activityCode = ref('16322') //活动码 + const activity = ref({}) //活动详情和奖池 -const activityId = ref('') //活动码 const userInfo = ref({}) //用户信息 const userIdentity = ref({}) //用户身份 @@ -2303,7 +2304,7 @@ const getUserInfo = async () => { //获取排行榜 const getRanking = async () => { let data = { - activityId: '2005571533988298753', + activityId: activityId.value, pageNo: rankingPageNo.value, pageSize: 20, } @@ -2328,24 +2329,18 @@ const getRanking = async () => { //获取奖池 const getActivityDetail = async () => { - const resvalidActivity = await validActivity() //活动是否有效 - - if (resvalidActivity.body?.id) { - activityId.value = resvalidActivity.body.id || '' - - getDrawableAmount() //获取可提现金额 - const resDetail = await activityDetail(resvalidActivity.body.activityCode) - if (resDetail.status && resDetail.body) { - activity.value = resDetail.body - } else { - activity.value = {} - } + getDrawableAmount() //获取可提现金额 + const resDetail = await activityDetail(activityCode.value) + if (resDetail.status && resDetail.body) { + activity.value = resDetail.body + } else { + activity.value = {} } } //获取充值记录 const getMyRecharge = async () => { - const resMyRecharge = await myRecharge('2005571533988298753') + const resMyRecharge = await myRecharge(activityId.value) if (resMyRecharge.status && resMyRecharge.body) { myRechargeRecode.value = resMyRecharge.body } else { @@ -2357,7 +2352,7 @@ const getMyRecharge = async () => { const getActivityReward = async () => { let data = { activityType: 'CONSUMPTION_ACTIVITY', - activityId: '2005571533988298753', + activityId: activityId.value, } const resActivityReward = await activityRewardConfigs(data) if (resActivityReward.status && resActivityReward.body) { @@ -2367,11 +2362,11 @@ const getActivityReward = async () => { if (rewards.sort == 1) { addReward = [ - { - type: 'TICKET', - cover: imageUrl('ticket'), - content: 10, - }, + // { + // type: 'TICKET', + // cover: imageUrl('ticket'), + // content: 10, + // }, ] } else if (rewards.sort == 2) { addReward = [ @@ -2484,7 +2479,7 @@ const showDetail = (type, reward) => { //获取拥有的抽奖券 const getTickets = async () => { - const resTickets = await myTickets() + const resTickets = await myTickets(activityId.value) if (resTickets.status && resTickets.body) { rollTimes.value = resTickets.body } else { @@ -2494,7 +2489,7 @@ const getTickets = async () => { //获取累计抽奖次数 const getTotalDrawCount = async () => { - const resTotalDrawCount = await myTotalDrawCount() + const resTotalDrawCount = await myTotalDrawCount(activityId.value) if (resTotalDrawCount.status && resTotalDrawCount.body) { totalDraw.value = resTotalDrawCount.body } @@ -2510,7 +2505,7 @@ const getDrawableAmount = async () => { //获取任务列表 const getTaskList = async () => { - const resTaskList = await ActTaskList() + const resTaskList = await ActTaskList(activityId.value) if (resTaskList.status && resTaskList.body) { taskList.value = resTaskList.body } @@ -2520,7 +2515,7 @@ const getTaskList = async () => { const getConfigsBadgeInfo = async () => { let data = { activityType: 'USER_RECHARGE_DRAW', - activityId: '2005571533988298753', + activityId: activityId.value, } const resConfigsBadge = await rewardConfigsBadge(data) if (resConfigsBadge.status && resConfigsBadge.body) { @@ -2530,7 +2525,7 @@ const getConfigsBadgeInfo = async () => { //获取中奖记录 const getDrawRecords = async () => { - const resDrawRecords = await drawRecords() + const resDrawRecords = await drawRecords(activityCode.value) if (resDrawRecords.status && resDrawRecords.body) { myRecords.value = resDrawRecords.body?.records || [] } @@ -2538,7 +2533,7 @@ const getDrawRecords = async () => { //获取中奖用户列表 const getWinners = async () => { - const resWinners = await winnerHistory() + const resWinners = await winnerHistory(activityId.value) if (resWinners.status && resWinners.body) { barrageList.value = resWinners.body } @@ -2581,7 +2576,7 @@ const receiveReward = async (rewards) => { const receiveRechargeBadge = async (rewards) => { let data = { activityType: rewards.activityType, - activityId: '2005571533988298753', + activityId: activityId.value, ruleId: rewards.ruleId, } try {