From 8cb66ad01bcd3d8626a5b12f1677982c055fadee Mon Sep 17 00:00:00 2001
From: RockYang <yangjian102621@gmail.com>
Date: Thu, 19 Sep 2024 09:03:14 +0800
Subject: [PATCH] fixed bug geek-plus#6, register page first tab not auto
 active

---
 CHANGELOG.md                       |  1 +
 web/src/components/LoginDialog.vue | 14 +++++++-------
 web/src/views/Register.vue         | 12 ++++++++----
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f610f799..5305970e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 * 功能优化：允许用户在聊天页面设置是否使用流式输出或者一次性输出，兼容 GPT-O1 模型。
 * 功能优化：移除PayJS支付渠道支持，PayJs已经关闭注册服务，请使用其他支付方式。
 * 功能新增：新增GeeK易支付支付渠道，支持支付宝，微信支付，QQ钱包，京东支付，抖音支付，Paypal支付等支付方式
+* Bug修复：修复注册页面 tab 组件没有自动选中问题 [#6](https://github.com/yangjian102621/geekai-plus/issues/6)
 
 ## v4.1.3
 * 功能优化：重构用户登录模块，给所有的登录组件增加行为验证码功能，支持用户绑定手机，邮箱和微信
diff --git a/web/src/components/LoginDialog.vue b/web/src/components/LoginDialog.vue
index 58f81428..ae5ec7d2 100644
--- a/web/src/components/LoginDialog.vue
+++ b/web/src/components/LoginDialog.vue
@@ -299,17 +299,17 @@ onMounted(() => {
   getSystemInfo().then(res => {
     if (res.data) {
       const registerWays = res.data['register_ways']
-      if (arrayContains(registerWays, "mobile")) {
-        enableMobile.value = true
-        activeName.value = activeName.value === "" ? "mobile" : activeName.value
+      if (arrayContains(registerWays, "username")) {
+        enableUser.value = true
+        activeName.value = 'username'
       }
       if (arrayContains(registerWays, "email")) {
         enableEmail.value = true
-        activeName.value = activeName.value === "" ? "email" : activeName.value
+        activeName.value = 'email'
       }
-      if (arrayContains(registerWays, "username")) {
-        enableUser.value = true
-        activeName.value = activeName.value === "" ? "username" : activeName.value
+      if (arrayContains(registerWays, "mobile")) {
+        enableMobile.value = true
+        activeName.value = 'mobile'
       }
       // 是否启用注册
       enableRegister.value = res.data['enabled_register']
diff --git a/web/src/views/Register.vue b/web/src/views/Register.vue
index 53840151..c15fcf61 100644
--- a/web/src/views/Register.vue
+++ b/web/src/views/Register.vue
@@ -223,14 +223,18 @@ getSystemInfo().then(res => {
     title.value = res.data.title
     logo.value = res.data.logo
     const registerWays = res.data['register_ways']
-    if (arrayContains(registerWays, "mobile")) {
-      enableMobile.value = true
+
+    if (arrayContains(registerWays, "username")) {
+      enableUser.value = true
+      activeName.value = 'username'
     }
     if (arrayContains(registerWays, "email")) {
       enableEmail.value = true
+      activeName.value = 'email'
     }
-    if (arrayContains(registerWays, "username")) {
-      enableUser.value = true
+    if (arrayContains(registerWays, "mobile")) {
+      enableMobile.value = true
+      activeName.value = 'mobile'
     }
     // 是否启用注册
     enableRegister.value = res.data['enabled_register']