Merge remote-tracking branch 'origin/master'

孔祥富

2021-03-18 2402f7902663a20fe1b66f4305abb5ba05d7016f

 src/router/index.js

@@ -59,6 +59,20 @@
    ]
  },
  {
    path: '/dictItem',
    component: Layout,
    redirect: '/dictItem/Index',
    hidden: true,
    children: [
      {
        path: 'Index/:dicId(\\d+)',
        component: (resolve) => require(['@/views/dictItem/Index'], resolve),
        name: 'Data',
        meta: { title: '字典数据', icon: '' }
      }
    ]
  },
  {
    path: '/error',
    component: Layout,
    redirect: 'noRedirect',
@@ -101,6 +115,7 @@
        if (!userRouter) {
          request.get(`system/menu/${user.username}`).then((res) => {
            const permissions = res.data.data.permissions
            save('PERMISSIONS', permissions)
            store.commit('account/setPermissions', permissions)
            asyncRouter = res.data.data.routes
            store.commit('account/setRoutes', asyncRouter)