From e40827dd2d9fde7ad5992b0a1471c7bf93ece3b2 Mon Sep 17 00:00:00 2001 From: Wik-T <812952667@qq.com> Date: Fri, 6 Jan 2023 17:47:54 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=97=AE=E9=A2=98=E7=A1=AE=E8=AE=A4=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/goods/refuel-confirm/refuel-confirm.vue | 93 +++++------ pages/order/confirmation.vue | 157 +++++++++--------- 2 files changed, 124 insertions(+), 126 deletions(-) diff --git a/pages/goods/refuel-confirm/refuel-confirm.vue b/pages/goods/refuel-confirm/refuel-confirm.vue index fdb5be9..2f3e185 100644 --- a/pages/goods/refuel-confirm/refuel-confirm.vue +++ b/pages/goods/refuel-confirm/refuel-confirm.vue @@ -81,7 +81,8 @@ 邀请码 - + @@ -175,55 +176,52 @@ - + 汇联通工会卡余额: {{tongCardPrice}}元 - --> + - - - - 车队油卡余额: {{oilUserNoPrice}}元 - - - - + + + + 车队油卡余额: {{oilUserNoPrice}}元 + + + + - - 车队油卡列表 - - - - {{item.cardNo}}({{item.contactName}}) - - - - + + 车队油卡列表 + + + + {{item.cardNo}}({{item.contactName}}) - - - 车牌号 - - - - - - 11111{{cardNoNumber}} - - - + + + + 车牌号 + + + + + + 11111{{cardNoNumber}} + + + + 重要说明 @@ -241,7 +239,6 @@ - 优惠券选择 - - { - if (res.return_code == '000000' && res.return_data !='') { + if (res.return_code == '000000' && res.return_data != '') { this.oilUserCardlist = res.return_data; this.oilUserno = res.return_data[0].cardNo; this.contactName = res.return_data[0].contactName; @@ -911,8 +904,8 @@ }) return; } - if (this.orderNo) { - this.wechatPay(); + // if (this.orderNo) { + // this.wechatPay(); // if (this.orderNo) { // this.orderToPay(); // return; @@ -951,7 +944,7 @@ "payGold": this.priceValue[1], "promoteCode": this.identificationCode, "payPwd": this.PaymentPassword, - memDiscountId:this.memDiscountId + memDiscountId: this.memDiscountId } create(goods).then(res => { @@ -1301,4 +1294,4 @@ width: 28%; } } - + diff --git a/pages/order/confirmation.vue b/pages/order/confirmation.vue index cce23cd..d184e17 100644 --- a/pages/order/confirmation.vue +++ b/pages/order/confirmation.vue @@ -93,96 +93,104 @@ ¥{{priceValue[1] / 100}} - + - + + - - - - - - 汇联通工会卡可用余额: {{tongCardPrice}}元 - - - - - - + - - - - - - 微信支付 - - - + --> + + + 支付方式 + - - - - 汇联通工会卡可用余额: {{tongCardPrice}}元 + + + + + 微信支付 + + + + - - + + + + 汇联通工会卡可用余额: {{tongCardPrice}}元 + + + + - @@ -200,7 +208,6 @@ - 优惠券选择 +