From 0c92fd00fae033a2aa04bb65b2d32bd2c8f9fd4a Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Wed, 04 Feb 2026 15:48:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/store/modules/user.js | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/applications/drone-command/src/store/modules/user.js b/applications/drone-command/src/store/modules/user.js
index 371e9e7..4dbd240 100644
--- a/applications/drone-command/src/store/modules/user.js
+++ b/applications/drone-command/src/store/modules/user.js
@@ -8,6 +8,7 @@
import { setStore, getStore } from '@/utils/store';
import { validatenull } from '@/utils/validate';
import { deepClone } from '@/utils/util';
+import defaultAva from '@/assets/images/defaultava.png'
import {
loginByUsername,
loginBySocial,
@@ -271,11 +272,10 @@
GetMenu({ commit, dispatch }, tenantId) {
const errLogOut = () => {
dispatch('LogOut').then(()=>{
- const env = import.meta.env.VITE_APP_ENV
- const adminUrl = import.meta.env.VITE_APP_DASHBOARD_URL
- env === 'development'
- ? window.location.href = "/drone-command/login"
- : window.location.replace(`${adminUrl}#/login`)
+ window.location.href = "/drone-command/login"
+ // env === 'development'
+ // ? window.location.href = "/drone-command/login"
+ // : window.location.replace(`${adminUrl}#/login`)
})
}
return new Promise(resolve => {
@@ -335,6 +335,9 @@
if (validatenull(userInfo.user_id) && validatenull(userInfo.account)) {
state.userInfo = { user_name: 'unauth', role_name: 'unauth' };
} else {
+ if (validatenull(userInfo.avatar)) {
+ userInfo.avatar = defaultAva;
+ }
state.userInfo = userInfo;
}
setStore({ name: 'userInfo', content: state.userInfo });
--
Gitblit v1.9.3