diff --git a/pages/pay/pay.vue b/pages/pay/pay.vue index 259a7ba..e858ff3 100644 --- a/pages/pay/pay.vue +++ b/pages/pay/pay.vue @@ -191,6 +191,9 @@ return } umsState(this.trade_id).then(res => { + + console.log(res) + resNumb++ if(res.state === 'success'){ clearInterval(outTime) @@ -322,7 +325,7 @@ title: '加载中...', mask : true }) - diffDgPay(this.orderId, { + diffDgPay(this.diffId, { type, use_fire : this.isDeduction ? 1 : 0, fire : this.deductionVal || 0, @@ -543,6 +546,8 @@ }, // 更新订单列表 onRrmoveItem(){ + console.log(this.orderId) + this.$store.commit('setOrderId', this.orderId) this.$Router.back() } diff --git a/pages/transfers/lists.vue b/pages/transfers/lists.vue index f891818..f967bff 100644 --- a/pages/transfers/lists.vue +++ b/pages/transfers/lists.vue @@ -172,9 +172,6 @@ status: this.tabs[this.tabsCurrent].val, type : this.type }).then(res => { - - console.log(res) - let { data } = res; this.orders = data }).catch(err => { diff --git a/pages/work/poorOrder.vue b/pages/work/poorOrder.vue index 2e124b8..dffe3f6 100644 --- a/pages/work/poorOrder.vue +++ b/pages/work/poorOrder.vue @@ -40,6 +40,8 @@ + + @@ -58,8 +60,14 @@ export default { data() { return { - orders: [], - page : '' + orders : [], + // 分页 + page : { + current : 1, + has_more: false, + }, + pagesShow : false, + status : '' } }, created() { @@ -87,10 +95,15 @@ }, // 获取订单列表 getList(){ - ordersDiffs().then(res => { + ordersDiffs({ + page : this.page.current + }).then(res => { let { data, page } = res; - this.orders = data - this.page = page + let atList = page.current == 1 ? [] : this.orders + + this.orders = atList.concat(data) + this.page = page + this.pagesShow = false }).catch(err => { uni.showToast({ title: err.message, @@ -101,12 +114,22 @@ // 变更当前列表状态 removeListVal(id){ let ListArr = this.orders - let ListIndex = ListArr.findIndex(val => val.business_order_id == id) + let ListIndex = ListArr.findIndex(val => val.order_id == id) if(ListIndex >= 0){ this.orders.splice(ListIndex, 1) } this.$store.commit('setOrderId', null) }, + }, + onReachBottom() { + this.pagesShow = true; + if(this.page.has_more){ + this.status = 'loading'; + this.page.current++ + this.getList() + return + } + this.status = 'nomore'; } } diff --git a/pages/work/refundOrder.vue b/pages/work/refundOrder.vue index 9e12110..ab43b02 100644 --- a/pages/work/refundOrder.vue +++ b/pages/work/refundOrder.vue @@ -38,6 +38,8 @@ + + @@ -56,7 +58,14 @@ export default { data() { return { - orders: [] + orders : [], + // 分页 + page : { + current : 1, + has_more: false, + }, + pagesShow : false, + status : '' }; }, created() { @@ -66,10 +75,15 @@ // 获取列表 getList(){ refunds({ - status: '' + status: '', + page : this.page.current }).then(res => { - let { data } = res; - this.orders = data + let { data, page } = res; + let atList = page.current == 1 ? [] : this.orders + + this.orders = atList.concat(data) + this.page = page + this.pagesShow = false }).catch(err => { uni.showToast({ title: err.message, @@ -77,6 +91,16 @@ }) }) } + }, + onReachBottom() { + this.pagesShow = true; + if(this.page.has_more){ + this.status = 'loading'; + this.page.current++ + this.getList() + return + } + this.status = 'nomore'; } }