|
|
@ -36,7 +36,7 @@ const Login: React.FC = () => {
|
|
|
|
const fetchUserInfo = async () => {
|
|
|
|
const fetchUserInfo = async () => {
|
|
|
|
const userInfo = await initialState?.fetchUserInfo?.();
|
|
|
|
const userInfo = await initialState?.fetchUserInfo?.();
|
|
|
|
if (userInfo) {
|
|
|
|
if (userInfo) {
|
|
|
|
await setInitialState((s) => ({
|
|
|
|
await setInitialState((s: any) => ({
|
|
|
|
...s,
|
|
|
|
...s,
|
|
|
|
currentUser: userInfo,
|
|
|
|
currentUser: userInfo,
|
|
|
|
}));
|
|
|
|
}));
|
|
|
@ -97,17 +97,11 @@ const Login: React.FC = () => {
|
|
|
|
<Tabs activeKey={type} onChange={setType}>
|
|
|
|
<Tabs activeKey={type} onChange={setType}>
|
|
|
|
<Tabs.TabPane
|
|
|
|
<Tabs.TabPane
|
|
|
|
key="account"
|
|
|
|
key="account"
|
|
|
|
tab={intl.formatMessage({
|
|
|
|
tab='账户密码登录'
|
|
|
|
id: 'pages.login.accountLogin.tab',
|
|
|
|
|
|
|
|
defaultMessage: '账户密码登录',
|
|
|
|
|
|
|
|
})}
|
|
|
|
|
|
|
|
/>
|
|
|
|
/>
|
|
|
|
<Tabs.TabPane
|
|
|
|
<Tabs.TabPane
|
|
|
|
key="mobile"
|
|
|
|
key="mobile"
|
|
|
|
tab={intl.formatMessage({
|
|
|
|
tab='手机号登录'
|
|
|
|
id: 'pages.login.phoneLogin.tab',
|
|
|
|
|
|
|
|
defaultMessage: '手机号登录',
|
|
|
|
|
|
|
|
})}
|
|
|
|
|
|
|
|
/>
|
|
|
|
/>
|
|
|
|
</Tabs>
|
|
|
|
</Tabs>
|
|
|
|
|
|
|
|
|
|
|
|