From 2a40e15f01be45b20ba4a7fcc16d4d757736e90d Mon Sep 17 00:00:00 2001
From: yangjie <812952667@qq.com>
Date: Wed, 30 Jun 2021 15:52:33 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=96=B0=E5=A2=9E=E8=AE=A2=E5=8D=95=E4=BC=98?=
 =?UTF-8?q?=E6=83=A0=E4=BB=B7=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods/refuel-confirm/refuel-confirm.vue |  9 ++++++---
 pages/goods/refuel-details/refuel-details.vue | 15 ++++++++++-----
 uni.scss                                      |  3 +++
 3 files changed, 19 insertions(+), 8 deletions(-)

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 @@
 				</view>
 			</view>
 			<view class="fcor999 font14 width90">
-				营业时间 : 00:00-23:59 <text class="relab"></text>
+				营业时间 : 00:00-23:59
 			</view>
 		</view>
 		<!-- 标价 -->
@@ -81,8 +81,8 @@
 		<view class="height60 width100"></view>
 		<!-- 底部按钮 -->
 		<view class="footer">
-			<view class="width50 flleft fcor666 padleft15 font15">
-				合计: ￥<text class="font24">{{totalPrice}}</text>
+			<view class="flleft padleft15 font15 fcoreb5">
+				合计: ￥<text class="font24">{{totalPrice}}</text><text class="font12 fcor666">优惠:￥{{discountPrice}}</text>
 			</view>
 
 			<!-- #ifdef MP -->
@@ -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;
 }