完成40%

2026-07-23 17:21:27 +08:00
parent f1edc6b533
commit bb6431b319
114 changed files with 10931 additions and 877 deletions
@@ -38,12 +38,12 @@
                class="auth-input"
                type="number"
                maxlength="11"
-                :disabled="sendingCode || cooldownSeconds > 0 || submitting"
+                :disabled="sendingCode || submitting || registrationCommitted"
                placeholder="请输入手机号"
                placeholder-class="placeholder"
                :aria-invalid="Boolean(fieldErrors.phone)"
                :aria-describedby="fieldErrors.phone ? 'a04-phone-error' : undefined"
-                @input="clearFieldError('phone')"
+                @input="handlePhoneInput"
              />
            </view>
            <text v-if="fieldErrors.phone" id="a04-phone-error" class="field-error" role="alert">{{
@@ -63,7 +63,7 @@
                class="auth-input"
                type="number"
                maxlength="4"
-                :disabled="submitting"
+                :disabled="submitting || registrationCommitted"
                placeholder="请输入验证码"
                placeholder-class="placeholder"
                :aria-invalid="Boolean(fieldErrors.verificationCode)"
@@ -73,7 +73,7 @@
              <button
                class="auth-plain-button get-code"
                :class="{ 'get-code--disabled': sendingCode || cooldownSeconds > 0 }"
-                :disabled="sendingCode || submitting || cooldownSeconds > 0"
+                :disabled="sendingCode || submitting || cooldownSeconds > 0 || registrationCommitted"
                hover-class="tap-fade"
                @click="prepareGetCode"
                >{{ sendingCode ? "请求中…" : cooldownSeconds > 0 ? `${cooldownSeconds}s 后重发` : "获取验证码" }}</button
@@ -96,7 +96,7 @@
                class="auth-input"
                password
                maxlength="32"
-                :disabled="submitting"
+                :disabled="submitting || registrationCommitted"
                placeholder="请设置登录密码"
                placeholder-class="placeholder"
                :aria-invalid="Boolean(fieldErrors.password)"
@@ -121,7 +121,7 @@
                class="auth-input"
                password
                maxlength="32"
-                :disabled="submitting"
+                :disabled="submitting || registrationCommitted"
                placeholder="请再次输入密码"
                placeholder-class="placeholder"
                :aria-invalid="Boolean(fieldErrors.confirmPassword)"
@@ -147,7 +147,15 @@
            src="/static/assets/foundation/transparent/a01-scroll-primary-v3.png"
            mode="aspectFit"
          />
-          <text class="register-submit__content">{{ submitting ? "注册中…" : "注册账号" }}</text>
+          <text class="register-submit__content">{{
+            submitting
+              ? registrationCommitted
+                ? "正在进入…"
+                : "注册中…"
+              : registrationCommitted
+                ? "进入家谱"
+                : "注册账号"
+          }}</text>
        </button>

        <view
@@ -160,7 +168,7 @@
              role="checkbox"
              :aria-checked="agreed"
              :aria-label="agreed ? '取消同意用户协议与隐私政策' : '同意用户协议与隐私政策'"
-              :disabled="sendingCode || submitting || tacVisible"
+              :disabled="sendingCode || submitting || tacVisible || registrationCommitted"
              @click="toggleAgreement"
            >
              <image
@@ -230,7 +238,7 @@

 <script setup>
 import { computed, ref } from "vue";
-import { onBackPress, onUnload } from "@dcloudio/uni-app";
+import { onBackPress, onShow, onUnload } from "@dcloudio/uni-app";
 import AppDialog from "@/components/AppDialog.vue";
 import AppToast from "@/components/AppToast.vue";
 import AuthPageShell from "@/components/AuthPageShell.vue";
@@ -244,9 +252,11 @@ import {
  AUTH_TAC_SCENE,
  createTacRenderContext,
  isAuthPhone,
+  isSmsDeliveryOutcomeUnknown,
  normalizeCaptchaRequirement,
  normalizeTacSuccess,
 } from "@/utils/auth-verification.js";
+import { createAuthSmsCooldown } from "@/utils/auth-sms-cooldown.js";
 import { runtimeConfig } from "@/utils/config.js";
 import { createDiscardConfirmation } from "@/utils/discard-confirmation.js";
 import { calcMD5 } from "@/utils/md5.js";
@@ -275,8 +285,11 @@ const tacVisible = ref(false);
 const tacContext = ref(null);
 const sendingCode = ref(false);
 const submitting = ref(false);
+const registrationCommitted = ref(false);
 const cooldownSeconds = ref(0);
+const sentPhone = ref("");
 const isDirty = computed(() =>
+  !registrationCommitted.value &&
  Boolean(
    phone.value ||
      verificationCode.value ||
@@ -286,10 +299,17 @@ const isDirty = computed(() =>
  ),
 );
 let feedbackTimer = null;
-let cooldownTimer = null;
 let tacSequence = 0;
 let pageActive = true;
+const registrationNavigationFailure =
+  "注册已完成，但暂时无法进入家谱，请再次点击进入";
 const authRequestController = createRequestController();
+const smsCooldown = createAuthSmsCooldown({
+  sceneCode: AUTH_TAC_SCENE.REGISTER,
+  onChange: (seconds) => {
+    cooldownSeconds.value = seconds;
+  },
+});
 const discardConfirmation = createDiscardConfirmation((visible) => {
  discardVisible.value = visible;
 });
@@ -309,17 +329,19 @@ const cancelPendingRequest = () => {
 };

 const requestBack = () =>
-  runBackGuard({
-    transientOpen: tacVisible.value || discardVisible.value,
-    submitting: submitting.value || sendingCode.value,
-    dirty: isDirty.value,
-    "close-transient": tacVisible.value ? closeTac : cancelDiscard,
-    "block-submitting": () => {
-      cancelPendingRequest();
-      return requestBack();
-    },
-    "confirm-discard": requestDiscardConfirmation,
-  });
+  registrationCommitted.value
+    ? enterAuthenticatedRoot()
+    : runBackGuard({
+        transientOpen: tacVisible.value || discardVisible.value,
+        submitting: submitting.value || sendingCode.value,
+        dirty: isDirty.value,
+        "close-transient": tacVisible.value ? closeTac : cancelDiscard,
+        "block-submitting": () => {
+          cancelPendingRequest();
+          return requestBack();
+        },
+        "confirm-discard": requestDiscardConfirmation,
+      });

 onBackPress((event) => handleBackPress(event, requestBack));

@@ -327,9 +349,10 @@ onUnload(() => {
  pageActive = false;
  authRequestController.abort();
  if (feedbackTimer) clearTimeout(feedbackTimer);
-  if (cooldownTimer) clearInterval(cooldownTimer);
+  smsCooldown.dispose();
  discardConfirmation.dispose();
 });
+onShow(() => smsCooldown.sync());

 const showFeedback = (message) => {
  feedbackMessage.value = message;
@@ -341,10 +364,26 @@ const showFeedback = (message) => {
  }, 2200);
 };

+const enterAuthenticatedRoot = async () => {
+  if (!pageActive) return false;
+  submitting.value = true;
+  try {
+    const opened = await goRoot("G01");
+    if (opened !== true) throw new Error("NAVIGATION_RETRY_REQUIRED");
+    return true;
+  } catch {
+    if (pageActive) showFeedback(registrationNavigationFailure);
+    return false;
+  } finally {
+    if (pageActive) submitting.value = false;
+  }
+};
+
 const prepareAgreement = () => showFeedback("协议页面准备中");

 const toggleAgreement = () => {
-  if (sendingCode.value || submitting.value) return;
+  if (sendingCode.value || submitting.value || registrationCommitted.value)
+    return;
  agreed.value = !agreed.value;
  if (agreed.value) agreementError.value = false;
 };
@@ -353,16 +392,11 @@ const clearFieldError = (field) => {
  fieldErrors.value[field] = "";
 };

-const startCooldown = () => {
-  cooldownSeconds.value = 60;
-  if (cooldownTimer) clearInterval(cooldownTimer);
-  cooldownTimer = setInterval(() => {
-    cooldownSeconds.value -= 1;
-    if (cooldownSeconds.value <= 0) {
-      clearInterval(cooldownTimer);
-      cooldownTimer = null;
-    }
-  }, 1000);
+const handlePhoneInput = () => {
+  clearFieldError("phone");
+  if (!sentPhone.value || phone.value === sentPhone.value) return;
+  verificationCode.value = "";
+  sentPhone.value = "";
 };

 const prepareGetCode = async () => {
@@ -424,12 +458,19 @@ const completeTac = async (result) => {
      { requestController: authRequestController },
    );
    if (!pageActive) return;
-    startCooldown();
+    sentPhone.value = expectedContext.subject;
+    smsCooldown.start();
    showFeedback("验证码已发送");
  } catch (error) {
    closeTac();
-    if (pageActive && !isRequestCancelled(error)) {
-      showFeedback(error.message || "验证码发送失败");
+    if (pageActive) {
+      if (isSmsDeliveryOutcomeUnknown(error)) {
+        sentPhone.value = expectedContext.subject;
+        smsCooldown.start();
+        showFeedback("发送结果未知，如收到短信可直接填写；60 秒后可重试");
+      } else if (!isRequestCancelled(error)) {
+        showFeedback(error.message || "验证码发送失败");
+      }
    }
  } finally {
    if (pageActive) sendingCode.value = false;
@@ -452,7 +493,9 @@ const validateForm = () => {
    confirmPassword: "",
  };
  if (!isAuthPhone(phone.value)) nextErrors.phone = "请输入正确手机号";
-  if (!/^\d{4}$/.test(verificationCode.value))
+  if (sentPhone.value !== phone.value)
+    nextErrors.verificationCode = "请先获取当前手机号的验证码";
+  else if (!/^\d{4}$/.test(verificationCode.value))
    nextErrors.verificationCode = "请输入 4 位验证码";
  const passwordResult = validatePassword(password.value);
  if (!passwordResult.valid) nextErrors.password = PASSWORD_POLICY_MESSAGE;
@@ -465,6 +508,7 @@ const validateForm = () => {

 const submitRegister = async () => {
  if (submitting.value || sendingCode.value) return;
+  if (registrationCommitted.value) return enterAuthenticatedRoot();
  const formValid = validateForm();
  if (!agreed.value) agreementError.value = true;
  if (!formValid || !agreed.value) return;
@@ -479,14 +523,17 @@ const submitRegister = async () => {
      { requestController: authRequestController },
    );
    if (!pageActive) return;
-    await goRoot("G01");
+    registrationCommitted.value = true;
  } catch (error) {
    if (pageActive && !isRequestCancelled(error)) {
      showFeedback(error.message || "注册失败，请稍后重试");
    }
+    return;
  } finally {
    if (pageActive) submitting.value = false;
  }
+  if (!pageActive) return;
+  await enterAuthenticatedRoot();
 };
 </script>

@@ -588,11 +635,17 @@ const submitRegister = async () => {
 }

 .get-code {
-  flex: 0 0 auto;
-  padding-left: 14rpx;
+  display: flex;
+  flex: 0 0 176rpx;
+  box-sizing: border-box;
+  align-items: center;
+  justify-content: flex-end;
+  padding: 0 8rpx;
  border-left: 1rpx solid #d7bd94;
+  background: transparent !important;
  color: #a7160c;
  font-size: 26rpx;
+  white-space: nowrap;
 }

 .get-code--disabled {