From 4a0ec78db9b725cda2a30584c3e9abbf33e69f05 Mon Sep 17 00:00:00 2001 From: yuweiqi Date: Fri, 17 Jan 2020 18:00:34 +0800 Subject: [PATCH 01/53] =?UTF-8?q?[new]=E5=9B=BD=E5=AF=8C=E4=BA=BA=E5=AF=BF?= =?UTF-8?q?=E5=AF=8C=E5=A8=83=E5=A8=83=E4=B8=BB=E9=99=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/common/MainRiskList.vue | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/views/ebiz/common/MainRiskList.vue b/src/views/ebiz/common/MainRiskList.vue index eda3058e8..2b1e02b5f 100644 --- a/src/views/ebiz/common/MainRiskList.vue +++ b/src/views/ebiz/common/MainRiskList.vue @@ -194,13 +194,15 @@ export default { }) } else if (item.type == 1) { //按年龄选择 - productTrialInfoDTO[item.code].forEach(factor => { - item = Object.assign(item, factor) - }) - if (item.code == 'inputPrem') { - item['inputPrem'] = Number(item.minPrem) * Number(item.moneyUnit) - } else { - item['amt'] = Number(item.minAmt) * Number(item.moneyUnit) + if (productTrialInfoDTO[item.code] != null) { + productTrialInfoDTO[item.code].forEach(factor => { + item = Object.assign(item, factor) + }) + if (item.code == 'inputPrem') { + item['inputPrem'] = Number(item.minPrem) * Number(item.moneyUnit) + } else { + item['amt'] = Number(item.minAmt) * Number(item.moneyUnit) + } } } //规则储存 From 17c6ed5317641c45749536c146154f2106d62918 Mon Sep 17 00:00:00 2001 From: yuweiqi Date: Sat, 18 Jan 2020 11:11:57 +0800 Subject: [PATCH 02/53] =?UTF-8?q?[FIX]=E7=AD=BE=E5=90=8D=E9=A1=B5-?= =?UTF-8?q?=E4=B8=87=E8=83=BD=E9=99=A9=E4=BA=A7=E5=93=81=E7=BC=96=E7=A0=81?= =?UTF-8?q?=E5=A4=9A=E5=8A=A0=E4=B8=80=E4=B8=AAGFRS=5FM0015?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/sale/SignatureConfirmation.vue | 2 +- src/views/ebiz/sale/SignatureOfElectronic.vue | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/ebiz/sale/SignatureConfirmation.vue b/src/views/ebiz/sale/SignatureConfirmation.vue index 79a62ff7e..bcbe04fce 100644 --- a/src/views/ebiz/sale/SignatureConfirmation.vue +++ b/src/views/ebiz/sale/SignatureConfirmation.vue @@ -436,7 +436,7 @@ export default { if (that.changeCard) { path = 'insuranceInformation' } else { - if (localStorage.productCode == 'GFRS_M0003') { + if (localStorage.productCode == 'GFRS_M0003' || localStorage.productCode == 'GFRS_M0015') { if (that.appntSign[0].documentStatus == 0) { path = 'insuranceInformation' } else if (that.appntSign[1].documentStatus == 2) { diff --git a/src/views/ebiz/sale/SignatureOfElectronic.vue b/src/views/ebiz/sale/SignatureOfElectronic.vue index 65e2c9f75..2b94e6c9b 100644 --- a/src/views/ebiz/sale/SignatureOfElectronic.vue +++ b/src/views/ebiz/sale/SignatureOfElectronic.vue @@ -751,7 +751,8 @@ export default { // 判断是不是万能险 let comment = window.localStorage.getItem('productCode') - if (comment == 'GFRS_M0003') { + // if (comment == 'GFRS_M0003') { + if (comment == 'GFRS_M0003' || comment == 'GFRS_M0015') { this.isComment = true } From 1ecaa9ded2e26d2c44cbd8f7ec21310f150d25a2 Mon Sep 17 00:00:00 2001 From: yuweiqi Date: Sat, 18 Jan 2020 11:23:30 +0800 Subject: [PATCH 03/53] =?UTF-8?q?[FIX]=E7=AD=BE=E5=90=8D=E9=A1=B5-?= =?UTF-8?q?=E4=B8=87=E8=83=BD=E9=99=A9=E4=BA=A7=E5=93=81=E7=BC=96=E7=A0=81?= =?UTF-8?q?=E5=A4=9A=E5=8A=A0=E4=B8=80=E4=B8=AAGFRS=5FM0015?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/sale/InsuranceInformation.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/ebiz/sale/InsuranceInformation.vue b/src/views/ebiz/sale/InsuranceInformation.vue index 984482940..5a6998d1b 100644 --- a/src/views/ebiz/sale/InsuranceInformation.vue +++ b/src/views/ebiz/sale/InsuranceInformation.vue @@ -273,7 +273,7 @@ export default { } }) } else { - url = this.productCode == 'GFRS_M0003' ? 'productTip' : 'insuranceTip' + url = this.productCode == 'GFRS_M0003' || 'GFRS_M0015' ? 'productTip' : 'insuranceTip' this.$jump({ flag: 'h5', extra: { From 0505d54f744e565d7f2fc5ad3d1efb9faf0d3ca1 Mon Sep 17 00:00:00 2001 From: yuweiqi Date: Sat, 18 Jan 2020 11:35:34 +0800 Subject: [PATCH 04/53] =?UTF-8?q?[FIX]=E7=AD=BE=E5=90=8D=E9=A1=B5-?= =?UTF-8?q?=E4=B8=87=E8=83=BD=E9=99=A9=E4=BA=A7=E5=93=81=E7=BC=96=E7=A0=81?= =?UTF-8?q?=E5=A4=9A=E5=8A=A0=E4=B8=80=E4=B8=AAGFRS=5FM0015?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/sale/InsuranceInformation.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/ebiz/sale/InsuranceInformation.vue b/src/views/ebiz/sale/InsuranceInformation.vue index 5a6998d1b..0aa4c254e 100644 --- a/src/views/ebiz/sale/InsuranceInformation.vue +++ b/src/views/ebiz/sale/InsuranceInformation.vue @@ -406,7 +406,7 @@ export default { if (that.changeCard) { url = 'SignatureConfirmation' } else { - url = this.productCode == 'GFRS_M0003' ? 'productTip' : 'insuranceTip' + url = this.productCode == 'GFRS_M0003' || 'GFRS_M0015' ? 'productTip' : 'insuranceTip' } this.$jump({ flag: 'h5', From ef3358d1fc4ad88138f704399ab8493f409ba12c Mon Sep 17 00:00:00 2001 From: yuweiqi Date: Sat, 18 Jan 2020 17:43:58 +0800 Subject: [PATCH 05/53] =?UTF-8?q?[FIX]=E5=AF=8C=E5=A8=83=E5=A8=83=E4=B8=BB?= =?UTF-8?q?=E9=99=A9+=E9=99=84=E5=8A=A0=E9=99=A9=20=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=A1=B9=E6=B8=B2=E6=9F=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/common/CalculatePremium.vue | 244 ++++++++++++++------- src/views/ebiz/common/MainRiskList.vue | 49 +++-- 2 files changed, 196 insertions(+), 97 deletions(-) diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue index f2681077f..c98cfd999 100644 --- a/src/views/ebiz/common/CalculatePremium.vue +++ b/src/views/ebiz/common/CalculatePremium.vue @@ -13,31 +13,16 @@ 主险 附加险 {{ item.riskName }} - 附 - + 附 + -
+
- {{ riskFactor.name + '(' + riskFactor.suffix + ')' }} + {{ riskFactor.name + '(' + riskFactor.suffix + ')' }} {{ riskFactor.name }}       @@ -70,17 +64,13 @@
{{ riskFactor.name }}
-
+
{{ dutyItem.dutyName }}({{ dutyItem.suffix }})
+ +
+
+
+
+ {{ riskFactor.name + '(' + riskFactor.suffix + ')' }} + {{ riskFactor.name }}       + + +
+
+
+ +
+
+
{{ riskFactor.name }}
+
+
+ {{ dutyItem.dutyName }}({{ dutyItem.suffix }}) +
+ + +
+
+
+
+
+
+
- - + +
- -
- + +
+
首期保费(元）： + v-if="(trialList.length > 0 && trialList[index].trialType == 0) || (trialList.length > 0 && trialList[index].trialType == 2) || isTrial === '0'" + >首期保费(元）： 保额(元）： - {{ trialList[index].prem.toFixed(2) | moneyFormat }} + {{ trialList[index].prem.toFixed(2) | moneyFormat }} + 0.00
- 完成 + 完成
@@ -226,7 +269,9 @@ export default { mult: '', isFrom: '', // 默认钱数 - defalutAmt: '' + defalutAmt: '', + //是否需要调试算接口标志 0-不需要调取 + isTrial: localStorage.isTrial } }, mounted() { @@ -281,8 +326,10 @@ export default { } this.mainRiskInfluenceAddRisk() - //初始化数据试算 - this.getTrial() + //初始化数据试算 isTrial是否调后端保费试算 /sale/ insure/trial 接口标志，0-不调取 + if (localStorage.isTrial === '') { + this.getTrial() + } }, // 责任保额份数变化 dutyStepperChange(value, productIndex, calFactorIndex, dutyItemIndex, isChecked, min, max) { @@ -309,7 +356,9 @@ export default { item.amt = Number(item.minDutyAmt) * Number(item.moneyUnit) }) this.mainRiskInfluenceAddRisk() - this.getTrial() + if (localStorage.isTrial === '') { + this.getTrial() + } } else { ;[this.productIndex, this.calFactorIndex] = [productIndex, calFactorIndex] let currentEle = this.chooseProducts[productIndex].calFactorLst[calFactorIndex].rules @@ -362,7 +411,9 @@ export default { } this.hiddenPayEndYear(currentEle) //特殊规则：设置豁免险 - this.getTrial() + if (localStorage.isTrial === '') { + this.getTrial() + } } this.popupShow = false @@ -379,7 +430,9 @@ export default { return false } this.mainRiskInfluenceAddRisk() - this.getTrial() + if (localStorage.isTrial === '') { + this.getTrial() + } }, // 计步器聚焦 focusStep() { @@ -652,7 +705,9 @@ export default { } localStorage.chooseProducts = JSON.stringify(this.chooseProducts) - this.getTrial() + if (localStorage.isTrial === '') { + this.getTrial() + } }) .catch(() => {}) }, @@ -804,10 +859,12 @@ export default { } else { this.mainRiskInfluenceAddRisk() currentEle['amt'] = Number(this.defalutAmt) * Number(currentEle.moneyUnit) - this.getTrial() + if (localStorage.isTrial === '') { + this.getTrial() + } } } - //被保人年龄如果在66-75之间 + //被保人年龄如果在66-75之间 } else if (this.saleInsuredPersonInfo.age >= 66 && this.saleInsuredPersonInfo.age <= 75) { //使用rules规则里的第一条控制保额份数 if (Number(this.defalutAmt) < Number(riskFactor.rules[0].minPrem) || Number(this.defalutAmt) > Number(riskFactor.rules[0].maxPrem)) { @@ -821,11 +878,32 @@ export default { } else { this.mainRiskInfluenceAddRisk() currentEle['amt'] = Number(this.defalutAmt) * Number(currentEle.moneyUnit) + if (localStorage.isTrial === '') { + this.getTrial() + } + } + } + } + //isTrial为0 ---暂时为富娃娃两全保险（万能型专配）输入保费校验 + } else if (this.isTrial === '0' && this.chooseProducts[productIndex].isMainRisk == '0') { + if (Number(this.defalutAmt) < Number(min) || Number(this.defalutAmt) > Number(max)) { + // this.$toast(localStorage.hint) + this.$toast(4444444) + this.nextStepFlag = true + } else { + if ((Number(this.defalutAmt) * 10000) % (Number(currentEle.limit) * 10000) != 0) { + // this.defalutAmt = currentEle.rules[productIndex].displayAmount + this.$toast(localStorage.hint) + this.nextStepFlag = true + } else { + this.mainRiskInfluenceAddRisk() + currentEle['amt'] = Number(this.defalutAmt) * Number(currentEle.moneyUnit) + if (localStorage.isTrial === '') { this.getTrial() } } } - //其他产品按照原先的逻辑判断 + //其他产品按照原先的逻辑判断 } else { if (Number(this.defalutAmt) < Number(min) || Number(this.defalutAmt) > Number(max)) { this.$toast(localStorage.hint) @@ -838,7 +916,9 @@ export default { } else { this.mainRiskInfluenceAddRisk() currentEle['amt'] = Number(this.defalutAmt) * Number(currentEle.moneyUnit) - this.getTrial() + if (localStorage.isTrial === '') { + this.getTrial() + } } } } @@ -897,7 +977,7 @@ export default { //万能型产品保费赋值给保额 //增加判断是否是从建议书跳转过来了的 if (localStorage.isFrom != 'proposal') { - if (this.trialList[index].productCode == 'GFRS_M0003') { + if (this.trialList[index].productCode == 'GFRS_M0003' || 'GFRS_M0015') { // console.log('2222222222') riskItem['amt'] = this.trialList[index].prem } diff --git a/src/views/ebiz/common/MainRiskList.vue b/src/views/ebiz/common/MainRiskList.vue index 2b1e02b5f..5d230deec 100644 --- a/src/views/ebiz/common/MainRiskList.vue +++ b/src/views/ebiz/common/MainRiskList.vue @@ -94,11 +94,13 @@ export default { }, //储存主险 async addMainRisk() { + localStorage.setItem('isTrial', '') let riskProductCode = this.result.riskProductCode let resultData = await calculatePremium({ productCodes: [riskProductCode], platform: 'app', type: '1' }) if (resultData.result == 0) { resultData = resultData.trialDTOS[0] localStorage.hint = resultData.hint + localStorage.isTrial = resultData.productTrialInfoDTO.isTrial if (resultData.productTrialInfoDTO.dutyGroup != null) { resultData.productTrialInfoDTO.dutyGroup.map(item => { if (item.dutyName == '意外身故/伤残保险金') { @@ -132,26 +134,43 @@ export default { //保存附加险 localStorage.addtionRiskLst = JSON.stringify(resultData.productTrialInfoDTO.addtionRiskLst) - // console.log('resultData', resultData) localStorage.isAutoPay = resultData.isAutoPay localStorage.isRenew = resultData.isRenew localStorage.isRelated = resultData.isRelated let calFactorLst = this.getFactorList(resultData) + let productTrialYearDTOS = localStorage.isTrial === '' ? null : resultData.productTrialInfoDTO.productTrialYearDTOS let hasAddtionRisk = resultData.productTrialInfoDTO.addtionRiskLst ? true : false - let currentProductInfo = { - calFactorLst, - hasAddtionRisk, - isMainRisk: 0, - riskType: resultData.riskType, - riskName: this.result.riskName, - productCode: this.result.riskProductCode, - mainRiskCode: this.result.riskProductCode, - documentDTOS: resultData.productTrialInfoDTO.documentDTOS, - influences: resultData.productTrialInfoDTO.influences, - isRemit: resultData.productTrialInfoDTO.isRemit, - hasPredictTransferPrem: resultData.productTrialInfoDTO.hasPredictTransferPrem, //建议书使用 是否展示预计转入保费 - predictTransferPrem: null //建议书使用 预计转入保费字段 - } + let currentProductInfo = + localStorage.isTrial === '' + ? { + calFactorLst, + hasAddtionRisk, + isMainRisk: 0, + riskType: resultData.riskType, + riskName: this.result.riskName, + productCode: this.result.riskProductCode, + mainRiskCode: this.result.riskProductCode, + documentDTOS: resultData.productTrialInfoDTO.documentDTOS, + influences: resultData.productTrialInfoDTO.influences, + isRemit: resultData.productTrialInfoDTO.isRemit, + hasPredictTransferPrem: resultData.productTrialInfoDTO.hasPredictTransferPrem, //建议书使用 是否展示预计转入保费 + predictTransferPrem: null //建议书使用 预计转入保费字段 + } + : { + productTrialYearDTOS, + calFactorLst, + hasAddtionRisk, + isMainRisk: 0, + riskType: resultData.riskType, + riskName: this.result.riskName, + productCode: this.result.riskProductCode, + mainRiskCode: this.result.riskProductCode, + documentDTOS: resultData.productTrialInfoDTO.documentDTOS, + influences: resultData.productTrialInfoDTO.influences, + isRemit: resultData.productTrialInfoDTO.isRemit, + hasPredictTransferPrem: resultData.productTrialInfoDTO.hasPredictTransferPrem, //建议书使用 是否展示预计转入保费 + predictTransferPrem: null //建议书使用 预计转入保费字段 + } //构建险种数组 let productsData From f40e583d5a24552188d3dd135305d0ac37d4bb11 Mon Sep 17 00:00:00 2001 From: yuweiqi Date: Sat, 18 Jan 2020 17:54:05 +0800 Subject: [PATCH 06/53] =?UTF-8?q?[FIX]=E5=AF=8C=E5=A8=83=E5=A8=83=E4=B8=BB?= =?UTF-8?q?=E9=99=A9=E6=8A=95=E4=BF=9D=E9=A1=B5=E9=9D=A2-=E9=A6=96?= =?UTF-8?q?=E6=9C=9F=E4=BF=9D=E8=B4=B9=E8=B7=9F=E7=9D=80=E5=A1=AB=E5=86=99?= =?UTF-8?q?=E7=9A=84=E4=BF=9D=E8=B4=B9=E8=BE=93=E5=85=A5=E5=80=BC=E4=B8=80?= =?UTF-8?q?=E8=B5=B7=E5=8F=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/common/CalculatePremium.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue index c98cfd999..4abe2b0d1 100644 --- a/src/views/ebiz/common/CalculatePremium.vue +++ b/src/views/ebiz/common/CalculatePremium.vue @@ -208,11 +208,12 @@ 首期保费(元）：首期保费（元）： 保额(元）： {{ trialList[index].prem.toFixed(2) | moneyFormat }} 0.00 + {{ defalutAmt }}
From 12f6739cabce302b741bcd0be4510ec43407967d Mon Sep 17 00:00:00 2001 From: yuweiqi Date: Sat, 18 Jan 2020 19:24:01 +0800 Subject: [PATCH 07/53] =?UTF-8?q?[FIX]=E5=AF=8C=E5=A8=83=E5=A8=83=E4=B8=A4?= =?UTF-8?q?=E5=85=A8=E4=BF=9D=E9=99=A9=EF=BC=88=E4=B8=87=E8=83=BD=E9=99=A9?= =?UTF-8?q?=EF=BC=89-=E6=8A=95=E4=BF=9D=E9=A1=B5=E9=9D=A2-=E4=BF=9D?= =?UTF-8?q?=E8=B4=B9=E5=A1=AB=E5=86=99=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/common/CalculatePremium.vue | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue index 4abe2b0d1..4bc6e33cd 100644 --- a/src/views/ebiz/common/CalculatePremium.vue +++ b/src/views/ebiz/common/CalculatePremium.vue @@ -102,7 +102,7 @@
- +
@@ -701,6 +701,7 @@ export default { path: '/common/selectedProduct' } }) + localStorage.trialList = '' } else { this.chooseProducts.splice(index, 1) } @@ -839,13 +840,10 @@ export default { console.log(defalutValue, productIndex, calFactorIndex, min, max) console.log(this.saleInsuredPersonInfo.age) console.log(riskFactor) - console.log(JSON.parse(localStorage.trialList)[0].productCode) - // debugger - let currentEle = this.chooseProducts[productIndex].calFactorLst[calFactorIndex] - + let currentEle = localStorage.isTrial !== '' && this.chooseProducts[productIndex].isMainRisk == '0' ? this.chooseProducts[productIndex].productTrialYearDTOS[calFactorIndex] : this.chooseProducts[productIndex].calFactorLst[calFactorIndex] //改动原因：孝心保产品有对年龄的特殊要求 //添加判断，是否是孝心保产品 - if (JSON.parse(localStorage.trialList)[0].productCode == 'GFRS_M0014') { + if (localStorage.trialList != '' && JSON.parse(localStorage.trialList)[0].productCode == 'GFRS_M0014') { //被保人年龄如果在50-65区间 if (this.saleInsuredPersonInfo.age >= 50 && this.saleInsuredPersonInfo.age <= 65) { //使用rules规则里的第二条控制保额份数 @@ -885,16 +883,15 @@ export default { } } } - //isTrial为0 ---暂时为富娃娃两全保险（万能型专配）输入保费校验 + //isTrial为0 ---暂时为富娃娃两全保险（万能型）专配 输入保费校验 } else if (this.isTrial === '0' && this.chooseProducts[productIndex].isMainRisk == '0') { if (Number(this.defalutAmt) < Number(min) || Number(this.defalutAmt) > Number(max)) { - // this.$toast(localStorage.hint) - this.$toast(4444444) + this.$toast(`交费期间为${riskFactor.yearWay}年交时，最低保费为${Number(min) * Number(riskFactor.moneyUnit)}元`) this.nextStepFlag = true } else { if ((Number(this.defalutAmt) * 10000) % (Number(currentEle.limit) * 10000) != 0) { // this.defalutAmt = currentEle.rules[productIndex].displayAmount - this.$toast(localStorage.hint) + this.$toast(`超过最低保费部分金额需为1000元整数倍`) this.nextStepFlag = true } else { this.mainRiskInfluenceAddRisk() From 0a4a64202450843b4b86e86466a84d1ecd444b08 Mon Sep 17 00:00:00 2001 From: yuweiqi Date: Sun, 19 Jan 2020 11:24:06 +0800 Subject: [PATCH 08/53] =?UTF-8?q?[FIX]=E4=B8=87=E8=83=BD=E9=99=A9bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/common/CalculatePremium.vue | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue index 4bc6e33cd..847ff2601 100644 --- a/src/views/ebiz/common/CalculatePremium.vue +++ b/src/views/ebiz/common/CalculatePremium.vue @@ -18,7 +18,7 @@
-
+
@@ -317,6 +317,11 @@ export default { } }) + //判断this.chooseProducts是否含有productTrialYearDTO + // this.chooseProducts.forEach((item,index) => { + + // }) + // this.influenceAddRiskCodes if (this.chooseProducts[0].influences && this.chooseProducts[0].influences.length > 0) { @@ -840,7 +845,10 @@ export default { console.log(defalutValue, productIndex, calFactorIndex, min, max) console.log(this.saleInsuredPersonInfo.age) console.log(riskFactor) - let currentEle = localStorage.isTrial !== '' && this.chooseProducts[productIndex].isMainRisk == '0' ? this.chooseProducts[productIndex].productTrialYearDTOS[calFactorIndex] : this.chooseProducts[productIndex].calFactorLst[calFactorIndex] + let currentEle = + localStorage.isTrial !== '' && this.chooseProducts[productIndex].isMainRisk == '0' + ? this.chooseProducts[productIndex].productTrialYearDTOS[calFactorIndex] + : this.chooseProducts[productIndex].calFactorLst[calFactorIndex] //改动原因：孝心保产品有对年龄的特殊要求 //添加判断，是否是孝心保产品 if (localStorage.trialList != '' && JSON.parse(localStorage.trialList)[0].productCode == 'GFRS_M0014') { From cc956cef132a4b26bdfd29a320c9dbf00498f01f Mon Sep 17 00:00:00 2001 From: yuweiqi Date: Sun, 19 Jan 2020 14:39:23 +0800 Subject: [PATCH 09/53] =?UTF-8?q?[FIX]=E5=BB=BA=E8=AE=AE=E4=B9=A6=E4=BF=9D?= =?UTF-8?q?=E8=B4=B9=E8=AF=95=E7=AE=97=E9=A1=B5=E9=9D=A2bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/common/CalculatePremium.vue | 30 ++++++++++++---------- src/views/ebiz/common/MainRiskList.vue | 7 ++--- 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue index 847ff2601..fff97e08b 100644 --- a/src/views/ebiz/common/CalculatePremium.vue +++ b/src/views/ebiz/common/CalculatePremium.vue @@ -18,7 +18,7 @@
-
+
@@ -103,7 +103,7 @@
-
+
@@ -273,6 +273,7 @@ export default { defalutAmt: '', //是否需要调试算接口标志 0-不需要调取 isTrial: localStorage.isTrial + //是否存在特殊配置 } }, mounted() { @@ -291,6 +292,7 @@ export default { methods: { //初始化数据 init() { + console.log('====unde', localStorage.isTrial === '999') // 获取是否从建议书过来的 this.isFrom = localStorage.isFrom //获取投保人信息 @@ -333,7 +335,8 @@ export default { this.mainRiskInfluenceAddRisk() //初始化数据试算 isTrial是否调后端保费试算 /sale/ insure/trial 接口标志，0-不调取 - if (localStorage.isTrial === '') { + if (localStorage.isTrial === '999') { + console.log('调了') this.getTrial() } }, @@ -362,7 +365,7 @@ export default { item.amt = Number(item.minDutyAmt) * Number(item.moneyUnit) }) this.mainRiskInfluenceAddRisk() - if (localStorage.isTrial === '') { + if (localStorage.isTrial === '999') { this.getTrial() } } else { @@ -377,7 +380,7 @@ export default { }, //弹框选择 toSelect(index, index1, columns) { - console.log(index, index1, columns) + console.log('===', index, index1, columns) ;[this.popupShow, this.productIndex, this.calFactorIndex] = [true, index, index1] this.columns = columns }, @@ -417,7 +420,7 @@ export default { } this.hiddenPayEndYear(currentEle) //特殊规则：设置豁免险 - if (localStorage.isTrial === '') { + if (localStorage.isTrial === '999') { this.getTrial() } } @@ -436,7 +439,7 @@ export default { return false } this.mainRiskInfluenceAddRisk() - if (localStorage.isTrial === '') { + if (localStorage.isTrial === '999') { this.getTrial() } }, @@ -712,7 +715,7 @@ export default { } localStorage.chooseProducts = JSON.stringify(this.chooseProducts) - if (localStorage.isTrial === '') { + if (localStorage.isTrial === '999') { this.getTrial() } }) @@ -851,7 +854,8 @@ export default { : this.chooseProducts[productIndex].calFactorLst[calFactorIndex] //改动原因：孝心保产品有对年龄的特殊要求 //添加判断，是否是孝心保产品 - if (localStorage.trialList != '' && JSON.parse(localStorage.trialList)[0].productCode == 'GFRS_M0014') { + let productCode = (localStorage.trialList !== undefined && localStorage.trialList != '') ? JSON.parse(localStorage.trialList)[0].productCode : '' + if (productCode == 'GFRS_M0014') { //被保人年龄如果在50-65区间 if (this.saleInsuredPersonInfo.age >= 50 && this.saleInsuredPersonInfo.age <= 65) { //使用rules规则里的第二条控制保额份数 @@ -866,7 +870,7 @@ export default { } else { this.mainRiskInfluenceAddRisk() currentEle['amt'] = Number(this.defalutAmt) * Number(currentEle.moneyUnit) - if (localStorage.isTrial === '') { + if (localStorage.isTrial === '999') { this.getTrial() } } @@ -885,7 +889,7 @@ export default { } else { this.mainRiskInfluenceAddRisk() currentEle['amt'] = Number(this.defalutAmt) * Number(currentEle.moneyUnit) - if (localStorage.isTrial === '') { + if (localStorage.isTrial === '999') { this.getTrial() } } @@ -904,7 +908,7 @@ export default { } else { this.mainRiskInfluenceAddRisk() currentEle['amt'] = Number(this.defalutAmt) * Number(currentEle.moneyUnit) - if (localStorage.isTrial === '') { + if (localStorage.isTrial === '999') { this.getTrial() } } @@ -922,7 +926,7 @@ export default { } else { this.mainRiskInfluenceAddRisk() currentEle['amt'] = Number(this.defalutAmt) * Number(currentEle.moneyUnit) - if (localStorage.isTrial === '') { + if (localStorage.isTrial === '999') { this.getTrial() } } diff --git a/src/views/ebiz/common/MainRiskList.vue b/src/views/ebiz/common/MainRiskList.vue index 5d230deec..6b9091e22 100644 --- a/src/views/ebiz/common/MainRiskList.vue +++ b/src/views/ebiz/common/MainRiskList.vue @@ -94,13 +94,14 @@ export default { }, //储存主险 async addMainRisk() { - localStorage.setItem('isTrial', '') + localStorage.setItem('isTrial', '999') let riskProductCode = this.result.riskProductCode let resultData = await calculatePremium({ productCodes: [riskProductCode], platform: 'app', type: '1' }) if (resultData.result == 0) { resultData = resultData.trialDTOS[0] localStorage.hint = resultData.hint - localStorage.isTrial = resultData.productTrialInfoDTO.isTrial + localStorage.isTrial = resultData.productTrialInfoDTO.isTrial === undefined ? '999' : resultData.productTrialInfoDTO.isTrial + console.log('localStorage.isTrial==', localStorage.isTrial, typeof localStorage.isTrial) if (resultData.productTrialInfoDTO.dutyGroup != null) { resultData.productTrialInfoDTO.dutyGroup.map(item => { if (item.dutyName == '意外身故/伤残保险金') { @@ -141,7 +142,7 @@ export default { let productTrialYearDTOS = localStorage.isTrial === '' ? null : resultData.productTrialInfoDTO.productTrialYearDTOS let hasAddtionRisk = resultData.productTrialInfoDTO.addtionRiskLst ? true : false let currentProductInfo = - localStorage.isTrial === '' + localStorage.isTrial == '' || localStorage.isTrial === undefined || localStorage.isTrial == null ? { calFactorLst, hasAddtionRisk, From a7228a64641a0e60ea95b085875d7ce77405bf93 Mon Sep 17 00:00:00 2001 From: yuweiqi Date: Sun, 19 Jan 2020 14:57:08 +0800 Subject: [PATCH 10/53] =?UTF-8?q?[FIX]=E5=BB=BA=E8=AE=AE=E4=B9=A6=E4=BF=9D?= =?UTF-8?q?=E8=B4=B9=E8=AF=95=E7=AE=97=E9=A1=B5=E9=9D=A2bug=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/common/MainRiskList.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/ebiz/common/MainRiskList.vue b/src/views/ebiz/common/MainRiskList.vue index 6b9091e22..652bd5b1a 100644 --- a/src/views/ebiz/common/MainRiskList.vue +++ b/src/views/ebiz/common/MainRiskList.vue @@ -139,10 +139,10 @@ export default { localStorage.isRenew = resultData.isRenew localStorage.isRelated = resultData.isRelated let calFactorLst = this.getFactorList(resultData) - let productTrialYearDTOS = localStorage.isTrial === '' ? null : resultData.productTrialInfoDTO.productTrialYearDTOS + let productTrialYearDTOS = localStorage.isTrial === '999' ? null : resultData.productTrialInfoDTO.productTrialYearDTOS let hasAddtionRisk = resultData.productTrialInfoDTO.addtionRiskLst ? true : false let currentProductInfo = - localStorage.isTrial == '' || localStorage.isTrial === undefined || localStorage.isTrial == null + localStorage.isTrial == '999' ? { calFactorLst, hasAddtionRisk, From 65daa3a30b0835cfc471277d4f62f0a555fc83ea Mon Sep 17 00:00:00 2001 From: yuweiqi Date: Sun, 19 Jan 2020 15:09:50 +0800 Subject: [PATCH 11/53] =?UTF-8?q?[FIX]=E5=BB=BA=E8=AE=AE=E4=B9=A6=E4=BF=9D?= =?UTF-8?q?=E8=B4=B9=E8=AF=95=E7=AE=97=E9=A1=B5=E9=9D=A2bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/common/CalculatePremium.vue | 27 +++++++++++----------- src/views/ebiz/common/MainRiskList.vue | 3 +-- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue index fff97e08b..9773f147e 100644 --- a/src/views/ebiz/common/CalculatePremium.vue +++ b/src/views/ebiz/common/CalculatePremium.vue @@ -18,7 +18,7 @@
-
+
@@ -103,7 +103,7 @@
-
+
@@ -271,7 +271,7 @@ export default { isFrom: '', // 默认钱数 defalutAmt: '', - //是否需要调试算接口标志 0-不需要调取 + //是否需要调试算接口标志 0-是 1-否 isTrial: localStorage.isTrial //是否存在特殊配置 } @@ -292,7 +292,6 @@ export default { methods: { //初始化数据 init() { - console.log('====unde', localStorage.isTrial === '999') // 获取是否从建议书过来的 this.isFrom = localStorage.isFrom //获取投保人信息 @@ -335,7 +334,7 @@ export default { this.mainRiskInfluenceAddRisk() //初始化数据试算 isTrial是否调后端保费试算 /sale/ insure/trial 接口标志，0-不调取 - if (localStorage.isTrial === '999') { + if (localStorage.isTrial === '1') { console.log('调了') this.getTrial() } @@ -365,7 +364,7 @@ export default { item.amt = Number(item.minDutyAmt) * Number(item.moneyUnit) }) this.mainRiskInfluenceAddRisk() - if (localStorage.isTrial === '999') { + if (localStorage.isTrial === '1') { this.getTrial() } } else { @@ -420,7 +419,7 @@ export default { } this.hiddenPayEndYear(currentEle) //特殊规则：设置豁免险 - if (localStorage.isTrial === '999') { + if (localStorage.isTrial === '1') { this.getTrial() } } @@ -439,7 +438,7 @@ export default { return false } this.mainRiskInfluenceAddRisk() - if (localStorage.isTrial === '999') { + if (localStorage.isTrial === '1') { this.getTrial() } }, @@ -715,7 +714,7 @@ export default { } localStorage.chooseProducts = JSON.stringify(this.chooseProducts) - if (localStorage.isTrial === '999') { + if (localStorage.isTrial === '1') { this.getTrial() } }) @@ -849,7 +848,7 @@ export default { console.log(this.saleInsuredPersonInfo.age) console.log(riskFactor) let currentEle = - localStorage.isTrial !== '' && this.chooseProducts[productIndex].isMainRisk == '0' + localStorage.isTrial == '0' && this.chooseProducts[productIndex].isMainRisk == '0' ? this.chooseProducts[productIndex].productTrialYearDTOS[calFactorIndex] : this.chooseProducts[productIndex].calFactorLst[calFactorIndex] //改动原因：孝心保产品有对年龄的特殊要求 @@ -870,7 +869,7 @@ export default { } else { this.mainRiskInfluenceAddRisk() currentEle['amt'] = Number(this.defalutAmt) * Number(currentEle.moneyUnit) - if (localStorage.isTrial === '999') { + if (localStorage.isTrial === '1') { this.getTrial() } } @@ -889,7 +888,7 @@ export default { } else { this.mainRiskInfluenceAddRisk() currentEle['amt'] = Number(this.defalutAmt) * Number(currentEle.moneyUnit) - if (localStorage.isTrial === '999') { + if (localStorage.isTrial === '1') { this.getTrial() } } @@ -908,7 +907,7 @@ export default { } else { this.mainRiskInfluenceAddRisk() currentEle['amt'] = Number(this.defalutAmt) * Number(currentEle.moneyUnit) - if (localStorage.isTrial === '999') { + if (localStorage.isTrial === '1') { this.getTrial() } } @@ -926,7 +925,7 @@ export default { } else { this.mainRiskInfluenceAddRisk() currentEle['amt'] = Number(this.defalutAmt) * Number(currentEle.moneyUnit) - if (localStorage.isTrial === '999') { + if (localStorage.isTrial === '1') { this.getTrial() } } diff --git a/src/views/ebiz/common/MainRiskList.vue b/src/views/ebiz/common/MainRiskList.vue index 652bd5b1a..157fa417c 100644 --- a/src/views/ebiz/common/MainRiskList.vue +++ b/src/views/ebiz/common/MainRiskList.vue @@ -94,13 +94,12 @@ export default { }, //储存主险 async addMainRisk() { - localStorage.setItem('isTrial', '999') + localStorage.setItem('isTrial', '1') let riskProductCode = this.result.riskProductCode let resultData = await calculatePremium({ productCodes: [riskProductCode], platform: 'app', type: '1' }) if (resultData.result == 0) { resultData = resultData.trialDTOS[0] localStorage.hint = resultData.hint - localStorage.isTrial = resultData.productTrialInfoDTO.isTrial === undefined ? '999' : resultData.productTrialInfoDTO.isTrial console.log('localStorage.isTrial==', localStorage.isTrial, typeof localStorage.isTrial) if (resultData.productTrialInfoDTO.dutyGroup != null) { resultData.productTrialInfoDTO.dutyGroup.map(item => { From cf821b6f171b51b2ba28cab4b3b36ac80fd65112 Mon Sep 17 00:00:00 2001 From: yuweiqi Date: Sun, 19 Jan 2020 15:27:40 +0800 Subject: [PATCH 12/53] =?UTF-8?q?[FIX]=E5=BB=BA=E8=AE=AE=E4=B9=A6=E4=BF=9D?= =?UTF-8?q?=E8=B4=B9=E8=AF=95=E7=AE=97bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/common/CalculatePremium.vue | 4 ++-- src/views/ebiz/common/MainRiskList.vue | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue index 9773f147e..310d0fc0a 100644 --- a/src/views/ebiz/common/CalculatePremium.vue +++ b/src/views/ebiz/common/CalculatePremium.vue @@ -18,7 +18,7 @@
-
+
@@ -103,7 +103,7 @@
-
+
diff --git a/src/views/ebiz/common/MainRiskList.vue b/src/views/ebiz/common/MainRiskList.vue index 157fa417c..b6458186b 100644 --- a/src/views/ebiz/common/MainRiskList.vue +++ b/src/views/ebiz/common/MainRiskList.vue @@ -99,8 +99,8 @@ export default { let resultData = await calculatePremium({ productCodes: [riskProductCode], platform: 'app', type: '1' }) if (resultData.result == 0) { resultData = resultData.trialDTOS[0] + localStorage.isTrial = resultData.productTrialInfoDTO.isTrial localStorage.hint = resultData.hint - console.log('localStorage.isTrial==', localStorage.isTrial, typeof localStorage.isTrial) if (resultData.productTrialInfoDTO.dutyGroup != null) { resultData.productTrialInfoDTO.dutyGroup.map(item => { if (item.dutyName == '意外身故/伤残保险金') { @@ -125,7 +125,7 @@ export default { if (riskRules.lifeGradeLimit(resultData, this)) { return } - if (resultData.productCode == 'GFRS_M0006') { + if (resultData.productInsuredDTO.validateAppntFlag == '0') { if (riskRules.lifeGradeLimitForBaby(resultData, this)) { return } @@ -138,10 +138,10 @@ export default { localStorage.isRenew = resultData.isRenew localStorage.isRelated = resultData.isRelated let calFactorLst = this.getFactorList(resultData) - let productTrialYearDTOS = localStorage.isTrial === '999' ? null : resultData.productTrialInfoDTO.productTrialYearDTOS + let productTrialYearDTOS = localStorage.isTrial === '1' ? null : resultData.productTrialInfoDTO.productTrialYearDTOS let hasAddtionRisk = resultData.productTrialInfoDTO.addtionRiskLst ? true : false let currentProductInfo = - localStorage.isTrial == '999' + localStorage.isTrial == '1' ? { calFactorLst, hasAddtionRisk, From 04dcb988abef513bca984adbc9355d1a91e16d99 Mon Sep 17 00:00:00 2001 From: yuweiqi Date: Sun, 19 Jan 2020 15:52:30 +0800 Subject: [PATCH 13/53] =?UTF-8?q?[FIX]bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/common/CalculatePremium.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue index 310d0fc0a..a6e6c9c87 100644 --- a/src/views/ebiz/common/CalculatePremium.vue +++ b/src/views/ebiz/common/CalculatePremium.vue @@ -335,7 +335,6 @@ export default { this.mainRiskInfluenceAddRisk() //初始化数据试算 isTrial是否调后端保费试算 /sale/ insure/trial 接口标志，0-不调取 if (localStorage.isTrial === '1') { - console.log('调了') this.getTrial() } }, From a5b29f13c7eee9cbf76a8b6d8471478e90cbcdf4 Mon Sep 17 00:00:00 2001 From: yuweiqi Date: Sun, 19 Jan 2020 16:22:23 +0800 Subject: [PATCH 14/53] =?UTF-8?q?[FIX]=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/common/CalculatePremium.vue | 48 +++++++++++++--------- 1 file changed, 28 insertions(+), 20 deletions(-) diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue index a6e6c9c87..3b04f3719 100644 --- a/src/views/ebiz/common/CalculatePremium.vue +++ b/src/views/ebiz/common/CalculatePremium.vue @@ -25,6 +25,7 @@ {{ riskFactor.name + '(' + riskFactor.suffix + ')' }} {{ riskFactor.name }}       + { if (item.mainRiskCode == 'GFRS_M0006') { item.isHidden = true } if (item.mainRiskCode != 'GFRS_M0008') { item.calFactorLst.map(i => { - this.defalutAmt = i.displayAmount + this.defalutAmt = i.displayAmount || 1 console.log(i.displayAmount) console.log(i.defaultValue) this.mult = Number(i.displayAmount) / Number(i.defaultValue) @@ -334,7 +335,7 @@ export default { this.mainRiskInfluenceAddRisk() //初始化数据试算 isTrial是否调后端保费试算 /sale/ insure/trial 接口标志，0-不调取 - if (localStorage.isTrial === '1') { + if (localStorage.isTrial === '') { this.getTrial() } }, @@ -363,7 +364,7 @@ export default { item.amt = Number(item.minDutyAmt) * Number(item.moneyUnit) }) this.mainRiskInfluenceAddRisk() - if (localStorage.isTrial === '1') { + if (localStorage.isTrial === '') { this.getTrial() } } else { @@ -376,9 +377,11 @@ export default { } } }, + // blur(value) { + // console.log('哈哈哈',value) + // }, //弹框选择 toSelect(index, index1, columns) { - console.log('===', index, index1, columns) ;[this.popupShow, this.productIndex, this.calFactorIndex] = [true, index, index1] this.columns = columns }, @@ -418,7 +421,7 @@ export default { } this.hiddenPayEndYear(currentEle) //特殊规则：设置豁免险 - if (localStorage.isTrial === '1') { + if (localStorage.isTrial === '') { this.getTrial() } } @@ -437,7 +440,7 @@ export default { return false } this.mainRiskInfluenceAddRisk() - if (localStorage.isTrial === '1') { + if (localStorage.isTrial === '') { this.getTrial() } }, @@ -606,7 +609,7 @@ export default { } } - //2、豁免险跟主险联动，值减一 + //2、豁免险跟主险联动，豁免险缴费期间和保险期间同主险的缴费期间 let remitIndex = this.getRemitIndex() if (!remitIndex) return @@ -619,13 +622,13 @@ export default { if (item.code == 'payEndYear') { item.hasFlag = '1' item.payEndYearFlag = 'Y' - item.payEndYear = Number(mainRiskInfo.payEndYear.payEndYear) - 1 + item.payEndYear = Number(mainRiskInfo.payEndYear.payEndYear) item.showContent = item.payEndYear + '年交' } if (item.code == 'insuYear') { item.hasFlag = '1' item.insuYearFlag = 'Y' - item.insuYear = Number(mainRiskInfo.payEndYear.payEndYear) - 1 + item.insuYear = Number(mainRiskInfo.payEndYear.payEndYear) item.showContent = item.insuYear + '年' } if (item.code == 'amt') { @@ -713,7 +716,7 @@ export default { } localStorage.chooseProducts = JSON.stringify(this.chooseProducts) - if (localStorage.isTrial === '1') { + if (localStorage.isTrial === '') { this.getTrial() } }) @@ -760,7 +763,12 @@ export default { if (factor.code == 'inputPrem') { trialInfo['prem'] = Number(this.defalutAmt) * Number(factor.moneyUnit) } else { - trialInfo['amt'] = Number(this.defalutAmt) * Number(factor.moneyUnit) + if (item.isRemit == 0) { + trialInfo['amt'] = Number(factor.defaultValue) * Number(factor.moneyUnit) + } else { + trialInfo['amt'] = Number(this.defalutAmt) * Number(factor.moneyUnit) + } + // trialInfo['amt'] = Number(this.defalutAmt) * Number(factor.moneyUnit) } } else if (factor.type == 2) { trialInfo.jobLevel = this.saleInsuredPersonInfo[factor.code] @@ -780,6 +788,7 @@ export default { } }) + console.log('trialInfo == ', trialInfo) //通用规则1：交费方式为一次交情，无交费期限 if (trialInfo['payIntv'] == '0') { trialInfo['payEndYear'] = '1000' @@ -847,13 +856,12 @@ export default { console.log(this.saleInsuredPersonInfo.age) console.log(riskFactor) let currentEle = - localStorage.isTrial == '0' && this.chooseProducts[productIndex].isMainRisk == '0' + localStorage.isTrial !== '' && this.chooseProducts[productIndex].isMainRisk == '0' ? this.chooseProducts[productIndex].productTrialYearDTOS[calFactorIndex] : this.chooseProducts[productIndex].calFactorLst[calFactorIndex] //改动原因：孝心保产品有对年龄的特殊要求 //添加判断，是否是孝心保产品 - let productCode = (localStorage.trialList !== undefined && localStorage.trialList != '') ? JSON.parse(localStorage.trialList)[0].productCode : '' - if (productCode == 'GFRS_M0014') { + if (localStorage.trialList != '' && JSON.parse(localStorage.trialList)[0].productCode == 'GFRS_M0014') { //被保人年龄如果在50-65区间 if (this.saleInsuredPersonInfo.age >= 50 && this.saleInsuredPersonInfo.age <= 65) { //使用rules规则里的第二条控制保额份数 @@ -868,7 +876,7 @@ export default { } else { this.mainRiskInfluenceAddRisk() currentEle['amt'] = Number(this.defalutAmt) * Number(currentEle.moneyUnit) - if (localStorage.isTrial === '1') { + if (localStorage.isTrial === '') { this.getTrial() } } @@ -887,7 +895,7 @@ export default { } else { this.mainRiskInfluenceAddRisk() currentEle['amt'] = Number(this.defalutAmt) * Number(currentEle.moneyUnit) - if (localStorage.isTrial === '1') { + if (localStorage.isTrial === '') { this.getTrial() } } @@ -906,7 +914,7 @@ export default { } else { this.mainRiskInfluenceAddRisk() currentEle['amt'] = Number(this.defalutAmt) * Number(currentEle.moneyUnit) - if (localStorage.isTrial === '1') { + if (localStorage.isTrial === '') { this.getTrial() } } @@ -924,7 +932,7 @@ export default { } else { this.mainRiskInfluenceAddRisk() currentEle['amt'] = Number(this.defalutAmt) * Number(currentEle.moneyUnit) - if (localStorage.isTrial === '1') { + if (localStorage.isTrial === '') { this.getTrial() } } From d37bd60c5c9e1d69e010ede2d66c818aca65526b Mon Sep 17 00:00:00 2001 From: yuweiqi Date: Sun, 19 Jan 2020 16:26:46 +0800 Subject: [PATCH 15/53] =?UTF-8?q?[FIX]=E5=BB=BA=E8=AE=AE=E4=B9=A6=E4=BF=9D?= =?UTF-8?q?=E8=B4=B9=E8=AF=95=E7=AE=97=E9=A1=B5=E9=9D=A2bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/common/CalculatePremium.vue | 574 ++++++++++++++++----- 1 file changed, 431 insertions(+), 143 deletions(-) diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue index 3b04f3719..3e9de5601 100644 --- a/src/views/ebiz/common/CalculatePremium.vue +++ b/src/views/ebiz/common/CalculatePremium.vue @@ -1,29 +1,63 @@ From 9d6f80f4f0bf66f767f10e30a4524ae5bf40e404 Mon Sep 17 00:00:00 2001 From: yuweiqi Date: Thu, 23 Jan 2020 11:48:24 +0800 Subject: [PATCH 41/53] =?UTF-8?q?[FIX]=E5=A2=9E=E5=8A=A0=E8=B0=83=E5=8F=96?= =?UTF-8?q?=20=E8=8E=B7=E5=8F=96=E6=B5=B7=E6=8A=A5=E5=88=86=E4=BA=AB?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E7=9A=84=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/ebiz/poster/poster.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/api/ebiz/poster/poster.js b/src/api/ebiz/poster/poster.js index 0a6aaca6b..05de43d83 100644 --- a/src/api/ebiz/poster/poster.js +++ b/src/api/ebiz/poster/poster.js @@ -27,3 +27,12 @@ export function getPosterInfo(data) { data }) } + +// 获取分享图片 +export function shareUrl(data) { + return request({ + url: getUrl('/media/pster/shareUrl', 1), + method: 'post', + data + }) +} From d934578f6f4ef8dbc9b848bc5ab54a07caaf9167 Mon Sep 17 00:00:00 2001 From: yuweiqi Date: Thu, 23 Jan 2020 11:49:37 +0800 Subject: [PATCH 42/53] =?UTF-8?q?[FIX]=E6=B5=B7=E6=8A=A5=E5=88=86=E4=BA=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/poster/PosterPreview.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/ebiz/poster/PosterPreview.vue b/src/views/ebiz/poster/PosterPreview.vue index 694e4b776..4ba40eab8 100644 --- a/src/views/ebiz/poster/PosterPreview.vue +++ b/src/views/ebiz/poster/PosterPreview.vue @@ -13,7 +13,7 @@