Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
merchant-manage-ui
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ui
merchant-manage-ui
Commits
89d6ed42
Commit
89d6ed42
authored
May 24, 2023
by
武广
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 修复用户没有用户名展示问题
parent
6054511a
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
32 additions
and
0 deletions
+32
-0
login.js
src/models/login.js
+2
-0
user.js
src/models/user.js
+4
-0
LoginSms.jsx
src/pages/user/login/components/Login/LoginSms.jsx
+2
-0
sessionStorage.js
src/utils/sessionStorage.js
+24
-0
No files found.
src/models/login.js
View file @
89d6ed42
...
@@ -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
,
...
...
src/models/user.js
View file @
89d6ed42
// 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
({
...
...
src/pages/user/login/components/Login/LoginSms.jsx
View file @
89d6ed42
...
@@ -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
);
...
...
src/utils/sessionStorage.js
0 → 100644
View file @
89d6ed42
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
();
},
};
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment