diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue index fb014a2..e8f7252 100755 --- a/src/layout/components/Sidebar/index.vue +++ b/src/layout/components/Sidebar/index.vue @@ -1,20 +1,22 @@ @@ -52,3 +54,8 @@ export default { } } + diff --git a/src/layout/index.vue b/src/layout/index.vue index 965bcd1..40a1e2d 100755 --- a/src/layout/index.vue +++ b/src/layout/index.vue @@ -88,12 +88,15 @@ export default { top: 0; right: 0; z-index: 9; - width: calc(100% - #{$sideBarWidth}); + // width: calc(100% - #{$sideBarWidth}); + width: 100%; + margin-top: 54px; transition: width 0.28s; } .hideSidebar .fixed-header { - width: calc(100% - 54px) + // width: calc(100% - 54px) + width:100%; } .mobile .fixed-header { diff --git a/src/router/index.js b/src/router/index.js index 3c19154..9cf0642 100755 --- a/src/router/index.js +++ b/src/router/index.js @@ -206,20 +206,20 @@ export const asyncRoutes = [ // chartsRouter, // nestedRouter, // tableRouter, - { - path: '/icon', - component: Layout, - children: [{ - path: 'index', - component: () => import('@/views/icons/index'), - name: 'Icons', - meta: { - title: 'icons', - icon: 'icon', - noCache: true - } - }] - }, + // { + // path: '/icon', + // component: Layout, + // children: [{ + // path: 'index', + // component: () => import('@/views/icons/index'), + // name: 'Icons', + // meta: { + // title: 'icons', + // icon: 'icon', + // noCache: true + // } + // }] + // }, /** when your routing map is too long, you can split it into small modules **/ // { diff --git a/src/router/modules/user.js b/src/router/modules/user.js index e5fcedd..2554925 100644 --- a/src/router/modules/user.js +++ b/src/router/modules/user.js @@ -14,62 +14,17 @@ const chartsRouter = { roles: ['admin', 'assistant'] // you can set roles in root nav }, children: [{ - path: 'assistant', + path: '用户管理', component: () => import('@/views/users/list'), - name: 'assistant', + name: '用户管理', query: { test: 'ssssss' }, meta: { - title: 'users.assistant', + title: '用户管理', roles: ['admin'] // or you can only set roles in sub nav } - }, - { - path: 'runner', - component: () => import('@/views/users/list'), - name: 'runner', - query: { - test: 'ssssss' - }, - meta: { - title: 'users.runner', - roles: ['admin', 'assistant'] // or you can only set roles in sub nav - } - }, - { - path: 'shoper', - component: () => import('@/views/users/list'), - name: 'shoper', - query: { - test: 'ssssss' - }, - meta: { - title: 'users.shoper', - roles: ['admin', 'assistant'] // or you can only set roles in sub nav - } - }, - { - path: 'users', - component: () => import('@/views/users/list'), - name: 'users', - query: { - test: 'ssssss' - }, - meta: { - title: 'users.user', - roles: ['admin', 'assistant'] // or you can only set roles in sub nav - } } - // ,{ - // path: '/icons', - // component: () => import('@/views/icons/index'), - // name: 'icons', - // meta: { - // title: 'icons', - // roles: ['admin', 'assistant', 'shoper', 'runner'] // or you can only set roles in sub nav - // } - // } ] } diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss index 3dad4c3..c2cf1f9 100755 --- a/src/styles/sidebar.scss +++ b/src/styles/sidebar.scss @@ -3,15 +3,18 @@ .main-container { min-height: 100%; transition: margin-left .28s; - margin-left: $sideBarWidth; + // margin-left: $sideBarWidth; + margin-top: 54px; position: relative; } .sidebar-container { transition: width 0.28s; - width: $sideBarWidth !important; + // width: $sideBarWidth !important; + width: 100% !important; background-color: $menuBg; - height: 100%; + // height: 100%; + height: 54px; position: fixed; font-size: 0px; top: 0; diff --git a/src/views/operations/operations.vue b/src/views/operations/operations.vue index 10bde58..b7b9190 100644 --- a/src/views/operations/operations.vue +++ b/src/views/operations/operations.vue @@ -1,577 +1,25 @@