diff --git a/src/views/consume/gold/addCoinConsume.vue b/src/views/consume/gold/addCoinConsume.vue index 09f897f..7e184bd 100644 --- a/src/views/consume/gold/addCoinConsume.vue +++ b/src/views/consume/gold/addCoinConsume.vue @@ -234,23 +234,25 @@ function calculateCoins(sumGold) { let remaining = parsedSumGold; let freeUsed = 0, permanentUsed = 0, taskUsed = 0; - // 优先消耗免费金币 - if (nowFreeGold > 0) { + // 先消耗任务金币 + if (remaining > 0 && nowTaskGold > 0) { + const availableTaskGold = parseFloat(nowTaskGold.toFixed(4)); + taskUsed = Math.min(availableTaskGold, remaining); + remaining = parseFloat((remaining - taskUsed).toFixed(4)); + } + + // 再消耗免费金币 + if (remaining > 0 && nowFreeGold > 0) { freeUsed = Math.min(parseFloat(nowFreeGold.toFixed(4)), remaining); remaining = parseFloat((remaining - freeUsed).toFixed(4)); } - // 其次消耗永久金币 + // 最后消耗永久金币 if (remaining > 0 && nowPermanentGold > 0) { permanentUsed = Math.min(parseFloat(nowPermanentGold.toFixed(4)), remaining); remaining = parseFloat((remaining - permanentUsed).toFixed(4)); } - // 最后消耗任务金币 - if (remaining > 0 && nowTaskGold > 0) { - taskUsed = parseFloat(remaining.toFixed(4)); - } - // 更新金币值 addConsume.value.freeGold = freeUsed; addConsume.value.permanentGold = permanentUsed; @@ -1087,4 +1089,4 @@ p { } } } - \ No newline at end of file +