diff --git a/pages/commissionedSales/receivedCommission/index.vue b/pages/commissionedSales/receivedCommission/index.vue index 0e6775a..b2c1646 100644 --- a/pages/commissionedSales/receivedCommission/index.vue +++ b/pages/commissionedSales/receivedCommission/index.vue @@ -19,6 +19,10 @@ 委托周期:{{item.entrust_day}} + + + {{item.entrust_finish==0?'未申请结束委托':""||item.entrust_finish==1?'委托已结束':""||item.entrust_finish==2?'商家拒绝结束委托':""||item.entrust_finish==3?'结束委托申请中':""}} + @@ -70,10 +74,10 @@ 已拒绝 - + 详情 @@ -105,15 +109,15 @@ - + 委托申请处理 - - 结算周期: {{obj.settle_cycle}}天 + + 结算周期: {{obj.mer_info.settle_cycle}}天 - - 利息比例: {{obj.interest_rate}}% + + 利息比例: {{obj.mer_info.interest_rate}}% diff --git a/pages/order_details/index.vue b/pages/order_details/index.vue index bafa280..fd8c56e 100644 --- a/pages/order_details/index.vue +++ b/pages/order_details/index.vue @@ -61,6 +61,7 @@ 已完成 + @@ -82,13 +83,17 @@ + + + + 查看物流 - + 确认收货 确认收货 diff --git a/pages/users/order_list/indexCopy.vue b/pages/users/order_list/indexCopy.vue index e838c9c..63577c1 100644 --- a/pages/users/order_list/indexCopy.vue +++ b/pages/users/order_list/indexCopy.vue @@ -732,7 +732,7 @@ if (status == 5) { uni.navigateTo({ - url: '/pages/users/refund/list?type=0' + url: '/pages/users/refund/list?type=98' }) } else { if (status == this.orderStatus) return; diff --git a/pages/users/order_list/relase.vue b/pages/users/order_list/relase.vue index 4014b4e..1dcd9a1 100644 --- a/pages/users/order_list/relase.vue +++ b/pages/users/order_list/relase.vue @@ -490,7 +490,7 @@ arrlist() { refundList({ - product_type: 98, + product_type: 99, type: 0, page: 1, limit: 1500 @@ -568,7 +568,7 @@ getOrderData: function() { let that = this; orderData({ - product_type: 98 + product_type: 99 }).then(res => { // console.log(res.data) that.$set(that, 'orderData', res.data); @@ -729,7 +729,7 @@ if (status == 5) { uni.navigateTo({ - url: '/pages/users/refund/list?type=0' + url: '/pages/users/refund/list?type=99' }) } else { if (status == this.orderStatus) return; @@ -756,7 +756,7 @@ groupOrderList({ page: that.page, limit: that.limit, - product_type: 98 + product_type: 99 }).then(res => { that.isReady = true; let list = res.data.list || []; @@ -783,7 +783,7 @@ status: arr, page: that.page, limit: that.limit, - product_type: 98 + product_type: 99 }).then(res => { let list = res.data.list || []; let loadend = list.length < that.limit; diff --git a/pages/users/refund/list.vue b/pages/users/refund/list.vue index 5184774..145fc39 100644 --- a/pages/users/refund/list.vue +++ b/pages/users/refund/list.vue @@ -111,7 +111,7 @@ isScroll: true, page: 1, limit: 15, - type: 1 + type: 0 } }, onLoad(e) { @@ -153,7 +153,7 @@ }, getList() { if (!this.isScroll) return - if (this.type == 1) { + if (this.type == 0) { refundList({ type: this.tabIndex, page: this.page, @@ -167,7 +167,7 @@ }) } else { refundList({ - product_type: 98, + product_type: this.type, type: this.tabIndex, page: this.page, limit: this.limit