1.优化2.0 车队油卡

Utils/Api.js

@@ -308,10 +308,6 @@ export const hltUnionCardPay = params => {
 	return POST('POST', `${base}/order/hltUnionCardPay`, params).then(res => res.data);
 }
 
-//车队油卡支付
-export const fleetOilCardPay = params => {
-	return POST('POST', `${base}/order/fleetOilCardPay`, params).then(res => res.data);
-}
 
 //绑定卡包
 export const bindHuiLianTongCard = params => {

pages/goods/refuel-confirm/refuel-confirm.vue

@@ -182,22 +182,23 @@
 				<view class="flright width30 fotct" v-if="isUse">
 					<radio :checked="paytype=='3'" @click="changeRiado()" color="#0083f5" />
 				</view>
+			</view>
+			<view class="line1" v-if="item ==7"></view>
+			<view class="heightl60 paddleft10 fcor666 width100 backcorfff" v-if="item ==7"
+				@tap="paytype='7'">
+				<view class="width60 flleft font14">
+					车队油卡<text class="font14 fcor666 margle">余额: {{oilUserNoPrice}}元</text>
+				</view>
+				<view class="flright width30 fotct" v-if="isUse">
+					<radio :checked="paytype=='7'" color="#0083f5" />
+				</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>
 
-		<view v-if="paytype=='fleettruck'">
+		<view v-if="paytype=='7'" class="backcorfff">
-			<view class="heightl60 paddleft10 fcor333 fontwig6 font16 width100 backcorfff">车队油卡列表</view>
+			<view class="heightl60 paddleft10 fcor333 fontwig6 font16 width100 backcorfff flleft">车队油卡列表</view>
 			<view class="line1"></view>
 			<view class="heightl60 paddleft10 fcor666 width100 backcorfff" v-for="(item,index) in oilUserCardlist"
 				:key="index">
@@ -274,7 +275,7 @@
 	import {
 		wechatPay,
 		getHuiLianTongCardBalance,
-		hltUnionCardPay,
+		cardPay,
 		orderToGoldPay,
 		findUser,
 		oilCardPay,
@@ -286,7 +287,6 @@
 		getRebateIntegral,
 		getThirdPartyByDetail,
 		getUserCardList,
-		fleetOilCardPay,
 		getCardListByCardNo
 	} from '../../../Utils/Api.js';
 	import ssPaymentPassword from '../../../components/sanshui-payment-password/index.vue';
@@ -658,10 +658,6 @@
 
 							}
 							this.orderNo = res.return_data.orderNo;
-							// uni.reLaunch({
-							// 	url: '/pages/goods/refuel-succes/refuel-succes?id=' +
-							// 		this.orderNo
-							// });
 							uni.reLaunch({
 								url: '../../user/order_details/order_details?id=' +
 									this.orderNo
@@ -683,77 +679,13 @@
 					})
 					return;
 				}
-				if (this.paytype == 'fleettruck') {
+				if (this.paytype == '3' || this.paytype == '6' || this.paytype == '7') {
-					let params = {
-						"orderId": this.orderNo,
-						"password": this.PaymentPassword,
-						"cardNo": this.oilUserno,
-						"carLicensePlate": this.cardNoNumber,
-
-					}
-					fleetOilCardPay(params).then(res => {
-						uni.hideLoading();
-						if (res.return_code == '000000') {
-							uni.showToast({
-								title: '支付成功'
-							})
-							uni.reLaunch({
-								url: '../../user/order_details/order_details?id=' +
-									this.orderNo
-							})
-							return;
-						}
-						if (res.return_code == '102130') {
-							uni.navigateTo({
-								url: '../../login/updatePas/updatePas'
-							})
-							return;
-						}
-						uni.showToast({
-							title: res.return_msg,
-							icon: 'none'
-						})
-					})
-					return;
-				}
-
-				// if (this.paytype == 'jifen') {
-				// 	let params = {
-				// 		"orderId": this.orderNo,
-				// 		"password": this.PaymentPassword
-				// 	}
-				// 	orderToGoldPay(params).then(res => {
-				// 		uni.hideLoading();
-				// 		if (res.return_code == '000000') {
-				// 			uni.showToast({
-				// 				title: '支付成功'
-				// 			})
-				// 			uni.reLaunch({
-				// 				url: '/pages/goods/refuel-succes/refuel-succes?id=' + this.orderNo
-				// 			});
-				// 			return;
-				// 		}
-				// 		if (res.return_code == '102130') {
-				// 			uni.navigateTo({
-				// 				url: '../../login/updatePas/updatePas'
-				// 			})
-				// 			return;
-				// 		}
-				// 		uni.showToast({
-				// 			title: res.return_msg,
-				// 			icon: 'none'
-				// 		})
-				// 	})
-				// 	return;
-				// }
-
-				if (this.paytype == '3' || this.paytype == '6') {
 					let params = {
 						"orderNo": this.orderNo,
 						"cardNo": this.user.hltCardNo.cardNo,
 						"password": this.PaymentPassword
 					}
-					hltUnionCardPay(params).then(res => {
+					cardPay(params).then(res => {
 						uni.hideLoading();
 						if (res.return_code == '000000') {
 							uni.showToast({
@@ -788,46 +720,6 @@
 					})
 					return;
 				}
-				// if (this.paytype == '4') {
-				// 	let params = {
-				// 		"orderId": this.orderNo,
-				// 		"cardNo": this.user.oilCard.cardNo,
-				// 		"password": this.PaymentPassword
-				// 	}
-				// 	oilCardPay(params).then(res => {
-				// 		uni.hideLoading();
-				// 		if (res.return_code == '000000') {
-				// 			uni.showToast({
-				// 				title: '支付成功'
-				// 			})
-				// 			uni.reLaunch({
-				// 				url: '/pages/goods/refuel-succes/refuel-succes?id=' + this.orderNo
-				// 			});
-				// 			return;
-				// 		}
-				// 		if (res.return_code == '102130') {
-				// 			this.cancel();
-				// 			uni.navigateTo({
-				// 				url: '../../login/updatePas/updatePas'
-				// 			})
-				// 			return;
-				// 		}
-				// 		if (res.return_code == '102132') {
-				// 			this.cancel();
-				// 			uni.showToast({
-				// 				title: res.return_msg,
-				// 				icon: 'none'
-				// 			})
-				// 			return;
-				// 		}
-				// 		uni.showToast({
-				// 			title: res.return_msg,
-				// 			icon: 'none'
-				// 		})
-				// 		uni.navigateBack({})
-				// 	})
-				// 	return;
-				// }
 
 			},
 			//取消订单
@@ -851,22 +743,6 @@
 			},
 			//获取选择支付方式
 			changeRiado() {
-				// if (!this.user.isSetHltCard && this.paytype == 'gonghuika') {
-				// 	uni.showToast({
-				// 		icon: 'none',
-				// 		title: '当前账号还未绑定,前往绑定',
-				// 		duration: 2000,
-				// 		success() {
-				// 			setTimeout(() => {
-				// 				uni.navigateTo({
-				// 					url: '../../user/bindingCard/bindingCard'
-				// 				})
-				// 			}, 1000)
-				// 		}
-				// 	});
-				// 	return;
-				// }
-
 				if (!this.user.isSetOilCard) {
 					uni.showToast({
 						icon: 'none',
@@ -910,14 +786,8 @@
 					})
 					return;
 				}
-				// if (this.orderNo) {
-				// this.wechatPay();
-				// if (this.orderNo) {
-				// 	this.orderToPay();
-				// 	return;
-				// }
 
-				if (this.paytype == 'fleettruck') {
+				if (this.paytype == '7') {
 					let that = this;
 					uni.showModal({
 						title: '温馨提示',
@@ -1049,7 +919,7 @@
 					})
 					return;
 				}
-				if (that.paytype == 'gonghuika') {
+				if (that.paytype == '3') {
 					if (!that.user.isSetPayPwd) {
 						uni.navigateTo({
 							url: '../../login/updatePas/updatePas'
@@ -1074,7 +944,7 @@
 					that.$refs.paymentPassword.modalFun('show');
 				}
 
-				if (that.paytype == 'fleettruck') {
+				if (that.paytype == '7') {
 					if (!that.user.isSetPayPwd) {
 						uni.navigateTo({
 							url: '../../login/updatePas/updatePas'
@@ -1083,7 +953,7 @@
 					}
 					that.$refs.paymentPassword.modalFun('show');
 				}
-				if (that.paytype == 'oilcard') {
+				if (that.paytype == '6') {
 					if (!that.user.isSetPayPwd) {
 						uni.navigateTo({
 							url: '../../login/updatePas/updatePas'