@@ -16,6 +16,7 @@ import GlobalComponent from '../init/GlobalComponent';
1616import styles from './index.less' ;
1717import { useUserStore , queryCurUser } from '@/store/user' ;
1818import AppTitleBar from '@/blocks/AppTitleBar' ;
19+ import OpenScreenAnimation from '@/components/OpenScreenAnimation' ;
1920
2021const GlobalLayout = ( ) => {
2122 const [ appTheme , setAppTheme ] = useTheme ( ) ;
@@ -62,14 +63,14 @@ const GlobalLayout = () => {
6263 } ;
6364
6465 // 等待状态页面
65- if ( serviceStatus === ServiceStatus . PENDING || curUser === null ) {
66- return (
67- < div className = { styles . app } >
68- < AppTitleBar className = { styles . appTitleBar } />
69- < Spin className = { styles . loadingBox } size = "large" /> ;
70- </ div >
71- ) ;
72- }
66+ // if (serviceStatus === ServiceStatus.PENDING || curUser === null) {
67+ // return (
68+ // <div className={styles.app}>
69+ // <AppTitleBar className={styles.appTitleBar} />
70+ // <OpenScreenAnimation />
71+ // </div>
72+ // );
73+ // }
7374
7475 // 错误状态页面
7576 if ( serviceStatus === ServiceStatus . FAILURE ) {
@@ -99,6 +100,7 @@ const GlobalLayout = () => {
99100 return (
100101 < ConfigProvider locale = { isEn ? antdEnUS : antdZhCN } theme = { antdTheme } >
101102 < div className = { styles . app } >
103+ { ( serviceStatus === ServiceStatus . PENDING || curUser === null ) && < OpenScreenAnimation /> }
102104 < AppTitleBar className = { styles . appTitleBar } />
103105 < div className = { styles . appBody } >
104106 < Outlet />
0 commit comments