From 8d5e535b05b845d6f42886531d4965a0cf4b5caa Mon Sep 17 00:00:00 2001
From: hzj <1304805162@qq.com>
Date: Thu, 30 Apr 2026 18:31:53 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=AF=8F=E6=97=A5=E5=85=85=E5=80=BC?=
 =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E9=A1=B5=E9=9D=A2):=20=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E4=BA=8C=E5=AE=8C=E6=88=90=E6=83=85=E5=86=B5=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E3=80=81=E8=BF=9B=E5=BA=A6=E6=9D=A1=E5=AE=BD?=
 =?UTF-8?q?=E5=BA=A6=E8=AE=A1=E7=AE=97=E6=96=B9=E5=BC=8F=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E6=88=90=E5=8F=AA=E7=9C=8B=E5=BD=93=E5=89=8D=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E7=AD=89=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Activities/DailyRecharge/index.vue | 27 ++++++++++----------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/views/Activities/DailyRecharge/index.vue b/src/views/Activities/DailyRecharge/index.vue
index 76e61e0..88108a9 100644
--- a/src/views/Activities/DailyRecharge/index.vue
+++ b/src/views/Activities/DailyRecharge/index.vue
@@ -165,14 +165,14 @@ justify-content: flex-start;
                     />
                   </div>
                   <!-- 任务二 -->
-                  <div :style="{ color: taskInfo.task2Completed ? '#1AFF00' : '#fff' }">
+                  <div :style="{ color: task2Completed ? '#1AFF00' : '#fff' }">
                     {{
                       t('active_game_task2_detail', {
                         progress: task2ProgressText,
                       })
                     }}
                     <img
-                      v-if="taskInfo.task2Completed"
+                      v-if="task2Completed"
                       v-smart-img
                       :src="imageUrl('done')"
                       alt=""
@@ -595,7 +595,7 @@ const currentTask2RewardTop = computed(() => {
 const canClaimTask2Reward = computed(() => {
   return (
     !currentTask2Claimed.value &&
-    taskInfo.value.task2Completed &&
+    task2Completed.value &&
     Boolean(currentTask2RewardTop.value?.rule?.id) &&
     !claimingTask2Reward.value
   )
@@ -617,17 +617,11 @@ const chestProgressList = computed(() => {
   })
 })
 const progressBarWidth = computed(() => {
-  const completedLevelCount = Math.min(Math.max(currentLevel.value - 1, 0), 9)
-  const completedWidth =
-    completedLevelCount === 0
+  const targetLevel = Math.min(Math.max(Number(currentLevel.value) || 0, 0), 10)
+  const progressWidth =
+    targetLevel === 0
       ? 0
-      : CHEST_PROGRESS_FIRST_CENTER_VW + (completedLevelCount - 1) * CHEST_PROGRESS_CENTER_STEP_VW
-  const currentLevelTaskCount =
-    (task1Completed.value ? 1 : 0) + (taskInfo.value.task2Completed ? 1 : 0)
-  const currentLevelProgressDistance =
-    completedLevelCount === 0 ? CHEST_PROGRESS_FIRST_CENTER_VW : CHEST_PROGRESS_CENTER_STEP_VW
-  const currentLevelWidth = (currentLevelProgressDistance * currentLevelTaskCount) / 2
-  const progressWidth = Math.min(completedWidth + currentLevelWidth, CHEST_PROGRESS_TRACK_WIDTH_VW)
+      : CHEST_PROGRESS_FIRST_CENTER_VW + (targetLevel - 1) * CHEST_PROGRESS_CENTER_STEP_VW
 
   return `${progressWidth}vw`
 })
@@ -654,6 +648,11 @@ const currentTask1TargetCoins = computed(() => {
 const currentTask2TargetAmount = computed(() => {
   return currentLevelInfo.value.rechargeTarget || 0
 })
+const task2Completed = computed(() => {
+  const rechargeAmount = Number(taskInfo.value.task2RechargeAmount) || 0
+  const targetAmount = Number(currentTask2TargetAmount.value) || 0
+  return targetAmount > 0 && rechargeAmount >= targetAmount
+})
 const currentTask1RewardCoins = computed(() => {
   return currentLevelInfo.value.rewardCoins || taskInfo.value.task1TodayRewardCoins || 0
 })
@@ -796,7 +795,7 @@ const isChestConditionReached = (level) => {
   }
 
   if (chestLevel === currentLevel.value) {
-    return task1Completed.value && taskInfo.value.task2Completed
+    return task1Completed.value && task2Completed.value
   }
 
   return false