From 6e88877847db2df56eeb8dc70a291394813dc417 Mon Sep 17 00:00:00 2001
From: Wik-T <812952667@qq.com>
Date: Wed, 11 Jan 2023 17:45:55 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BC=98=E5=8C=962.0=20=E8=BD=A6=E9=98=9F?=
=?UTF-8?q?=E6=B2=B9=E5=8D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Utils/Api.js | 4 -
pages/goods/refuel-confirm/refuel-confirm.vue | 170 +++---------------
2 files changed, 20 insertions(+), 154 deletions(-)
diff --git a/Utils/Api.js b/Utils/Api.js
index bb2d990..c04cdab 100644
--- a/Utils/Api.js
+++ b/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 => {
diff --git a/pages/goods/refuel-confirm/refuel-confirm.vue b/pages/goods/refuel-confirm/refuel-confirm.vue
index 68e8389..d5e7ae0 100644
--- a/pages/goods/refuel-confirm/refuel-confirm.vue
+++ b/pages/goods/refuel-confirm/refuel-confirm.vue
@@ -182,22 +182,23 @@
+
+
+
+
+ 车队油卡余额: {{oilUserNoPrice}}元
+
+
+
+
-
-
-
- 车队油卡余额: {{oilUserNoPrice}}元
-
-
-
-
-
+
-
- 车队油卡列表
+
+ 车队油卡列表
@@ -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') {
- 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') {
+ if (this.paytype == '3' || this.paytype == '6' || this.paytype == '7') {
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'