diff --git a/electron/preload.js b/electron/preload.js index dbbc176..39bf1aa 100644 --- a/electron/preload.js +++ b/electron/preload.js @@ -1,5 +1,5 @@ const electron = require('electron'); -const { contextBridge } = electron; +const { contextBridge, ipcRenderer } = electron; // console.log(electron.ipcRenderer.on); diff --git a/src/app.ts b/src/app.ts index 737a7bb..cbde4d3 100644 --- a/src/app.ts +++ b/src/app.ts @@ -98,8 +98,8 @@ export const request: RequestConfig = { export async function getInitialState(): Promise<{ isLogin: boolean; - fetchUserInfo: () => Promise; - currentUser?: DATA.User; + fetchUserInfo: () => Promise; + currentUser?: DATA.User | null; }> { async function fetchUserInfo() { const res = await queryCurrent(); diff --git a/src/components/AppHeader/components/userCenter/UserCenter.tsx b/src/components/AppHeader/components/userCenter/UserCenter.tsx index 1ddff78..04cf6fa 100644 --- a/src/components/AppHeader/components/userCenter/UserCenter.tsx +++ b/src/components/AppHeader/components/userCenter/UserCenter.tsx @@ -46,13 +46,18 @@ export default function UserCenter(props: UserCenterProps) { } function PopContent(props) { - const { initialState: { currentUser } = {} } = useModel('@@initialState'); + const { + refresh, + initialState: { currentUser } = {}, + setInitialState, + } = useModel('@@initialState'); console.log(currentUser); const tryLogout = useCallback(() => { confirm({ onOk() { logout(); + refresh(); }, content: '确实退出登录?', }); diff --git a/src/pages/login/index.tsx b/src/pages/login/index.tsx index 11271f2..e476462 100644 --- a/src/pages/login/index.tsx +++ b/src/pages/login/index.tsx @@ -14,7 +14,7 @@ export default function Login() { const [account, setAccount] = useState(''); const [password, setPassword] = useState(''); const [loading, setLoading] = useState(false); - + const { refresh } = useModel('@@initialState'); // const { loading, signin } = useModel('useAuthModel'); const onLogin = useCallback(async () => { @@ -37,14 +37,9 @@ export default function Login() { // history.push('/'); // window.location.href = '/'; history.replace('/'); - window.location.reload(); + refresh(); + // window.location.reload(); }); - // if(!isReqSuccess(res)) { - // setErrText(res.msg); - // return; - // } - // Taro.switchTab({ url: '/pages/project/index' }); - // Taro.navigateTo({ url: '/pages/project/index' }); }, [account, password]); useEffect(() => { diff --git a/src/services/user.ts b/src/services/user.ts index 46f1ec3..ac3d2ab 100644 --- a/src/services/user.ts +++ b/src/services/user.ts @@ -9,10 +9,9 @@ export async function queryCurrent() { if (!accountId) { return errorReponse(''); } - const res = await fetchApi>( - 'user/queryUserByUserId', - { id: accountId }, - ); + const res = await fetchApi('user/queryUserByUserId', { + id: accountId, + }); return res; } @@ -64,5 +63,5 @@ export function logout() { storage.clear(); // window.location.href = '/login'; history.replace('/login'); - window.location.reload(); + // window.location.reload(); }