Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
jinfa-platform
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
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
黄庭坚
jinfa-platform
Commits
21428a45
Commit
21428a45
authored
Aug 16, 2021
by
Bill
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 修改首页bug
parent
17ffe033
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
7 deletions
+6
-7
AvatarDropdown.tsx
src/layouts/components/AvatarDropdown.tsx
+2
-2
index.tsx
src/pages/home/components/UserCenter/index.tsx
+3
-3
auth.ts
src/utils/auth.ts
+1
-2
No files found.
src/layouts/components/AvatarDropdown.tsx
View file @
21428a45
...
...
@@ -18,7 +18,7 @@ const AvatarDropdown = (props) => {
}
const
currentUser
=
{
name
:
getAuth
()?.
name
||
'未知用户'
,
name
:
getAuth
()?.
company
||
'未知用户'
,
avatar
:
props
.
UserStore
.
avatar
||
''
,
}
...
...
@@ -52,7 +52,7 @@ const AvatarDropdown = (props) => {
:
<
Icon
component=
{
()
=>
<
DefaultAvatar
className=
{
styles
.
logo
}
/>
}
/>
}
<
span
className=
{
styles
.
name
}
>
{
currentUser
.
name
}
</
span
>
<
span
className=
{
styles
.
name
}
>
{
currentUser
?
.
name
}
</
span
>
</
span
>
</
PersonDropdown
>
)
...
...
src/pages/home/components/UserCenter/index.tsx
View file @
21428a45
...
...
@@ -62,8 +62,8 @@ const UserCenter: React.FC<Iprops> = (props) => {
const
logo
=
info
.
file
.
response
.
data
const
{
code
}
=
await
PublicApi
.
postMemberMainpageLogoAdd
({
logo
:
logo
});
if
(
code
===
1000
)
{
dispatch
({
type
:
'done'
,
payload
:
{
url
:
logo
}})
props
.
UserStore
.
setUserAvatar
(
logo
)
dispatch
({
type
:
'done'
,
payload
:
{
url
:
logo
}})
;
(
props
as
any
)
.
UserStore
.
setUserAvatar
(
logo
)
}
}
}
...
...
@@ -75,7 +75,7 @@ const UserCenter: React.FC<Iprops> = (props) => {
<
div
className=
{
styles
.
header
}
>
<
div
className=
{
styles
.
infos
}
>
<
div
className=
{
styles
.
hi
}
>
{
`Hi, ${userAuth?.
name
}! 欢迎来到${GlobalConfig.global.siteInfo.name}`
}
{
`Hi, ${userAuth?.
company
}! 欢迎来到${GlobalConfig.global.siteInfo.name}`
}
</
div
>
<
div
className=
{
styles
.
date
}
>
{
today
.
format
(
'YYYY年MM月DD日'
)
}
星期
{
WEEKDAYS
[
today
.
day
()]
}
...
...
src/utils/auth.ts
View file @
21428a45
...
...
@@ -4,7 +4,7 @@ import { getTopDomainByHost } from '.'
import
{
getCookie
,
removeCookie
,
setCookie
}
from
'./cookie'
import
{
getUserCookie
,
setUserCookie
}
from
'./siteCookie'
export
interface
AuthInfo
{
export
interface
AuthInfo
extends
GetMemberLoginRegetResponse
{
urls
:
string
[]
userId
:
number
,
memberId
:
number
,
...
...
@@ -16,7 +16,6 @@ export interface AuthInfo {
creditPoint
:
number
,
memberRoleType
:
number
,
memberRoleId
:
number
,
roles
:
any
,
}
const
AUTH_KEY
=
'AUTH'
...
...
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