diff --git a/member-Recharge/rec-confirmation/rec-confirmation.vue b/member-Recharge/rec-confirmation/rec-confirmation.vue index f96afef..c07bff1 100644 --- a/member-Recharge/rec-confirmation/rec-confirmation.vue +++ b/member-Recharge/rec-confirmation/rec-confirmation.vue @@ -174,7 +174,7 @@ wechatPay, cardPay, getUserOrderPreList, - thirdCancelOrder, + cancel, getRebateIntegral } from '../../Utils/Api.js'; // #ifdef H5 @@ -575,14 +575,14 @@ title: '工会卡余额不足', duration: 2000, }); - that.thirdCancelOrder(); + that.cancel(); return; } if (!that.user.isSetPayPwd) { uni.navigateTo({ url: '../../pages/login/updatePas/updatePas' }) - that.thirdCancelOrder(); + that.cancel(); return; } if (!that.user.isSetHltCard) { @@ -598,7 +598,7 @@ }, 1000) } }); - that.thirdCancelOrder(); + that.cancel(); return; } that.$refs.paymentPassword.modalFun('show'); @@ -611,11 +611,11 @@ } }, //取消订单 - thirdCancelOrder() { + cancel() { let params = { - orderId: this.orderId, + orderNo: this.orderId, } - thirdCancelOrder(params).then(res => { + cancel(params).then(res => { if (res.return_code == '000000') { this.orderId = ''; } @@ -672,7 +672,7 @@ icon: 'none', duration: 2000 }); - this.thirdCancelOrder(); + this.cancel(); }) return; } diff --git a/pages/tabBar/home/home.vue b/pages/tabBar/home/home.vue index 4907376..60d0dba 100644 --- a/pages/tabBar/home/home.vue +++ b/pages/tabBar/home/home.vue @@ -31,7 +31,7 @@ - + @@ -65,11 +65,13 @@ - + - {{item.childDate[0].title}} + {{item.childDate[0].title}} + {{swipers.timeData}} @@ -82,7 +84,8 @@ - {{swipers.title}} + {{swipers.title}} + {{swipers.timeData}} @@ -112,8 +115,10 @@ 更多 - - + + {{goods.couponName}} @@ -121,8 +126,10 @@ - - + + {{goods.title}}