diff --git a/src/assets/css/components/common/sidebar.scss b/src/assets/css/components/common/sidebar.scss index 8f5117a..702af2a 100644 --- a/src/assets/css/components/common/sidebar.scss +++ b/src/assets/css/components/common/sidebar.scss @@ -186,14 +186,19 @@ justify-content: center; align-items: center; margin-left: 4px; - padding: 10px; width: 36px; height: 36px; font-size: constants.$SIZE_ICON_XS; border: 2px constants.$font-secondary-color solid; color: constants.$font-secondary-color; border-radius: 50%; + overflow: hidden; cursor: pointer; + + img { + width: 100%; + height: 100%; + } } .text { diff --git a/src/assets/css/pages/sign.scss b/src/assets/css/pages/sign.scss index 73aaa2b..73f0d1f 100644 --- a/src/assets/css/pages/sign.scss +++ b/src/assets/css/pages/sign.scss @@ -91,6 +91,13 @@ } } + .verify { + a { + color: constants.$production-color; + font-weight: bolder; + } + } + .sign-up, .sign-in, .forget { .footer { a { diff --git a/src/components/common/HideScrollbar.tsx b/src/components/common/HideScrollbar.tsx index d0ffcf9..6200598 100644 --- a/src/components/common/HideScrollbar.tsx +++ b/src/components/common/HideScrollbar.tsx @@ -433,6 +433,9 @@ const HideScrollbar = forwardRef((prop } useEffect(() => { + setTimeout(() => { + reloadScrollbar() + }, 500) const resizeObserver = new ResizeObserver(() => { reloadScrollbar() }) diff --git a/src/components/common/sidebar/SidebarFooter.tsx b/src/components/common/sidebar/SidebarFooter.tsx index 77e6aac..454e67d 100644 --- a/src/components/common/sidebar/SidebarFooter.tsx +++ b/src/components/common/sidebar/SidebarFooter.tsx @@ -1,8 +1,8 @@ -import React from 'react' +import React, { useState } from 'react' import Icon from '@ant-design/icons' import { COLOR_ERROR } from '@/constants/common.constants' import { getRedirectUrl } from '@/util/route' -import { getLoginStatus, getNickname, removeToken } from '@/util/auth' +import { getAvatar, getLoginStatus, getNickname, removeToken } from '@/util/auth' import { r_auth_logout } from '@/services/auth' const SidebarFooter: React.FC = () => { @@ -12,6 +12,7 @@ const SidebarFooter: React.FC = () => { const navigate = useNavigate() const [exiting, setExiting] = useState(false) const [nickname, setNickname] = useState('') + const [avatar, setAvatar] = useState('') const handleClickAvatar = () => { if (getLoginStatus()) { @@ -45,6 +46,10 @@ const SidebarFooter: React.FC = () => { if (getLoginStatus()) { void getNickname().then((nickname) => { setNickname(nickname) + + void getAvatar().then((avatar) => { + setAvatar(`data:image/png;base64,${avatar}`) + }) }) } }, [loginStatus]) @@ -56,7 +61,11 @@ const SidebarFooter: React.FC = () => { onClick={handleClickAvatar} title={getLoginStatus() ? '个人中心' : '登录'} > - + {avatar ? ( + {'Avatar'} + ) : ( + + )} -