From e38b06be142fb25238797a39a6ff0ec1db02881f Mon Sep 17 00:00:00 2001 From: yuweiqi Date: Mon, 29 Jun 2020 16:02:05 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[NEW]=E3=80=90=E7=A6=8F=E4=BA=AB=E5=B9=B4?= =?UTF-8?q?=E5=B9=B4=E3=80=91=E8=8E=B7=E5=8F=96=E4=B8=BB=E9=99=A9=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=EF=BC=8C=E5=A2=9E=E5=8A=A0type=E5=8F=82=E6=95=B0?= =?UTF-8?q?=EF=BC=9B=E5=89=8D=E7=AB=AF=E4=BA=A7=E5=93=81=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E6=89=A9=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/utils/data-dictionary.js | 5 +++++ src/views/ebiz/common/MainRiskList.vue | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/assets/js/utils/data-dictionary.js b/src/assets/js/utils/data-dictionary.js index fd2aff2c4..000e61f4e 100644 --- a/src/assets/js/utils/data-dictionary.js +++ b/src/assets/js/utils/data-dictionary.js @@ -954,6 +954,11 @@ export default { shortName: '重疾险', name: '国富人寿桂企保重大疾病保险', code: 'GFRS_M0024' + }, + { + shortName: '年金险', + name: '国富人寿福享年年长期年金保险', + code: 'GFRS_M0026' } ], // 职级 diff --git a/src/views/ebiz/common/MainRiskList.vue b/src/views/ebiz/common/MainRiskList.vue index 517553ce5..edfc5adc1 100644 --- a/src/views/ebiz/common/MainRiskList.vue +++ b/src/views/ebiz/common/MainRiskList.vue @@ -76,7 +76,7 @@ export default { //获取主险列表 async getMainRiskList() { let mainRiskCodes = localStorage.mainRiskCodes && JSON.parse(localStorage.mainRiskCodes) - let resultData = await mainRiskList({ platform: 'app' }) + let resultData = await mainRiskList({ platform: 'app', type: localStorage.isFrom == 'proposal' ? 'proposal' : null }) if (resultData.result == 0) { resultData.mainRiskDTOS.forEach(item => { //已选主险不能再选、险种互斥 From e4b8941a902e08fbddd89a636a63f84dd1bcb172 Mon Sep 17 00:00:00 2001 From: yuweiqi Date: Mon, 29 Jun 2020 16:32:27 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[FIX]=E3=80=90=E7=A6=8F=E4=BA=AB=E5=B9=B4?= =?UTF-8?q?=E5=B9=B4=E3=80=91=E8=8E=B7=E5=8F=96=E4=B8=BB=E9=99=A9=E5=88=97?= =?UTF-8?q?=E8=A1=A8-=E5=BB=BA=E8=AE=AE=E4=B9=A6=EF=BC=8C=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=E6=8E=A5=E5=8F=A3=E5=9C=B0=E5=9D=80=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/ebiz/common/common.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/api/ebiz/common/common.js b/src/api/ebiz/common/common.js index d554da983..95c52828d 100644 --- a/src/api/ebiz/common/common.js +++ b/src/api/ebiz/common/common.js @@ -12,7 +12,8 @@ export function calculatePremium(data) { // 主险列表 export function mainRiskList(data) { return request({ - url: getUrl(`/${localStorage.isFrom}/product/getMainRiskLst`, 1), + url: getUrl(`/sale/product/getMainRiskLst`, 1), + // url: getUrl(`/${localStorage.isFrom}/product/getMainRiskLst`, 1), method: 'post', data }) From 55799059bf3574013c9e6ad475ec0627c0d742da Mon Sep 17 00:00:00 2001 From: yuweiqi Date: Mon, 29 Jun 2020 17:18:25 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[FIX]=E3=80=90=E7=A6=8F=E4=BA=AB=E5=B9=B4?= =?UTF-8?q?=E5=B9=B4=E3=80=91=E8=8E=B7=E5=8F=96=E4=B8=BB=E9=99=A9=E5=88=97?= =?UTF-8?q?=E8=A1=A8-=E5=BB=BA=E8=AE=AE=E4=B9=A6=EF=BC=8C=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=E6=8E=A5=E5=8F=A3=E5=85=A5=E5=8F=82=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/common/MainRiskList.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/ebiz/common/MainRiskList.vue b/src/views/ebiz/common/MainRiskList.vue index edfc5adc1..ba3ae1d05 100644 --- a/src/views/ebiz/common/MainRiskList.vue +++ b/src/views/ebiz/common/MainRiskList.vue @@ -76,7 +76,7 @@ export default { //获取主险列表 async getMainRiskList() { let mainRiskCodes = localStorage.mainRiskCodes && JSON.parse(localStorage.mainRiskCodes) - let resultData = await mainRiskList({ platform: 'app', type: localStorage.isFrom == 'proposal' ? 'proposal' : null }) + let resultData = await mainRiskList({ platform: localStorage.isFrom == 'proposal' ? 'proposal' : 'app' }) if (resultData.result == 0) { resultData.mainRiskDTOS.forEach(item => { //已选主险不能再选、险种互斥