From 9c39dc7cd98be5b675310ac7af643964a7c86106 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期一, 05 二月 2024 19:20:16 +0800
Subject: [PATCH] token

---
 src/common/utils/request.ts   |    2 +-
 src/views/login/loginView.vue |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/common/utils/request.ts b/src/common/utils/request.ts
index 9c2a96b..4e350ed 100644
--- a/src/common/utils/request.ts
+++ b/src/common/utils/request.ts
@@ -16,7 +16,7 @@
   (config) => {
     // 鑻ユ槸鏈夊仛閴存潈token , 灏辩粰澶撮儴甯︿笂token
     const token = getToken()
-    if (token == null || token == '' || token == 'undefined') {
+    if ((token == null || token == '' || token == 'undefined') && config.url != '/api/base/login') {
       router.push('/login')
       return config
       // window.location = `//${window.location.hostname}:9080`+'/login'
diff --git a/src/views/login/loginView.vue b/src/views/login/loginView.vue
index 533d652..6ad0216 100644
--- a/src/views/login/loginView.vue
+++ b/src/views/login/loginView.vue
@@ -36,7 +36,7 @@
 import { ref, reactive, onMounted } from 'vue'
 import type { FormInstance, FormRules } from 'element-plus'
 import { getCaptcha, login } from '@/api'
-import { setToken } from '@/common/utils/index'
+import { setToken, getToken } from '@/common/utils/index'
 import { ElMessage } from 'element-plus'
 import { useRouter } from 'vue-router'
 
@@ -110,7 +110,7 @@
       }).then((rsp) => {
         if (rsp.code == 200) {
           console.log(rsp)
-          setToken(rsp.token)
+          setToken(rsp.data.token)
           ElMessage({
             message: '鐧诲綍鎴愬姛锛�',
             type: 'success'

--
Gitblit v1.8.0