From 6d2dedfa4399a62654be01d7f6e69b59e7c5125d Mon Sep 17 00:00:00 2001
From: youmengting <2080639302@qq.com>
Date: Thu, 29 Jun 2023 10:53:54 +0800
Subject: [PATCH] =?UTF-8?q?=20=E7=A7=AF=E5=88=86=E5=85=91=E6=8D=A2?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=98=BE=E7=A4=BA=E6=80=BB=E7=A7=AF=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/confirmation.vue | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/pages/order/confirmation.vue b/pages/order/confirmation.vue
index 33c2587..4fb83a5 100644
--- a/pages/order/confirmation.vue
+++ b/pages/order/confirmation.vue
@@ -87,18 +87,19 @@
 
 		<view class="width94 comorder mart10">
 
-			<view class="width92 alijusstart paddtop20">
-				<view class="width30 fcor333 fontwig6 font16">
+			<view class="width92 alijusstart paddtop20" @touchmove.stop>
+				<view class=" fcor333 fontwig6 font16" style="flex-shrink: 0;padding-right: 10px;">
 					积分抵扣
 				</view>
 				<view class="cj-slider">
-					<view class="flleft fotct font14 fcor666" style="width: 15%;">0</view>
-					<cj-slider style="width: 60%; float:left;" v-if="isDiscount" v-model="priceValue" :min="0"
+					<view class="flleft fotct font14 fcor666"  style="flex-shrink: 0;padding: 0 15px 0 0;">0</view>
+					<cj-slider  class="flex-1" v-if="isDiscount" v-model="priceValue" :min="0"
 						:max="availIntegal" :step="1" :blockWidth="40" @start="blockStart" @moving="blockMoving"
 						@end="blockEnd" />
-					<view class="flright fotrt font14 fcor666" style="width: 25%;">{{availIntegal}}</view>
+					<view class="flright fotrt font14 fcor666" style="flex-shrink: 0;padding-left: 15px;">{{availIntegal}}/{{user.gold || 0}}</view>
 				</view>
 			</view>
+			
 			<view class="width94 line1 mart15 marb5"></view>
 			<view class="height50 width100 backcorfff">
 				<view class="width70 flleft fcor333 fontwig6 font16 text1" style="padding-left: 4%;">
@@ -330,7 +331,7 @@
 				priceValue: [0, 0], // 积分可以指定默认值
 				changePrice: '', //滑动值
 				isDiscount: true,
-				availIntegal: '', // 可用积分
+				availIntegal: 0, // 可用积分
 				isUse: true, // 是否禁用状态
 				rechargeDes: '', // 支付详情
 				rebateIntegral: '', //返回积分
@@ -470,6 +471,7 @@
 							this.oilPirce = res.return_data.oilCard.amount;
 						}
 						this.getUserNormalDiscountList();
+						this.getThirdPartyByDetail();
 						uni.setStorage({
 							key: "user",
 							data: res.return_data
@@ -544,7 +546,7 @@
 						this.saveprice = res.return_data.discountPrice;
 						this.orderPrice = res.return_data.salesPrice;
 						this.getRebateIntegral();
-						this.getThirdPartyByDetail();
+						// this.getThirdPartyByDetail();
 					}
 				})
 			},
@@ -1149,10 +1151,10 @@
 						.deductionPrice).toFixed(2);
 				}
 				if (this.paytheprice == 0) {
-					if(this.paytype!=8){
+					// if(this.paytype!=8){
 						this.isUse = false;
 						this.paytype = '';
-					}
+					// }
 				} else {
 					this.isUse = true;
 				}