From 3fe6f406c8eed604422847570c27ac3e4aef5d5c Mon Sep 17 00:00:00 2001 From: Junling Bu Date: Sun, 8 Mar 2020 14:31:23 +0800 Subject: [PATCH] =?UTF-8?q?fix[litemall-admin]:=20=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=97=B6=E9=97=B4=E8=BF=87=E6=BB=A4=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- litemall-admin/src/router/index.js | 2 +- litemall-admin/src/views/mall/order.vue | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/litemall-admin/src/router/index.js b/litemall-admin/src/router/index.js index 7d161f26..8ba5ae75 100644 --- a/litemall-admin/src/router/index.js +++ b/litemall-admin/src/router/index.js @@ -410,7 +410,7 @@ export const asyncRouterMap = [ { path: 'notice', component: () => import('@/views/sys/notice'), - name: 'notice', + name: 'sysNotice', meta: { perms: ['GET /admin/notice/list', 'POST /admin/notice/create', 'POST /admin/notice/update', 'POST /admin/notice/delete'], title: '通知管理', diff --git a/litemall-admin/src/views/mall/order.vue b/litemall-admin/src/views/mall/order.vue index 8cae6d33..ff87556f 100644 --- a/litemall-admin/src/views/mall/order.vue +++ b/litemall-admin/src/views/mall/order.vue @@ -248,10 +248,14 @@ export default { checkPermission, getList() { this.listLoading = true - if (this.listQuery.timeArray.length === 2) { + if (this.listQuery.timeArray && this.listQuery.timeArray.length === 2) { this.listQuery.start = this.listQuery.timeArray[0] this.listQuery.end = this.listQuery.timeArray[1] + } else { + this.listQuery.start = null + this.listQuery.end = null } + listOrder(this.listQuery).then(response => { this.list = response.data.data.list this.total = response.data.data.total