Commit 89d6ed42 authored by 武广's avatar 武广

fix: 修复用户没有用户名展示问题

parent 6054511a
...@@ -5,6 +5,7 @@ import { fakeAccountLogin, getFakeCaptcha } from '@/services/login'; ...@@ -5,6 +5,7 @@ import { fakeAccountLogin, getFakeCaptcha } from '@/services/login';
import { setAuthority } from '@/utils/authority'; import { setAuthority } from '@/utils/authority';
import { getPageQuery } from '@/utils/utils'; import { getPageQuery } from '@/utils/utils';
import localStorage from '@/utils/localStorage'; import localStorage from '@/utils/localStorage';
import sessionStorage from '@/utils/sessionStorage';
const Model = { const Model = {
namespace: 'login', namespace: 'login',
...@@ -18,6 +19,7 @@ const Model = { ...@@ -18,6 +19,7 @@ const Model = {
localStorage.set('token', response.data.accessToken); localStorage.set('token', response.data.accessToken);
localStorage.set('refreshtoken', response.data.refreshToken); localStorage.set('refreshtoken', response.data.refreshToken);
localStorage.set('atExpire', response.data.atExpire); localStorage.set('atExpire', response.data.atExpire);
payload.username && sessionStorage.set('account', payload.username);
yield put({ yield put({
type: 'changeLoginStatus', type: 'changeLoginStatus',
payload: response, payload: response,
......
// queryUsers // queryUsers
import { queryCurrent, homeInfo } from '@/services/user'; import { queryCurrent, homeInfo } from '@/services/user';
import localStorage from '@/utils/localStorage'; import localStorage from '@/utils/localStorage';
import sessionStorage from '@/utils/sessionStorage';
const UserModel = { const UserModel = {
namespace: 'user', namespace: 'user',
...@@ -20,6 +21,9 @@ const UserModel = { ...@@ -20,6 +21,9 @@ const UserModel = {
*fetchCurrent(_, { call, put }) { *fetchCurrent(_, { call, put }) {
const response = yield call(queryCurrent); const response = yield call(queryCurrent);
if (response.code === 2000) { if (response.code === 2000) {
if (response.data && !response.data.name) {
response.data.name = sessionStorage.get('account');
}
localStorage.set('user', JSON.stringify(response.data)); localStorage.set('user', JSON.stringify(response.data));
} }
yield put({ yield put({
......
...@@ -4,6 +4,7 @@ import { history } from 'umi'; ...@@ -4,6 +4,7 @@ import { history } from 'umi';
import { apiSMSCaptcha, fakeAccountLogin } from '@/services/login'; import { apiSMSCaptcha, fakeAccountLogin } from '@/services/login';
import { getDefaultRule, validatePhone } from '@/utils/validator'; import { getDefaultRule, validatePhone } from '@/utils/validator';
import localStorage from '@/utils/localStorage'; import localStorage from '@/utils/localStorage';
import sessionStorage from '@/utils/sessionStorage';
import styles from '../../style.less'; import styles from '../../style.less';
const FormItem = Form.Item; const FormItem = Form.Item;
...@@ -24,6 +25,7 @@ const LoginSMS = props => { ...@@ -24,6 +25,7 @@ const LoginSMS = props => {
localStorage.set('token', res.data.accessToken); localStorage.set('token', res.data.accessToken);
localStorage.set('refreshtoken', res.data.refreshToken); localStorage.set('refreshtoken', res.data.refreshToken);
localStorage.set('atExpire', res.data.atExpire); localStorage.set('atExpire', res.data.atExpire);
phone && sessionStorage.set('account', phone);
history.replace('/'); history.replace('/');
} else { } else {
message.error(res.msg); message.error(res.msg);
......
export default {
get(key) {
let result = sessionStorage.getItem(key);
try {
result = JSON.parse(result);
} catch {
console.log(); // eslint-disable-line no-console
}
return result;
},
set(key, value) {
const { toString } = Object.prototype;
if (toString.call(value) === '[object Array]' || toString.call(value) === '[object Object]') {
value = JSON.stringify(value); // eslint-disable-line no-param-reassign
}
return sessionStorage.setItem(key, value);
},
remove(key) {
return sessionStorage.removeItem(key);
},
clear() {
return sessionStorage.clear();
},
};
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment