Merge branch 'feature/GFRS-1036【待确定】微信支付-卡单微信支付' into dev

This commit is contained in:
wangmingzhe
2020-04-29 14:18:33 +08:00

View File

@@ -228,13 +228,9 @@ export default {
this.radio = '3' this.radio = '3'
let token = this.$route.query.token let token = this.$route.query.token
let orderNo = this.$route.query.orderNo let orderNo = this.$route.query.orderNo
this.bankListName = this.$route.query.bankListName
this.underWriteData.name = this.$route.query.name
this.underWriteData.bankName = this.$route.query.bankName
this.underWriteData.bankCode = this.$route.query.bankCode
localStorage.token = token localStorage.token = token
localStorage.orderNo = orderNo localStorage.orderNo = orderNo
// this.isLoading = true this.isLoading = true
// 再次支付 调详情 获取信息 // 再次支付 调详情 获取信息
this.getOrderDetail() this.getOrderDetail()
} }
@@ -407,6 +403,9 @@ export default {
this.underWriteData = { this.underWriteData = {
appntName: res.orderDTO.insuredDTOs[0].riskDTOLst[0].riskName, appntName: res.orderDTO.insuredDTOs[0].riskDTOLst[0].riskName,
name: res.orderDTO.appntDTO.name, name: res.orderDTO.appntDTO.name,
bankName: res.orderDTO.orderAccountDTO.bankCode,
bankCode: res.orderDTO.orderAccountDTO.cardBookCode,
cardBookCode: res.orderDTO.orderAccountDTO.cardBookCode,
idType: res.orderDTO.appntDTO.idType, idType: res.orderDTO.appntDTO.idType,
orderAmount: res.orderDTO.orderInfoDTO.orderAmount, orderAmount: res.orderDTO.orderInfoDTO.orderAmount,
orderNo: res.orderDTO.orderAccountDTO.orderNo, orderNo: res.orderDTO.orderAccountDTO.orderNo,
@@ -414,12 +413,15 @@ export default {
resultMessage: '交易处理成功', resultMessage: '交易处理成功',
uwResult: '02' uwResult: '02'
} }
this.underWriteData.bankCode = this.bankListName = res.orderDTO.orderAccountDTO.bankName
res.orderDTO.orderAccountDTO.cardBookCode !== null ? res.orderDTO.orderAccountDTO.cardBookCode : this.$route.query.bankCode if (this.isWeixin) {
this.underWriteData.bankName = res.orderDTO.orderAccountDTO.bankCode !== null ? res.orderDTO.orderAccountDTO.bankCode : this.$route.query.bankName this.underWriteData.bankCode =
this.underWriteData.cardBookCode = res.orderDTO.orderAccountDTO.cardBookCode !== null ? res.orderDTO.orderAccountDTO.cardBookCode : this.$route.query.bankCode
res.orderDTO.orderAccountDTO.cardBookCode !== null ? res.orderDTO.orderAccountDTO.cardBookCode : this.$route.query.bankCode this.underWriteData.bankName = res.orderDTO.orderAccountDTO.bankCode !== null ? res.orderDTO.orderAccountDTO.bankCode : this.$route.query.bankName
this.bankListName = res.orderDTO.orderAccountDTO.bankName !== null ? res.orderDTO.orderAccountDTO.bankName : this.$route.query.bankListName this.underWriteData.cardBookCode =
res.orderDTO.orderAccountDTO.cardBookCode !== null ? res.orderDTO.orderAccountDTO.cardBookCode : this.$route.query.bankCode
this.bankListName = res.orderDTO.orderAccountDTO.bankName !== null ? res.orderDTO.orderAccountDTO.bankName : this.$route.query.bankListName
}
if (this.isWeixin) { if (this.isWeixin) {
this.pay() this.pay()