From a989f37d4da092968caeaed37e30d73d1be51a34 Mon Sep 17 00:00:00 2001 From: "li.kai" Date: Fri, 3 Jul 2020 10:31:31 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[FIX]=20=E3=80=90=E7=94=9F=E4=BA=A7-?= =?UTF-8?q?=E7=94=B5=E6=8A=95=E3=80=91=E4=BF=AE=E5=A4=8D=E5=85=AB=E6=A1=82?= =?UTF-8?q?=E9=99=84=E5=8A=A0=E9=99=A9=E8=81=8C=E4=B8=9A=E7=AD=89=E7=BA=A7?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/common/AddRiskList.vue | 39 ++++++++++++++------------- src/views/ebiz/common/risk-rules.js | 7 +++-- 2 files changed, 25 insertions(+), 21 deletions(-) diff --git a/src/views/ebiz/common/AddRiskList.vue b/src/views/ebiz/common/AddRiskList.vue index 371d01141..b202e6fd9 100644 --- a/src/views/ebiz/common/AddRiskList.vue +++ b/src/views/ebiz/common/AddRiskList.vue @@ -76,30 +76,30 @@ export default { localStorage.isAutoPay = localStorage.isAutoPay == '0' ? '0' : resultData.isAutoPay //自动垫交 localStorage.isRenew = localStorage.isRenew == '0' ? '0' : resultData.isRenew //自动续保 localStorage.isForceRenew = localStorage.isForceRenew == '0' ? '0' : resultData.isForceRenew //自动续保默认是否选中 0-是 1-否 - if(resultData.productTrialInfoDTO.ruleExpression){ - let ruleExpression = localStorage.ruleExpression ? JSON.parse(localStorage.ruleExpression) : {}; + if (resultData.productTrialInfoDTO.ruleExpression) { + let ruleExpression = localStorage.ruleExpression ? JSON.parse(localStorage.ruleExpression) : {} ruleExpression[resultData.productCode] = resultData.productTrialInfoDTO.ruleExpression localStorage.ruleExpression = JSON.stringify(ruleExpression) - - for(let item of ruleExpression[resultData.productCode]){ + + for (let item of ruleExpression[resultData.productCode]) { let config = JSON.parse(item.ruleExpression) - switch (config.eventType){ + switch (config.eventType) { case 'loadFormat': - let initFn = new Function(...config.funPar, config.funBody.join('')) - let str = initFn(resultData) - if(str){ - return this.$toast(str) - } - break; + let initFn = new Function(...config.funPar, config.funBody.join('')) + let str = initFn(resultData) + if (str) { + return this.$toast(str) + } + break case 'checkMainRisk': - let checkMainRiskFn = new Function(...config.funPar, config.funBody.join('')) - let checkMainRiskStr = checkMainRiskFn() - if(checkMainRiskStr){ - return this.$toast(checkMainRiskStr) - } - break; + let checkMainRiskFn = new Function(...config.funPar, config.funBody.join('')) + let checkMainRiskStr = checkMainRiskFn() + if (checkMainRiskStr) { + return this.$toast(checkMainRiskStr) + } + break default: - break; + break } // if(config.eventType == 'loadFormat'){ // let initFn = new Function(...config.funPar, config.funBody.join('')) @@ -158,7 +158,7 @@ export default { // } // break; // } - + /********start 附加险选择限制 start******/ //豁免险与其他附加险年龄险种 if (resultData.productTrialInfoDTO.isRemit == '0' && resultData.productTrialInfoDTO.remitType == '0') { @@ -194,6 +194,7 @@ export default { } } else { //校验主合同的被保险人寿险职业等级 + console.log(1111, resultData) if (riskRules.lifeGradeLimit(resultData, this)) { return } diff --git a/src/views/ebiz/common/risk-rules.js b/src/views/ebiz/common/risk-rules.js index a8ed5b6b1..d5be05b12 100644 --- a/src/views/ebiz/common/risk-rules.js +++ b/src/views/ebiz/common/risk-rules.js @@ -43,9 +43,12 @@ export default { } return false }, - //寿险等级对附加险的影响 + //寿险等级对附加险的影响 标识 lifeGradeLimit(resultData, vm) { - let cuttentLifeGrade = this.getSaleInsuredPersonInfo().lifeGrade + let cuttentLifeGrade + if (resultData.productTrialInfoDTO.isRemit === '0' && resultData.productTrialInfoDTO.remitType === '0') + cuttentLifeGrade = this.getSaleInsuredInfo().lifeGrade + else cuttentLifeGrade = this.getSaleInsuredPersonInfo().lifeGrade let lifeGrade = resultData.productInsuredDTO.lifeGrade if (lifeGrade == 0) return false if (Number(cuttentLifeGrade) > Number(lifeGrade)) { From 605154e567dc0fd9b84a84993803e55068511442 Mon Sep 17 00:00:00 2001 From: "li.kai" Date: Fri, 3 Jul 2020 14:53:40 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[FIX]=20=E3=80=90=E7=94=9F=E4=BA=A7-?= =?UTF-8?q?=E7=94=B5=E6=8A=95=E3=80=91=E4=BF=AE=E5=A4=8D=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9C=AA=E5=8A=A0=E8=BD=BD=E5=AE=8C=E6=AF=95=E5=8F=AF=E7=82=B9?= =?UTF-8?q?=E5=87=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/sale/SignatureConfirmation.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/views/ebiz/sale/SignatureConfirmation.vue b/src/views/ebiz/sale/SignatureConfirmation.vue index 80448d9be..2fc2468a6 100644 --- a/src/views/ebiz/sale/SignatureConfirmation.vue +++ b/src/views/ebiz/sale/SignatureConfirmation.vue @@ -258,6 +258,7 @@ export default { data() { let isWeixin = this.$utils.device().isWeixin //判断环境 return { + initEnd: false, show: false, // 获取短信验证码 codeDisabled: false, // 获取验证码按钮是否禁用 timeId: null, // 计时器ID @@ -367,6 +368,7 @@ export default { }, // 初始化 async init() { + this.initEnd = false localStorage.doubleRecordFlag = '0' //0不是双录单 1是双录单 if (this.isWeixin) { if (this.$route.query.airSign) { @@ -451,6 +453,7 @@ export default { this.getSignInvalid() this.isShow = true } + this.initEnd = true }, // 获取消息和阅读状态 realPeopelCheck() { @@ -568,6 +571,8 @@ export default { // 人脸识别 start_ocr(val) { // val 0投保人 1被保险人 2本人 + ///// + if (!this.initEnd) return let that = this if (this.isWeixin) { window.localStorage.setItem('sign-val', val) From ab4b9d8acf938a142ca0158a3f634aa290cd4916 Mon Sep 17 00:00:00 2001 From: "li.kai" Date: Fri, 3 Jul 2020 15:56:28 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[FIX]=20=E3=80=90=E7=94=9F=E4=BA=A7-?= =?UTF-8?q?=E7=94=B5=E6=8A=95=E3=80=91=E4=BF=AE=E5=A4=8D=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9C=AA=E5=8A=A0=E8=BD=BD=E5=AE=8C=E6=88=90=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/sale/SignatureConfirmation.vue | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/src/views/ebiz/sale/SignatureConfirmation.vue b/src/views/ebiz/sale/SignatureConfirmation.vue index 2fc2468a6..0801de33f 100644 --- a/src/views/ebiz/sale/SignatureConfirmation.vue +++ b/src/views/ebiz/sale/SignatureConfirmation.vue @@ -258,7 +258,6 @@ export default { data() { let isWeixin = this.$utils.device().isWeixin //判断环境 return { - initEnd: false, show: false, // 获取短信验证码 codeDisabled: false, // 获取验证码按钮是否禁用 timeId: null, // 计时器ID @@ -368,7 +367,6 @@ export default { }, // 初始化 async init() { - this.initEnd = false localStorage.doubleRecordFlag = '0' //0不是双录单 1是双录单 if (this.isWeixin) { if (this.$route.query.airSign) { @@ -453,7 +451,6 @@ export default { this.getSignInvalid() this.isShow = true } - this.initEnd = true }, // 获取消息和阅读状态 realPeopelCheck() { @@ -572,7 +569,6 @@ export default { start_ocr(val) { // val 0投保人 1被保险人 2本人 ///// - if (!this.initEnd) return let that = this if (this.isWeixin) { window.localStorage.setItem('sign-val', val) @@ -718,15 +714,16 @@ export default { }*/ } console.log('跳转页面path', path) - that.$jump({ - flag: 'h5', - extra: { - url: location.origin + '/#/sale/' + path - }, - routerInfo: { - path: '/sale/' + path - } - }) + if (path) + that.$jump({ + flag: 'h5', + extra: { + url: location.origin + '/#/sale/' + path + }, + routerInfo: { + path: '/sale/' + path + } + }) }, insuredUrl() { let that = this