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