From 2adbfd2aed024bf8fda3b85b3e7af07108329f85 Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: 星期一, 09 十二月 2024 14:01:43 +0800
Subject: [PATCH] 修改报销表

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

diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 201f2d2..9900234 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -2,6 +2,7 @@
 import { getToken, setToken, removeToken } from '@/utils/auth'
 import defAva from '@/assets/images/profile.jpg'
 import Cookies from "js-cookie";
+import {getUserById} from "@/api/sysUsers";
 const useUserStore = defineStore(
   'user',
   {
@@ -21,11 +22,10 @@
         const code = userInfo.code
         const uuid = userInfo.uuid
         const identity = userInfo.identity
-        return new Promise((resolve, reject) => {
-          login(username, password, code, uuid, identity).then(res => {
-            setToken(res.data.token)
-            Cookies.set('userInfo',JSON.stringify(res.data))
-            this.token = res.data.token
+        return new Promise( (resolve, reject) => {
+          login(username, password, code, uuid, identity).then( async res => {
+            setToken(res.token)
+            this.token = res.token
             resolve()
           }).catch(error => {
             reject(error)
@@ -38,7 +38,6 @@
           getInfo().then(res => {
             const user = res.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
@@ -48,6 +47,7 @@
             this.id = user.userId
             this.name = user.userName
             this.avatar = avatar
+            Cookies.set('userInfo',JSON.stringify(user))
             resolve(res)
           }).catch(error => {
             reject(error)

--
Gitblit v1.9.2