From 548c937eaacbccf865b3a0613103a81c4872531f Mon Sep 17 00:00:00 2001 From: "bai.jinyan" Date: Tue, 11 May 2021 10:03:04 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feature/GFRS-2441=20=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E7=9F=AD=E6=9C=9F=E5=81=A5=E5=BA=B7=E9=99=A9=E6=8A=95=E4=BF=9D?= =?UTF-8?q?=E9=A1=BB=E7=9F=A5-=E5=88=9D=E7=89=88=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=8F=90=E4=BA=A4-=E6=8F=90=E4=BA=A4=E4=BA=BA=EF=BC=9A?= =?UTF-8?q?=E7=99=BD=E9=87=91=E5=B2=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/ebiz/sale.js | 9 + src/views/ebiz/sale/SignatureConfirmation.vue | 23 +- src/views/ebiz/sale/shortPeriodProduct.vue | 313 ++++++++++++++++++ 3 files changed, 335 insertions(+), 10 deletions(-) create mode 100644 src/views/ebiz/sale/shortPeriodProduct.vue diff --git a/src/router/ebiz/sale.js b/src/router/ebiz/sale.js index 75456c643..f03b8dcd5 100644 --- a/src/router/ebiz/sale.js +++ b/src/router/ebiz/sale.js @@ -26,6 +26,7 @@ const avoidDutyTip = () => import('@/views/ebiz/sale/AvoidDutyTip') const doubleRecordTip = () => import('@/views/ebiz/sale/DoubleRecordTip') const PayResultFail = () => import('@/views/ebiz/sale/PayResultFail') const apointValidDoc = () => import('@/views/ebiz/sale/apointValidDoc') +const shortPeriodProduct = () => import('@/views/ebiz/sale/shortPeriodProduct') let riskName = localStorage.riskName console.log('sale/riskName==', riskName) export default [ @@ -229,5 +230,13 @@ export default [ meta: { title: '支付结果' } + }, + { + path: '/sale/shortPeriodProduct', + name: 'shortPeriodProduct', + component: shortPeriodProduct, + meta: { + title: '国富人寿短期健康险投保须知' + } } ] diff --git a/src/views/ebiz/sale/SignatureConfirmation.vue b/src/views/ebiz/sale/SignatureConfirmation.vue index 70c379100..b5f082f10 100644 --- a/src/views/ebiz/sale/SignatureConfirmation.vue +++ b/src/views/ebiz/sale/SignatureConfirmation.vue @@ -38,11 +38,11 @@
-

{{ item.documentCode == '1' || item.documentCode == '8' ? '需阅读' : '需签署' }}

+

{{ item.documentCode == '1' || item.documentCode == '8' || item.documentCode == '9' ? '需阅读' : '需签署' }}

{{ item.documentName }} - - + +

@@ -131,11 +131,11 @@
-

{{ item.documentCode == '1' || item.documentCode == '8' ? '需阅读' : '需签署' }}

+

{{ item.documentCode == '1' || item.documentCode == '8' || item.documentCode == '9'? '需阅读' : '需签署' }}

{{ item.documentName }} - - + +

@@ -169,7 +169,7 @@

{{ item.documentName }} - +

点击【开始】或【分享】,进行相关操作

@@ -1001,7 +1001,7 @@ export default { } else { console.log('that.appntSign.length ==', that.appntSign.length, typeof that.appntSign.length) for (let i = 0; i < that.appntSign.length; i++) { - if ((that.appntSign[i].documentCode == '1' || that.appntSign[i].documentCode == '8') && that.appntSign[i].documentStatus == 0) { + if ((that.appntSign[i].documentCode == '1' || that.appntSign[i].documentCode == '8' || that.appntSign[i].documentCode == '9') && that.appntSign[i].documentStatus == 0) { //1投保须知 未读 path = that.appntSign[i].routePath break @@ -1053,7 +1053,7 @@ export default { } else { console.log('that.appntSign.length ==', that.appntSign.length, typeof that.appntSign.length) for (let i = 0; i < that.appntSign.length; i++) { - if ((that.appntSign[i].documentCode == '1' || that.appntSign[i].documentCode == '8') && that.appntSign[i].documentStatus == 0) { + if ((that.appntSign[i].documentCode == '1' || that.appntSign[i].documentCode == '8' || that.appntSign[i].documentCode == '9') && that.appntSign[i].documentStatus == 0) { //1投保须知 未读 path = that.appntSign[i].routePath break @@ -1543,7 +1543,7 @@ export default { }, //自定义key值排序用 addKey(item) { - //ducumentCode 1投保须知 2投保单 3产品说明书 4提示书 6免除保险人责任条款说明书 7保险销售行为双录说明 + //ducumentCode 1投保须知 2投保单 3产品说明书 4提示书 6免除保险人责任条款说明书 7保险销售行为双录说明 8指定保单生效日 9短期险投保须知 if (item.documentCode == '1') { item.key = 2 item.routePath = 'insuranceInformation' @@ -1565,6 +1565,9 @@ export default { } else if (item.documentCode == '8') { item.key = 1 item.routePath = 'apointValidDoc' + } else if (item.documentCode == '9') { + item.key = 0 + item.routePath = 'shortPeriodProduct' } }, getSignInvalid() { diff --git a/src/views/ebiz/sale/shortPeriodProduct.vue b/src/views/ebiz/sale/shortPeriodProduct.vue new file mode 100644 index 000000000..215b87197 --- /dev/null +++ b/src/views/ebiz/sale/shortPeriodProduct.vue @@ -0,0 +1,313 @@ + + + From 330aae61fb16cb947a888ce397933fa4bf6b1d72 Mon Sep 17 00:00:00 2001 From: "bai.jinyan" Date: Tue, 11 May 2021 17:16:24 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feature/GFRS-2441=20=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E7=9F=AD=E6=9C=9F=E5=81=A5=E5=BA=B7=E9=99=A9=E6=8A=95=E4=BF=9D?= =?UTF-8?q?=E9=A1=BB=E7=9F=A5-=E5=89=8D=E7=AB=AF=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=8F=90=E4=BA=A4-=E6=8F=90=E4=BA=A4=E4=BA=BA=EF=BC=9A?= =?UTF-8?q?=E7=99=BD=E9=87=91=E5=B2=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/sale/InsuranceInformation.vue | 12 ++++++++++++ src/views/ebiz/sale/shortPeriodProduct.vue | 20 +++++++++++++------- 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/src/views/ebiz/sale/InsuranceInformation.vue b/src/views/ebiz/sale/InsuranceInformation.vue index 8ab5226ac..646fc168a 100644 --- a/src/views/ebiz/sale/InsuranceInformation.vue +++ b/src/views/ebiz/sale/InsuranceInformation.vue @@ -338,6 +338,12 @@ export default { url = 'apointValidDoc' } }) + // 若需展示 短期健康险投保须知,则优先展示 + that.appntSign.map(item => { + if (item.documentCode == '9') { + url = 'shortPeriodProduct' + } + }) this.$jump({ flag: 'h5', extra: { @@ -471,6 +477,12 @@ export default { url = 'SignatureConfirmation' } else { url = this.productCode == 'GFRS_M0003' || this.productCode == 'GFRS_M0015' || this.productCode == 'GFRS_M0017' ? 'productTip' : 'insuranceTip' + // 本人或投保人-需阅读短期健康险投保须知时 跳转shortPeriodProduct + that.appntSign.map(item => { + if (item.documentCode == '9') { + url = 'shortPeriodProduct' + } + }) } this.$jump({ flag: 'h5', diff --git a/src/views/ebiz/sale/shortPeriodProduct.vue b/src/views/ebiz/sale/shortPeriodProduct.vue index 215b87197..669b39cac 100644 --- a/src/views/ebiz/sale/shortPeriodProduct.vue +++ b/src/views/ebiz/sale/shortPeriodProduct.vue @@ -47,6 +47,8 @@ export default { saleInsuredPersonInfo: {}, // local带来的投保人信息 saleInsuredInfo: {}, + //获取产品编号 + productCode: localStorage.productCode, src: location.origin + '/pdfjs/web/viewer.html?file=', } }, @@ -202,15 +204,19 @@ export default { saveInformation(data).then(res => { if (res.result == '0') { this.$toast.clear() - window.sessionStorage.onewxSigned = false - // window.sessionStorage.oneimgBase64Data = '' + let url = this.productCode == 'GFRS_M0003' || this.productCode == 'GFRS_M0015' || this.productCode == 'GFRS_M0017' ? 'productTip' : 'insuranceTip' + that.appntSign.map(item => { + if (item.documentCode == '8') { + url = 'apointValidDoc' + } + }) this.$jump({ flag: 'h5', extra: { - url: location.origin + '/#/sale/insuranceInformation' + url: location.origin + '/#/sale/' + url }, routerInfo: { - path: '/sale/insuranceInformation' + path: '/sale/' + url } }) } else { @@ -253,14 +259,14 @@ export default { saveInformation(data).then(res => { if (res.result == '0') { this.$toast.clear() + let url = this.productCode == 'GFRS_M0003' || this.productCode == 'GFRS_M0015' || this.productCode == 'GFRS_M0017' ? 'productTip' : 'insuranceTip'; this.$jump({ flag: 'h5', extra: { - url: location.origin + '/#/sale/insuranceInformation', - forbidSwipeBack: '1' + url: location.origin + '/#/sale/' + url }, routerInfo: { - path: '/sale/insuranceInformation' + path: '/sale/' + url } }) } else { From 144d54372a49ea9c4d69751212d2fd7f2937dc9f Mon Sep 17 00:00:00 2001 From: "bai.jinyan" Date: Tue, 11 May 2021 17:30:18 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feature/GFRS-2441=20=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E7=9F=AD=E6=9C=9F=E5=81=A5=E5=BA=B7=E9=99=A9=E6=8A=95=E4=BF=9D?= =?UTF-8?q?=E9=A1=BB=E7=9F=A5-=E5=89=8D=E7=AB=AF=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=8F=90=E4=BA=A4-=E6=8F=90=E4=BA=A4=E4=BA=BA=EF=BC=9A?= =?UTF-8?q?=E7=99=BD=E9=87=91=E5=B2=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/sale/SignatureConfirmation.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/views/ebiz/sale/SignatureConfirmation.vue b/src/views/ebiz/sale/SignatureConfirmation.vue index b5f082f10..fbb1c5d68 100644 --- a/src/views/ebiz/sale/SignatureConfirmation.vue +++ b/src/views/ebiz/sale/SignatureConfirmation.vue @@ -1548,25 +1548,25 @@ export default { item.key = 2 item.routePath = 'insuranceInformation' } else if (item.documentCode == '2') { - item.key = 7 + item.key = 8 item.routePath = 'SignatureOfElectronic' } else if (item.documentCode == '3') { - item.key = 3 + item.key = 4 item.routePath = 'productTip' } else if (item.documentCode == '4') { - item.key = 4 + item.key = 5 item.routePath = 'InsuranceTip' } else if (item.documentCode == '6') { - item.key = 5 + item.key = 6 item.routePath = 'avoidDutyTip' } else if (item.documentCode == '7') { - item.key = 6 + item.key = 7 item.routePath = 'doubleRecordTip' } else if (item.documentCode == '8') { item.key = 1 item.routePath = 'apointValidDoc' } else if (item.documentCode == '9') { - item.key = 0 + item.key = 3 item.routePath = 'shortPeriodProduct' } },