diff --git a/code/VideoAccess-VCMP/web/client/src/layout/containers/layout/index.jsx b/code/VideoAccess-VCMP/web/client/src/layout/containers/layout/index.jsx index 23f1ec7..934eb79 100644 --- a/code/VideoAccess-VCMP/web/client/src/layout/containers/layout/index.jsx +++ b/code/VideoAccess-VCMP/web/client/src/layout/containers/layout/index.jsx @@ -49,7 +49,9 @@ const LayoutContainer = props => { useEffect(() => { NProgress.done(); - if ((!user || !user.authorized) && !authCrossLoading) { + console.log(user, authCrossLoading, props); + if ((!user || !user.authorized) && !authCrossLoading && props.location.pathname != '/video_play_status') { + console.log(123123); history.push('/signin'); } if (msg) { diff --git a/code/VideoAccess-VCMP/web/client/src/layout/index.jsx b/code/VideoAccess-VCMP/web/client/src/layout/index.jsx index ced72fb..dfddebf 100644 --- a/code/VideoAccess-VCMP/web/client/src/layout/index.jsx +++ b/code/VideoAccess-VCMP/web/client/src/layout/index.jsx @@ -165,7 +165,7 @@ const Root = props => { await store.dispatch(actions.auth.logout()) } } - + console.log(data); setAuthCrossLoading(false) }); // setAuthCrossLoading(false) @@ -202,8 +202,14 @@ const Root = props => { } // setMicroAppWaiting(false) + if (props.location.pathname == '/video_play_status') { + setAuthCrossLoading(false) + setMicroAppWaiting(false) + } }, []) + console.log(authCrossLoading, microAppWaiting); + return ( <> {