From 4967355ddfa69cbf6d9c918bcc78af8845b60a18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=8F=E6=B2=AB=E8=8A=B1=E7=81=ABzzz=F0=9F=8C=99?=
 <xmcn@1l1.icu>
Date: Fri, 6 Sep 2024 16:57:30 +0800
Subject: [PATCH] rewrited: Register.vue

---
 src/api/v2/users/index.ts    |  4 +++
 src/api/v2/users/login.ts    |  4 +--
 src/api/v2/users/register.ts | 24 +++++++++++++
 src/api/v2/users/send.ts     | 12 +++++++
 src/views/Register.vue       | 67 ++++++++++++++++++++++--------------
 src/views/ResetPassword.vue  |  6 ++--
 6 files changed, 86 insertions(+), 31 deletions(-)
 create mode 100644 src/api/v2/users/register.ts
 create mode 100644 src/api/v2/users/send.ts

diff --git a/src/api/v2/users/index.ts b/src/api/v2/users/index.ts
index 11cb27e..c41db29 100644
--- a/src/api/v2/users/index.ts
+++ b/src/api/v2/users/index.ts
@@ -1,9 +1,13 @@
 import info from './info'
 import login from './login'
+import register from './register'
 import reset from './reset'
+import send from './send'
 
 export default {
   info: info,
   login: login,
+  register: register,
+  send: send,
   reset: reset
 }
diff --git a/src/api/v2/users/login.ts b/src/api/v2/users/login.ts
index 8fadd01..e3a1dd1 100644
--- a/src/api/v2/users/login.ts
+++ b/src/api/v2/users/login.ts
@@ -2,7 +2,7 @@
 import { post } from '@/utils/request'
 import base from '@/api/base'
 
-const info = async (username: string, password: string) => {
+const login = async (username: string, password: string) => {
   const rs = post(`${base.api_v2_url}/users/login`, {
     username: username,
     password: password
@@ -10,4 +10,4 @@ const info = async (username: string, password: string) => {
   return base.buildResponse(await rs)
 }
 
-export default info
+export default login
diff --git a/src/api/v2/users/register.ts b/src/api/v2/users/register.ts
new file mode 100644
index 0000000..91ed0f2
--- /dev/null
+++ b/src/api/v2/users/register.ts
@@ -0,0 +1,24 @@
+//@ts-ignore
+import { post } from '@/utils/request'
+import base from '@/api/base'
+
+const register = async (
+  username: string,
+  password: string,
+  confirm_password: string,
+  email: string,
+  verify: number,
+  qq: number
+) => {
+  const rs = post(`${base.api_v2_url}/users/register`, {
+    username: username,
+    password: password,
+    confirm_password: confirm_password,
+    email: email,
+    verify: verify,
+    qq: qq
+  })
+  return base.buildResponse(await rs)
+}
+
+export default register
diff --git a/src/api/v2/users/send.ts b/src/api/v2/users/send.ts
new file mode 100644
index 0000000..f89b5e2
--- /dev/null
+++ b/src/api/v2/users/send.ts
@@ -0,0 +1,12 @@
+//@ts-ignore
+import { get } from '@/utils/request'
+import base from '@/api/base'
+
+const send = async (email: string) => {
+  const rs = get(`${base.api_v2_url}/users/send`, {
+    email: email
+  })
+  return base.buildResponse(await rs)
+}
+
+export default send
diff --git a/src/views/Register.vue b/src/views/Register.vue
index ba99967..21713cb 100644
--- a/src/views/Register.vue
+++ b/src/views/Register.vue
@@ -30,7 +30,7 @@
           <n-input type="text" v-model:value="model.verify" placeholder="验证码" />
         </n-grid-item>
         <n-grid-item span="0:6 600:1">
-          <n-button ghost round type="primary" @click="sendcode" v-bind:disabled="verify.isClick">
+          <n-button ghost round type="primary" @click="sendCode" v-bind:disabled="verify.isClick">
             {{ verify.msg }}
           </n-button>
         </n-grid-item>
@@ -39,7 +39,7 @@
     <div style="display: flex; margin-bottom: 20px; justify-content: flex-end">
       <n-space>
         <n-button type="primary" @click="register" style="margin-right: 10px"> 注册 </n-button>
-        <n-button ghost type="primary" style="--n-border: none" @click="gologin">
+        <n-button ghost type="primary" style="--n-border: none" @click="goLogin">
           已有账户？去登录
         </n-button>
       </n-space>
@@ -50,8 +50,8 @@
 <script setup>
 import { ref } from 'vue'
 import { useLoadingBar, useMessage } from 'naive-ui'
-import { post } from '@/utils/request'
 import router from '@/router/index'
+import api from '@/api'
 
 const refkey = 0
 const formRef = ref(null)
@@ -65,7 +65,7 @@ const model = ref([
     email: '',
     confirmpwd: '',
     qq: '',
-    verify: ''
+    verify: null
   }
 ])
 
@@ -74,42 +74,57 @@ const verify = ref({
   msg: `发送验证码`
 })
 
-function gologin() {
+function goLogin() {
   router.push('/login')
 }
 
-function sendcode() {
+async function sendCode() {
   console.log('尝试发送验证码')
   verify.value.isClick = true
   verify.value.msg = ref(`正在处理`)
   ldb.start()
-  const rs = post('https://api.locyanfrp.cn/User/SendRegCode', model.value)
-  rs.then((res) => {
-    if (res.status) {
-      message.success(res.message)
-      verify.value.msg = ref(`已发送`)
-    } else {
-      message.error(res.message)
-      verify.value.isClick = false
-      verify.value.msg = ref(`发送验证码`)
-    }
-    ldb.finish()
-    console.log('处理发送验证码事件完毕')
-  })
+  let rs
+  try {
+    rs = await api.v2.users.send(model.value.email)
+  } catch (e) {
+    message.error('请求邮件验证代码失败: ' + e)
+  }
+  if (!rs) return
+  if (rs.status) {
+    message.success('已发送，若未收到请检查收件箱')
+    verify.value.msg = ref(`已发送`)
+  } else {
+    message.error(rs.data.msg)
+    verify.value.isClick = ref(false)
+    verify.value.msg = ref(`发送验证码`)
+  }
+  ldb.finish()
+  // console.log('处理发送验证码事件完毕')
 }
 
-function register() {
+async function register() {
   ldb.start()
-  const rs = post('https://api.locyanfrp.cn/User/DoReg', model.value)
-  rs.then((res) => {
-    if (res.status) {
-      message.success(res.message)
+  let rs
+  try {
+    rs = await api.v2.users.register(
+      model.value.username,
+      model.value.password,
+      model.value.confirmpwd,
+      model.value.email,
+      model.value.verify
+    )
+  } catch (e) {
+    message.error('请求注册失败: ' + e)
+  }
+  if (!rs) return
+  // const rs = post('https://api.locyanfrp.cn/User/DoReg', model.value)
+    if (rs.status === 200) {
+      message.success(rs.data.msg)
       router.push('/login')
     } else {
-      message.error(res.message)
+      message.error(rs.data.msg)
     }
     ldb.finish()
-  })
 }
 
 const rules = {
diff --git a/src/views/ResetPassword.vue b/src/views/ResetPassword.vue
index adb1611..ccfd759 100644
--- a/src/views/ResetPassword.vue
+++ b/src/views/ResetPassword.vue
@@ -16,12 +16,12 @@
             type="text"
             v-model:value="model.username"
             placeholder="用户名"
-            @keyup.enter="sendresetmail"
+            @keyup.enter="sendResetMail"
           />
         </n-form-item>
         <div style="display: flex; justify-content: flex-end">
           <n-space>
-            <n-button type="primary" @click="sendresetmail" style="margin-right: 10px">
+            <n-button type="primary" @click="sendResetMail" style="margin-right: 10px">
               发送邮件
             </n-button>
             <n-button ghost type="primary" @click="gologin"> 登录</n-button>
@@ -124,7 +124,7 @@ function doresetrequest() {
   })
 }
 
-function sendresetmail() {
+function sendResetMail() {
   if (status.value === 'sending') {
     message.warning('上一个请求正在处理！')
     return