diff --git a/src/pages/index/order.vue b/src/pages/index/order.vue index 769709c8fd85cbecd1816608ec494199ffbf3e9c..4fb950465e9d941c9318f02ea81f5c24354a299d 100644 --- a/src/pages/index/order.vue +++ b/src/pages/index/order.vue @@ -353,7 +353,7 @@ export default { if (this.needSort) { self.orderList[this.curNow][this.current[this.curNow]].sort( (x, y) => { - return x.currentOverTime <= y.currentOverTime ? 1 : -1 + return x.currentOverTime < y.currentOverTime ? 1 : -1 } ) } diff --git a/src/pages/mine/order/list.vue b/src/pages/mine/order/list.vue index bee8068731da5949ef0a178070e58223e8290871..0f899999d090bf566d6d7e8ada5392e265e8294e 100644 --- a/src/pages/mine/order/list.vue +++ b/src/pages/mine/order/list.vue @@ -15,7 +15,7 @@ enable-back-to-top refresher-background="#F4F5F7" > - <view class="loading-view" v-if="!loaded && !_freshing"> + <view class="loading-view" v-if="!loaded"> <u-loading mode="flower"></u-loading> </view> <NoOrder @@ -63,8 +63,6 @@ export default { loadStatus: 'loading', dataValue: [], loaded: false, - triggered: true, - _freshing: false, title: '', orderType: '', timeParam: {}, @@ -80,10 +78,19 @@ export default { noOrderCustomStyle() { return 'margin-top: 100rpx;background-color: #F4F5F7' }, + sortType() { + return { + take: 'acceptOrderDateTime', + checkin: 'checkInDateTime', + finish: 'orderFinishDatetime', + } + }, + currentSorttype() { + return this.sortType[this.orderType] + }, }, onLoad(e) { getApp().trackPage('订å•首页') - this._freshing = false if (e && e.title) { this.title = decodeURIComponent(e.title) } @@ -116,34 +123,30 @@ export default { type: this.orderType, ...this.timeParam, } - var self = this - self.$u.api.manageOrderList(param).then((res) => { + this.$u.api.manageOrderList(param).then((res) => { if (res.code == 200) { - if (self.pageNumber == 1) { - self.orderList = [] + if (this.pageNumber == 1) { + this.orderList = [] } if (res.data.list) { - self.orderList.push(...res.data.list) + this.orderList.push(...res.data.list) - self.orderList.sort((x, y) => { - return x.currentOverTime <= y.currentOverTime ? 1 : -1 + this.orderList.sort((x, y) => { + return (x[this.currentSorttype] || 0) < + (y[this.currentSorttype] || 0) + ? 1 + : -1 }) - self.loadStatus = - res.data.total > self.orderList.length && - res.data.list.length == self.pageSize + this.loadStatus = + res.data.total > this.orderList.length && + res.data.list.length == this.pageSize ? 'loadmore' : 'nomore' } } else { console.log(res.message, '获å–è®¢å•æ•°é‡å¤±è´¥ï¼') } - self.$nextTick(() => { - if (self._freshing) { - self.triggered = false - self._freshing = false - } - }) this.loaded = true }) },