diff --git a/src/pages/Authorized.js b/src/pages/Authorized.js index 8b11d9234ec7198dbcab8b09de31b6734fa826f8..0b0d6b1b897db3c5905890a44b2731d781a7bca6 100644 --- a/src/pages/Authorized.js +++ b/src/pages/Authorized.js @@ -3,22 +3,35 @@ import RenderAuthorized from '@/components/Authorized'; import Exception from '@/components/Exception'; import { matchRoutes } from 'react-router-config'; import uniq from 'lodash/uniq'; +import { formatMessage } from 'umi/locale'; +import Link from 'umi/link'; const Authorized = RenderAuthorized(['admin', 'user']); -const noMatch = ; export default ({ children, route, location }) => { const routes = matchRoutes(route.routes, location.pathname); let authorities = []; routes.forEach(item => { - if (Array.isArray(item.authority)) { - authorities = authorities.concat(item.authority); - } else if (typeof item.authority === 'string') { - authorities.push(item.authority); + if (Array.isArray(item.route.authority)) { + authorities = authorities.concat(item.route.authority); + } else if (typeof item.route.authority === 'string') { + authorities.push(item.route.authority); } }); + const noMatch = ( + + ); return ( - + {children} );