From 8d6282c3e6065d64f42c1b30da7ce3fb4216fb79 Mon Sep 17 00:00:00 2001
From: xuxin <15279969124@163.com>
Date: Fri, 5 Jun 2026 09:54:27 +0800
Subject: [PATCH] =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E6=89=8B=E5=8A=A8=E8=BE=93=E5=85=A5=E6=9C=9F=E9=97=B4=E5=BB=B6?=
 =?UTF-8?q?=E9=95=BF=E5=80=92=E8=AE=A1=E6=97=B6=EF=BC=8C=E9=98=B2=E6=AD=A2?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=BE=93=E5=85=A5=E4=B8=80=E5=8D=8A=E4=B9=8B?=
 =?UTF-8?q?=E5=89=8D60=E7=A7=92=E7=BB=93=E6=9D=9F=E7=BB=88=E6=AD=A2?=
 =?UTF-8?q?=E4=BA=86=E8=BE=93=E9=AA=8C=E8=AF=81=E7=A0=81=E6=AD=A5=E9=AA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Login.vue | 49 ++++++++++++++++++++++++++++-----------------
 1 file changed, 31 insertions(+), 18 deletions(-)

diff --git a/src/views/Login.vue b/src/views/Login.vue
index bcc9c09..fcd74ff 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -116,10 +116,6 @@
               <span class="login-view__spinner"></span>
               <span>登录中</span>
             </template>
-            <!-- 即将返回提示 -->
-            <template v-else-if="isReturning">
-              即将返回发送验证码
-            </template>
             <!-- 倒计时状态 -->
             <template v-else>
               {{ countdown }} 秒后可继续发送
@@ -174,10 +170,14 @@ const countdown = ref(0)
 let countdownTimer: ReturnType<typeof setInterval> | null = null
 /** 是否正在调用登录接口 */
 const isLoggingIn = ref(false)
-/** 是否处于"即将返回"提示阶段 */
-const isReturning = ref(false)
 /** 用户最后一次输入验证码的时间戳 */
 let lastOtpInputTime = 0
+/** 倒计时结束后等待用户输入冷却的定时器 */
+let returnWaitTimer: ReturnType<typeof setTimeout> | null = null
+/** 延长倒计时的定时器（每秒递减） */
+let extendTimer: ReturnType<typeof setInterval> | null = null
+/** 标记60秒倒计时已结束，等待返回中 */
+let countdownFinished = false
 /** OTP 输入框引用 */
 const otpInputRef = ref<HTMLInputElement | null>(null)
 
@@ -215,21 +215,27 @@ function startCountdown() {
 
 /** 倒计时结束后的返回逻辑 — 考虑用户最近操作 */
 function triggerReturn() {
-  // 计算距离用户最后一次输入过了多久
-  const elapsed = Date.now() - lastOtpInputTime
-  // 如果用户5秒内还在输入，则等待剩余时间后再提示
-  const waitTime = Math.max(0, 5000 - elapsed)
+  countdownFinished = true
+  scheduleReturn()
+}
 
-  // 先等用户操作冷却
-  setTimeout(() => {
-    // 显示"即将返回发送验证码"提示5秒
-    isReturning.value = true
-    setTimeout(() => {
-      isReturning.value = false
+/** 安排返回：用户停止输入5秒后回步骤一，每次输入都重置5秒 */
+function scheduleReturn() {
+  // 清除之前所有定时器，重新开始5秒倒计时
+  if (returnWaitTimer) { clearTimeout(returnWaitTimer); returnWaitTimer = null }
+  if (extendTimer) { clearInterval(extendTimer); extendTimer = null }
+
+  // 直接重置为5秒倒计时
+  countdown.value = 5
+  extendTimer = setInterval(() => {
+    countdown.value--
+    if (countdown.value <= 0) {
+      if (extendTimer) { clearInterval(extendTimer); extendTimer = null }
+      countdownFinished = false
       step.value = 1
       otpValue.value = ''
-    }, 5000)
-  }, waitTime)
+    }
+  }, 1000)
 }
 
 /** 步骤一：发送验证码 */
@@ -272,8 +278,15 @@ function handleOtpInput() {
   otpValue.value = otpValue.value.replace(/\D/g, '').slice(0, 6)
   // 记录用户最后输入时间
   lastOtpInputTime = Date.now()
+  // 如果倒计时已结束且用户还在输入（未满6位），重新安排返回计时
+  if (countdownFinished && otpValue.value.length < 6) {
+    scheduleReturn()
+  }
   // 满6位自动触发登录
   if (otpValue.value.length === 6) {
+    // 取消返回流程
+    if (returnWaitTimer) { clearTimeout(returnWaitTimer); returnWaitTimer = null }
+    if (extendTimer) { clearInterval(extendTimer); extendTimer = null }
     handleLogin()
   }
 }