From 4991bc08e414f371c624151f671236fcfed0bf01 Mon Sep 17 00:00:00 2001
From: Mr Ke <kelq@hugeinfo.com.cn>
Date: Wed, 27 May 2020 14:41:24 +0800
Subject: [PATCH] 修改报错问题

---
 src/index.js |   41 ++++++++++++++++++++++-------------------
 1 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/src/index.js b/src/index.js
index aa04fd0..642bba7 100644
--- a/src/index.js
+++ b/src/index.js
@@ -33,7 +33,7 @@
     super(props);
     this.state = {
       context: {
-        role: 'oa',
+        role: '',
         roleMenuList: [],
         setContext: this.setContext,
       },
@@ -46,23 +46,26 @@
       ? JSON.parse(window.localStorage.getItem('menusListByRole'))
       : [];
 
-    let role = Object.keys(menusListByRole).reduce((p, n) => {
-      if (
-        menusListByRole[n].menus
-          .reduce((p, n) => {
-            if (n.children) {
-              return p.concat(n.children);
-            } else {
-              return p.concat(n);
-            }
-          }, [])
-          .find(({ path }) => path == pathname)
-      ) {
-        return p.concat(n);
-      } else {
-        return p;
-      }
-    }, []);
+    let role = Object.keys(menusListByRole)
+      .reduce((p, n) => {
+        if (
+          menusListByRole[n].menus
+            .reduce((p, n) => {
+              if (n.children) {
+                return p.concat(n.children);
+              } else {
+                return p.concat(n);
+              }
+            }, [])
+            .find(({ path }) => path == pathname)
+        ) {
+          return p.concat(n);
+        } else {
+          return p;
+        }
+      }, [])
+      .join('');
+    console.log('role', role);
 
     this.setState({
       context: {
@@ -106,9 +109,9 @@
                 </Switch>
                 <Layout>
                   <Content>
+                    <Route path="/login" component={()=>( <Login setContext={this.setContext}/>)} />
                     {context.role == 'oa' && <OaRouteDom />}
                     {context.role == 'user' && <UserRouteDom />}
-                    <Route path="/login" component={Login} />
                   </Content>
                 </Layout>
               </Layout>

--
Gitblit v1.8.0