diff --git a/package2/pages/appointment/appointment.js b/package2/pages/appointment/appointment.js index 647f58c..11fcf96 100644 --- a/package2/pages/appointment/appointment.js +++ b/package2/pages/appointment/appointment.js @@ -38,6 +38,10 @@ Page({ if (this.data.id) { this.getDetail(this.data.id) + } else { + this.setData({ + isShowBtns: true + }) } }, diff --git a/pages/order/detail/index.js b/pages/order/detail/index.js index 4b5cb72..b895b49 100644 --- a/pages/order/detail/index.js +++ b/pages/order/detail/index.js @@ -243,7 +243,7 @@ Page({ status = 1 } else if (orderStatus == 3 || orderStatus == 4 || orderStatus == 5) { - if (refundOrderStatus == 1) { // 退款中 + if (refundOrderStatus == 1 || refundOrderStatus == 11) { // 退款中 status = 2 } else if (refundOrderStatus == 3) { //退款成功 status = 3 @@ -572,6 +572,35 @@ Page({ mask: false }); }) + } else { + Http.get({ + url: config.api.getStatus, + data: { + couponOrderId: tempData.couponOrderId, + mallTenantId: this.data.mallTenantId || '' + } + }).then(res => { + console.log(res, 'getStatus'); + that.setData({ + couponOrderStatus: res.data.CouponOrderStatus + }); + if (res.data.CouponOrderStatus == 1 || res.data.CouponOrderStatus == 3) { + /** + * 动态改变上一级页面的核销状态 + */ + // that.getStaticGame() + //直接调用上一个页面的setData()方法,把数据存到上一个页面中去 + clearInterval(that.data.setInter); + clearInterval(that.data.templTiem); + that.updetail() + that.setData({ + mystatus: res.data.CouponOrderStatus + }); + } + }) + .catch(err => { + console.log(err); + }) } }, 2000); that.setData({ diff --git a/pages/order/detail/index.ttml b/pages/order/detail/index.ttml index e3328e1..ea566e9 100644 --- a/pages/order/detail/index.ttml +++ b/pages/order/detail/index.ttml @@ -48,7 +48,7 @@ - + @@ -97,9 +97,6 @@ - - -