From a8083088c69fe8788cec6d48427b805e9de68cc1 Mon Sep 17 00:00:00 2001 From: zyh Date: Fri, 29 Aug 2025 17:12:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20Play.vue=20=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=B7=B2=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E7=82=B9=E6=95=B0=E7=9A=84=E7=8A=B6=E6=80=81=E7=AE=A1=E7=90=86?= =?UTF-8?q?=EF=BC=8C=E4=BC=98=E5=8C=96=E7=82=B9=E6=95=B0=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=8C=E7=A1=AE=E4=BF=9D=E5=9C=A8=E6=B8=B8?= =?UTF-8?q?=E6=88=8F=E6=95=B0=E6=8D=AE=E6=9B=B4=E6=96=B0=E6=97=B6=E6=AD=A3?= =?UTF-8?q?=E7=A1=AE=E5=8F=8D=E6=98=A0=E5=B7=B2=E5=AE=8C=E6=88=90=E7=82=B9?= =?UTF-8?q?=E6=95=B0=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Play.vue | 42 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 38 insertions(+), 4 deletions(-) diff --git a/src/views/Play.vue b/src/views/Play.vue index 28ca7f7..fe19b41 100644 --- a/src/views/Play.vue +++ b/src/views/Play.vue @@ -111,11 +111,11 @@
状态
目标点数
-
+
{{ state.region }}
QQ
微信
{{ getDisplayStatus() }}
-
{{ state.totalPoints || 0 }}
+
{{ state.completedPoints || 0 }}/{{ state.totalPoints || 0 }}
@@ -225,6 +225,7 @@ export default { assets: null, currentPoints: 0, totalPoints: 1000, + completedPoints: 0, // 已完成点数 error: null, qrDelaySeconds: 0, isWaitingQr: false, @@ -318,7 +319,7 @@ export default { state.status = 'LOGGED_IN' // 构建assets对象,包含图片URL - if(status == "COMPLETED"){ + if(gameData.status == "COMPLETED"){ state.assets = { homepageUrl: gameData.homepageUrl, firstRewardUrl: gameData.firstRewardUrl, @@ -342,8 +343,15 @@ export default { }} // 更新区域信息 + console.log('更新区域信息:', { + gameDataRegion: gameData.region, + originalStateRegion: state.region + }) if (gameData.region) { state.region = gameData.region + console.log('已设置 state.region =', state.region) + } else { + console.log('gameData.region 为空,未更新 state.region') } // 更新机器ID @@ -358,11 +366,23 @@ export default { state.totalPoints = gameData.assets.totalPoints } + // 更新已完成点数 + state.completedPoints = gameData.completedPoints || 0 + // 初始化当前点数为0(代表刚开始) state.currentPoints = 0 clearTimer('loginPoll') clearTimer('countdown') + + console.log('handleLoggedInStatus 执行完成,最终状态:', { + status: state.status, + region: state.region, + totalPoints: state.totalPoints, + completedPoints: state.completedPoints, + mecmachineId: state.mecmachineId + }) + ElMessage.success('登录成功,正在进入游戏界面...') } catch (error) { @@ -393,11 +413,13 @@ export default { // 设置点数信息 - 已完成时当前点数等于目标点数 state.totalPoints = gameData.totalPoints || 50 + state.completedPoints = gameData.completedPoints || state.totalPoints // 已完成点数 state.currentPoints = state.totalPoints // 已完成,当前点数等于目标点数 console.log('已完成状态更新完成:', { status: state.status, totalPoints: state.totalPoints, + completedPoints: state.completedPoints, currentPoints: state.currentPoints, assets: !!state.assets }) @@ -435,6 +457,11 @@ export default { state.totalPoints = data.totalPoints } + // 更新已完成点数 + if (data.completedPoints !== undefined) { + state.completedPoints = data.completedPoints + } + // 如果有游戏数据,也检查assets中的点数信息 if (data.assets && data.assets.totalPoints) { state.totalPoints = data.assets.totalPoints @@ -447,8 +474,11 @@ export default { // 调试信息 console.log('updateStateFromResponse:', { status: data.status, - region: data.region, + dataRegion: data.region, + stateRegion: state.region, mecmachineId: data.mecmachineId, + totalPoints: state.totalPoints, + completedPoints: state.completedPoints, skipQrProcessing }) @@ -773,6 +803,10 @@ export default { const data = response.data state.currentPoints = data.currentPoints || state.currentPoints state.totalPoints = data.totalPoints || state.totalPoints + // 更新已完成点数 + if (data.completedPoints !== undefined) { + state.completedPoints = data.completedPoints + } } catch (error) { console.error('进度轮询错误:', error) }