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

This commit is contained in:
wangmingzhe
2020-04-29 11:58:11 +08:00

View File

@@ -228,6 +228,10 @@ 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
@@ -595,6 +599,7 @@ export default {
} }
} else { } else {
this.$toast(res.resultMessage) this.$toast(res.resultMessage)
this.isLoading = false
} }
// }) // })
}, },
@@ -624,7 +629,20 @@ export default {
extra: { extra: {
title: `国富人寿卡单投保(${shareName})付款`, title: `国富人寿卡单投保(${shareName})付款`,
content: '付款进行', content: '付款进行',
url: location.origin + '/#/cardList/pay?orderNo=' + localStorage.orderNo + '&token=' + localStorage.token, url:
location.origin +
'/#/cardList/pay?orderNo=' +
localStorage.orderNo +
'&token=' +
localStorage.token +
'&name=' +
this.underWriteData.name +
'&bankName=' +
this.underWriteData.bankName +
'&bankCode=' +
this.underWriteData.bankCode +
'&bankListName=' +
this.bankListName,
img: this.$assetsUrl + 'images/logo.png' img: this.$assetsUrl + 'images/logo.png'
} }
}) })
@@ -638,38 +656,6 @@ export default {
* { * {
box-sizing: border-box; box-sizing: border-box;
} }
// .oi {
// font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';
// font-weight: 700;
// font-style: normal;
// color: #666666;
// }
// .money {
// display: flex;
// width: 100%;
// align-items: center;
// justify-content: space-between;
// z-index: 100;
// background: white;
// height: 40px;
// overflow: hidden;
// > div:nth-of-type(1) {
// display: flex;
// align-items: center;
// img {
// width: 33px;
// height: 32px;
// }
// span {
// font-size: 14px;
// }
// }
// > div:nth-of-type(2) {
// display: flex;
// align-items: center;
// }
// }
.vximg { .vximg {
width: 23px; width: 23px;