Xiao_123 1 rok temu
rodzic
commit
4badbab722

+ 1 - 1
src/locales/en.js

@@ -5,7 +5,7 @@ export default {
     password: 'Password',
     login: 'Sign in',
     reLogin: 'Sign in again',
-    register: 'Register',
+    register: 'Sign in or Register',
     checkPassword: 'Confirm password',
     mobileNumber: 'Mobile Number',
     mobileNumberPlaceholder: 'Please Enter Mobile Number',

+ 1 - 1
src/locales/zh-CN.js

@@ -5,7 +5,7 @@ export default {
     password: '密码',
     login: '登录',
     reLogin: '重新登录',
-    register: '注册',
+    register: '登录/注册',
     checkPassword: '确认密码',
     mobileNumber: '手机号码',
     mobileNumberPlaceholder: '请输入手机号码',

+ 1 - 1
src/router/modules/remaining.js

@@ -9,7 +9,7 @@ const routeArray = [
 const items = routeArray[type]
 const remainingRouter = [
   {
-    path: '/',
+    path: '/login',
     component: () => import('@/views/login/index'),
     name: 'login',
     meta: {

+ 10 - 5
src/store/user.js

@@ -1,14 +1,13 @@
 import { defineStore } from 'pinia'
 import { reactive } from 'vue'
-import { setToken } from '@/utils/auth'
+import { setToken, deleteToken } from '@/utils/auth'
 import { smsLogin } from '@/api/common/index'
-import { useRouter } from 'vue-router'
 
 export const userLocaleStore = defineStore('user',
   () => {
     let userInfo = reactive({})
+    // 登录
     const handleLogin = async (data) => {
-      console.log(data, 'login-params')
       return new Promise((resolve, reject) => {
         smsLogin(data).then(res => {
           const { data } = res
@@ -16,14 +15,20 @@ export const userLocaleStore = defineStore('user',
           setToken(data.accessToken)
           userInfo = data
           localStorage.setItem('expiresTime', data.expiresTime) // token过期时间
-          useRouter().push('/home')
           resolve()
         }).catch(err => { reject(err) })
       })
     }
+    // 退出登录
+    const userLogout = () => {
+      deleteToken()
+      userInfo = {}
+      localStorage.removeItem('expiresTime')
+    }
     return {
       userInfo,
-      handleLogin
+      handleLogin,
+      userLogout
     }
   },
   {

+ 1 - 1
src/utils/request.js

@@ -56,7 +56,7 @@ service.interceptors.response.use(
     // if (res.code === 60902) {
     //   return Promise.reject(res)
     // }
-    if (res.code !== 20000) {
+    if (res.code !== 0) {
       if (res.data) {
         return Promise.reject(res)
       }

+ 3 - 1
src/views/login/index.vue

@@ -56,6 +56,8 @@ import { userLocaleStore } from '@/store/user'
 import { useRouter } from 'vue-router'
 defineOptions({ name: 'login-index' })
 
+const router = useRouter()
+
 const phone = ref()
 let isPhone = ref(false)
 const handlePhone = () => {
@@ -76,6 +78,7 @@ const handleLogin = async () => {
   loginLoading.value = true
   try {
     await userStore.handleLogin(phoneRef.value.loginData)
+    router.push({ path: '/home' })
   } catch (error) {
     console.log(error, 'error-login')
   } finally {
@@ -84,7 +87,6 @@ const handleLogin = async () => {
 }
 
 // 隐私、用户协议
-const router = useRouter()
 const handleToUserAgreement = () => {
   router.push({ path: '/userAgreement' })
 }