|
|
@@ -190,6 +190,20 @@ const App = () => {
|
|
|
SoundHelp.loadAllAudioFile();
|
|
|
// preventTouchMove();
|
|
|
}
|
|
|
+ const checkOpenCheckin=()=>{
|
|
|
+ if (userID>0){
|
|
|
+ if (pathname==="/"){
|
|
|
+ if(hash==null||hash===""){
|
|
|
+ navigate(ROUTE_PATH.CHECK_IN);
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ const onCloseHallWheel=()=>{
|
|
|
+ checkOpenCheckin();
|
|
|
+ }
|
|
|
//初始化
|
|
|
useEffect(() => {
|
|
|
appInitData();
|
|
|
@@ -214,14 +228,7 @@ const App = () => {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- if (userID>0){
|
|
|
- if (pathname==="/"){
|
|
|
- if(hash==null||hash===""){
|
|
|
- navigate(ROUTE_PATH.CHECK_IN);
|
|
|
- return;
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
+ checkOpenCheckin();
|
|
|
},[turnplate]);
|
|
|
useEffect(()=>{
|
|
|
if (prevLocation){
|
|
|
@@ -239,7 +246,7 @@ const App = () => {
|
|
|
return (
|
|
|
<>
|
|
|
{
|
|
|
- fetchStatus===REQ_STATUS.IDLE?<Layout />:(<LoadingFull />)
|
|
|
+ fetchStatus===REQ_STATUS.IDLE?<Layout onCloseHallWheel={onCloseHallWheel} />:(<LoadingFull />)
|
|
|
}
|
|
|
</>
|
|
|
)
|