合并冲突

src/components/Layout/view.js

@@ -40,7 +40,7 @@ const Page = ({ children, userRoute = [], location }) => {
                 <Menu theme={theme} mode="inline" selectedKeys={index} >
                 <Menu theme={theme} mode="inline" selectedKeys={index} >
                     {userRoute.map(e => {
                     {userRoute.map(e => {
                         return (
                         return (
-                            <SubMenu key={e.name} icon={<img className="icon" src={APP.STATIS_URL + e.icon} alt="" />} title={e.name}>
+                            <SubMenu key={e.name} icon={<img className="icon" alt="图标" src={APP.STATIS_URL + e.icon} />} title={e.name}>
                                 {e.childMenus.map(child => <Item key={child.url} url={child.url} >{child.name}</Item>)}
                                 {e.childMenus.map(child => <Item key={child.url} url={child.url} >{child.name}</Item>)}
                             </SubMenu>
                             </SubMenu>
                         )
                         )

src/router/router-view.js

@@ -10,7 +10,7 @@ import { getAllRouter } from '../libs/utilts'
 /** 获取全部路由的路径 */
 /** 获取全部路由的路径 */
 const getAllRouterName = route => route.map(e => e.url)
 const getAllRouterName = route => route.map(e => e.url)
 
 
-const RouterView = ({basisRoute = [], serviceRoute = [], userRoute = [] }) => {
+const RouterView = ({basisRoute = [], serviceRoute = [], userRoute = [], userSatatus }) => {
     const [openRoute, setOpenRoute] = useState([])
     const [openRoute, setOpenRoute] = useState([])
 
 
     useEffect(() => {
     useEffect(() => {
@@ -47,6 +47,7 @@ const RouterView = ({basisRoute = [], serviceRoute = [], userRoute = [] }) => {
             <Layout>
             <Layout>
                 {basisRoute.map(e => <Route path={e.url} exact={e.exact} component={e.component} key={e.url} />)}
                 {basisRoute.map(e => <Route path={e.url} exact={e.exact} component={e.component} key={e.url} />)}
                 {openRoute.map(e => <Route path={e.url} exact={e.exact} component={e.component} key={e.url} />)}
                 {openRoute.map(e => <Route path={e.url} exact={e.exact} component={e.component} key={e.url} />)}
+                
             </Layout>
             </Layout>
         </Switch> 
         </Switch> 
     )
     )

src/store/modules/route/connect.js

@@ -2,6 +2,7 @@ import { connect } from 'react-redux'
 
 
 const mapState = state => ({
 const mapState = state => ({
     userRoute: state.route.route,
     userRoute: state.route.route,
+    userSatatus: state.user.userSatatus
 })
 })
 
 
 const mapDispatch = dispatch => ({
 const mapDispatch = dispatch => ({

src/store/modules/user/index.js

+export default {
+    state: {
+        userSatatus: false
+    },
+    reducers: {
+        loginSucess() {
+            
+        }
+    }
+}
\ No newline at end of file