diff --git a/pages/goods/refuel-confirm/refuel-confirm.vue b/pages/goods/refuel-confirm/refuel-confirm.vue index db16716..94f3d4c 100644 --- a/pages/goods/refuel-confirm/refuel-confirm.vue +++ b/pages/goods/refuel-confirm/refuel-confirm.vue @@ -173,12 +173,15 @@ title: '支付成功' }) uni.reLaunch({ - url: '/pages/goods/refuel-succes/refuel-succes?id=' + that - .orderNo + url: '/pages/goods/refuel-succes/refuel-succes?id=' + + that.orderNo }); }, cancel: function(r) {}, - fail: function(res) {} + fail: function(res) {}, + complete: function(res) { + + } }); }); diff --git a/pages/goods/refuel-details/refuel-details.vue b/pages/goods/refuel-details/refuel-details.vue index 5bd7d95..43accd8 100644 --- a/pages/goods/refuel-details/refuel-details.vue +++ b/pages/goods/refuel-details/refuel-details.vue @@ -13,7 +13,7 @@ - 营业时间 : 00:00-23:59 + 营业时间 : 00:00-23:59 @@ -81,8 +81,8 @@ - - 合计: ¥{{totalPrice}} + + 合计: ¥{{totalPrice}}优惠:¥{{discountPrice}} @@ -165,7 +165,8 @@ inputMoney: '', gasOilNo: '', litre: '', - totalPrice: '0.00' + totalPrice: '0.00', + discountPrice : '0.00' } }, onLoad(options) { @@ -240,6 +241,8 @@ this.inputMoney = amount.price; this.litre = parseFloat(amount.price / this.priceGun).toFixed(2); this.totalPrice = parseFloat(amount.price / this.priceGun * this.priceVip).toFixed(2); + let gbprice = parseFloat(this.litre * this.priceOfficial).toFixed(2); + this.discountPrice = parseFloat(gbprice - this.inputMoney).toFixed(2); }, // 微信获取手机号 getPhoneNumber(PhoneNumber) { @@ -274,6 +277,8 @@ Listeningfocus() { this.litre = parseFloat(this.inputMoney / this.priceGun).toFixed(2); this.totalPrice = parseFloat(this.inputMoney / this.priceGun * this.priceVip).toFixed(2); + let gbprice = parseFloat(this.litre * this.priceOfficial).toFixed(2); + this.discountPrice = parseFloat(gbprice - this.inputMoney).toFixed(2); }, toPay() { if (this.inputMoney == '' || this.inputMoney < 1) { @@ -441,7 +446,7 @@ align-items: center; .reBtn { - width: 110px; + width: 90px; background-color: #089bf5; color: #FFFFFF; text-align: center; diff --git a/uni.scss b/uni.scss index bf3c912..70437a8 100644 --- a/uni.scss +++ b/uni.scss @@ -76,6 +76,9 @@ $uni-color-paragraph: #3F536E; // 文章段落颜色 $uni-font-size-paragraph:30upx; /* 字体大小 */ +.font11 { + font-size: 11px; +} .font12 { font-size: 12px; }