From 23cc668c0390edb5cefc8497fbd6d54e7dc5f609 Mon Sep 17 00:00:00 2001 From: donqi Date: Thu, 2 Jun 2022 17:39:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E6=8E=A5=E5=8F=A3=E5=AF=B9?= =?UTF-8?q?=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/js/request.js | 18 +++++- pages/order-manage/order-manage.vue | 98 +++++++++++++++++++++-------- 2 files changed, 90 insertions(+), 26 deletions(-) diff --git a/common/js/request.js b/common/js/request.js index e2cc3b2..6cc5201 100644 --- a/common/js/request.js +++ b/common/js/request.js @@ -300,7 +300,11 @@ export default { let res = await uni.request({ url: '/worker/team/getTeamList', method: 'POST', - data: params + data: params, + header: { + pageNum: params.pageNum, + pageSize: params.pageSize + } }) return res[1].data; }, @@ -345,5 +349,17 @@ export default { data: params }) return res[1].data; + }, + async qryMasterOrderPage(params = {}) { + let res = await uni.request({ + url: '/order/master/app/list', + method: 'POST', + data: params, + header: { + pageNum: params.pageNum, + pageSize: params.pageSize + } + }) + return res[1].data; } } diff --git a/pages/order-manage/order-manage.vue b/pages/order-manage/order-manage.vue index 47656fd..1cc9e3f 100644 --- a/pages/order-manage/order-manage.vue +++ b/pages/order-manage/order-manage.vue @@ -69,13 +69,13 @@ - {{order.title}} + {{order.orderGoods.goodsName}} - 新 - 未 - 待 - 服 - 确 + 新 + 未 + 待 + 服 + 确 {{tag.content}} @@ -98,7 +98,7 @@ 服务时间：{{order.servTime}} - + 距上门： - + 距到帐： - + - + - + - + @@ -143,10 +143,10 @@ - + - + @@ -198,11 +198,12 @@ - + - 备注：{{order.comments}} + 备注：{{order.remark}} + @@ -235,6 +236,7 @@ import payQrcode from '@/pages/order-manage/modal/pay-qrcode.vue'; import urgentMsg from '@/pages/order-manage/modal/urgent-msg.vue'; import picModal from '@/components/modal/pic-modal.vue'; + import loadStatusBar from '@/components/custom-bar/load-status-bar.vue'; export default { components: { @@ -246,7 +248,8 @@ newServPrice, payQrcode, urgentMsg, - picModal + picModal, + loadStatusBar }, data() { return { @@ -285,17 +288,18 @@ code: 3, name: '服务中' }, { - code: 4, + code: 6, name: '确认中' }, { - code: 5, + code: '-', name: '售后中' }, { - code: 6, + code: 4, name: '已完成' }], myOrders: {}, orderList: [], + pageParams: [], curOrder: {}, myTeamMembers: [], scrollLeft: 0, @@ -324,9 +328,50 @@ let myTeamInfo = await this.$api.data('myTeamInfo'); this.myTeamMembers = myTeamInfo.members; this.myOrders = await this.$api.data('myOrders'); - this.orderList = this.myOrders.orderList; + // this.orderList = this.myOrders.orderList; this.areaList = await this.$api.data('areaList'); - this.categoryList = await this.$api.data('categoryList'); + this.categoryList = await this.$api.data('categoryList'); + + for(let i = 0; i < this.subStateList.length; i++) { + this.pageParams.push({ + pageNum: 0 + }); + } + // 初始化订单列表 + this.loadMasterOrderPage({ + orderStatus: this.subStateList[0].code + }); + }, + reloadMasterOrderPage(params = {}) { + this.pageParams = []; + for(let i = 0; i < this.subStateList.length; i++) { + this.pageParams.push({ + pageNum: 0 + }); + } + this.orderList = []; + this.$refs.loadStatusBar.showLoadMore(); + this.loadMasterOrderPage(params); + }, + async loadMasterOrderPage(params = {}) { + params.pageNum = this.pageParams[this.tabCur].pageNum; + params.pageSize = this.$globalData.initPageSize; + this.$refs.loadStatusBar.showLoading(); + try { + let res = await this.$request.qryMasterOrderPage(params); + let rowsLength = res.rows.length; + if (rowsLength > 0) { + this.orderList = this.orderList.concat(res.rows); + this.pageParams[this.tabCur].pageNum++; + if (rowsLength === this.pageSize) { + this.$refs.loadStatusBar.showLoadMore(); + } + } + this.$refs.loadStatusBar.showLoadOver(); + } catch (e) { + console.error(e) + this.$refs.loadStatusBar.showLoadErr(); + } }, bindEvent() { uni.$on(this.$globalFun.SHOW_ARRANGE_FAIL_TIME, this.showArrangeFailTime); @@ -361,7 +406,10 @@ tabSelect(e) { this.tabCur = e.currentTarget.dataset.id; this.scrollLeft = (e.currentTarget.dataset.id - 1) * 60 - this.loadData(this.stateCur, this.subStateList[this.tabCur].code); + // this.reloadMasterOrderPage(this.stateCur, this.subStateList[this.tabCur].code); + this.reloadMasterOrderPage({ + orderStatus: this.subStateList[this.tabCur].code + }); }, statusSelect(e) { this.stateCur = e.currentTarget.dataset.id; @@ -432,10 +480,10 @@ }) }, updateRefundStatus(status, index) { - this.myOrders.orderList[index].refundStatus = status; + this.orderList[index].refundStatus = status; }, updateAfterSaleDealStatus(status, index) { - this.myOrders.orderList[index].afterSaleDealStatus = status; + this.orderList[index].afterSaleDealStatus = status; }, async showAfterSalePic() { // TODO:查询该售后单中的拒绝原因中上传的截图