From f3ec4dd955193ce14f27df0ebc15c1a078b2f546 Mon Sep 17 00:00:00 2001 From: "Adam.Gong" Date: Sun, 10 May 2020 03:06:24 +0800 Subject: [PATCH] auto commit the code by alias command --- src/router/index.js | 34 +--- src/router/modules/prod.js | 11 +- src/views/order/complex-table.vue | 379 -------------------------------------- src/views/prod/complex-table.vue | 379 -------------------------------------- 4 files changed, 11 insertions(+), 792 deletions(-) delete mode 100755 src/views/order/complex-table.vue delete mode 100755 src/views/prod/complex-table.vue diff --git a/src/router/index.js b/src/router/index.js index 0b074fb..2a8419c 100755 --- a/src/router/index.js +++ b/src/router/index.js @@ -14,6 +14,7 @@ import Layout from '@/layout' import userRouter from './modules/user' import systemRouter from './modules/system' import prodRouter from './modules/prod' +import orderRouter from './modules/order' import metaRouter from './modules/meta' import sitesRouter from './modules/sites' @@ -186,38 +187,7 @@ export const asyncRoutes = [ metaRouter, userRouter, prodRouter, - { - path: '/orders', - component: Layout, - redirect: '/order/page', - alwaysShow: true, // will always show the root menu - name: 'Order', - meta: { - title: 'orders', - icon: 'shopping', - roles: ['admin', 'assistant', 'runner', 'shoper'] // you can set roles in root nav - }, - children: [{ - path: 'page', - component: () => import('@/views/permission/page'), - name: 'OrderList', - meta: { - title: 'OrderList', - roles: ['admin', 'assistant', 'runner', 'shoper'] // or you can only set roles in sub nav - } - }, - { - path: 'defined', - component: () => import('@/views/permission/directive'), - name: 'OrderDefiend', - meta: { - title: 'OrderDefiend', - roles: ['admin', 'assistant', 'runner', 'shoper'] - // if do not set roles, means: this page does not require permission - } - } - ] - }, + orderRouter, sitesRouter, // { diff --git a/src/router/modules/prod.js b/src/router/modules/prod.js index 180b5e2..c06f1e0 100644 --- a/src/router/modules/prod.js +++ b/src/router/modules/prod.js @@ -19,7 +19,7 @@ const prodRouter = { name: 'ProdList', meta: { title: 'ProdList', - roles: ['admin', 'assistant', 'runner', 'shoper'] // or you can only set roles in sub nav + roles: ['admin', 'assistant', 'runner', 'shoper'] } }, { @@ -29,7 +29,14 @@ const prodRouter = { meta: { title: 'ProdDefiend', roles: ['admin', 'assistant', 'shoper'] - // if do not set roles, means: this page does not require permission + } + }, { + path: 'defined2', + component: () => import('@/views/prod/list'), + name: 'prod...', + meta: { + title: '产品列表', + roles: ['admin', 'assistant', 'shoper'] } } ] diff --git a/src/views/order/complex-table.vue b/src/views/order/complex-table.vue deleted file mode 100755 index f073374..0000000 --- a/src/views/order/complex-table.vue +++ /dev/null @@ -1,379 +0,0 @@ - - - diff --git a/src/views/prod/complex-table.vue b/src/views/prod/complex-table.vue deleted file mode 100755 index f073374..0000000 --- a/src/views/prod/complex-table.vue +++ /dev/null @@ -1,379 +0,0 @@ - - - -- 2.0.0