From 44e3047a9f534c98f78940af3c62786b4f374b9d Mon Sep 17 00:00:00 2001
From: youmengting <2080639302@qq.com>
Date: Fri, 30 Jun 2023 17:14:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=93=E9=AA=8C=E7=89=88:2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/confirmation.vue | 44 ++++++++++++++++++++----------------
 1 file changed, 25 insertions(+), 19 deletions(-)

diff --git a/pages/order/confirmation.vue b/pages/order/confirmation.vue
index f709e5c..e1d7e9d 100644
--- a/pages/order/confirmation.vue
+++ b/pages/order/confirmation.vue
@@ -127,7 +127,7 @@
 					{{rebateIntegral}}
 				</view> -->
 			</view>
-			<view class=" width100 backcorfff alijusstart paddbotm10" style="padding-left: 2%;">
+			<view class=" width100 backcorfff alijusstart paddbotm10 border-box" style="padding-left: 2%;">
 				<image src="../../static/img/sigh.png" mode="widthFix" style="width:20px;height:20px"></image>
 				<text class="fcor999 font13">积分抵扣与优惠券抵扣不同享</text>
 			</view>
@@ -158,7 +158,7 @@
 					</view>
 					<view class="width20 flright fotrt paddtright10 font15 fontwig6 fcor666 alijun"
 						style="align-items: center;" v-if="isUse">
-						<!-- || (Number(paytheprice)==0&&item.payTypeId==8) -->
+						<!--v-if="isUse"    || (Number(paytheprice)==0&&item.payTypeId==8) -->
 						<template v-if="item.payTypeId == 3">
 						<radio :checked="paytype==item.payTypeId" @click="changeRiado()" color="#0083f5" />
 						</template>
@@ -395,17 +395,20 @@
 			// #ifdef MP
 			this.identificationCode = app.globalData.identificationCode;
 			// #endif
-			this.getCouponById();
+			// this.getCouponById();
 			this.rpxTopx();
 			
 		},
-		onShow() {
+		 onShow() {
 			let that = this;
 			// that.paytype = '';
 			/*  */
 			// that.user = app.globalData.userInfo;
 			/*  */
-			that.findUser();
+			
+			
+			//  that.findUser();
+			 this.getCouponById();
 			this.getUserCardList();
 	
 		},
@@ -508,9 +511,7 @@
 					if (res.return_code == '000000') {
 						app.globalData.userInfo = res.return_data;
 						this.user = res.return_data;
-						/*  测试数据*/
-						// this.user.gold = 10000;
-						/* 测试数据 */
+						
 						if (this.user.hltCardNo) {
 							this.getHuiLianTongCardBalance();
 						}
@@ -593,6 +594,7 @@
 						this.saveprice = res.return_data.discountPrice;
 						this.orderPrice = res.return_data.salesPrice;
 						this.getRebateIntegral();
+						this.findUser();
 						// this.getThirdPartyByDetail();
 					}
 				})
@@ -710,6 +712,8 @@
 						this
 						.deductionPrice).toFixed(2);
 				}
+				
+
 				this.getRebateIntegral();
 			},
 			rechangeload() {
@@ -819,10 +823,7 @@
 				}
 
 				
-				if(!this.isAgree){
-					this.showPopupNeedKnow();
-					return;
-				}
+				
 
 				/* 积分兑换*/
 				if(this.paytype == '8'){ 
@@ -1251,14 +1252,19 @@
 					this.paytheprice = parseFloat(this.orderPrice - parseFloat(this.priceValue[1] / 100).toFixed(2) - this
 						.deductionPrice).toFixed(2);
 				}
-				if (this.paytheprice == 0) {
-					// if(this.paytype!=8){
-						this.isUse = false;
-						this.paytype = '';
-					// }
-				} else {
-					this.isUse = true;
+				
+				if(Number(this.paytheprice)==0){
+					this.paytype = 8;
 				}
+				
+				// if (this.paytheprice == 0) {
+				// 	// if(this.paytype!=8){
+				// 		this.isUse = false;
+				// 		this.paytype = '';
+				// 	// }
+				// } else {
+				// 	this.isUse = true;
+				// }
 				this.getRebateIntegral();
 			},