From 94919917c0dc23e57181799515bb312c8defc208 Mon Sep 17 00:00:00 2001
From: Wik-T <812952667@qq.com>
Date: Wed, 3 Aug 2022 16:12:19 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=9B=A2=E6=B2=B9=E6=8A=98?=
 =?UTF-8?q?=E6=89=A3=E4=BB=B7=E6=A0=BC=E5=8F=8A=E6=98=BE=E7=A4=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods/refuel-confirm/refuel-confirm.vue | 36 +++++++++----------
 qianzhu-KFC/confirmOrder/confirmOrder.vue     |  6 ++--
 subPages/recharge-centre/recharge-centre.vue  |  4 +--
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/pages/goods/refuel-confirm/refuel-confirm.vue b/pages/goods/refuel-confirm/refuel-confirm.vue
index f85492a..2c094bc 100644
--- a/pages/goods/refuel-confirm/refuel-confirm.vue
+++ b/pages/goods/refuel-confirm/refuel-confirm.vue
@@ -42,13 +42,16 @@
 			</view>
 		</view>
 		<view class="line1"></view>
-		<view class="heightl60 paddleft10 fcor666  font16 width100 backcorfff">
-			<view class="flleft width50">
-				平台折扣
-			</view>
-			<view class="flright width40 fotct">
-				{{orderList.gasDiscount}}折
-			</view>
+		<view class="heightl60 paddleft10 fcor666  font16 width100 backcorfff">
+			<view class="flleft width50">
+				平台折扣
+			</view>
+			<view class="flright width40 fotct" v-if="orderList.gasDiscount != 1">
+				{{(orderList.gasDiscount * 100).toFixed(2)}}折
+			</view>
+			<view class="flright width40 fotct" v-else>
+				无
+			</view>
 		</view>
 		<view class="line1"></view>
 		<view class="heightl60 paddleft10 fcor666  font16 width100 backcorfff">
@@ -90,7 +93,7 @@
 		<!-- //优惠券，积分抵扣 -->
 		<view class="width100 concont mart10 backcorfff">
 			<view class="height50 width100 paddtop5 backcorfff" @click="showPopup()">
-				<view class="width50 flleft fcor333 fontwig6 font16" style="padding-left: 4%;">
+				<view class="width50 flleft fcor333 fontwig6 font16" style="padding-left: 2%;">
 					优惠抵扣<text class="yhqky">{{OrderPreList.length}}张可用</text>
 				</view>
 				<view class="width40 flright fotrt paddtright10 font15 fontwig6 fcor666 alijun"
@@ -106,13 +109,10 @@
 			</view>
 			<view class="width94 line1 mart5 marb5"></view>
 			<view class="Bubble alijusstart font14 fcor999">
-				选取: <text class="tests fotct font14 colorc3 paddleft5 paddtright5"
-					v-if="typeid == 1">{{priceValue[1]}}</text><text
-					class="tests fotct font14 color2f6f43 paddleft5 paddtright5"
-					v-if="typeid == 2">{{priceValue[1]}}</text> 分
+				选取: <text class="tests fotct font14 colorc3 paddleft5 paddtright5">{{priceValue[1]}}</text> 分
 			</view>
-			<view class="width92 alijusstart paddtop10">
-				<view class="width30 fcor333 fontwig6 font16">
+			<view class="width94 alijusstart paddtop10">
+				<view class="width30 fcor333 font16">
 					积分抵扣
 				</view>
 				<view class="cj-slider">
@@ -125,7 +125,7 @@
 			</view>
 			<view class="width94 line1 mart15 marb5"></view>
 			<view class="height50 width100 backcorfff">
-				<view class="width70 flleft fcor666 font16 text1" style="padding-left: 4%;">
+				<view class="width70 flleft fcor666 font16 text1" style="padding-left: 2%;">
 					抵扣金额
 				</view>
 				<view class="width20 flright fotrt paddtright10 font15 fcor666 alijun" style="align-items: center;">
@@ -425,12 +425,10 @@
 				this.isDiscount = 1;
 				if (this.deductionPrice == 0) {
 					this.payPrice = Math.abs(parseFloat(this.totalprice - parseFloat(this.priceValue[1] / 100).toFixed(2))
-						.toFixed(
-							2));
+						.toFixed(2));
 				} else {
 					this.payPrice = Math.abs(parseFloat(this.orderPrice - parseFloat(this.priceValue[1] / 100).toFixed(2) -
-						this
-						.deductionPrice).toFixed(2));
+						this.deductionPrice).toFixed(2));
 				}
 				if (this.payPrice == 0) {
 					this.isUse = false;
diff --git a/qianzhu-KFC/confirmOrder/confirmOrder.vue b/qianzhu-KFC/confirmOrder/confirmOrder.vue
index a81d26f..e994a59 100644
--- a/qianzhu-KFC/confirmOrder/confirmOrder.vue
+++ b/qianzhu-KFC/confirmOrder/confirmOrder.vue
@@ -43,9 +43,11 @@
 					</view>
 					<view class="width10 font12 fcor999">x{{item.num}}</view>
 					<view class="width20">
-						<view class="width100 fcor333 font12">¥<text class="fontwig6 font16">{{item.price}}</text>
+						<view class="width100 fcor333 font12">¥
+							<text class="fontwig6 font16" v-if="!memDiscountId">{{item.price}}</text>
+							<text class="fontwig6 font16" v-else>{{item.oldprice}}</text>
 						</view>
-						<view class="width100 fcor999 font12" v-if="item.price != item.oldprice"
+						<view class="width100 fcor999 font12" v-if="item.price != item.oldprice && !memDiscountId"
 							style="text-decoration: line-through;">¥{{item.oldprice}}
 						</view>
 					</view>
diff --git a/subPages/recharge-centre/recharge-centre.vue b/subPages/recharge-centre/recharge-centre.vue
index b1ac4d8..4c1ac45 100644
--- a/subPages/recharge-centre/recharge-centre.vue
+++ b/subPages/recharge-centre/recharge-centre.vue
@@ -9,11 +9,11 @@
 				<view class="line1 width100 backcorfff"></view>
 			</view>
 		</view>
-		<view class="mart5">
+		<!-- <view class="mart5">
 			<QSTabs ref="tabs" :tabs="tabs" animationMode="line2" :current="current" @change="change"
 				activeColor="#089bf5" lineColor="#089bf5" minWidth="374">
 			</QSTabs>
-		</view>
+		</view> -->
 		<view class="width90 font16 fcor333 fontwig6 mart20">
 			选择金额
 		</view>