From 224fdeb589b2de97aede7c9acfaa5231361ad1e6 Mon Sep 17 00:00:00 2001 From: "tian.guangyuan" Date: Mon, 13 Apr 2020 16:12:36 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E3=80=90new=E3=80=91=20=E4=BF=9D=E5=85=A8?= =?UTF-8?q?=EF=BC=9A=E5=8F=97=E7=9B=8A=E4=BA=BA=E5=8F=98=E6=9B=B4=20?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E9=83=A8=E5=88=86=E7=B2=97=E7=95=A5=E5=AE=8C?= =?UTF-8?q?=E6=88=90=EF=BC=8C=E8=BF=98=E9=9C=80=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/ebiz/preserve.js | 10 + .../ebiz/preserve/BeneficiaryConfirmation.vue | 404 ++++++- src/views/ebiz/preserve/BeneficiaryInfo.vue | 312 ++++- .../ebiz/preserve/BeneficiaryInfoAdd.vue | 1070 +++++++++++++++++ src/views/ebiz/preserve/ContactInfo.vue | 4 +- src/views/ebiz/preserve/HandleResult.vue | 11 +- src/views/ebiz/preserve/js/methods.js | 95 ++ src/views/ebiz/preserve/js/verification.js | 52 + 8 files changed, 1950 insertions(+), 8 deletions(-) create mode 100644 src/views/ebiz/preserve/BeneficiaryInfoAdd.vue create mode 100644 src/views/ebiz/preserve/js/methods.js create mode 100644 src/views/ebiz/preserve/js/verification.js diff --git a/src/router/ebiz/preserve.js b/src/router/ebiz/preserve.js index 2a5a9b295..d2a34fdb7 100644 --- a/src/router/ebiz/preserve.js +++ b/src/router/ebiz/preserve.js @@ -10,6 +10,7 @@ const contactInfo = () => import('@/views/ebiz/preserve/ContactInfo') const contacAgreement = () => import('@/views/ebiz/preserve/ContacAgreement') const contactConfirmation = () => import('@/views/ebiz/preserve/ContactConfirmation') const beneficiaryInfo = () => import('@/views/ebiz/preserve/BeneficiaryInfo') +const beneficiaryInfoAdd = () => import('@/views/ebiz/preserve/BeneficiaryInfoAdd') const beneficiaryConfirmation = () => import('@/views/ebiz/preserve/BeneficiaryConfirmation') const surrenderInfo = () => import('@/views/ebiz/preserve/SurrenderInfo') const surrenderConfirmation = () => import('@/views/ebiz/preserve/SurrenderConfirmation') @@ -70,6 +71,15 @@ export default [ index: 5 } }, + { + path: '/preserve/beneficiaryInfoAdd', + name: 'beneficiaryInfoAdd', + component: beneficiaryInfoAdd, + meta: { + title: '指定受益人信息', + index: 105 + } + }, { path: '/preserve/surrenderInfo', name: 'surrenderInfo', diff --git a/src/views/ebiz/preserve/BeneficiaryConfirmation.vue b/src/views/ebiz/preserve/BeneficiaryConfirmation.vue index b09433e35..86bb8649d 100644 --- a/src/views/ebiz/preserve/BeneficiaryConfirmation.vue +++ b/src/views/ebiz/preserve/BeneficiaryConfirmation.vue @@ -1 +1,403 @@ - \ No newline at end of file + + + + + diff --git a/src/views/ebiz/preserve/BeneficiaryInfo.vue b/src/views/ebiz/preserve/BeneficiaryInfo.vue index 048b818fd..5385b18fe 100644 --- a/src/views/ebiz/preserve/BeneficiaryInfo.vue +++ b/src/views/ebiz/preserve/BeneficiaryInfo.vue @@ -1 +1,311 @@ - \ No newline at end of file + + + + + diff --git a/src/views/ebiz/preserve/BeneficiaryInfoAdd.vue b/src/views/ebiz/preserve/BeneficiaryInfoAdd.vue new file mode 100644 index 000000000..6e6044f8c --- /dev/null +++ b/src/views/ebiz/preserve/BeneficiaryInfoAdd.vue @@ -0,0 +1,1070 @@ + + + + diff --git a/src/views/ebiz/preserve/ContactInfo.vue b/src/views/ebiz/preserve/ContactInfo.vue index 7ee2a58ae..02f00ea56 100644 --- a/src/views/ebiz/preserve/ContactInfo.vue +++ b/src/views/ebiz/preserve/ContactInfo.vue @@ -138,9 +138,9 @@ export default { this.$jump({ flag: 'h5', extra: { - url: location.origin + '/#/preserve/HandleResult' + url: location.origin + '/#/preserve/HandleResult?entry=contact' }, - routerInfo: '/preserve/HandleResult' + routerInfo: '/preserve/HandleResult?entry=contact' }) } else { this.$toast(res.resultMessage) diff --git a/src/views/ebiz/preserve/HandleResult.vue b/src/views/ebiz/preserve/HandleResult.vue index b3824ae21..7b09a0265 100644 --- a/src/views/ebiz/preserve/HandleResult.vue +++ b/src/views/ebiz/preserve/HandleResult.vue @@ -31,8 +31,11 @@ export default { } // 此处处理 this.path switch (this.entry) { - case 'basic': - this.path = '1' + case 'contact': + this.path = '/preserve/ContactConfirmation?entry=contact' + break + case 'beneficiary': + this.path = '/preserve/BeneficiaryConfirmation?entry=beneficiary&' break case 'renewal': this.path = '2' @@ -63,10 +66,10 @@ export default { // 若被保险人≥18周岁，人脸识别录入被保人本人 // 若被保险人＜18周岁，被保险人与投保人为子女关系，人脸识别录入未成年人父亲或母亲 // toDo + this.jumpNextPage(this.path) } }, - jumpNextPage(path) { - path = '/preserve/ContactConfirmation' + jumpNextPage(path = '/preserve/BeneficiaryInfo') { this.$jump({ flag: 'h5', extra: { diff --git a/src/views/ebiz/preserve/js/methods.js b/src/views/ebiz/preserve/js/methods.js new file mode 100644 index 000000000..da4406408 --- /dev/null +++ b/src/views/ebiz/preserve/js/methods.js @@ -0,0 +1,95 @@ +//点击弹出组件 +export function selectComp(that, index, type = '') { + that.currentPopupIndex = index + let title = '' + if (index == 1) { + ;[that.customerShowPicker, title] = [true, '客户列表'] + } else if (index == 2) { + ;[that.occupationShowPicker, title] = [true, '职业类别'] + } else if (index == 3) { + if (type == '1') { + //投保人 + localStorage.scanFromInsured = 'true' + } else if (type == '2') { + //被保险人 + localStorage.scanFromInsured = 'false' + } + ;[that.isScan, title] = [true, '身份证扫描'] + } + + setTimeout(() => { + that.$jump({ + flag: 'navigation', + extra: { + title, + hiddenLeft: '1' + } + }) + closeBtn(that) + }, 400) +} + +// 关闭按钮的显示 +function closeBtn(that) { + that.$jump({ + flag: 'webview_right_button', + extra: { + btns: [ + { + img: that.$assetsUrl + 'images/del-close.png', + route: { flag: '', extra: {} } + } + ] + } + }) +} + +// 获取身份证扫描信息 +/** + * + * @param {*} that 上下文 + * @param {*} data 扫描数据 + * @param {*} type 1 投保人 2 被保险人 + */ +export function getIdentityInfo(that, data, type) { + console.log(data) + // 正面 + if (data.name && data.name != '待识别') { + that.userInfo.name = data.name + that.userInfo.idNo = data.idNo + that.userInfo.birthday = `${data.birthYear}-${data.birthMonth}-${data.birthDay}` + that.userInfo.sex = data.gender == '男' ? '0' : '1' + } + // 反面 + if (data.startDate && data.startDate != '待识别') { + that.userInfo.certificateValidate = `${data.startDate.substr(0, 4)}-${data.startDate.substr(5, 2)}-${data.startDate.substr(8, 2)}` + //that.userInfo.certificateValidate = `${data.startDate.substr(0, 4)}-${data.startDate.substr(4, 2)}-${data.startDate.substr(6, 2)}` + // 是否为长期身份证 + if (data.endDate != '长期') { + that.userInfo.certiexpiredate = `${data.endDate.substr(0, 4)}-${data.endDate.substr(5, 2)}-${data.endDate.substr(8, 2)}` + // that.userInfo.certiexpiredate = `${data.endDate.substr(0, 4)}-${data.endDate.substr(4, 2)}-${data.endDate.substr(6, 2)}` + that.effectiveDateTypeAble = true + that.idLimit = false + that.isRequired = true + } else { + // 勾选长期 + that.userInfo.effectiveDateType = true + // 长期按钮不禁用 + that.effectiveDateTypeAble = false + // 证件截止日期不需要校验 + that.certiexpiredateRequired = false + //截止日期不可编辑 + that.idLimit = true + that.isRequired = false + } + } + that.isScan = false + let title = type == '1' ? '投保人信息' : '被保险人信息' + that.$jump({ + flag: 'navigation', + extra: { + title, + hiddenRight: '1' + } + }) +} diff --git a/src/views/ebiz/preserve/js/verification.js b/src/views/ebiz/preserve/js/verification.js new file mode 100644 index 000000000..b42c40b4b --- /dev/null +++ b/src/views/ebiz/preserve/js/verification.js @@ -0,0 +1,52 @@ +import changeFifteenToEighteen from '@/assets/js/utils/changeFifteenToEighteen' +import idNoCheck from '@/assets/js/utils/idNoCheck' +import utilsAge from '@/assets/js/utils/age' + +//身份证带出出生日期,性别,年龄 +export function idToData(idNo) { + //非空 + if (!idNo.trim()) { + return { + text: '证件号码不能为空' + } + } + + // 证件号码规则校验 + if (!idNoCheck.isIdno(idNo)) { + return { + text: '您填写的证件号码有误' + } + } + + //如果是15位身份证号先转为18位 + if (idNo.length == 15) { + idNo = changeFifteenToEighteen(idNo) + } + let birthday = getBirthById(idNo) + let age = utilsAge.getAge(birthday, new Date()) + let sex = getSexById(idNo) + return { + birthday, + age, + sex + } +} + +function getBirthById(idNo) { + // 获取生日 + var year = idNo.substr(6, 4) + var month = idNo.substr(10, 2) + var day = idNo.substr(12, 2) + return year + '-' + month + '-' + day +} + +function getSexById(idNo) { + // 获取性别 + if (idNo.charAt(16) >= '0' && idNo.charAt(16) <= '9') { + if (parseInt(idNo.charAt(16)) % 2 == 0) { + return '1' + } else { + return '0' + } + } +} From 36cf16535149e4792f21c420b4016e028b7af8c8 Mon Sep 17 00:00:00 2001 From: "tian.guangyuan" Date: Wed, 15 Apr 2020 13:06:33 +0800 Subject: [PATCH 2/5] =?UTF-8?q?[new]=20=E6=96=B0=E5=A2=9E=E4=BF=9D?= =?UTF-8?q?=E5=85=A8-=E5=8F=97=E7=9B=8A=E4=BA=BA=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=8C=E9=A1=B5=E9=9D=A2=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E5=AE=8C=E6=88=90=EF=BC=8C=E9=83=A8=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=9B=A0=E6=8E=A5=E5=8F=A3=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E6=9A=82=E6=97=B6=E6=97=A0=E6=B3=95=E7=BB=A7=E7=BB=AD=E5=BC=80?= =?UTF-8?q?=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/ebiz/preserve/preserve.js | 18 + src/config/preserve.js | 1 + src/router/ebiz/preserve.js | 10 + .../ebiz/preserve/AutopayAuthorization.vue | 2 +- .../ebiz/preserve/BeneficiaryConfirmation.vue | 345 ++------ src/views/ebiz/preserve/BeneficiaryInfo.vue | 253 ++---- .../ebiz/preserve/BeneficiaryInfoAdd.vue | 796 ++++-------------- .../ebiz/preserve/BeneficiaryInfoDetail.vue | 309 +++++++ src/views/ebiz/preserve/ContacAgreement.vue | 2 +- .../ebiz/preserve/ContactConfirmation.vue | 7 +- src/views/ebiz/preserve/HandleResult.vue | 37 +- src/views/ebiz/preserve/ImageUpload.vue | 2 +- src/views/ebiz/preserve/PolicyList.vue | 150 +++- .../ebiz/preserve/RenewalConfirmation.vue | 2 +- src/views/ebiz/preserve/RenewalInfo.vue | 2 +- src/views/ebiz/preserve/SubmitResult.vue | 4 +- .../ebiz/preserve/SurrenderConfirmation.vue | 2 +- src/views/ebiz/preserve/SurrenderInfo.vue | 2 +- 18 files changed, 863 insertions(+), 1081 deletions(-) create mode 100644 src/views/ebiz/preserve/BeneficiaryInfoDetail.vue diff --git a/src/api/ebiz/preserve/preserve.js b/src/api/ebiz/preserve/preserve.js index 779a88c6e..f69680adb 100644 --- a/src/api/ebiz/preserve/preserve.js +++ b/src/api/ebiz/preserve/preserve.js @@ -33,3 +33,21 @@ export function customerInfo(data) { data }) } + +//客户详情 +// export function customerInfo(data) { +// return request({ +// url: getUrl('/edor/customer/customerInfo', 0), +// method: 'post', +// data +// }) +// } + +//保单列表 +export function policyList(data) { + return request({ + url: getUrl('/edor/customer/policyList', 0), + method: 'post', + data + }) +} \ No newline at end of file diff --git a/src/config/preserve.js b/src/config/preserve.js index 78caff926..5d609dd4d 100644 --- a/src/config/preserve.js +++ b/src/config/preserve.js @@ -2,6 +2,7 @@ let mockBaseUrl = 'http://rap2.taobao.org:38080/app/mock/250585/' export default { + '/edor/customer/policyList': mockBaseUrl + '/edor/customer/policyList', '/edor/customer/customerInfo': mockBaseUrl + '/edor/customer/customerInfo', '/edor/customer/customerList': mockBaseUrl + '/edor/customer/customerList', '/edor/item/change': mockBaseUrl + '/edor/item/change', diff --git a/src/router/ebiz/preserve.js b/src/router/ebiz/preserve.js index d2a34fdb7..d57f16cb4 100644 --- a/src/router/ebiz/preserve.js +++ b/src/router/ebiz/preserve.js @@ -11,6 +11,7 @@ const contacAgreement = () => import('@/views/ebiz/preserve/ContacAgreement') const contactConfirmation = () => import('@/views/ebiz/preserve/ContactConfirmation') const beneficiaryInfo = () => import('@/views/ebiz/preserve/BeneficiaryInfo') const beneficiaryInfoAdd = () => import('@/views/ebiz/preserve/BeneficiaryInfoAdd') +const beneficiaryInfoDetail = () => import('@/views/ebiz/preserve/BeneficiaryInfoDetail') const beneficiaryConfirmation = () => import('@/views/ebiz/preserve/BeneficiaryConfirmation') const surrenderInfo = () => import('@/views/ebiz/preserve/SurrenderInfo') const surrenderConfirmation = () => import('@/views/ebiz/preserve/SurrenderConfirmation') @@ -80,6 +81,15 @@ export default [ index: 105 } }, + { + path: '/preserve/beneficiaryInfoDetail', + name: 'beneficiaryInfoDetail', + component: beneficiaryInfoDetail, + meta: { + title: '指定受益人信息', + index: 105 + } + }, { path: '/preserve/surrenderInfo', name: 'surrenderInfo', diff --git a/src/views/ebiz/preserve/AutopayAuthorization.vue b/src/views/ebiz/preserve/AutopayAuthorization.vue index f95338a4f..f37f03046 100644 --- a/src/views/ebiz/preserve/AutopayAuthorization.vue +++ b/src/views/ebiz/preserve/AutopayAuthorization.vue @@ -1,4 +1,4 @@ \ No newline at end of file + diff --git a/src/views/ebiz/preserve/BeneficiaryConfirmation.vue b/src/views/ebiz/preserve/BeneficiaryConfirmation.vue index 86bb8649d..5c1333d5a 100644 --- a/src/views/ebiz/preserve/BeneficiaryConfirmation.vue +++ b/src/views/ebiz/preserve/BeneficiaryConfirmation.vue @@ -1,15 +1,15 @@ - + diff --git a/src/views/ebiz/preserve/BeneficiaryInfo.vue b/src/views/ebiz/preserve/BeneficiaryInfo.vue index 5385b18fe..5b680ed09 100644 --- a/src/views/ebiz/preserve/BeneficiaryInfo.vue +++ b/src/views/ebiz/preserve/BeneficiaryInfo.vue @@ -4,12 +4,12 @@
- {{ insuredPerson }} + {{ insuredName }}
- + 法定受益人 指定受益人 @@ -22,12 +22,7 @@
- + {{ item.name }}
@@ -54,10 +49,10 @@ diff --git a/src/views/ebiz/preserve/ContacAgreement.vue b/src/views/ebiz/preserve/ContacAgreement.vue index 0abd48252..3c3311ab6 100644 --- a/src/views/ebiz/preserve/ContacAgreement.vue +++ b/src/views/ebiz/preserve/ContacAgreement.vue @@ -118,7 +118,7 @@ export default { } }) .catch(err => { - console.log(err); + console.log(err) }) } }, diff --git a/src/views/ebiz/preserve/ContactConfirmation.vue b/src/views/ebiz/preserve/ContactConfirmation.vue index f764df15c..030a6279a 100644 --- a/src/views/ebiz/preserve/ContactConfirmation.vue +++ b/src/views/ebiz/preserve/ContactConfirmation.vue @@ -209,12 +209,12 @@ export default { }, //提交变更申请 async changeSubmit() { - if(!this.sessionId){ + if (!this.sessionId) { this.$toast({ - message: "请先获取验证码", + message: '请先获取验证码', onClose: this.showAuth }) - return; + return } let res = await autchCodeCheck({ smsId: this.sessionId, @@ -238,7 +238,6 @@ export default { onClose: this.showAuth }) } - } }, beforeDestroy() { diff --git a/src/views/ebiz/preserve/HandleResult.vue b/src/views/ebiz/preserve/HandleResult.vue index ff1f6d6eb..4c0d17526 100644 --- a/src/views/ebiz/preserve/HandleResult.vue +++ b/src/views/ebiz/preserve/HandleResult.vue @@ -53,19 +53,30 @@ export default { }, methods: { nextStep() { - if (this.customerInfo.idType != '1') { - // 如果证件类型不是身份证 - // 直接跳过人脸识别 - - this.jumpNextPage(this.path) - } else if (this.entry != 'beneficiary') { + if (this.entry != 'beneficiary') { // 如果 保全项不是 受益人变更、则 在证件类型为身份证时 直接接入人脸识别 - this.toFace() + // if (this.customerInfo.idType != '1') { + // 如果证件类型不是身份证 + // 直接跳过人脸识别 + this.jumpNextPage(this.path) + // } else { + // this.toFace({ + // number: this.customerInfo.idNo, //身份证号码 + // name: this.customerInfo.name //姓名 + // }) + // } } else if (this.entry == 'beneficiary') { // 如果 保全项是 受益人变更、则进行特殊判断 // 若被保险人≥18周岁，人脸识别录入被保人本人 // 若被保险人＜18周岁，被保险人与投保人为子女关系，人脸识别录入未成年人父亲或母亲 // toDo + // + // if (this.customerInfo.idType != '1' ) { + // // 如果证件类型不是身份证 + // // 直接跳过人脸识别 + // this.jumpNextPage(this.path) + // } + // this.jumpNextPage(this.path) } }, @@ -80,17 +91,19 @@ export default { } }) }, - toFace() { + toFace(config) { // eslint-disable-next-line no-undef - EWebBridge.webCallAppInJs('face_auth', { - number: this.customerInfo.idNo, //身份证号码 - name: this.customerInfo.name //姓名 + EWebBridge.webCallAppInJs('face_auth', config ) + // { + // number: this.customerInfo.idNo, //身份证号码 + // name: this.customerInfo.name //姓名 // }) // 跳过人脸识别 // new Promise(resolve => { // console.log('--跳过人脸识别--返回识别成功') // resolve(JSON.stringify({ state: '1' })) - }).then(data => { + // }) + .then(data => { if (JSON.parse(data).state == '1') { this.jumpNextPage(this.path) } else { diff --git a/src/views/ebiz/preserve/ImageUpload.vue b/src/views/ebiz/preserve/ImageUpload.vue index d3cafad27..fd090439d 100644 --- a/src/views/ebiz/preserve/ImageUpload.vue +++ b/src/views/ebiz/preserve/ImageUpload.vue @@ -1 +1 @@ - \ No newline at end of file + diff --git a/src/views/ebiz/preserve/PolicyList.vue b/src/views/ebiz/preserve/PolicyList.vue index 8f230b2ad..9c297dfb5 100644 --- a/src/views/ebiz/preserve/PolicyList.vue +++ b/src/views/ebiz/preserve/PolicyList.vue @@ -1 +1,149 @@ - \ No newline at end of file + + + diff --git a/src/views/ebiz/preserve/RenewalConfirmation.vue b/src/views/ebiz/preserve/RenewalConfirmation.vue index 4e81ad177..814c4f807 100644 --- a/src/views/ebiz/preserve/RenewalConfirmation.vue +++ b/src/views/ebiz/preserve/RenewalConfirmation.vue @@ -1 +1 @@ - \ No newline at end of file + diff --git a/src/views/ebiz/preserve/RenewalInfo.vue b/src/views/ebiz/preserve/RenewalInfo.vue index c5e0dd4b5..a7ca40faf 100644 --- a/src/views/ebiz/preserve/RenewalInfo.vue +++ b/src/views/ebiz/preserve/RenewalInfo.vue @@ -1 +1 @@ - \ No newline at end of file + diff --git a/src/views/ebiz/preserve/SubmitResult.vue b/src/views/ebiz/preserve/SubmitResult.vue index 3773a13f3..99f278085 100644 --- a/src/views/ebiz/preserve/SubmitResult.vue +++ b/src/views/ebiz/preserve/SubmitResult.vue @@ -6,7 +6,7 @@

提交成功

如有疑问请拨打客服电话: 4008-008-008

- +
返回
@@ -24,7 +24,7 @@ export default { document.body.style.backgroundColor = '#fff' }, methods: { - nextStep(){ + nextStep() { // service this.$jump({ flag: 'service' diff --git a/src/views/ebiz/preserve/SurrenderConfirmation.vue b/src/views/ebiz/preserve/SurrenderConfirmation.vue index 5627c94d6..e2bece42b 100644 --- a/src/views/ebiz/preserve/SurrenderConfirmation.vue +++ b/src/views/ebiz/preserve/SurrenderConfirmation.vue @@ -1 +1 @@ - \ No newline at end of file + diff --git a/src/views/ebiz/preserve/SurrenderInfo.vue b/src/views/ebiz/preserve/SurrenderInfo.vue index e680f7a0c..c185277aa 100644 --- a/src/views/ebiz/preserve/SurrenderInfo.vue +++ b/src/views/ebiz/preserve/SurrenderInfo.vue @@ -1 +1 @@ - \ No newline at end of file + From d73de89000314eb6fc4be2d3be4ed65e3688c903 Mon Sep 17 00:00:00 2001 From: "tian.guangyuan" Date: Wed, 15 Apr 2020 13:14:15 +0800 Subject: [PATCH 3/5] =?UTF-8?q?[IMP]=20=E4=BF=AE=E5=A4=8D=E4=BF=9D?= =?UTF-8?q?=E5=85=A8=E7=9A=84=20=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ebiz/preserve/BeneficiaryConfirmation.vue | 24 +++++++------- src/views/ebiz/preserve/BeneficiaryInfo.vue | 20 ++++++------ .../ebiz/preserve/BeneficiaryInfoAdd.vue | 26 +++------------ .../ebiz/preserve/BeneficiaryInfoDetail.vue | 26 +++------------ src/views/ebiz/preserve/HandleResult.vue | 32 +++++++++---------- 5 files changed, 47 insertions(+), 81 deletions(-) diff --git a/src/views/ebiz/preserve/BeneficiaryConfirmation.vue b/src/views/ebiz/preserve/BeneficiaryConfirmation.vue index 5c1333d5a..35a7b8d07 100644 --- a/src/views/ebiz/preserve/BeneficiaryConfirmation.vue +++ b/src/views/ebiz/preserve/BeneficiaryConfirmation.vue @@ -57,7 +57,7 @@ - + 提交申请
@@ -86,22 +86,22 @@ export default { }, data() { let feachData = { - surrenderDTOList: [ - { - surrenderId: '', - edorapplyNo: '', - surrenderType: '2', - bnfDTOs: [] - } - ] - } + surrenderDTOList: [ + { + surrenderId: '', + edorapplyNo: '', + surrenderType: '2', + bnfDTOs: [] + } + ] + } return { show: false, // 获取短信验证码 codeDisabled: false, // 获取验证码按钮是否禁用 timeId: null, // 计时器ID countDown: 60, // 倒计时 authCode: '', // 验证码 - feachData:feachData, + feachData: feachData, type: '', isDisType: false, policy: null, @@ -123,7 +123,7 @@ export default { nextStep() { this.showAuth() }, - detail(index){ + detail(index) { // edit=0 let path = '/preserve/BeneficiaryInfoDetail?edit=' + index this.$jump({ diff --git a/src/views/ebiz/preserve/BeneficiaryInfo.vue b/src/views/ebiz/preserve/BeneficiaryInfo.vue index 5b680ed09..df097ccbd 100644 --- a/src/views/ebiz/preserve/BeneficiaryInfo.vue +++ b/src/views/ebiz/preserve/BeneficiaryInfo.vue @@ -61,17 +61,17 @@ export default { }, data() { let feachData = { - surrenderDTOList: [ - { - surrenderId: '', - edorapplyNo: '', - surrenderType: '2', - bnfDTOs: [] - } - ] - } + surrenderDTOList: [ + { + surrenderId: '', + edorapplyNo: '', + surrenderType: '2', + bnfDTOs: [] + } + ] + } return { - feachData:feachData, + feachData: feachData, type: '', isDisType: false, policy: null, diff --git a/src/views/ebiz/preserve/BeneficiaryInfoAdd.vue b/src/views/ebiz/preserve/BeneficiaryInfoAdd.vue index cef5c384f..011265e1e 100644 --- a/src/views/ebiz/preserve/BeneficiaryInfoAdd.vue +++ b/src/views/ebiz/preserve/BeneficiaryInfoAdd.vue @@ -131,24 +131,8 @@ v-validate="'required'" @click="chooseArea" /> - - + + 100) { return this.$toast('受益份额有误,请重新输入~') } - - if(!this.$route.query.edit){ + + if (!this.$route.query.edit) { this.bnfDTOs.push(this.userInfo) - }else{ + } else { this.bnfDTOs[this.editIndex] = this.userInfo } this.policy.bnfDTOs = this.bnfDTOs diff --git a/src/views/ebiz/preserve/BeneficiaryInfoDetail.vue b/src/views/ebiz/preserve/BeneficiaryInfoDetail.vue index 5e31ccb59..627e4ead4 100644 --- a/src/views/ebiz/preserve/BeneficiaryInfoDetail.vue +++ b/src/views/ebiz/preserve/BeneficiaryInfoDetail.vue @@ -69,7 +69,7 @@ readonly >
- 长期 + 长期
- - + + diff --git a/src/views/ebiz/preserve/HandleResult.vue b/src/views/ebiz/preserve/HandleResult.vue index 4c0d17526..2bc5e667d 100644 --- a/src/views/ebiz/preserve/HandleResult.vue +++ b/src/views/ebiz/preserve/HandleResult.vue @@ -56,9 +56,9 @@ export default { if (this.entry != 'beneficiary') { // 如果 保全项不是 受益人变更、则 在证件类型为身份证时 直接接入人脸识别 // if (this.customerInfo.idType != '1') { - // 如果证件类型不是身份证 - // 直接跳过人脸识别 - this.jumpNextPage(this.path) + // 如果证件类型不是身份证 + // 直接跳过人脸识别 + this.jumpNextPage(this.path) // } else { // this.toFace({ // number: this.customerInfo.idNo, //身份证号码 @@ -70,13 +70,13 @@ export default { // 若被保险人≥18周岁，人脸识别录入被保人本人 // 若被保险人＜18周岁，被保险人与投保人为子女关系，人脸识别录入未成年人父亲或母亲 // toDo - // + // // if (this.customerInfo.idType != '1' ) { // // 如果证件类型不是身份证 // // 直接跳过人脸识别 // this.jumpNextPage(this.path) // } - // + // this.jumpNextPage(this.path) } }, @@ -93,8 +93,8 @@ export default { }, toFace(config) { // eslint-disable-next-line no-undef - EWebBridge.webCallAppInJs('face_auth', config ) - // { + EWebBridge.webCallAppInJs('face_auth', config) + // { // number: this.customerInfo.idNo, //身份证号码 // name: this.customerInfo.name //姓名 // }) @@ -102,15 +102,15 @@ export default { // new Promise(resolve => { // console.log('--跳过人脸识别--返回识别成功') // resolve(JSON.stringify({ state: '1' })) - // }) - .then(data => { - if (JSON.parse(data).state == '1') { - this.jumpNextPage(this.path) - } else { - // eslint-disable-next-line no-undef - EWebBridge.webCallAppInJs('webview_toast', '人脸检测失败') - } - }) + // }) + .then(data => { + if (JSON.parse(data).state == '1') { + this.jumpNextPage(this.path) + } else { + // eslint-disable-next-line no-undef + EWebBridge.webCallAppInJs('webview_toast', '人脸检测失败') + } + }) } } // beforeRouteLeave(to, from, next) { From 36f053a9bf531b99203fb7b169c168f3e2db0b80 Mon Sep 17 00:00:00 2001 From: "tian.guangyuan" Date: Wed, 6 May 2020 09:54:30 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E3=80=90fix=E3=80=91=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=8C=89=E7=85=A7=E6=8E=A5=E5=8F=A3=E6=96=87=E6=A1=A3=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/preserve/PolicyList.vue | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/src/views/ebiz/preserve/PolicyList.vue b/src/views/ebiz/preserve/PolicyList.vue index 9c297dfb5..ea7c60822 100644 --- a/src/views/ebiz/preserve/PolicyList.vue +++ b/src/views/ebiz/preserve/PolicyList.vue @@ -45,7 +45,7 @@ 保额（元） - {{ item.amnt | amtFormat }} + {{ item.amt | amtFormat }}
@@ -85,10 +85,21 @@ export default { { contNo: '11111111', appntName: '张三', - isuredName: '李四', + insuredName: '李四', riskName: '国富人寿八桂无忧', - amnt: '130.000', + amt: '130.000', cvaliDate: '2020-01-19' + }, + { + "grpContNo": "11222111", + "contNo": "11111111", + "proposalPrtNo": "641596", + "hangUpFlag": "2", + "appntName": "张三2", + "insuredName": "李四2", + "riskName": "国富人寿八桂无忧", + "amt": "130.00", + "cvaliDate": "2020-01-19" } ] //保单列表 /* @@ -105,14 +116,15 @@ export default { mounted() { this.entry = this.$route.query.entry //await this.getPolicyList({ customerNo: this.customerInfo.customerNo }) - this.getPolicyList({ customerNo: '' }) + // this.getPolicyList({ customerNo: '' }) }, methods: { //获取保单列表 async getPolicyList(data) { policyList(data).then(res => { if (res.result == '0') { - this.policyList = res.content.policyListDTOList + // this.policyList = res.content.policyListDTOList + this.policyList = res.content.contList } else { this.$toast(res.resultMessage) } From a652f3960aea76895422c48b1033b9d27bf10b4f Mon Sep 17 00:00:00 2001 From: "tian.guangyuan" Date: Wed, 6 May 2020 11:03:10 +0800 Subject: [PATCH 5/5] =?UTF-8?q?[fix]=20=E6=97=A0=E5=8F=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/ebiz/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/router/ebiz/index.js b/src/router/ebiz/index.js index 24a71ace8..d8b72d777 100644 --- a/src/router/ebiz/index.js +++ b/src/router/ebiz/index.js @@ -27,5 +27,5 @@ export default [ ...report, ...survey, ...nbs, - ...preserve + ...preserve, ] //根据需要进行删减