From a4433ebe689a486a1d2daa876ab5f72b7767c779 Mon Sep 17 00:00:00 2001
From: 3030332422 <3030332422@qq.com>
Date: Mon, 29 Sep 2025 14:21:41 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E7=A7=BB=E5=8A=A8?=
 =?UTF-8?q?=E7=AB=AF=E6=B3=A8=E5=86=8C=E9=A1=B5=E9=9D=A2=E7=9A=84=E4=B8=80?=
 =?UTF-8?q?=E4=BA=9Bbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main/manager-mobile/src/i18n/en.ts            |  1 +
 main/manager-mobile/src/i18n/zh_CN.ts         |  1 +
 main/manager-mobile/src/i18n/zh_TW.ts         |  1 +
 .../src/pages/register/index.vue              | 51 +++++++------------
 4 files changed, 22 insertions(+), 32 deletions(-)

diff --git a/main/manager-mobile/src/i18n/en.ts b/main/manager-mobile/src/i18n/en.ts
index 47921775..9f7bac93 100644
--- a/main/manager-mobile/src/i18n/en.ts
+++ b/main/manager-mobile/src/i18n/en.ts
@@ -48,6 +48,7 @@ export default {
   'register.loginNow': 'Login Now',
   'register.selectCountry': 'Select Country/Region',
   'register.confirm': 'Confirm',
+  'register.captchaSendSuccess': 'Verification code sent successfully',
 
   // Home page
   'home.pageTitle': 'Home',
diff --git a/main/manager-mobile/src/i18n/zh_CN.ts b/main/manager-mobile/src/i18n/zh_CN.ts
index c5d7c695..b6b1320b 100644
--- a/main/manager-mobile/src/i18n/zh_CN.ts
+++ b/main/manager-mobile/src/i18n/zh_CN.ts
@@ -48,6 +48,7 @@ export default {
   'register.loginNow': '立即登录',
   'register.selectCountry': '选择国家/地区',
   'register.confirm': '确认',
+  'register.captchaSendSuccess': '验证码发送成功',
 
   // 首页
   'home.pageTitle': '首页',
diff --git a/main/manager-mobile/src/i18n/zh_TW.ts b/main/manager-mobile/src/i18n/zh_TW.ts
index 7aa6183f..c8d06493 100644
--- a/main/manager-mobile/src/i18n/zh_TW.ts
+++ b/main/manager-mobile/src/i18n/zh_TW.ts
@@ -48,6 +48,7 @@ export default {
   'register.loginNow': '立即登錄',
   'register.selectCountry': '選擇國家/地區',
   'register.confirm': '確認',
+  'register.captchaSendSuccess': '驗證碼發送成功',
 
   // 首頁
   'home.pageTitle': '首頁',
diff --git a/main/manager-mobile/src/pages/register/index.vue b/main/manager-mobile/src/pages/register/index.vue
index 6c9f65d0..719eafa6 100644
--- a/main/manager-mobile/src/pages/register/index.vue
+++ b/main/manager-mobile/src/pages/register/index.vue
@@ -166,7 +166,7 @@ async function sendSmsVerification() {
       captchaId: formData.value.captchaId,
     })
 
-    toast.success(t('message.registerSuccess'))
+    toast.success(t('register.captchaSendSuccess'))
 
     // 开始倒计时
     smsCountdown.value = 60
@@ -193,13 +193,8 @@ async function sendSmsVerification() {
 // 注册
 async function handleRegister() {
   // 表单验证
-  if (registerType.value === 'username') {
-    if (!formData.value.username) {
-      toast.warning(t('register.enterUsername'))
-      return
-    }
-  }
-  else {
+  if (enableMobileRegister.value) {
+    // 手机号注册验证
     if (!formData.value.mobile) {
       toast.warning(t('register.enterPhone'))
       return
@@ -215,6 +210,13 @@ async function handleRegister() {
       return
     }
   }
+  else {
+    // 用户名注册验证
+    if (!formData.value.username) {
+      toast.warning(t('register.enterUsername'))
+      return
+    }
+  }
 
   if (!formData.value.password) {
     toast.warning(t('register.enterPassword'))
@@ -259,7 +261,7 @@ async function handleRegister() {
 
     // 构建注册数据
     const registerData = {
-      username: registerType.value === 'mobile' ? `${selectedAreaCode.value}${formData.value.mobile}` : formData.value.username,
+      username: enableMobileRegister.value ? `${selectedAreaCode.value}${formData.value.mobile}` : formData.value.username,
       password: encryptedPassword,
       captchaId: formData.value.captchaId,
       areaCode: formData.value.areaCode,
@@ -272,7 +274,9 @@ async function handleRegister() {
 
     // 跳转到登录页
     setTimeout(() => {
-      uni.navigateBack()
+      uni.redirectTo({
+        url: '/pages/login/index'
+      })
     }, 1000)
   }
   catch (error: any) {
@@ -294,7 +298,9 @@ async function handleRegister() {
 
 // 返回登录
 function goBack() {
-  uni.navigateBack()
+  uni.redirectTo({
+    url: '/pages/login/index'
+  })
 }
 
 // 页面加载时获取验证码
@@ -339,7 +345,7 @@ onMounted(async () => {
     <view class="form-container">
       <view class="form">
         <!-- 手机号注册 -->
-        <template v-if="registerType === 'mobile'">
+        <template v-if="enableMobileRegister">
           <view class="input-group">
             <view class="input-wrapper mobile-wrapper">
               <view class="area-code-selector" @click="openAreaCodeSheet">
@@ -418,7 +424,7 @@ onMounted(async () => {
         </view>
 
         <!-- 手机验证码输入框 -->
-        <view v-if="registerType === 'mobile'" class="input-group">
+        <view v-if="enableMobileRegister" class="input-group">
           <view class="input-wrapper sms-wrapper">
             <wd-input
                 v-model="formData.mobileCaptcha"
@@ -457,25 +463,6 @@ onMounted(async () => {
           </text>
         </view>
 
-        <!-- 注册方式切换 -->
-        <view v-if="enableMobileRegister" class="register-type-switch">
-          <view class="switch-tabs">
-            <view
-              class="switch-tab"
-              :class="{ active: registerType === 'username' }"
-              @click="toggleRegisterType"
-            >
-              <wd-icon name="user" />
-            </view>
-            <view
-              class="switch-tab"
-              :class="{ active: registerType === 'mobile' }"
-              @click="toggleRegisterType"
-            >
-              <wd-icon name="phone" />
-            </view>
-          </view>
-        </view>
       </view>
     </view>