增加登录和登录后逻辑分离

src/router/router-view.js

@@ -19,7 +19,7 @@ import fullScreenRoute from './modules/fullScreenRoute'
 const getAllRouterName = route => route.map(e => e.url)
 const getAllRouterName = route => route.map(e => e.url)
 
 
 /** 路由视图 */
 /** 路由视图 */
-const RouterView = ({basisRoute = [], serviceRoute = [], userRoute = [], userSatatus, SYSTEM_LOGIN}) => {
+const RouterView = ({ basisRoute = [], serviceRoute = [], userRoute = [], userSatatus, SYSTEM_LOGIN }) => {
     const [openRoute, setOpenRoute] = useState([])
     const [openRoute, setOpenRoute] = useState([])
     const history = useHistory()
     const history = useHistory()
 
 
@@ -30,7 +30,7 @@ const RouterView = ({basisRoute = [], serviceRoute = [], userRoute = [], userSat
 
 
         const newRoutes = allRoute.map(e => {
         const newRoutes = allRoute.map(e => {
             const index = serviceRoute.findIndex(service => service.url === e.url)
             const index = serviceRoute.findIndex(service => service.url === e.url)
-            const newE = {...e}
+            const newE = { ...e }
 
 
             if (index !== -1)
             if (index !== -1)
                 newE.component = serviceRoute[index].component
                 newE.component = serviceRoute[index].component
@@ -72,9 +72,8 @@ const RouterView = ({basisRoute = [], serviceRoute = [], userRoute = [], userSat
             history.replace('/login')
             history.replace('/login')
     }, [])
     }, [])
 
 
+    if (userSatatus)
         return (
         return (
-        <>
-            {userSatatus ?
             <Layout>
             <Layout>
                 <Switch>
                 <Switch>
                     {basisRoute.map(e => <Route path={e.url} exact={e.exact} component={Guards(e.component)} key={e.url} />)}
                     {basisRoute.map(e => <Route path={e.url} exact={e.exact} component={Guards(e.component)} key={e.url} />)}
@@ -82,13 +81,13 @@ const RouterView = ({basisRoute = [], serviceRoute = [], userRoute = [], userSat
                     <Route component={error401} />
                     <Route component={error401} />
                 </Switch>
                 </Switch>
             </Layout>
             </Layout>
-            :
+        )
+    else
+        return (
             <Switch>
             <Switch>
                 {fullScreenRoute.map(e => <Route path={e.url} exact={e.exact} component={Guards(e.component)} key={e.url} />)}
                 {fullScreenRoute.map(e => <Route path={e.url} exact={e.exact} component={Guards(e.component)} key={e.url} />)}
                 <Route component={error404} />
                 <Route component={error404} />
             </Switch>
             </Switch>
-            }
-        </>
         )
         )
 }
 }