From 8afa122693c168c334d1bada8bf7fe8f371c1fd0 Mon Sep 17 00:00:00 2001
From: Wik-T <812952667@qq.com>
Date: Wed, 6 Apr 2022 09:37:37 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E6=94=AF=E4=BB=98=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 high-unionPay/pages/order/confirmation.vue  | 14 +++++++-------
 high-unionPay/pages/pay/payment/payment.vue |  8 ++++----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/high-unionPay/pages/order/confirmation.vue b/high-unionPay/pages/order/confirmation.vue
index cb206bc..f813203 100644
--- a/high-unionPay/pages/order/confirmation.vue
+++ b/high-unionPay/pages/order/confirmation.vue
@@ -91,11 +91,11 @@
 		<view class="width94 comorder mart10">
 			<view class="height50 width100 backcorfff">
 				<view class="width100 flleft fcor333 fontwig6 font16" style="padding-left: 4%;">
-					支付方式<text class="jfrecharge" @click="jumpdeposits" v-if="typeId == 1">积分充值</text>
+					支付方式<text class="jfrecharge" @click="jumpdeposits" v-if="couponList.displayArea == 2|| couponList.displayArea == 4 ">积分充值</text>
 				</view>
 			</view>
-			<view class="width94 line1 mart5 marb5" v-if="typeId == 1"></view>
-			<view class="height50 width100 backcorfff" @tap="paytype='jinbi'" v-if="typeId == 1">
+			<view class="width94 line1 mart5 marb5" v-if="couponList.displayArea == 2 || couponList.displayArea == 4"></view>
+			<view class="height50 width100 backcorfff" @tap="paytype='jinbi'" v-if="couponList.displayArea == 2 || couponList.displayArea == 4">
 				<view class="width70 flleft fcor333 fontwig6 font16 text1" style="padding-left: 4%;">
 					积分支付<text class="font14 fcor666 margle">可用积分: {{user.gold}}</text>
 				</view>
@@ -104,8 +104,8 @@
 					<radio :checked="paytype=='jinbi'" color="#0083f5" />
 				</view>
 			</view>
-			<view class="width94 line1 mart5 marb5" v-if="typeId == 2"></view>
-			<view class="height50 width100 backcorfff" @tap="paytype='unionPay'" v-if="typeId == 2">
+			<view class="width94 line1 mart5 marb5" v-if="couponList.displayArea != 2"></view>
+			<view class="height50 width100 backcorfff" @tap="paytype='unionPay'" v-if="couponList.displayArea != 2">
 				<view class="width50 flleft fcor333 fontwig6 font16" style="padding-left: 4%;">
 					银联支付
 				</view>
@@ -114,7 +114,7 @@
 					<radio :checked="paytype=='unionPay'" color="#0083f5" />
 				</view>
 			</view>
-			<view class="width94 line1 mart5 marb5" v-if="couponList.displayArea == 4"></view>
+			<!-- <view class="width94 line1 mart5 marb5" v-if="couponList.displayArea == 4"></view>
 			<view class="height50 width100 backcorfff" @tap="paytype='unionPaystags'"
 				v-if="couponList.displayArea == 4">
 				<view class="width50 flleft fcor333 fontwig6 font16" style="padding-left: 4%;">
@@ -124,7 +124,7 @@
 					style="align-items: center;">
 					<radio :checked="paytype=='unionPaystags'" color="#0083f5" />
 				</view>
-			</view>
+			</view> -->
 
 		</view>
 
diff --git a/high-unionPay/pages/pay/payment/payment.vue b/high-unionPay/pages/pay/payment/payment.vue
index 3c59ff1..85a02e7 100644
--- a/high-unionPay/pages/pay/payment/payment.vue
+++ b/high-unionPay/pages/pay/payment/payment.vue
@@ -18,7 +18,7 @@
 			</view>
 			<view class="content">
 				<view class="pay-list">
-					<!-- 	<view class="row" @tap="paytype='jinbi'">
+						<view class="row" @tap="paytype='jinbi'">
 						<view class="left">
 							<image src="../../../static/img/jfx.png"></image>
 						</view>
@@ -28,7 +28,7 @@
 						<view class="right">
 							<radio :checked="paytype=='jinbi'" color="#0083f5" />
 						</view>
-					</view> -->
+					</view>
 					<view class="row" @tap="paytype='gonghuika'">
 						<view class="left">
 							<image mode="widthFix" style="border-radius: 50%;" src="../../../static/img/unionpay.png">
@@ -41,7 +41,7 @@
 							<radio :checked="paytype=='gonghuika'" color="#0083f5" />
 						</view>
 					</view>
-					<view class="width100 line1 mart5 marb5"></view>
+					<!-- <view class="width100 line1 mart5 marb5"></view>
 					<view class="row" @tap="paytype='unionPaystags'">
 						<view class="left">
 							<image mode="widthFix" style="border-radius: 50%;" src="../../../static/img/unionpay.png">
@@ -52,7 +52,7 @@
 						<view class="right">
 							<radio :checked="paytype=='unionPaystags'" color="#0083f5" />
 						</view>
-					</view>
+					</view> -->
 				</view>
 			</view>
 		</view>