hy/aslan-h5
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(抽奖活动页): 修复任务完成进度的展示问题，修复接口参数问题

Browse Source
This commit is contained in:
hzj 2025-10-24 18:27:45 +08:00
parent 170c2f1fb3
commit a0822da7a8
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/views/Activities/Lottery/Lottery.vue
View File

@ -875,7 +875,7 @@ const barrageList = ref([])
// 活动详情
const activity = ref({}) //活动详情和奖池
const activityCode = ref('') //活动码
const activityId = ref('') //活动码
const userInfo = ref({}) //用户信息
const userIdentity = ref({}) //用户身份
@ -936,6 +936,9 @@ 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 ? 'mins' : 'hours'
return `On the mic(${currentValue}/${targetValue}${timeUnit})`
@ -976,7 +979,7 @@ const searchPayee = () => {
// 前往提现页
const goToWithdraw = () => {
router.push({ path: '/cash-out', query: { activityCode: activityCode.value } })
router.push({ path: '/cash-out', query: { activityId: activityId.value } })
}
// 转账金币选项
@ -1356,11 +1359,11 @@ const getRanking = async () => {
const getActivityDetail = async () => {
const resvalidActivity = await validActivity() //活动是否有效
if (resvalidActivity.body?.activityCode) {
activityCode.value = resvalidActivity.body.activityCode || ''
if (resvalidActivity.body?.id) {
activityId.value = resvalidActivity.body.id || ''
getDrawableAmount() //获取可提现金额
const resDetail = await activityDetail(activityCode.value)
const resDetail = await activityDetail(resvalidActivity.body.activityCode)
if (resDetail.status && resDetail.body) {
activity.value = resDetail.body
} else {
@ -1381,7 +1384,7 @@ const getTickets = async () => {
//可提现金额
const getDrawableAmount = async () => {
const resDrawableAmount = await withdrawableAmount(activityCode.value)
const resDrawableAmount = await withdrawableAmount(activityId.value)
if (resDrawableAmount.status && resDrawableAmount.body) {
currentAmount.value = resDrawableAmount.body
} else {

6
src/views/Wallet/CashOut/CashOut.vue
View File

@ -198,7 +198,7 @@ import { useRouter, useRoute } from 'vue-router'
const router = useRouter()
const route = useRoute()
const activityCode = route.query.activityCode || ''
const activityId = route.query.activityId || ''
const maskLayerShow = ref(false)
const currentAmount = ref(0) //可提现金额
@ -222,7 +222,7 @@ const gotoKYC = () => {
const CashOut = () => {
if (hasBankCard.value) {
try {
const resApply = withdrawApply({ ...getApplyInfo(), activityId: activityCode })
const resApply = withdrawApply({ ...getApplyInfo(), activityId: activityId })
if (resApply.status) {
setApplyInfo()
router.go(-1)
@ -242,7 +242,7 @@ const Receive = () => {
//获取可提现金额
const getDrawableAmount = async () => {
const resDrawableAmount = await withdrawableAmount(activityCode)
const resDrawableAmount = await withdrawableAmount(activityId)
if (resDrawableAmount.status && resDrawableAmount.body) {
currentAmount.value = resDrawableAmount.body
} else {