1 changed files with 2 additions and 2 deletions
Unified View
Diff Options
+ 2
- 2
src/layout/MainLayout/Header/HeaderContent/Profile/index.js
View File
| @@ -107,7 +107,7 @@ const Profile = () => { | |||||
| > | > | ||||
| <Stack direction="row" alignItems="center" sx={{ p: 0.5 }}> | <Stack direction="row" alignItems="center" sx={{ p: 0.5 }}> | ||||
| <AccountCircleIcon style={{ color: 'black' }} alt="profile user" src={avatar1} sx={{ width: 32, height: 32 }} /> | <AccountCircleIcon style={{ color: 'black' }} alt="profile user" src={avatar1} sx={{ width: 32, height: 32 }} /> | ||||
| <Typography style={{ color: 'black',fontFamily: "微軟正黑體", fontSize: "1.2rem" }} variant="subtitle1">{userData == null ? "" : userData.fullenName}</Typography> | |||||
| <Typography style={{ color: 'black',fontFamily: "微軟正黑體", fontSize: "1.2rem" }} variant="subtitle1">{userData == null ? "" : (userData.fullenName?userData.fullenName: userData.fullchName)}</Typography> | |||||
| </Stack> | </Stack> | ||||
| </ButtonBase> | </ButtonBase> | ||||
| <Popper | <Popper | ||||
| @@ -150,7 +150,7 @@ const Profile = () => { | |||||
| <Stack direction="row" spacing={1.25} alignItems="center"> | <Stack direction="row" spacing={1.25} alignItems="center"> | ||||
| <AccountCircleIcon style={{ color: 'black' }} alt="profile user" src={avatar1} sx={{ width: 32, height: 32 }} /> | <AccountCircleIcon style={{ color: 'black' }} alt="profile user" src={avatar1} sx={{ width: 32, height: 32 }} /> | ||||
| <Stack> | <Stack> | ||||
| <Typography style={{ color: 'black',fontFamily: "微軟正黑體", fontSize: "1.2rem" }} variant="subtitle1">{userData == null ? "" : userData.fullenName}</Typography> | |||||
| <Typography style={{ color: 'black',fontFamily: "微軟正黑體", fontSize: "1.2rem" }} variant="subtitle1">{userData == null ? "" : (userData.fullenName?userData.fullenName: userData.fullchName)}</Typography> | |||||
| {/* <Typography variant="body2" color="textSecondary"> | {/* <Typography variant="body2" color="textSecondary"> | ||||
| {userData == null ? "" : userData.fullenName} | {userData == null ? "" : userData.fullenName} | ||||
| </Typography> */} | </Typography> */} | ||||