From 59094e384c828d08e01555bc78ce59e0e87b4afa Mon Sep 17 00:00:00 2001 From: toesbieya <1647775459@qq.com> Date: Sun, 9 Aug 2020 12:01:53 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B7=AF=E7=94=B1=E9=A1=B5=E9=9D=A2=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E4=BB=A5Page=E4=B8=BA=E5=90=8E=E7=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vue/src/router/authority/module/message.js | 4 ++-- vue/src/router/authority/module/purchase.js | 8 ++++---- vue/src/router/authority/module/sell.js | 8 ++++---- vue/src/router/authority/module/stock.js | 2 +- vue/src/router/authority/module/system.js | 12 +++++------ vue/src/router/constant/module/app.js | 4 ++-- vue/src/router/constant/module/example.js | 20 +++++++++---------- vue/src/store/module/resource.js | 14 ++++++------- ...ctorExample.vue => regionSelectorPage.vue} | 0 .../{rippleExample.vue => ripplePage.vue} | 0 ...signatureExample.vue => signaturePage.vue} | 0 .../{skeletonExample.vue => skeletonPage.vue} | 0 ...eeSelectExample.vue => treeSelectPage.vue} | 0 .../{uploadExample.vue => uploadPage.vue} | 0 .../example/cool/{fluid.vue => fluidPage.vue} | 0 .../example/cool/{l2d.vue => l2dPage.vue} | 0 .../{index.vue => indexPage.vue} | 0 .../example/icon/{index.vue => indexPage.vue} | 0 .../view/index/{index.vue => indexPage.vue} | 0 .../manage/{index.vue => indexPage.vue} | 0 .../message/user/{index.vue => indexPage.vue} | 0 .../inbound/{detail.vue => detailPage.vue} | 0 .../inbound/{index.vue => indexPage.vue} | 0 .../order/{detail.vue => detailPage.vue} | 0 .../order/{index.vue => indexPage.vue} | 0 .../sell/order/{detail.vue => detailPage.vue} | 0 .../sell/order/{index.vue => indexPage.vue} | 0 .../outbound/{detail.vue => detailPage.vue} | 0 .../outbound/{index.vue => indexPage.vue} | 0 .../current/{index.vue => indexPage.vue} | 0 .../category/{index.vue => indexPage.vue} | 0 .../customer/{index.vue => indexPage.vue} | 0 .../department/{index.vue => indexPage.vue} | 0 .../system/role/{index.vue => indexPage.vue} | 0 .../supplier/{index.vue => indexPage.vue} | 0 .../system/user/{index.vue => indexPage.vue} | 0 .../userCenter/{index.vue => indexPage.vue} | 0 37 files changed, 35 insertions(+), 37 deletions(-) rename vue/src/view/example/component/{regionSelectorExample.vue => regionSelectorPage.vue} (100%) rename vue/src/view/example/component/{rippleExample.vue => ripplePage.vue} (100%) rename vue/src/view/example/component/{signatureExample.vue => signaturePage.vue} (100%) rename vue/src/view/example/component/{skeletonExample.vue => skeletonPage.vue} (100%) rename vue/src/view/example/component/{treeSelectExample.vue => treeSelectPage.vue} (100%) rename vue/src/view/example/component/{uploadExample.vue => uploadPage.vue} (100%) rename vue/src/view/example/cool/{fluid.vue => fluidPage.vue} (100%) rename vue/src/view/example/cool/{l2d.vue => l2dPage.vue} (100%) rename vue/src/view/example/developingTest/{index.vue => indexPage.vue} (100%) rename vue/src/view/example/icon/{index.vue => indexPage.vue} (100%) rename vue/src/view/index/{index.vue => indexPage.vue} (100%) rename vue/src/view/message/manage/{index.vue => indexPage.vue} (100%) rename vue/src/view/message/user/{index.vue => indexPage.vue} (100%) rename vue/src/view/purchase/inbound/{detail.vue => detailPage.vue} (100%) rename vue/src/view/purchase/inbound/{index.vue => indexPage.vue} (100%) rename vue/src/view/purchase/order/{detail.vue => detailPage.vue} (100%) rename vue/src/view/purchase/order/{index.vue => indexPage.vue} (100%) rename vue/src/view/sell/order/{detail.vue => detailPage.vue} (100%) rename vue/src/view/sell/order/{index.vue => indexPage.vue} (100%) rename vue/src/view/sell/outbound/{detail.vue => detailPage.vue} (100%) rename vue/src/view/sell/outbound/{index.vue => indexPage.vue} (100%) rename vue/src/view/stock/current/{index.vue => indexPage.vue} (100%) rename vue/src/view/system/category/{index.vue => indexPage.vue} (100%) rename vue/src/view/system/customer/{index.vue => indexPage.vue} (100%) rename vue/src/view/system/department/{index.vue => indexPage.vue} (100%) rename vue/src/view/system/role/{index.vue => indexPage.vue} (100%) rename vue/src/view/system/supplier/{index.vue => indexPage.vue} (100%) rename vue/src/view/system/user/{index.vue => indexPage.vue} (100%) rename vue/src/view/userCenter/{index.vue => indexPage.vue} (100%) diff --git a/vue/src/router/authority/module/message.js b/vue/src/router/authority/module/message.js index 155bdac..2955408 100644 --- a/vue/src/router/authority/module/message.js +++ b/vue/src/router/authority/module/message.js @@ -10,13 +10,13 @@ const router = { { path: 'manage', name: 'messageManagement', - component: lazyLoadView(import('@/view/message/manage')), + component: lazyLoadView(import('@/view/message/manage/indexPage')), meta: {title: '消息管理'} }, { path: 'user', name: 'userMessage', - component: lazyLoadView(import('@/view/message/user')), + component: lazyLoadView(import('@/view/message/user/indexPage')), meta: {title: '个人消息', noAuth: true, noCache: true} } ] diff --git a/vue/src/router/authority/module/purchase.js b/vue/src/router/authority/module/purchase.js index 72aa096..1a021aa 100644 --- a/vue/src/router/authority/module/purchase.js +++ b/vue/src/router/authority/module/purchase.js @@ -10,13 +10,13 @@ const router = { { path: 'order', name: 'purchaseOrder', - component: lazyLoadView(import('@/view/purchase/order')), + component: lazyLoadView(import('@/view/purchase/order/indexPage')), meta: {title: '采购订单'} }, { path: 'order/detail/:type(see|add|edit)/:id?', props: true, - component: lazyLoadView(import('@/view/purchase/order/detail')), + component: lazyLoadView(import('@/view/purchase/order/detailPage')), meta: { dynamicTitle(to) { const {type, id} = to.params @@ -37,13 +37,13 @@ const router = { { path: 'inbound', name: 'purchaseInbound', - component: lazyLoadView(import('@/view/purchase/inbound')), + component: lazyLoadView(import('@/view/purchase/inbound/indexPage')), meta: {title: '采购入库'} }, { path: 'inbound/detail/:type(see|add|edit)/:id?', props: true, - component: lazyLoadView(import('@/view/purchase/inbound/detail')), + component: lazyLoadView(import('@/view/purchase/inbound/detailPage')), meta: { dynamicTitle(to) { const {type, id} = to.params diff --git a/vue/src/router/authority/module/sell.js b/vue/src/router/authority/module/sell.js index 157034c..6541a71 100644 --- a/vue/src/router/authority/module/sell.js +++ b/vue/src/router/authority/module/sell.js @@ -10,13 +10,13 @@ const router = { { path: 'order', name: 'sellOrder', - component: lazyLoadView(import('@/view/sell/order')), + component: lazyLoadView(import('@/view/sell/order/indexPage')), meta: {title: '销售订单'} }, { path: 'order/detail/:type(see|add|edit)/:id?', props: true, - component: lazyLoadView(import('@/view/sell/order/detail')), + component: lazyLoadView(import('@/view/sell/order/detailPage')), meta: { dynamicTitle(to) { const {type, id} = to.params @@ -37,13 +37,13 @@ const router = { { path: 'outbound', name: 'sellOutbound', - component: lazyLoadView(import('@/view/sell/outbound')), + component: lazyLoadView(import('@/view/sell/outbound/indexPage')), meta: {title: '销售出库'} }, { path: 'outbound/detail/:type(see|add|edit)/:id?', props: true, - component: lazyLoadView(import('@/view/sell/outbound/detail')), + component: lazyLoadView(import('@/view/sell/outbound/detailPage')), meta: { dynamicTitle(to) { const {type, id} = to.params diff --git a/vue/src/router/authority/module/stock.js b/vue/src/router/authority/module/stock.js index a820e71..308afb5 100644 --- a/vue/src/router/authority/module/stock.js +++ b/vue/src/router/authority/module/stock.js @@ -10,7 +10,7 @@ const router = { { path: 'current', name: 'currentStock', - component: lazyLoadView(import('@/view/stock/current')), + component: lazyLoadView(import('@/view/stock/current/indexPage')), meta: {title: '当前库存'} } ] diff --git a/vue/src/router/authority/module/system.js b/vue/src/router/authority/module/system.js index 3a109f7..70b1ce1 100644 --- a/vue/src/router/authority/module/system.js +++ b/vue/src/router/authority/module/system.js @@ -10,37 +10,37 @@ const router = { { path: 'department', name: 'departmentManagement', - component: lazyLoadView(import('@/view/system/department')), + component: lazyLoadView(import('@/view/system/department/indexPage')), meta: {title: '部门管理'} }, { path: 'role', name: 'roleManagement', - component: lazyLoadView(import('@/view/system/role')), + component: lazyLoadView(import('@/view/system/role/indexPage')), meta: {title: '角色管理'} }, { path: 'user', name: 'userManagement', - component: lazyLoadView(import('@/view/system/user')), + component: lazyLoadView(import('@/view/system/user/indexPage')), meta: {title: '用户管理'} }, { path: 'category', name: 'categorySetting', - component: lazyLoadView(import('@/view/system/category')), + component: lazyLoadView(import('@/view/system/category/indexPage')), meta: {title: '商品分类'} }, { path: 'customer', name: 'customerManagement', - component: lazyLoadView(import('@/view/system/customer')), + component: lazyLoadView(import('@/view/system/customer/indexPage')), meta: {title: '客户管理'} }, { path: 'supplier', name: 'supplierManagement', - component: lazyLoadView(import('@/view/system/supplier')), + component: lazyLoadView(import('@/view/system/supplier/indexPage')), meta: {title: '供应商管理'} } ] diff --git a/vue/src/router/constant/module/app.js b/vue/src/router/constant/module/app.js index deab45a..b415524 100644 --- a/vue/src/router/constant/module/app.js +++ b/vue/src/router/constant/module/app.js @@ -14,14 +14,14 @@ const router = [ children: [ { path: 'index', - component: lazyLoadView(import('@/view/index')), + component: lazyLoadView(import('@/view/index/indexPage')), name: 'index', meta: {title: '首页', affix: true, icon: 'home', sort: 0} }, { path: 'user', name: 'userCenter', - component: lazyLoadView(import('@/view/userCenter')), + component: lazyLoadView(import('@/view/userCenter/indexPage')), meta: {title: '个人中心', noCache: true, icon: 'user', hidden: true}, } ] diff --git a/vue/src/router/constant/module/example.js b/vue/src/router/constant/module/example.js index b23c306..078386e 100644 --- a/vue/src/router/constant/module/example.js +++ b/vue/src/router/constant/module/example.js @@ -14,7 +14,7 @@ const router = { }, { path: 'icon', - component: lazyLoadView(import('@/view/example/icon')), + component: lazyLoadView(import('@/view/example/icon/indexPage')), meta: {title: '图 标'} }, { @@ -28,12 +28,12 @@ const router = { children: [ { path: 'fluid', - component: lazyLoadView(import('@/view/example/cool/fluid')), + component: lazyLoadView(import('@/view/example/cool/fluidPage')), meta: {title: '流体动画'} }, { path: 'l2d', - component: lazyLoadView(import('@/view/example/cool/l2d')), + component: lazyLoadView(import('@/view/example/cool/l2dPage')), meta: {title: '看板娘'} }, ] @@ -45,39 +45,39 @@ const router = { children: [ { path: 'uploadExample', - component: lazyLoadView(import('@/view/example/component/uploadExample')), + component: lazyLoadView(import('@/view/example/component/uploadPage')), meta: {title: '上传文件'} }, { path: 'skeletonExample', - component: lazyLoadView(import('@/view/example/component/skeletonExample')), + component: lazyLoadView(import('@/view/example/component/skeletonPage')), meta: {title: '骨架屏'} }, { path: 'rippleExample', - component: lazyLoadView(import('@/view/example/component/rippleExample')), + component: lazyLoadView(import('@/view/example/component/ripplePage')), meta: {title: '波纹'} }, { path: 'signatureExample', - component: lazyLoadView(import('@/view/example/component/signatureExample')), + component: lazyLoadView(import('@/view/example/component/signaturePage')), meta: {title: '手写签名'} }, { path: 'regionSelectorExample', - component: lazyLoadView(import('@/view/example/component/regionSelectorExample')), + component: lazyLoadView(import('@/view/example/component/regionSelectorPage')), meta: {title: '行政区划选择'} }, { path: 'treeSelectExample', - component: lazyLoadView(import('@/view/example/component/treeSelectExample')), + component: lazyLoadView(import('@/view/example/component/treeSelectPage')), meta: {title: '树选择'} } ] }, { path: 'developingTest', - component: lazyLoadView(import('@/view/example/developingTest')), + component: lazyLoadView(import('@/view/example/developingTest/indexPage')), meta: {title: '开发测试'} }, { diff --git a/vue/src/store/module/resource.js b/vue/src/store/module/resource.js index 561b4d2..dc1339d 100644 --- a/vue/src/store/module/resource.js +++ b/vue/src/store/module/resource.js @@ -154,18 +154,16 @@ function sort(routes) { } const getSortValue = item => { - const {meta: {sort} = {}} = deepTap(item) || {} + const sort = deepTap(item) return isEmpty(sort) ? 10000 : sort } const deepTap = item => { - const {name, children, meta: {title, hidden, sort} = {}} = item + const {name, children = [], meta: {title, hidden, sort} = {}} = item if (hidden) return null - if (!isEmpty(sort)) return item - if (isEmpty(name, title)) { - //如果是类似首页那样的路由层级 - if (children && children.length === 1) { - return deepTap(children[0]) - } + if (!isEmpty(sort)) return sort + //如果是类似首页那样的路由层级 + if (isEmpty(name, title) && children.length === 1) { + return deepTap(children[0]) } return null } diff --git a/vue/src/view/example/component/regionSelectorExample.vue b/vue/src/view/example/component/regionSelectorPage.vue similarity index 100% rename from vue/src/view/example/component/regionSelectorExample.vue rename to vue/src/view/example/component/regionSelectorPage.vue diff --git a/vue/src/view/example/component/rippleExample.vue b/vue/src/view/example/component/ripplePage.vue similarity index 100% rename from vue/src/view/example/component/rippleExample.vue rename to vue/src/view/example/component/ripplePage.vue diff --git a/vue/src/view/example/component/signatureExample.vue b/vue/src/view/example/component/signaturePage.vue similarity index 100% rename from vue/src/view/example/component/signatureExample.vue rename to vue/src/view/example/component/signaturePage.vue diff --git a/vue/src/view/example/component/skeletonExample.vue b/vue/src/view/example/component/skeletonPage.vue similarity index 100% rename from vue/src/view/example/component/skeletonExample.vue rename to vue/src/view/example/component/skeletonPage.vue diff --git a/vue/src/view/example/component/treeSelectExample.vue b/vue/src/view/example/component/treeSelectPage.vue similarity index 100% rename from vue/src/view/example/component/treeSelectExample.vue rename to vue/src/view/example/component/treeSelectPage.vue diff --git a/vue/src/view/example/component/uploadExample.vue b/vue/src/view/example/component/uploadPage.vue similarity index 100% rename from vue/src/view/example/component/uploadExample.vue rename to vue/src/view/example/component/uploadPage.vue diff --git a/vue/src/view/example/cool/fluid.vue b/vue/src/view/example/cool/fluidPage.vue similarity index 100% rename from vue/src/view/example/cool/fluid.vue rename to vue/src/view/example/cool/fluidPage.vue diff --git a/vue/src/view/example/cool/l2d.vue b/vue/src/view/example/cool/l2dPage.vue similarity index 100% rename from vue/src/view/example/cool/l2d.vue rename to vue/src/view/example/cool/l2dPage.vue diff --git a/vue/src/view/example/developingTest/index.vue b/vue/src/view/example/developingTest/indexPage.vue similarity index 100% rename from vue/src/view/example/developingTest/index.vue rename to vue/src/view/example/developingTest/indexPage.vue diff --git a/vue/src/view/example/icon/index.vue b/vue/src/view/example/icon/indexPage.vue similarity index 100% rename from vue/src/view/example/icon/index.vue rename to vue/src/view/example/icon/indexPage.vue diff --git a/vue/src/view/index/index.vue b/vue/src/view/index/indexPage.vue similarity index 100% rename from vue/src/view/index/index.vue rename to vue/src/view/index/indexPage.vue diff --git a/vue/src/view/message/manage/index.vue b/vue/src/view/message/manage/indexPage.vue similarity index 100% rename from vue/src/view/message/manage/index.vue rename to vue/src/view/message/manage/indexPage.vue diff --git a/vue/src/view/message/user/index.vue b/vue/src/view/message/user/indexPage.vue similarity index 100% rename from vue/src/view/message/user/index.vue rename to vue/src/view/message/user/indexPage.vue diff --git a/vue/src/view/purchase/inbound/detail.vue b/vue/src/view/purchase/inbound/detailPage.vue similarity index 100% rename from vue/src/view/purchase/inbound/detail.vue rename to vue/src/view/purchase/inbound/detailPage.vue diff --git a/vue/src/view/purchase/inbound/index.vue b/vue/src/view/purchase/inbound/indexPage.vue similarity index 100% rename from vue/src/view/purchase/inbound/index.vue rename to vue/src/view/purchase/inbound/indexPage.vue diff --git a/vue/src/view/purchase/order/detail.vue b/vue/src/view/purchase/order/detailPage.vue similarity index 100% rename from vue/src/view/purchase/order/detail.vue rename to vue/src/view/purchase/order/detailPage.vue diff --git a/vue/src/view/purchase/order/index.vue b/vue/src/view/purchase/order/indexPage.vue similarity index 100% rename from vue/src/view/purchase/order/index.vue rename to vue/src/view/purchase/order/indexPage.vue diff --git a/vue/src/view/sell/order/detail.vue b/vue/src/view/sell/order/detailPage.vue similarity index 100% rename from vue/src/view/sell/order/detail.vue rename to vue/src/view/sell/order/detailPage.vue diff --git a/vue/src/view/sell/order/index.vue b/vue/src/view/sell/order/indexPage.vue similarity index 100% rename from vue/src/view/sell/order/index.vue rename to vue/src/view/sell/order/indexPage.vue diff --git a/vue/src/view/sell/outbound/detail.vue b/vue/src/view/sell/outbound/detailPage.vue similarity index 100% rename from vue/src/view/sell/outbound/detail.vue rename to vue/src/view/sell/outbound/detailPage.vue diff --git a/vue/src/view/sell/outbound/index.vue b/vue/src/view/sell/outbound/indexPage.vue similarity index 100% rename from vue/src/view/sell/outbound/index.vue rename to vue/src/view/sell/outbound/indexPage.vue diff --git a/vue/src/view/stock/current/index.vue b/vue/src/view/stock/current/indexPage.vue similarity index 100% rename from vue/src/view/stock/current/index.vue rename to vue/src/view/stock/current/indexPage.vue diff --git a/vue/src/view/system/category/index.vue b/vue/src/view/system/category/indexPage.vue similarity index 100% rename from vue/src/view/system/category/index.vue rename to vue/src/view/system/category/indexPage.vue diff --git a/vue/src/view/system/customer/index.vue b/vue/src/view/system/customer/indexPage.vue similarity index 100% rename from vue/src/view/system/customer/index.vue rename to vue/src/view/system/customer/indexPage.vue diff --git a/vue/src/view/system/department/index.vue b/vue/src/view/system/department/indexPage.vue similarity index 100% rename from vue/src/view/system/department/index.vue rename to vue/src/view/system/department/indexPage.vue diff --git a/vue/src/view/system/role/index.vue b/vue/src/view/system/role/indexPage.vue similarity index 100% rename from vue/src/view/system/role/index.vue rename to vue/src/view/system/role/indexPage.vue diff --git a/vue/src/view/system/supplier/index.vue b/vue/src/view/system/supplier/indexPage.vue similarity index 100% rename from vue/src/view/system/supplier/index.vue rename to vue/src/view/system/supplier/indexPage.vue diff --git a/vue/src/view/system/user/index.vue b/vue/src/view/system/user/indexPage.vue similarity index 100% rename from vue/src/view/system/user/index.vue rename to vue/src/view/system/user/indexPage.vue diff --git a/vue/src/view/userCenter/index.vue b/vue/src/view/userCenter/indexPage.vue similarity index 100% rename from vue/src/view/userCenter/index.vue rename to vue/src/view/userCenter/indexPage.vue