diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue index c5748594d..50ab621eb 100644 --- a/src/views/ebiz/common/CalculatePremium.vue +++ b/src/views/ebiz/common/CalculatePremium.vue @@ -2696,6 +2696,9 @@ //建议书需要添加全部投保人信息,电投只需要投保人ID let insuredDTOItem = Object.assign(this.saleInsuredPersonInfo, { riskDTOLst: riskDTOLst }) + if (!insuredDTOItem.insuredAge) { + insuredDTOItem.insuredAge = insuredDTOItem.age + } let orderNo = localStorage.isFrom == 'proposal'?this.$route.query.proposalOrderNo:this.$route.query.orderNo let params = { orderType: 'RISK_ORDER', diff --git a/src/views/ebiz/proposal/List.vue b/src/views/ebiz/proposal/List.vue index be83caf61..d9893f829 100644 --- a/src/views/ebiz/proposal/List.vue +++ b/src/views/ebiz/proposal/List.vue @@ -267,7 +267,7 @@ export default { this.$CacheUtils.setLocItem('proposalNo', item.orderInfoDTO.orderNo) //新增 解决直接点击预览报错问题 localStorage.mainRiskCode = item.insuredDTOs[0].mainRisk[0].mainRiskCode - let url = `/proposal/proposalInfo?proposalNo=${item.orderInfoDTO.orderNo}` + let url = `/proposal/proposalInfo?proposalOrderNo=${item.orderInfoDTO.orderNo}` this.$jump({ flag: 'h5', extra: { @@ -322,11 +322,11 @@ export default { this.$jump({ flag: 'h5', extra: { - url: location.origin + '/#/sale/insuredInfo?edit=1', + url: location.origin + '/#/sale/insuredInfo?edit=1&proposalOrderNo=' + res.content.orderNo, backToFirst: '1' }, routerInfo: { - path: '/sale/insuredInfo?edit=1' + path: '/sale/insuredInfo?edit=1&proposalOrderNo=' + res.content.orderNo } }) } else { diff --git a/src/views/ebiz/proposal/ProposalInfo.vue b/src/views/ebiz/proposal/ProposalInfo.vue index f35898de2..bef184085 100644 --- a/src/views/ebiz/proposal/ProposalInfo.vue +++ b/src/views/ebiz/proposal/ProposalInfo.vue @@ -505,14 +505,14 @@ export default { proposalNo: '' } } - if (this.$route.query.proposalNo) { - this.proposalNo = this.$route.query.proposalNo; - params.proposalInfoDTO.proposalNo = this.$route.query.proposalNo - this.$CacheUtils.setLocItem('proposalNo',this.$route.query.proposalNo) + if (this.$route.query.proposalOrderNo) { + this.proposalNo = this.$route.query.proposalOrderNo; + params.proposalInfoDTO.proposalNo = this.$route.query.proposalOrderNo + this.$CacheUtils.setLocItem('proposalNo',this.$route.query.proposalOrderNo) } if (this.isWeixin) { //在微信端 - params.proposalInfoDTO.proposalNo = this.$route.query.proposalNo + params.proposalInfoDTO.proposalNo = this.$route.query.proposalOrderNo /*this.mainRiskCodes = JSON.parse(this.$route.query.mainRiskCodes)*/ this.$CacheUtils.setLocItem('token',this.$route.query.token) let agentResult = await getAgentInfo({}) //调取代理人查询接口 @@ -546,7 +546,7 @@ export default { if (agentResult.result == '0') { this.agent.name = agentResult.name } - params.proposalInfoDTO.proposalNo = this.$route.query.proposalNo + params.proposalInfoDTO.proposalNo = this.$route.query.proposalOrderNo getDemo(params).then(res => { this.formatLocal(res) }) @@ -637,7 +637,7 @@ export default { extra: { title: title, content: shareContent, - url: location.origin + '/#/proposal/proposalInfo?proposalNo=' + encodeURI(localStorage.proposalNo) + '&token=' + encodeURI(res.content), + url: location.origin + '/#/proposal/proposalInfo?proposalNo=' + encodeURI(this.$route.query.proposalOrderNo) + '&token=' + encodeURI(res.content), img: this.$assetsUrl + 'images/logo.png' } }) diff --git a/src/views/ebiz/sale/List.vue b/src/views/ebiz/sale/List.vue index 9b99368df..4b76df009 100644 --- a/src/views/ebiz/sale/List.vue +++ b/src/views/ebiz/sale/List.vue @@ -362,9 +362,9 @@ export default { this.$jump({ flag: 'h5', extra: { - url: location.origin + '/#/sale/payMent' + url: location.origin + '/#/sale/payMent?orderNo=' + order.orderInfoDTO.orderNo }, - routerInfo: { path: '/sale/payMent' } + routerInfo: { path: '/sale/payMent?orderNo=' + order.orderInfoDTO.orderNo } }) }, //支付失败去换卡 @@ -378,13 +378,13 @@ export default { localStorage.setItem('changeCard', true) switch (orderStatus) { case '55': //账户信息页 - url = '/sale/AccountInformation' + url = '/sale/AccountInformation?orderNo=' + order.orderInfoDTO.orderNo break case '48': //账户信息填写成功,跳到影像上传页 - url = '/sale/AttachmentManagement' + url = '/sale/AttachmentManagement?orderNo=' + order.orderInfoDTO.orderNo break case '49': //影像上传页填写成功,跳到银行卡号确认页 - url = '/sale/SignatureConfirmation' + url = '/sale/SignatureConfirmation?orderNo=' + order.orderInfoDTO.orderNo break } this.$jump({ @@ -404,9 +404,9 @@ export default { this.$jump({ flag: 'h5', extra: { - url: location.origin + '/#/sale/payMent' + url: location.origin + '/#/sale/payMent?orderNo=' + order.orderInfoDTO.orderNo }, - routerInfo: { path: '/sale/payMent' } + routerInfo: { path: '/sale/payMent?orderNo=' + order.orderInfoDTO.orderNo } }) }, //查看保单 @@ -416,10 +416,10 @@ export default { this.$jump({ flag: 'h5', extra: { - url: location.origin + '/#/sale/detail?type=1' + url: location.origin + '/#/sale/detail?type=1&orderNo=' + order.orderInfoDTO.orderNo }, routerInfo: { - path: '/sale/detail', + path: '/sale/detail?orderNo=' + order.orderInfoDTO.orderNo, query: { type: 1 } diff --git a/src/views/ebiz/sale/PayMent.vue b/src/views/ebiz/sale/PayMent.vue index a84916d5b..cd0b43bd2 100644 --- a/src/views/ebiz/sale/PayMent.vue +++ b/src/views/ebiz/sale/PayMent.vue @@ -282,15 +282,23 @@ export default { if (signFlag) { const res = await payFlag({ orderNo: this.orderNo }) console.dir(res) - if (res.content.payFlag == 'Y') { - this.getAcceptInsurance() + if (res.result == 0) { + if (res.content.payFlag == 'Y') { + this.getAcceptInsurance() + } } else { this.$toast(res.resultMessage) - - setTimeout(() => { - this.$router.push({ path: '/sale/payResultFail' }) - }, 2000) } + // if (res.content.payFlag == 'Y') { + // this.getAcceptInsurance() + // } else { + // debugger + // this.$toast(res.resultMessage) + // + // setTimeout(() => { + // this.$router.push({ path: '/sale/payResultFail' }) + // }, 2000) + // } } }, // 取消支付