diff --git a/common/js/request.js b/common/js/request.js index 48a38b4..0259e1d 100644 --- a/common/js/request.js +++ b/common/js/request.js @@ -434,7 +434,9 @@ export default { data: params, header: { pageNum: params.pageNum, - pageSize: params.pageSize + pageSize: params.pageSize, + orderByColumn: params.orderByColumn, + isAsc: params.isAsc } }) return res[1].data; @@ -451,7 +453,11 @@ export default { let res = await uni.request({ url: '/order/app/mix/order/list', method: 'POST', - data: params + data: params, + header: { + orderByColumn: params.orderByColumn, + isAsc: params.isAsc + } }) return res[1].data; }, @@ -459,7 +465,11 @@ export default { let res = await uni.request({ url: '/order/app/mix/after/list', method: 'POST', - data: params + data: params, + header: { + orderByColumn: params.orderByColumn, + isAsc: params.isAsc + } }) return res[1].data; }, @@ -494,7 +504,9 @@ export default { data: params, header: { pageNum: params.pageNum, - pageSize: params.pageSize + pageSize: params.pageSize, + orderByColumn: params.orderByColumn, + isAsc: params.isAsc } }) return res[1].data; diff --git a/pages/order-manage/order-manage.vue b/pages/order-manage/order-manage.vue index 480da8b..c79e6bf 100644 --- a/pages/order-manage/order-manage.vue +++ b/pages/order-manage/order-manage.vue @@ -663,14 +663,14 @@ params.expectTimeStart = date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate() + " 00:00:00", params.expectTimeEnd = date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate() + " 23:59:59" params.orderByColumn = "expectTimeStart"; - params.isAsc = "desc"; + params.isAsc = "asc"; } else if (this.stateList[this.stateCur].code === 101) { // 明日单 params.orderStatus = 2; params.expectTimeStart = date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + (date.getDate() + 1) + " 00:00:00", params.expectTimeEnd = date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + (date.getDate() + 1) + " 23:59:59" params.orderByColumn = "expectTimeStart"; - params.isAsc = "desc"; + params.isAsc = "asc"; } else if (this.stateList[this.stateCur].code === 104) { // 搁置单 params.shelveStatus = 1; @@ -714,7 +714,7 @@ } else if (this.tabCur === 1) { // 待上门 params.orderByColumn = "expectTimeStart"; - params.isAsc = "desc"; + params.isAsc = "asc"; } } try {