From 94c2019c34d741ff6d287ed8e145de4ba987d52b Mon Sep 17 00:00:00 2001
From: Jason <chenjxlg@163.com>
Date: Thu, 23 Sep 2021 09:25:32 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=80=BB=E8=BE=91=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/auth.ts   | 14 ++++++++++++
 src/utils/filters.ts        | 44 -------------------------------------
 src/views/Auth/login.vue    |  6 +----
 src/views/Auth/register.vue | 23 +++++++++++--------
 4 files changed, 29 insertions(+), 58 deletions(-)
 delete mode 100644 src/utils/filters.ts

diff --git a/src/store/modules/auth.ts b/src/store/modules/auth.ts
index 8fb6725..28f74e6 100644
--- a/src/store/modules/auth.ts
+++ b/src/store/modules/auth.ts
@@ -26,6 +26,20 @@ export default {
                 })
             })
         },
+        Register: ({ commit }, payload: AuthData) => {
+            return new Promise((resolve, reject) => {
+                auth.register(payload).then(response => {
+                    commit('setAccessToken', response, { root: true })
+                    commit('refresh/setUser', true, { root: true })
+                    user.info().then(info => {
+                        commit('setUserInfo', info, { root: true })
+                    })
+                    resolve(response)
+                }).catch(error => {
+                    reject(error)
+                })
+            })
+        },
         Logout: ({ commit }) => {
             return new Promise((resolve, reject) => {
                 auth.logout().then(() => {
diff --git a/src/utils/filters.ts b/src/utils/filters.ts
deleted file mode 100644
index 68dd029..0000000
--- a/src/utils/filters.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * 秒，转化为时间格式 100 => 01:40
- * @param time
- */
-const numberToTime = (time: number) => {
-    let timeStr = ''
-    const stringFormat = (i: number) => {
-        return i < 10 ? `0${i}` : `${i}`
-    }
-    let minuteTime = 0
-    let secondTime = 0
-    let hourTime = 0
-    if (time < 60) {
-        timeStr = `00:${stringFormat(time)}`
-    } else if (time >= 60 && time < 3600) {
-        minuteTime = Math.ceil(time / 60)
-        secondTime = time % 60
-        timeStr = `${stringFormat(minuteTime)}:${stringFormat(secondTime)}`
-    } else if (time >= 3600) {
-        const _t = time % 3600
-        hourTime = Math.ceil(time / 3600)
-        minuteTime = Math.ceil(_t / 60)
-        secondTime = _t % 60
-        timeStr = `${stringFormat(hourTime)}:${stringFormat(minuteTime)}:${stringFormat(secondTime)}`
-    }
-    return timeStr
-}
-
-/**
- * 隐藏手机号中间位数
- * @param str   要修改的字符串
- * @param start 开始位置隐藏几位
- * @param end   末端隐藏位数
- */
-const hideMiddle = (str: string, start?: number, end?: number) => {
-    start = start || 3
-    end = end || 4
-    return str.substr(0, start) + '***' + str.substr(-end)
-}
-
-export {
-    numberToTime,
-    hideMiddle
-}
diff --git a/src/views/Auth/login.vue b/src/views/Auth/login.vue
index 6ae0df5..c6e3f89 100644
--- a/src/views/Auth/login.vue
+++ b/src/views/Auth/login.vue
@@ -13,11 +13,7 @@ const store = useStore()
 
 const onLogin = () => {
   store.dispatch('auth/Login', { username: '15555555555', password: '123123' }).then(() => {
-    if (route.query.to) {
-      router.replace({ path: route.query.to })
-    } else {
-      router.replace({ name: 'Home' })
-    }
+    route.query.to ? router.replace({ path: route.query.to as string }) : router.replace({ name: 'Home' })
   }).catch(err => {
     alert(err.message)
   })
diff --git a/src/views/Auth/register.vue b/src/views/Auth/register.vue
index f6c592f..f3d71fd 100644
--- a/src/views/Auth/register.vue
+++ b/src/views/Auth/register.vue
@@ -7,20 +7,25 @@
 </template>
 
 <script lang="ts" setup>
-import { auth } from '@/api'
-import { INVITE_CODE } from '@/store'
+import { INVITE_CODE, useStore } from '@/store'
+import type { AuthData } from '@/types/auth'
+import { ref } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
 
+const store = useStore()
+const route = useRoute()
+const router = useRouter()
 const invite = localStorage.getItem(INVITE_CODE)
+const loading = ref<boolean>(false)
 
-const onRegister = () => {
-  auth.register({
-    username: '15512341112',
-    password: '111111',
-    invite: invite
-  }).then(res => {
-    console.log(res)
+const onRegister = (e: AuthData) => {
+  loading.value = true
+  store.dispatch('auth/Register', e).then(() => {
+    route.query.to ? router.replace({ path: route.query.to as string }) : router.replace({ name: 'Home' })
   }).catch(err => {
     alert(err.message)
+  }).finally(() => {
+    loading.value = false
   })
 }
 </script>