diff --git a/src/api/lottery.js b/src/api/lottery.js index 381540c..15224bc 100644 --- a/src/api/lottery.js +++ b/src/api/lottery.js @@ -71,9 +71,9 @@ export const activityDetail = async (activityCode) => { } // 获取充值记录 -export const myRecharge = async () => { +export const myRecharge = async (activityId) => { try { - const response = await get(`/activity/lottery/my-recharge`) + const response = await get(`/activity/lottery/my-recharge?activityId=${activityId}`) return response } catch (error) { console.error('Failed to fetch get my recharge:', error) diff --git a/src/views/Activities/NewYear/components/topUser.vue b/src/views/Activities/NewYear/components/topUser.vue index e1ef024..f058519 100644 --- a/src/views/Activities/NewYear/components/topUser.vue +++ b/src/views/Activities/NewYear/components/topUser.vue @@ -73,13 +73,6 @@ height: distributionValueHeight, }" > -
- {{ distributionValue }} + ${{ distributionValue }}
diff --git a/src/views/Activities/NewYear/index.vue b/src/views/Activities/NewYear/index.vue index a7946db..ac9da66 100644 --- a/src/views/Activities/NewYear/index.vue +++ b/src/views/Activities/NewYear/index.vue @@ -12,7 +12,7 @@
- + @@ -412,7 +412,7 @@ v-for="(listItem, index) in showRanking" :key="listItem.userId" :imgUrl="imageUrl('RankingItem')" - :contentStyle="`padding: 0 13%`" + :contentStyle="`padding: 0 9%`" :lazy="true" :immediate="index < 2" @click="viewUserInfo(listItem.userId)" @@ -481,14 +481,8 @@ align-items: center; " > -
- {{ listItem?.amount }} + ${{ listItem?.amount }}
@@ -540,13 +534,13 @@ " :style="[getGridPosition(index)]" > - + /> --> @@ -603,7 +597,7 @@ margin: -80vw 4vw 0; display: flex; flex-direction: column; - gap: 4vw; + gap: 2vw; padding: 12px; border-radius: 12px; background: linear-gradient( @@ -646,17 +640,17 @@ >
- Total Spins:({{ totalDraw?.usedCount || 0 }}/100) + Total Tickets:({{ totalDraw?.usedCount || 0 }}/100)
-
-
Lucky Dollars Medal*permanent
+
+
Lucky Dollars Medal*permanent
@@ -715,9 +709,19 @@ v-for="task in taskList" style=" border-radius: 12px; - background: rgba(255, 255, 255, 0.2); - box-shadow: 0 0 4px 0 rgba(1, 255, 39, 0.25); - backdrop-filter: blur(32px); + border: 2px solid #fff; + background: linear-gradient( + 264deg, + rgba(220, 228, 255, 0.4) 10.17%, + rgba(151, 176, 255, 0.4) 60.22%, + rgba(220, 228, 255, 0.4) 103.12% + ); + box-shadow: 0 36.858px 13.981px 0 rgba(151, 176, 255, 0.02), + 0 20.335px 12.71px 0 rgba(151, 176, 255, 0.08), + 0 8.897px 8.897px 0 rgba(151, 176, 255, 0.13), + 0 2.542px 5.084px 0 rgba(151, 176, 255, 0.15); + backdrop-filter: blur(4.5px); + display: flex; padding: 8px; justify-content: space-between; @@ -762,18 +766,14 @@
-
-
- {{ showTarget(task) }} -
-
- {{ task.taskName }} -
+ +
+ {{ showTarget(task) }}
+ +
+
Rewards:
-
*{{ task.rewardValue }}
+
*{{ task.rewardValue }}
@@ -905,13 +905,13 @@ gap: 4px; " > - +
- -
- {{ myRanking?.amount || 0 }} -
+
${{ myRanking?.amount || 0 }}
@@ -1743,19 +1735,27 @@ const taskList = ref([]) // 展示任务目标 const showTarget = (task) => { - let timeType = task.targetValue < 60 - let currentValue = timeType ? task.currentValue : task.currentValue / 60 - let targetValue = timeType ? task.targetValue : task.targetValue / 60 - // 直接去除小数部分（向下取整） - currentValue = Math.floor(currentValue) - targetValue = Math.floor(targetValue) - let timeUnit = timeType ? t('minutes_short') : t('hours_short') + if (task.targetType == 'MIC_TIME') { + let timeType = task.targetValue < 60 + let currentValue = timeType ? task.currentValue : task.currentValue / 60 + let targetValue = timeType ? task.targetValue : task.targetValue / 60 + // 直接去除小数部分（向下取整） + currentValue = Math.floor(currentValue) + targetValue = Math.floor(targetValue) + let timeUnit = timeType ? t('minutes_short') : t('hours_short') - return t('on_mic_progress', { - current: currentValue, - total: targetValue, - unit: timeUnit, - }) + return t('on_mic_progress', { + current: currentValue, + total: targetValue, + unit: timeUnit, + }) + } else if (task.targetType == 'SEND_GIFT') { + return `${task.taskName}(${task.currentValue}/${task.targetValue})` + } else if (task.targetType == 'SPEND_COINS') { + return `${task.taskName}(${task.currentValue}/${task.targetValue})` + } else if (task.targetType == 'RECHARGE_AMOUNT') { + return `${task.taskName}(${task.currentValue}/${task.targetValue})` + } } // 选中的收款人 @@ -2076,7 +2076,7 @@ const getActivityDetail = async () => { //获取充值记录 const getMyRecharge = async () => { - const resMyRecharge = await myRecharge() + const resMyRecharge = await myRecharge('2005571533988298753') if (resMyRecharge.status && resMyRecharge.body) { myRechargeRecode.value = resMyRecharge.body } else { @@ -2124,8 +2124,9 @@ const getActivityReward = async () => { content: 30, }, { - type: 'Gift', + type: 'GIFT', cover: imageUrl('reward_gift'), + content: 1, }, ] } else if (rewards.sort == 5) { @@ -2136,8 +2137,9 @@ const getActivityReward = async () => { content: 40, }, { - type: 'Gift', + type: 'GIFT', cover: imageUrl('reward_gift'), + content: 1, }, ] } else if (rewards.sort == 6) { @@ -2148,8 +2150,9 @@ const getActivityReward = async () => { content: 50, }, { - type: 'Gift', + type: 'GIFT', cover: imageUrl('reward_gift'), + content: 1, }, { type: 'PROPS', @@ -2311,9 +2314,6 @@ const preloadCriticalImages = async () => { imageUrl('bg1'), imageUrl('bg2'), imageUrl('bg3'), - imageUrl('bg4'), - imageUrl('bg5'), - imageUrl('bg6'), imageUrl('myAvatarFrame'), imageUrl('myInfoBg'), imageUrl('rankBt'), @@ -2341,9 +2341,6 @@ const preloadCriticalImages = async () => { imageUrl('bg1'), imageUrl('bg2'), imageUrl('bg3'), - imageUrl('bg4'), - imageUrl('bg5'), - imageUrl('bg6'), imageUrl('myAvatarFrame'), imageUrl('myInfoBg'), imageUrl('rankBt_ar'),