From 08942d70a8172b5ebbee5641b617ac0b70cc0fe5 Mon Sep 17 00:00:00 2001
From: Wik-T <812952667@qq.com>
Date: Fri, 25 Mar 2022 09:31:48 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=9B=A2=E6=B2=B9=E5=8A=A0=E6=B2=B9=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E8=B6=85=E8=BF=87800=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .hbuilderx/launch.json                        | 4 ++++
 pages/goods/refuel-confirm/refuel-confirm.vue | 4 ++--
 pages/goods/refuel-details/refuel-details.vue | 9 ++++++++-
 pages/order/confirmation.vue                  | 8 ++++----
 pages/pay/payment/payment.vue                 | 2 +-
 5 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
index 9cba30d..075b9c5 100644
--- a/.hbuilderx/launch.json
+++ b/.hbuilderx/launch.json
@@ -6,6 +6,10 @@
      	{
      		"launchtype" : "remote"
      	},
+     	"h5" : 
+     	{
+     		"launchtype" : "remote"
+     	},
      	"mp-weixin" : 
      	{
      		"launchtype" : "remote"
diff --git a/pages/goods/refuel-confirm/refuel-confirm.vue b/pages/goods/refuel-confirm/refuel-confirm.vue
index 59cb8ef..b81c6f0 100644
--- a/pages/goods/refuel-confirm/refuel-confirm.vue
+++ b/pages/goods/refuel-confirm/refuel-confirm.vue
@@ -67,7 +67,7 @@
 				</view>
 			</view>
 
-			<view class="line1"></view>
+			<!-- <view class="line1"></view>
 			<view class="heightl60 paddleft10 fcor666 width100 backcorfff" @tap="paytype='gonghuika'">
 				<view class="width60 flleft fontwig6">
 					汇联通工会卡<text class="font14 fcor666 margle">余额: {{tongCardPrice}}元</text>
@@ -75,7 +75,7 @@
 				<view class="flright width30 fotct">
 					<radio :checked="paytype=='gonghuika'" @click="changeRiado()" color="#0083f5" />
 				</view>
-			</view>
+			</view> -->
 		</view>
 
 		<view class="width100 mart15 fcor333 font16 fontwig6 paddleft10">重要说明</view>
diff --git a/pages/goods/refuel-details/refuel-details.vue b/pages/goods/refuel-details/refuel-details.vue
index c229ded..aa8c146 100644
--- a/pages/goods/refuel-details/refuel-details.vue
+++ b/pages/goods/refuel-details/refuel-details.vue
@@ -66,7 +66,7 @@
 		<view class="width90 height40 mart10" style="border: 1px solid #f2f2f2;">
 			<view class="width8 flleft">￥</view>
 			<input type="digit" class="font16 width60 flleft height40" placeholder="请输入金额" v-model="inputMoney"
-				@blur="Listeningfocus" maxlength="6" />
+				@blur="Listeningfocus" maxlength="3" />
 			<view class="width30 height40 flright font14 fcor999 fotct"
 				style="border-left: 1px solid #f2f2f2;line-height: 40px;">
 				约{{litre}}L
@@ -284,6 +284,13 @@
 			},
 			//失去焦点算价格和油升
 			Listeningfocus() {
+				if(this.inputMoney > 800){
+					uni.showToast({
+						title: '加油金额不能超过800元',
+						icon: "none"
+					});
+					this.inputMoney = 800;
+				}
 				//原来计算方式
 				this.litre = parseFloat(this.inputMoney / this.priceOfficial).toFixed(2);
 				this.totalPrice = parseFloat(this.inputMoney / this.priceOfficial * this.priceVip).toFixed(2);
diff --git a/pages/order/confirmation.vue b/pages/order/confirmation.vue
index 467c15d..4887a31 100644
--- a/pages/order/confirmation.vue
+++ b/pages/order/confirmation.vue
@@ -95,7 +95,7 @@
 				</view>
 			</view>
 			<view class="width94 line1 mart5 marb5"></view>
-			<view class="height50 width100 backcorfff" v-if="couponList.payType == 2 || couponList.payType==3 "
+			<view class="height50 width100 backcorfff" v-if="couponList.payType == 2 || couponList.payType==3 || couponList.payType== 4"
 				@tap="paytype='jinbi'">
 				<view class="width70 flleft fcor333 fontwig6 font16 text1" style="padding-left: 4%;">
 					积分支付<text class="font14 fcor666 margle">可用积分: {{user.gold}}</text>
@@ -105,7 +105,7 @@
 					<radio :checked="paytype=='jinbi'" color="#0083f5" />
 				</view>
 			</view>
-			<view class="width94 line1 mart5 marb5" v-if="couponList.payType == 2 || couponList.payType==3 "></view>
+			<view class="width94 line1 mart5 marb5" v-if="couponList.payType == 2 || couponList.payType==3 || couponList.payType== 4"></view>
 			<view class="height50 width100 backcorfff" @tap="paytype='weixin'"
 				v-if="couponList.payType == 1 || couponList.payType==3 ">
 				<view class="width50 flleft fcor333 fontwig6 font16" style="padding-left: 4%;">
@@ -116,8 +116,8 @@
 					<radio :checked="paytype=='weixin'" color="#0083f5" />
 				</view>
 			</view>
-			<view class="width94 line1 mart5 marb5" v-if="couponList.payType == 1 || couponList.payType==3 "></view>
-			<view class="height50 width100 backcorfff" @tap="paytype='gonghuika'">
+			<view class="width94 line1 mart5 marb5" v-if="couponList.payType == 1 || couponList.payType==3"></view>
+			<view class="height50 width100 backcorfff" @tap="paytype='gonghuika'" v-if="couponList.payType== 4">
 				<view class="width70 flleft fcor333 fontwig6 font16 text1" style="padding-left: 4%;">
 					汇联通工会卡<text class="font14 fcor666 margle">可用余额: {{tongCardPrice}}元</text>
 				</view>
diff --git a/pages/pay/payment/payment.vue b/pages/pay/payment/payment.vue
index c29f0e5..56dea76 100644
--- a/pages/pay/payment/payment.vue
+++ b/pages/pay/payment/payment.vue
@@ -18,7 +18,7 @@
 			</view>
 			<view class="content">
 				<view class="pay-list">
-					<view class="row" @tap="paytype='jinbi'" v-if="pryType == 2 || pryType==3 ">
+					<view class="row" @tap="paytype='jinbi'" v-if="(pryType == 2 || pryType==3) && goodsType != 1">
 						<view class="left">
 							<image src="../../../static/img/jfx.png"></image>
 						</view>