Commit 14dd1dc2 authored by GuanHua's avatar GuanHua

feat:未登录状态进入能力中心报错问题

parent 8948c1f5
......@@ -141,7 +141,7 @@ const BasicLayout: React.FC<BasicLayoutProps> = (props) => {
)}
collapsed={collapsed}
onCollapse={handleMenuCollapse}
disableContentMargin={currentRouter.noMargin !== undefined}
disableContentMargin={currentRouter?.noMargin !== undefined}
breadcrumbRender={(routers = []) => [
]}
......
......@@ -5,8 +5,8 @@ import { getAuth, setAuth, setRouters } from '@/utils/auth';
import { PublicApi } from '@/services/api';
interface MemberRole {
memberRoleId: number;
memberRoleName: string;
memberRoleId: number;
memberRoleName: string;
};
const Roles: React.FC = () => {
......@@ -14,12 +14,12 @@ const Roles: React.FC = () => {
const [roles, setRoles] = useState<MemberRole[]>([]);
useEffect(() => {
const userInfo = getAuth();
setRoles(userInfo.roles || []);
const userInfo = getAuth() || {};
setRoles(userInfo.roles || []);
if (userInfo.roles && userInfo.roles.length) {
const current = userInfo.roles.find(item => item.memberRoleId === userInfo.memberRoleId);
setCurRole(current);
setCurRole(current);
}
}, []);
......@@ -30,19 +30,19 @@ const Roles: React.FC = () => {
}
const msg = message.loading({
content: '正在切换角色...',
duration: 0,
content: '正在切换角色...',
duration: 0,
});
PublicApi.postMemberLoginSwitchrole({
memberRoleId,
memberRoleId,
}).then(res => {
if (res.code !== 1000) {
return;
}
msg();
setAuth(res.data);
setRouters(res.data.urls);
setRouters(res.data.urls);
setTimeout(() => {
window.location.replace('/memberCenter/home');
}, 800);
......@@ -62,9 +62,9 @@ const Roles: React.FC = () => {
);
return (
<Dropdown
overlay={menuHeaderDropdown}
placement="bottomRight"
<Dropdown
overlay={menuHeaderDropdown}
placement="bottomRight"
>
<Space size={5} style={{ cursor: 'pointer', padding: '0 15px' }}>
{curRole?.memberRoleName}
......@@ -72,6 +72,6 @@ const Roles: React.FC = () => {
</Space>
</Dropdown>
)
};
};
export default Roles;
\ No newline at end of file
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