From f7e9b835c30e5b3287b2c04e24950871cafa907d Mon Sep 17 00:00:00 2001
From: liyj <1003249715@qq.com>
Date: Mon, 07 Sep 2020 15:28:45 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/huge/frontEnd/hugeOA
---
src/index.js | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/index.js b/src/index.js
index 167584b..cbc45b2 100644
--- a/src/index.js
+++ b/src/index.js
@@ -19,9 +19,11 @@
import Header from './components/common/HeadView';
import Login from './module/login/login';
-// oa路由映射
+// 路由映射
import OaRouteDom from './routeDom/oaRouteDom';
import UserRouteDom from './routeDom/userRouteDom';
+import RouteDomView from './routeDom/routeDom';
+
import { oaMenus, userMenus } from './menu';
export const Context = React.createContext();
@@ -131,8 +133,9 @@
path="/login"
component={() => <Login setContext={this.setContext} />}
/>
- {context.role == 'oa' && <OaRouteDom />}
- {context.role == 'user' && <UserRouteDom />}
+ <RouteDomView />
+ {/* {context.role == 'oa' && <OaRouteDom />}
+ {context.role == 'user' && <UserRouteDom />} */}
</Switch>
</Content>
</Layout>
--
Gitblit v1.8.0