瀏覽代碼

fix: 登录的用户信息没有填充进initalState上

lanjianrong 3 年之前
父節點
當前提交
c19584379f
共有 2 個文件被更改,包括 10 次插入6 次删除
  1. 1 0
      package.json
  2. 9 6
      src/pages/user/Login/index.tsx

+ 1 - 0
package.json

@@ -7,6 +7,7 @@
     "analyze": "cross-env ANALYZE=1 umi build",
     "analyze": "cross-env ANALYZE=1 umi build",
     "build": "umi build",
     "build": "umi build",
     "deploy:qa": "cross-env REACT_APP_ENV=dev auto-deploy build -t qa",
     "deploy:qa": "cross-env REACT_APP_ENV=dev auto-deploy build -t qa",
+    "deploy:uat": "cross-env REACT_APP_ENV=dev auto-deploy build -t uat",
     "dev": "npm run start:dev",
     "dev": "npm run start:dev",
     "gh-pages": "gh-pages -d dist",
     "gh-pages": "gh-pages -d dist",
     "i18n-remove": "pro i18n-remove --locale=zh-CN --write",
     "i18n-remove": "pro i18n-remove --locale=zh-CN --write",

+ 9 - 6
src/pages/user/Login/index.tsx

@@ -1,5 +1,5 @@
 import { LockOutlined, UserOutlined } from '@ant-design/icons'
 import { LockOutlined, UserOutlined } from '@ant-design/icons'
-import { Alert, message, Tabs } from 'antd'
+import { Alert, message } from 'antd'
 import React, { useState } from 'react'
 import React, { useState } from 'react'
 import ProForm, { ProFormCheckbox, ProFormText } from '@ant-design/pro-form'
 import ProForm, { ProFormCheckbox, ProFormText } from '@ant-design/pro-form'
 import { useIntl, Link, history, FormattedMessage, SelectLang, useModel, useRequest } from 'umi'
 import { useIntl, Link, history, FormattedMessage, SelectLang, useModel, useRequest } from 'umi'
@@ -34,7 +34,7 @@ const goto = () => {
 const Login: React.FC = () => {
 const Login: React.FC = () => {
   // const { setAuthToken } = useModel('user')
   // const { setAuthToken } = useModel('user')
   const [userLoginState, setUserLoginState] = useState<API.LoginResult>({})
   const [userLoginState, setUserLoginState] = useState<API.LoginResult>({})
-  const [type, setType] = useState<string>('account')
+  const [type] = useState<string>('account')
   const { initialState, setInitialState } = useModel('@@initialState')
   const { initialState, setInitialState } = useModel('@@initialState')
 
 
   const { run, loading } = useRequest(queryCurrentUser, {
   const { run, loading } = useRequest(queryCurrentUser, {
@@ -42,7 +42,7 @@ const Login: React.FC = () => {
     onSuccess: async result => {
     onSuccess: async result => {
       setInitialState({
       setInitialState({
         ...initialState,
         ...initialState,
-        currentUser: result.currentAccount
+        currentUser: result.currentUser
       })
       })
       goto()
       goto()
     }
     }
@@ -150,7 +150,8 @@ const Login: React.FC = () => {
               }}
               }}
               onFinish={async values => {
               onFinish={async values => {
                 handleSubmit(values as API.LoginParams)
                 handleSubmit(values as API.LoginParams)
-              }}>
+              }}
+            >
               {/* <Tabs activeKey={type} onChange={setType}>
               {/* <Tabs activeKey={type} onChange={setType}>
                 <Tabs.TabPane
                 <Tabs.TabPane
                   key="account"
                   key="account"
@@ -215,14 +216,16 @@ const Login: React.FC = () => {
               <div
               <div
                 style={{
                 style={{
                   marginBottom: 24
                   marginBottom: 24
-                }}>
+                }}
+              >
                 <ProFormCheckbox noStyle name="autoLogin">
                 <ProFormCheckbox noStyle name="autoLogin">
                   <FormattedMessage id="pages.login.rememberMe" defaultMessage="自动登录" />
                   <FormattedMessage id="pages.login.rememberMe" defaultMessage="自动登录" />
                 </ProFormCheckbox>
                 </ProFormCheckbox>
                 <a
                 <a
                   style={{
                   style={{
                     float: 'right'
                     float: 'right'
-                  }}>
+                  }}
+                >
                   <FormattedMessage id="pages.login.forgotPassword" defaultMessage="忘记密码" />
                   <FormattedMessage id="pages.login.forgotPassword" defaultMessage="忘记密码" />
                 </a>
                 </a>
               </div>
               </div>