From 398794afbbe0696e763aa002313dcf4c3b82420c Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: Tue, 30 Jun 2026 08:35:44 +0800
Subject: [PATCH] 中科大支线—用户导入

---
 src/store/modules/user.js |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 7fdf5a5..af5ac68 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -23,9 +23,8 @@
         const password = userInfo.password
         const code = userInfo.code
         const uuid = userInfo.uuid
-        const identity = userInfo.identity
         return new Promise( (resolve, reject) => {
-          login(username, password, code, uuid, identity).then( async res => {
+          login(username, password, code, uuid).then( async res => {
             setToken(res.data.token)
             if(res.data && res.data.id){
               const info = await getUserById(res.data.id);
@@ -42,6 +41,8 @@
                 if(con.code === 200){
                   Cookies.set('configInfo',JSON.stringify(con.data))
                 }
+              }else {
+                Cookies.set('configInfo',null)
               }
             }
             this.token = res.data.token
@@ -55,12 +56,14 @@
       getInfo() {
         return new Promise((resolve, reject) => {
           getInfo().then(res => {
-            const user = res.user
+
+            const user = res.data.user
+
             const avatar = (user.avatar == "" || user.avatar == null) ? defAva : import.meta.env.VITE_APP_BASE_API + user.avatar;
 
-            if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
-              this.roles = res.roles
-              this.permissions = res.permissions
+            if (res.data.roles && res.data.roles.length > 0) { // 验证返回的roles是否是一个非空数组
+              this.roles = res.data.roles
+              this.permissions = res.data.permissions
             } else {
               this.roles = ['ROLE_DEFAULT']
             }

--
Gitblit v1.9.2