From a1e7b016e92b4636be7097f8d9f64e9d1c57d83c Mon Sep 17 00:00:00 2001 From: "li.yuetong" Date: Thu, 30 Jun 2022 17:15:06 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=9B=BD=E5=AF=8C=E6=83=A0=E6=A1=82?= =?UTF-8?q?=E4=BF=9D=E5=9B=A2=E4=BD=93=E5=8C=BB=E7=96=97=E4=BF=9D=E9=99=A9?= =?UTF-8?q?=E4=BA=A7=E5=93=81=E4=B8=8A=E7=BA=BF=E9=87=91=E6=8E=8C=E6=A1=82?= =?UTF-8?q?=E6=8A=95=E4=BF=9D=E5=BC=80=E5=8F=91=E9=9C=80=E6=B1=82=E3=80=91?= =?UTF-8?q?=E5=9B=A2=E9=99=A9=E4=B8=8E=E9=9D=9E=E5=9B=A2=E9=99=A9=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E5=88=86=E4=BA=AB=E9=A1=B5=E9=9D=A2=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E8=84=9A=E6=9C=AC=EF=BC=8C=E6=94=AF=E4=BB=98=E5=88=86=E4=BA=AB?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=B7=BB=E5=8A=A0isGroupCard:''=20//1=20?= =?UTF-8?q?=E5=9B=A2=E9=99=A9=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/cardList/GroupPayMent.vue | 13 ++++++++----- src/views/ebiz/cardList/Pay.vue | 7 +++++-- src/views/ebiz/cardList/phoneCode.vue | 8 +++++++- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/views/ebiz/cardList/GroupPayMent.vue b/src/views/ebiz/cardList/GroupPayMent.vue index 6716bbced..6ba15297b 100644 --- a/src/views/ebiz/cardList/GroupPayMent.vue +++ b/src/views/ebiz/cardList/GroupPayMent.vue @@ -288,7 +288,8 @@ export default { isAreaListShow: false, accBankProvince: '', accBankCity: '', - areaStr: '' + areaStr: '', + isGroupCard:'' //1 团险标识 } }, created() { @@ -298,7 +299,7 @@ export default { riskName: orderDetail.insuredDTOs[0].riskDTOLst[0].riskName, appntName: orderDetail.appntDTO.name, insuredName: orderDetail.insuredDTOs, - orderAmount: orderDetail.insuredDTOs[0].riskDTOLst[0].prem, + orderAmount: orderDetail.orderInfoDTO.orderAmount, schemeName: orderDetail.insuredDTOs[0].riskDTOLst[0].proScheme, idType: orderDetail.appntDTO.idType, bankCode: orderDetail.orderAccountDTO.cardBookCode, @@ -532,7 +533,7 @@ export default { // cardBookCode: res.orderDTO.orderAccountDTO.cardBookCode, schemeName: res.orderDTO.insuredDTOs[0].riskDTOLst[0].proScheme, idType: res.orderDTO.appntDTO.idType, - orderAmount: res.orderDTO.insuredDTOs[0].riskDTOLst[0].prem, + orderAmount: res.orderDTO.orderInfoDTO.orderAmount, orderNo: res.orderDTO.orderAccountDTO.orderNo, result: '', resultMessage: '交易处理成功', @@ -545,7 +546,9 @@ export default { 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) { + // isGroupCard 1 团险标识 + this.isGroupCard = res.orderDTO.orderInfoDTO.isGroupCard + // if (this.isWeixin) { // this.pay() // } } else { @@ -815,7 +818,7 @@ export default { localStorage.bankCode = this.underWriteData.bankCode localStorage.bankListName = this.bankListName let res = await getShareParam({ shareType: 'card_pay' }) - let url = location.origin + '/#/cardList/phoneCode?orderNo=' + localStorage.orderNo + '&token=' + res.content + let url = location.origin + '/#/cardList/phoneCode?orderNo=' + localStorage.orderNo + '&token=' + res.content + '&isGroupCard=' + this.isGroupCard if (res.result == '0') { EWebBridge.webCallAppInJs('bridge', { flag: 'share', diff --git a/src/views/ebiz/cardList/Pay.vue b/src/views/ebiz/cardList/Pay.vue index a0cc2a81e..3c5de9d39 100644 --- a/src/views/ebiz/cardList/Pay.vue +++ b/src/views/ebiz/cardList/Pay.vue @@ -289,7 +289,8 @@ export default { isAreaListShow: false, accBankProvince: '', accBankCity: '', - areaStr: '' + areaStr: '', + isGroupCard:'' //1 团险标识 } }, created() { @@ -547,6 +548,8 @@ export default { 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 + // isGroupCard 1 团险标识 + this.isGroupCard = res.orderDTO.orderInfoDTO.isGroupCard // if (this.isWeixin) { // this.pay() // } @@ -817,7 +820,7 @@ export default { localStorage.bankCode = this.underWriteData.bankCode localStorage.bankListName = this.bankListName let res = await getShareParam({ shareType: 'card_pay' }) - let url = location.origin + '/#/cardList/phoneCode?orderNo=' + localStorage.orderNo + '&token=' + res.content + let url = location.origin + '/#/cardList/phoneCode?orderNo=' + localStorage.orderNo + '&token=' + res.content + '&isGroupCard=' + this.isGroupCard if (res.result == '0') { EWebBridge.webCallAppInJs('bridge', { flag: 'share', diff --git a/src/views/ebiz/cardList/phoneCode.vue b/src/views/ebiz/cardList/phoneCode.vue index a3385695c..d62031853 100644 --- a/src/views/ebiz/cardList/phoneCode.vue +++ b/src/views/ebiz/cardList/phoneCode.vue @@ -64,10 +64,16 @@ export default { code: this.userInfo.authCode, }).then((res) => { if (res.result == 0) { + let url + if(this.$route.query.isGroupCard == '1'){ + url = `/#/cardList/GroupCheckInfo?cardOrderNo=`+ this.$route.query.orderNo + }else{ + url = `/#/cardList/cardDetail` + } this.$jump({ flag: 'h5', extra: { - url: location.origin + `/#/cardList/cardDetail`, + url: location.origin + url, }, routerInfo: { path: `/cardList/cardDetail`,