diff --git a/subPackages/order/detail.vue b/subPackages/order/detail.vue index 7769f7d..03a4ff5 100644 --- a/subPackages/order/detail.vue +++ b/subPackages/order/detail.vue @@ -413,12 +413,12 @@ 立即支付 - 快递查询 - + --> - 确认收货 @@ -519,7 +519,13 @@ lat: uni.getStorageSync('location').lat || '36.95286642085422' }, '/api/order/orderDetail').then(res => { this.info = res.data; - + try { + if (this.info.order_child[0].data[0].status == "POST") { + this.info.status = this.info.order_child[0].data[0].status + this.info.status_text = this.info.order_child[0].data[0].status_text + } + } catch(e) {} + if (this.info.order_child[0].goods_genre == 'food') { // 美食类的需要调取规格详情 this.Post({ diff --git a/subPackages/order/trades.vue b/subPackages/order/trades.vue index fbdfb72..9da269d 100644 --- a/subPackages/order/trades.vue +++ b/subPackages/order/trades.vue @@ -54,7 +54,7 @@ 申请退款 关闭订单 - 确认收货 + 确认收货 立即支付 @@ -86,7 +86,8 @@ name: '待使用' }, { - id: 'PAYMENT_SUCCESSFULLY', + // id: 'PAYMENT_SUCCESSFULLY', + id: "WAIT_DELIVER", name: '待发货' }, { @@ -202,16 +203,19 @@ '/api/order/confirmPost' ).then(res => { if (res.code == 200) { - list[index].order_child.map(item => { - item.status = 'WAIT_COMMENT'; - }); - list[index].status = 'WAIT_COMMENT'; - list[index].postFlag = false; - that.list = list; + // list[index].order_child.map(item => { + // item.status = 'WAIT_COMMENT'; + // }); + // list[index].status = 'WAIT_COMMENT'; + // list[index].postFlag = false; + // that.list = list; uni.showToast({ title: '操作成功' }); - that.$forceUpdate(); + // that.$forceUpdate(); + that.list = []; + that.finished = false; + that.getList(); } }); }