From 391eec3114a17e68652434c6eae610799d80290e Mon Sep 17 00:00:00 2001
From: ludc <ludc@vci-tech.com>
Date: 星期四, 16 一月 2025 11:13:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/store/modules/user.js | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/store/modules/user.js b/Source/plt-web/plt-web-ui/src/store/modules/user.js
index fc95d95..5f3aab8 100644
--- a/Source/plt-web/plt-web-ui/src/store/modules/user.js
+++ b/Source/plt-web/plt-web-ui/src/store/modules/user.js
@@ -4,7 +4,7 @@
import {isURL, validatenull} from '@/util/validate'
import {deepClone, queryStringToObject} from '@/util/util'
import website from '@/config/website'
-import {loginByUsername, loginBySocial, loginBySso, getUserInfo, logout, refreshToken, getButtons} from '@/api/user'
+import {loginByUsername, loginBySocial, loginBySso, getUserInfo, logout, refreshToken, getButtons,getUserPhoto} from '@/api/user'
import {getTopMenu, getRoutes} from '@/api/system/menu'
import md5 from 'js-md5'
import func from "@/util/func";
@@ -286,12 +286,27 @@
state.tenantId = tenantId;
setStore({name: 'tenantId', content: state.tenantId})
},
+ // SET_USER_INFO: (state, userInfo) => {
+ // getUserPhoto().then(res => {
+ // userInfo.avatar = URL.createObjectURL(res.data);
+ // console.log('userInfo',userInfo)
+ // })
+ // state.userInfo = userInfo;
+ // setStore({name: 'userInfo', content: state.userInfo})
+ // },
SET_USER_INFO: (state, userInfo) => {
- if (validatenull(userInfo.avatar)) {
- userInfo.avatar = "/img/bg/img-logo.png";
- }
- state.userInfo = userInfo;
- setStore({name: 'userInfo', content: state.userInfo})
+ getUserPhoto().then(res => {
+ // 灏� Blob 杞崲涓� Base64
+ const reader = new FileReader();
+ reader.onloadend = (result) => {
+ userInfo.avatar = reader.result; // 瀛樺偍 Base64 瀛楃涓�
+
+ // 鏇存柊鐘舵�佸苟瀛樺偍鍒� localStorage
+ state.userInfo = userInfo;
+ setStore({ name: 'userInfo', content: state.userInfo });
+ };
+ reader.readAsDataURL(res.data); // 璋冪敤reader鏂规硶
+ });
},
SET_ROLES: (state, roles) => {
state.roles = roles;
--
Gitblit v1.9.3