diff --git a/pages/goods/refuel-confirm/refuel-confirm.vue b/pages/goods/refuel-confirm/refuel-confirm.vue
index fdb5be9..2f3e185 100644
--- a/pages/goods/refuel-confirm/refuel-confirm.vue
+++ b/pages/goods/refuel-confirm/refuel-confirm.vue
@@ -81,7 +81,8 @@
 		<view class="width100 backcorfff mart10">
 			<view class="width96 alijusstart height50 font14 fcor666">
 				<view class="width40 fcor333 fontwig6 font16">邀请码</view>
-				<input class="width60 fotrt font15" style="padding-right: 6%;" v-model="identificationCode" placeholder="请输入邀请码" />
+				<input class="width60 fotrt font15" style="padding-right: 6%;" v-model="identificationCode"
+					placeholder="请输入邀请码" />
 			</view>
 		</view>
 
@@ -175,55 +176,52 @@
 
 			<view class="line1" v-if="item == 3"></view>
 			<view class="heightl60 paddleft10 fcor666 width100 backcorfff" v-if="item == 3" @tap="paytype='3'">
-				<view class="width60 flleft fontwig6">
+				<view class="width60 flleft font14">
 					汇联通工会卡<text class="font14 fcor666 margle">余额: {{tongCardPrice}}元</text>
 				</view>
 				<view class="flright width30 fotct" v-if="isUse">
 					<radio :checked="paytype=='3'" @click="changeRiado()" color="#0083f5" />
 				</view>
 			</view>
-			</view> -->
+		</view>
 
-			<view class="line1" v-if="oilUserCardlist"></view>
-			<view class="heightl60 paddleft10 fcor666 width100 backcorfff" v-if="oilUserCardlist"
-				@tap="paytype='fleettruck'">
-				<view class="width60 flleft font14">
-					车队油卡<text class="font14 fcor666 margle">余额: {{oilUserNoPrice}}元</text>
-				</view>
-				<view class="flright width30 fotct" v-if="isUse">
-					<radio :checked="paytype=='fleettruck'" color="#0083f5" />
-				</view>
+		<view class="line1" v-if="oilUserCardlist"></view>
+		<view class="heightl60 paddleft10 fcor666 width100 backcorfff" v-if="oilUserCardlist"
+			@tap="paytype='fleettruck'">
+			<view class="width60 flleft font14">
+				车队油卡<text class="font14 fcor666 margle">余额: {{oilUserNoPrice}}元</text>
+			</view>
+			<view class="flright width30 fotct" v-if="isUse">
+				<radio :checked="paytype=='fleettruck'" color="#0083f5" />
 			</view>
+		</view>
 
-			<view v-if="paytype=='fleettruck'">
-				<view class="heightl60 paddleft10 fcor333 fontwig6 font16 width100 backcorfff">车队油卡列表</view>
-				<view class="line1"></view>
-				<view class="heightl60 paddleft10 fcor666 width100 backcorfff" v-for="(item,index) in oilUserCardlist"
-					:key="index">
-					<view class="width60 flleft font14">
-						{{item.cardNo}}({{item.contactName}})
-					</view>
-					<view class="flright width30 fotct">
-						<radio :checked="oilUserno==item.cardNo" @click="changeRiado1(item)" color="#0083f5" />
-					</view>
+		<view v-if="paytype=='fleettruck'">
+			<view class="heightl60 paddleft10 fcor333 fontwig6 font16 width100 backcorfff">车队油卡列表</view>
+			<view class="line1"></view>
+			<view class="heightl60 paddleft10 fcor666 width100 backcorfff" v-for="(item,index) in oilUserCardlist"
+				:key="index">
+				<view class="width60 flleft font14">
+					{{item.cardNo}}({{item.contactName}})
 				</view>
-
-				<view class="username">
-					<view class="namecont font15">车牌号</view>
-					<input style="width: 70%;" placeholder="输入车牌号" class="font15" v-model="cardNoNumber">
-					<!-- <view class="date text1" >{{cardNoNumber}}</view> -->
-					<!-- </view> -->
-					<picker mode="selector" style="width: 20%;" :range="UserCard" range-key="carLicensePlate"
-						@change="bindUserCard">
-						<view class="date text1"
-							style="color: white;position: absolute;margin-top: -2px;min-width: 100px;">
-							11111{{cardNoNumber}}</view>
-					</picker>
-					<image class="flright" style="width: 15px;height: 15px;" src="../../../static/img/downj.png">
-					</image>
+				<view class="flright width30 fotct">
+					<radio :checked="oilUserno==item.cardNo" @click="changeRiado1(item)" color="#0083f5" />
 				</view>
 			</view>
 
+			<view class="username">
+				<view class="namecont font15">车牌号</view>
+				<input style="width: 70%;" placeholder="输入车牌号" class="font15" v-model="cardNoNumber">
+				<!-- <view class="date text1" >{{cardNoNumber}}</view> -->
+				<!-- </view> -->
+				<picker mode="selector" style="width: 20%;" :range="UserCard" range-key="carLicensePlate"
+					@change="bindUserCard">
+					<view class="date text1" style="color: white;position: absolute;margin-top: -2px;min-width: 100px;">
+						11111{{cardNoNumber}}</view>
+				</picker>
+				<image class="flright" style="width: 15px;height: 15px;" src="../../../static/img/downj.png">
+				</image>
+			</view>
 		</view>
 
 		<view class="width100 mart15 fcor333 font16 fontwig6 paddleft10">重要说明</view>
@@ -241,7 +239,6 @@
 		</view>
 
 
-
 		<wybPopup ref="popup" type="bottom" width="500" :scrollY="true" radius="6" :showCloseIcon="true">
 			<view class="fotct font18 fontwig6 fcor333 mart10 height30">优惠券选择</view>
 			<view class="width92 height110 tccs mart10 alijus" v-for="(items, index) in OrderPreList" :key="index"
@@ -256,11 +253,9 @@
 					</view>
 					<view class="width20 fotrt">
 						<view>
-							<radio
-								v-if="items.discountCondition && orderPrice >= items.discountCondition"
+							<radio v-if="items.discountCondition && orderPrice >= items.discountCondition"
 								color="#c72a20" :checked="items.id == memDiscountId" />
-							<radio
-								v-if="items.discountCondition && orderPrice < items.discountCondition"
+							<radio v-if="items.discountCondition && orderPrice < items.discountCondition"
 								color="#c72a20" disabled="true" :checked="items.id == memDiscountId" />
 
 							<radio v-if="!items.discountCondition" color="#c72a20"
@@ -289,8 +284,7 @@
 		cancel,
 		oilPriceDiscountCompute,
 		getRebateIntegral,
-		getThirdPartyByDetail
-		getRebateIntegral,
+		getThirdPartyByDetail,
 		getUserCardList,
 		fleetOilCardPay,
 		getCardListByCardNo
@@ -335,7 +329,6 @@
 				Integrastu: 1, //返积分状态
 				paytypeList: [], //支付方式
 				identificationCode: '', //渠道商
-				Integrastu: 1, //返积分状态
 				oilUserCardlist: '', //油卡列表
 				oilUserno: '', //油卡卡号
 				contactName: '', //油卡联系人
@@ -420,7 +413,7 @@
 					type: 3
 				}
 				getUserCardList(datas).then(res => {
-					if (res.return_code == '000000' && res.return_data !='') {
+					if (res.return_code == '000000' && res.return_data != '') {
 						this.oilUserCardlist = res.return_data;
 						this.oilUserno = res.return_data[0].cardNo;
 						this.contactName = res.return_data[0].contactName;
@@ -911,8 +904,8 @@
 					})
 					return;
 				}
-				if (this.orderNo) {
-					this.wechatPay();
+				// if (this.orderNo) {
+				// this.wechatPay();
 				// if (this.orderNo) {
 				// 	this.orderToPay();
 				// 	return;
@@ -951,7 +944,7 @@
 					"payGold": this.priceValue[1],
 					"promoteCode": this.identificationCode,
 					"payPwd": this.PaymentPassword,
-					memDiscountId:this.memDiscountId
+					memDiscountId: this.memDiscountId
 				}
 
 				create(goods).then(res => {
@@ -1301,4 +1294,4 @@
 			width: 28%;
 		}
 	}
-</style>
+</style>
diff --git a/pages/order/confirmation.vue b/pages/order/confirmation.vue
index cce23cd..d184e17 100644
--- a/pages/order/confirmation.vue
+++ b/pages/order/confirmation.vue
@@ -93,96 +93,104 @@
 					¥{{priceValue[1] / 100}}
 				</view>
 			</view>
-			<view class="width94 line1 mart5 marb5"></view>
+			<!-- <view class="width94 line1 mart5 marb5"></view> -->
 
 			<view class="height40 width100 backcorfff">
-				<view class="width40 flleft fcor666 font15 fontwig6 text1 alijusstart" style="padding-left: 2%;">
+				<!-- <view class="width40 flleft fcor666 font15 fontwig6 text1 alijusstart" style="padding-left: 2%;">
 					<image src="../../static/img/rebate.png" mode="widthFix" style="width: 25px;"></image>
 					<text>下单返积分</text>
-			<view class="height50 width100 backcorfff" @tap="paytype='weixin'"
-				v-if="couponList.payType == 1 || couponList.payType==3 ">
-				<view class="width50 flleft fcor333 font16" style="padding-left: 4%;">
-					微信支付
-				</view>
-				<view class="width40 flright fotrt paddtright10 font15 fontwig6 fcor666 alijun"
-					style="align-items: center;">
-					<radio :checked="paytype=='weixin'" color="#0083f5" />
-				</view>
-			</view>
+					<view class="height50 width100 backcorfff" @tap="paytype='weixin'"
+						v-if="couponList.payType == 1 || couponList.payType==3 ">
+						<view class="width50 flleft fcor333 font16" style="padding-left: 4%;">
+							微信支付
+						</view>
+						<view class="width40 flright fotrt paddtright10 font15 fontwig6 fcor666 alijun"
+							style="align-items: center;">
+							<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"
-				v-if="couponList.payType == 1 || couponList.payType == 2 || couponList.payType==3"
-				@tap="paytype='jinbi'">
-				<view class="width70 flleft fcor333 font16 text1" style="padding-left: 4%;">
-					积分支付<text class="font14 fcor666 margle">可用积分: {{user.gold}}</text>
-				</view>
-				<view class="width50 flright fotrt paddtright10 font15 colore95 alijun" v-if="Integrastu == 1"
-					style="align-items: center;">
-					返{{rebateIntegral}}积分
-				</view>
-				<view class="width50 flright fotrt paddtright10 font15 colore95 alijun" v-if="Integrastu == 2"
-					style="align-items: center;">
-					{{rebateIntegral}}
-				</view>
-			</view>
-			<view class=" width100 backcorfff alijusstart paddbotm10" style="padding-left: 2%;">
-				<image src="../../static/img/sigh.png" mode="widthFix" class="icon20"></image>
-				<text class="fcor999 font13">积分抵扣与优惠券抵扣不同享</text>
-			</view>
+					<view class="width94 line1 mart5 marb5" v-if="couponList.payType == 1 ||  couponList.payType==3">
+					</view>
+					<view class="height50 width100 backcorfff"
+						v-if="couponList.payType == 1 || couponList.payType == 2 || couponList.payType==3"
+						@tap="paytype='jinbi'">
+						<view class="width70 flleft fcor333 font16 text1" style="padding-left: 4%;">
+							积分支付<text class="font14 fcor666 margle">可用积分: {{user.gold}}</text>
+						</view>
+						<view class="width50 flright fotrt paddtright10 font15 colore95 alijun" v-if="Integrastu == 1"
+							style="align-items: center;">
+							返{{rebateIntegral}}积分
+						</view>
+						<view class="width50 flright fotrt paddtright10 font15 colore95 alijun" v-if="Integrastu == 2"
+							style="align-items: center;">
+							{{rebateIntegral}}
+						</view>
+					</view>
+					<view class=" width100 backcorfff alijusstart paddbotm10" style="padding-left: 2%;">
+						<image src="../../static/img/sigh.png" mode="widthFix" class="icon20"></image>
+						<text class="fcor999 font13">积分抵扣与优惠券抵扣不同享</text>
+					</view>
 
 
-			<view class="height50 width100 backcorfff">
-				<view class="width100 flleft fcor333 fontwig6 font16" style="padding-left: 4%;">
-					支付方式
-					<!-- : <text class="jfrecharge" @click="jumpdeposits"
+					<view class="height50 width100 backcorfff">
+						<view class="width100 flleft fcor333 fontwig6 font16" style="padding-left: 4%;">
+							支付方式 -->
+							<!-- : <text class="jfrecharge" @click="jumpdeposits"
 						v-if="couponList.payType == 1 || couponList.payType == 2 || couponList.payType==3">积分充值</text> -->
-				</view>
-			</view>
-			<view class="width94 line1 mart5 marb5"
-				v-if="couponList.payType == 1 || couponList.payType == 2 ||  couponList.payType==3"></view>
-			<view class="height50 width100 backcorfff" @tap="paytype='gonghuika'" v-if="couponList.payType== 4">
-				<view class="width70 flleft fcor333 font16 text1" style="padding-left: 4%;">
-					汇联通工会卡<text class="font14 fcor666 margle">可用余额: {{tongCardPrice}}元</text>
-				</view>
-				<view class="width20 flright fotrt paddtright10 font15 fontwig6 fcor666 alijun"
-					style="align-items: center;">
-					<radio :checked="paytype=='gonghuika'" @click="changeRiado()" color="#0083f5" />
-				</view>
-			</view>
-		</view>
+					<!-- 	</view>
+					</view>
+					<view class="width94 line1 mart5 marb5"
+						v-if="couponList.payType == 1 || couponList.payType == 2 ||  couponList.payType==3"></view>
+					<view class="height50 width100 backcorfff" @tap="paytype='gonghuika'" v-if="couponList.payType== 4">
+						<view class="width70 flleft fcor333 font16 text1" style="padding-left: 4%;">
+							汇联通工会卡<text class="font14 fcor666 margle">可用余额: {{tongCardPrice}}元</text>
+						</view>
+						<view class="width20 flright fotrt paddtright10 font15 fontwig6 fcor666 alijun"
+							style="align-items: center;">
+							<radio :checked="paytype=='gonghuika'" @click="changeRiado()" color="#0083f5" />
+						</view>
+					</view>
+				</view> -->
 
 
 
-		<!-- <view class="width94 comorder mart10">
+				<!-- <view class="width94 comorder mart10">
 			<view class="height50 width100 backcorfff">
 				<view class="width80p flleft fcor333 fontwig6 font14" style="padding-left: 4%;">
 					<text style="color: #0083F5;">《条约协议》</text>点击立即支付，即代表同意
-			<!-- <view class="width94 line1 mart5 marb5"></view> -->
-			<view class="width100" v-for="(item,index) in paytypeList" :key="index">
-				<view class="width94 line1 mart5 marb5" v-if="item == 2"></view>
-				<view class="height50 width100 backcorfff" @tap="paytype='2'" v-if="item == 2">
-					<view class="width50 flleft fcor333 font16" style="padding-left: 4%;">
-						微信支付
-					</view>
-					<view class="width40 flright fotrt paddtright10 font15 fontwig6 fcor666 alijun"
-						style="align-items: center;" v-if="isUse">
-						<radio :checked="paytype=='2'" color="#0083f5" />
+			 <view class="width94 line1 mart5 marb5"></view> -->
+				<view class="height50 width100 backcorfff">
+					<view class="width100 flleft fcor333 fontwig6 font16" style="padding-left: 4%;">
+						支付方式
+						<!-- : <text class="jfrecharge" @click="jumpdeposits"
+			 	v-if="couponList.payType == 1 || couponList.payType == 2 || couponList.payType==3">积分充值</text> -->
 					</view>
 				</view>
-				<view class="width94 line1 mart5 marb5" v-if="item == 3"></view>
-				<view class="height50 width100 backcorfff" @tap="paytype='3'" v-if="item == 3">
-					<view class="width70 flleft fcor333 font16 text1" style="padding-left: 4%;">
-						汇联通工会卡<text class="font14 fcor666 margle">可用余额: {{tongCardPrice}}元</text>
+				<view class="width100" v-for="(item,index) in paytypeList" :key="index">
+					<view class="width94 line1 mart5 marb5" v-if="item == 2"></view>
+					<view class="height50 width100 backcorfff" @tap="paytype='2'" v-if="item == 2">
+						<view class="width50 flleft fcor333 font16" style="padding-left: 4%;">
+							微信支付
+						</view>
+						<view class="width40 flright fotrt paddtright10 font15 fontwig6 fcor666 alijun"
+							style="align-items: center;" v-if="isUse">
+							<radio :checked="paytype=='2'" color="#0083f5" />
+						</view>
 					</view>
-					<view class="width20 flright fotrt paddtright10 font15 fontwig6 fcor666 alijun"
-						style="align-items: center;" v-if="isUse">
-						<radio :checked="paytype=='3'" @click="changeRiado()" color="#0083f5" />
+					<view class="width94 line1 mart5 marb5" v-if="item == 3"></view>
+					<view class="height50 width100 backcorfff" @tap="paytype='3'" v-if="item == 3">
+						<view class="width70 flleft fcor333 font16 text1" style="padding-left: 4%;">
+							汇联通工会卡<text class="font14 fcor666 margle">可用余额: {{tongCardPrice}}元</text>
+						</view>
+						<view class="width20 flright fotrt paddtright10 font15 fontwig6 fcor666 alijun"
+							style="align-items: center;" v-if="isUse">
+							<radio :checked="paytype=='3'" @click="changeRiado()" color="#0083f5" />
+						</view>
 					</view>
 				</view>
 			</view>
 		</view>
-
 		<view class="width100 height60"></view>
 		<view class="footer">
 			<view class="settlement">
@@ -200,7 +208,6 @@
 
 			</view>
 		</view>
-
 		<wybPopup ref="popup" type="bottom" width="500" scrollY="true" radius="6" :showCloseIcon="true">
 			<view class="fotct font18 fontwig6 fcor333 mart10 height30">优惠券选择</view>
 			<view class="width92 height110 tccs mart10" v-for="(items, index) in UserNormalDiscountList" :key="items"
@@ -277,8 +284,7 @@
 				isUse: true, // 是否禁用状态
 				rechargeDes: '', // 支付详情
 				rebateIntegral: '', //返回积分
-				Integrastu: 1 //返积分状态
-				identificationCode: '', //渠道商
+				Integrastu: 1, //返积分状态
 				contactPepole: '', //联系人
 				contactPhone: '', //联系电话
 				contactAddress: '' //联系地址
@@ -610,9 +616,8 @@
 					}],
 					"payGold": this.priceValue[1],
 					"promoteCode": this.identificationCode,
-					memDiscountId: this.memDiscountId
-						"storeId": this.storeId
-					}],
+					memDiscountId: this.memDiscountId,
+					"storeId": this.storeId,
 					"postData": {
 						"address": this.contactAddress,
 						"user": this.contactPepole,
@@ -1290,4 +1295,4 @@
 			}
 		}
 	}
-</style>
+</style>