From 80dec42d2704bb055e021259232a7d645004c694 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=9A=AE=E4=BC=9F?= Date: Tue, 26 Nov 2019 14:33:26 +0800 Subject: [PATCH 01/61] =?UTF-8?q?=E5=8D=A1=E5=8D=95=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/ebiz/cardList/cardList.js | 4 + src/assets/js/utils/request.js | 5 +- src/config/cardList.js | 1 + src/router/ebiz/cardList.js | 13 + src/router/ebiz/index.js | 3 +- src/views/ebiz/cardList/information.vue | 1146 ++++++++++++++++++++ src/views/ebiz/cardList/js/methods.js | 89 ++ src/views/ebiz/cardList/js/verification.js | 52 + src/views/ebiz/sale/InsuredInfo.vue | 2 +- 9 files changed, 1312 insertions(+), 3 deletions(-) create mode 100644 src/api/ebiz/cardList/cardList.js create mode 100644 src/config/cardList.js create mode 100644 src/router/ebiz/cardList.js create mode 100644 src/views/ebiz/cardList/information.vue create mode 100644 src/views/ebiz/cardList/js/methods.js create mode 100644 src/views/ebiz/cardList/js/verification.js diff --git a/src/api/ebiz/cardList/cardList.js b/src/api/ebiz/cardList/cardList.js new file mode 100644 index 000000000..28dac83d8 --- /dev/null +++ b/src/api/ebiz/cardList/cardList.js @@ -0,0 +1,4 @@ +// 卡单接口 + +import request from '@/assets/js/utils/request' +import getUrl from '@/assets/js/utils/get-url' diff --git a/src/assets/js/utils/request.js b/src/assets/js/utils/request.js index 0fe1f1100..5e2dac6de 100644 --- a/src/assets/js/utils/request.js +++ b/src/assets/js/utils/request.js @@ -1,5 +1,6 @@ import axios from 'axios' import { Dialog, Toast } from 'vant' +//建议书 let proposal = [ '/proposal/proposal/list', '/proposal/proposal/toInsurance', @@ -9,7 +10,9 @@ let proposal = [ '/proposal/proposal/updateInsured', '/proposal/file/getFile', '/proposal/proposal/deleteProposal' -] //建议书 +] +// 卡单 +let cardList = [] let sale = ['/sale/order/orderList', '/sale/order/saveOrUpdateOrderInfo'] //在线投保 let whiteList = ['/customer/agent/getCustomersList', ...proposal, ...sale] diff --git a/src/config/cardList.js b/src/config/cardList.js new file mode 100644 index 000000000..2f89c5c05 --- /dev/null +++ b/src/config/cardList.js @@ -0,0 +1 @@ +// 卡单 diff --git a/src/router/ebiz/cardList.js b/src/router/ebiz/cardList.js new file mode 100644 index 000000000..e65351aae --- /dev/null +++ b/src/router/ebiz/cardList.js @@ -0,0 +1,13 @@ +// 卡单路由 +const information = () => import('@/views/ebiz/cardList/information') +export default [ + { + path: '/cardList/information', + name: 'information', + component: information, + meta: { + title: '投被保人信息', + index: 1 + } + } +] diff --git a/src/router/ebiz/index.js b/src/router/ebiz/index.js index 9be0c4106..0ef1fa792 100644 --- a/src/router/ebiz/index.js +++ b/src/router/ebiz/index.js @@ -6,4 +6,5 @@ import my from './my' import serve from './serve' import common from './common' import product from './product' -export default [...proposal, ...sale, ...customer, ...my, ...serve, ...common, ...product] //根据需要进行删减 +import cardList from './cardList' +export default [...proposal, ...sale, ...customer, ...my, ...serve, ...common, ...product, ...cardList] //根据需要进行删减 \ No newline at end of file diff --git a/src/views/ebiz/cardList/information.vue b/src/views/ebiz/cardList/information.vue new file mode 100644 index 000000000..f6959ecc3 --- /dev/null +++ b/src/views/ebiz/cardList/information.vue @@ -0,0 +1,1146 @@ + + + diff --git a/src/views/ebiz/cardList/js/methods.js b/src/views/ebiz/cardList/js/methods.js new file mode 100644 index 000000000..b2cda7c38 --- /dev/null +++ b/src/views/ebiz/cardList/js/methods.js @@ -0,0 +1,89 @@ +//点击弹出组件 +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) { + // 正面 + 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 + } else { + // 勾选长期 + that.userInfo.effectiveDateType = true + // 长期按钮不禁用 + that.effectiveDateTypeAble = false + // 证件截止日期不需要校验 + that.certiexpiredateRequired = false + } + } + that.isScan = false + let title = type == '1' ? '投保人信息' : '被保人信息' + that.$jump({ + flag: 'navigation', + extra: { + title, + hiddenRight: '1' + } + }) +} diff --git a/src/views/ebiz/cardList/js/verification.js b/src/views/ebiz/cardList/js/verification.js new file mode 100644 index 000000000..b42c40b4b --- /dev/null +++ b/src/views/ebiz/cardList/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' + } + } +} diff --git a/src/views/ebiz/sale/InsuredInfo.vue b/src/views/ebiz/sale/InsuredInfo.vue index 3694cf47a..1a7198ac9 100644 --- a/src/views/ebiz/sale/InsuredInfo.vue +++ b/src/views/ebiz/sale/InsuredInfo.vue @@ -317,7 +317,7 @@ import IdentityCardScan from '@/components/ebiz/sale/IdentityCardScan' import idNoCheck from '@/assets/js/utils/idNoCheck' import beforeDate from '@/assets/js/utils/getBeforeDate.js' import { idToData } from './js/verification' -import { selectComp,getIdentityInfo } from './js/methods' +import { selectComp } from './js/methods' export default { name: 'insuredInfo', From 70a7f625b782911dd465fb5fb6363f65c5d659a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=9A=AE=E4=BC=9F?= Date: Tue, 26 Nov 2019 17:53:55 +0800 Subject: [PATCH 02/61] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=94=B9=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/cardList/information.vue | 516 +++++------------------- 1 file changed, 112 insertions(+), 404 deletions(-) diff --git a/src/views/ebiz/cardList/information.vue b/src/views/ebiz/cardList/information.vue index f6959ecc3..e00248b4f 100644 --- a/src/views/ebiz/cardList/information.vue +++ b/src/views/ebiz/cardList/information.vue @@ -1,10 +1,10 @@ - diff --git a/src/views/ebiz/cardList/productDetails.vue b/src/views/ebiz/cardList/productDetails.vue index 5c17613f7..6c8ba33a6 100644 --- a/src/views/ebiz/cardList/productDetails.vue +++ b/src/views/ebiz/cardList/productDetails.vue @@ -1,160 +1,70 @@ - \ No newline at end of file From 621e0867bdc35929112b2904e81b36c984a147bd Mon Sep 17 00:00:00 2001 From: nimengmeng_1990 <1175001086@qq.com> Date: Fri, 20 Dec 2019 18:40:45 +0800 Subject: [PATCH 10/61] =?UTF-8?q?=E5=8D=A1=E5=8D=95=E7=AC=AC=E4=B8=80?= =?UTF-8?q?=E6=AC=A1=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/ebiz/cardList/cardList.js | 36 ++ src/config/cardList.js | 9 + src/config/urlMap.js | 3 +- src/router/ebiz/cardList.js | 26 +- src/views/ebiz/cardList/CardTotreasure.vue | 158 +++++--- src/views/ebiz/cardList/Pay.vue | 400 +++++++++++++++++---- src/views/ebiz/cardList/PaySuccess.vue | 79 ++-- src/views/ebiz/cardList/information.vue | 115 +++--- src/views/ebiz/cardList/js/methods.js | 73 ++-- src/views/ebiz/cardList/productDetails.vue | 175 ++++++--- 10 files changed, 783 insertions(+), 291 deletions(-) diff --git a/src/api/ebiz/cardList/cardList.js b/src/api/ebiz/cardList/cardList.js index 28dac83d8..8fa4257a3 100644 --- a/src/api/ebiz/cardList/cardList.js +++ b/src/api/ebiz/cardList/cardList.js @@ -2,3 +2,39 @@ import request from '@/assets/js/utils/request' import getUrl from '@/assets/js/utils/get-url' + +// 获取卡单列表 +export function getCardList(data) { + return request({ + url: getUrl('/sale/product/getProList', 1), + method: 'post', + data + }) +} + +// 获取我的卡单列表 +export function getMyCardList(data) { + return request({ + url: getUrl('/sale/card/getMyCardList', 1), + method: 'post', + data + }) +} + +// 获取产品详情 +export function getProductDetails(data) { + return request({ + url: getUrl('/sale/product/getItemDetail', 1), + method: 'post', + data + }) +} + +// 获取产品试算详情 +export function getProductInfo(data) { + return request({ + url: getUrl('/sale/product/getDetail', 1), + method: 'post', + data + }) +} diff --git a/src/config/cardList.js b/src/config/cardList.js index 2f89c5c05..573380b8e 100644 --- a/src/config/cardList.js +++ b/src/config/cardList.js @@ -1 +1,10 @@ // 卡单 +let mockBaseUrl = 'http://mock-api.com/9KOlmpzk.mock' +export default { + // 获取产品列表接口 + '/sale/card/getCardList': mockBaseUrl + '/sale/card/getCardList', + // 获取我的卡单接口 + getMyCardList: mockBaseUrl + '/sale/card/getMyCardList', + // 获取卡单详情接口 + getProductInfo: mockBaseUrl + '/sale/card/getCardDetail' +} diff --git a/src/config/urlMap.js b/src/config/urlMap.js index f383fc9d1..09c11c1b4 100644 --- a/src/config/urlMap.js +++ b/src/config/urlMap.js @@ -10,6 +10,7 @@ import my from './my' import product from './product' import serve from './serve' import common from './common' +import cardList from './cardList' const mockBaseUrl = 'http://rap2api.taobao.org/app/mock' let baseObj = { @@ -17,6 +18,6 @@ let baseObj = { '/user/info': mockBaseUrl + '/223948/info', '/user/logout': mockBaseUrl + '/223948/logout' } -Object.assign(baseObj, proposal, sale, customer, my, product, serve, common) +Object.assign(baseObj, proposal, sale, customer, my, product, serve, common, cardList) export default baseObj diff --git a/src/router/ebiz/cardList.js b/src/router/ebiz/cardList.js index f4a75b779..db63ad4e4 100644 --- a/src/router/ebiz/cardList.js +++ b/src/router/ebiz/cardList.js @@ -1,8 +1,10 @@ // 卡单路由 const information = () => import('@/views/ebiz/cardList/information') const cardTotreasure = () => import('@/views/ebiz/cardList/CardTotreasure') -const productDetails = () => import('@/views/ebiz/cardList/ProductDetails') +const productDetails = () => import('@/views/ebiz/cardList/productDetails') +const ShowPDF = () => import('@/views/ebiz/cardList/ShowPDF') const pay = () => import('@/views/ebiz/cardList/Pay') +const payResult = () => import('@/views/ebiz/cardList/PayResult') const paySuccess = () => import('@/views/ebiz/cardList/PaySuccess') const payLoser = () => import('@/views/ebiz/cardList/PayLoser') export default [ @@ -25,7 +27,7 @@ export default [ } }, { - path: '/cardList/productDetails', + path: '/cardList/productDetails/:productDetailCode', name: 'productDetails', component: productDetails, meta: { @@ -33,6 +35,15 @@ export default [ index: 3 } }, + { + path: '/cardList/ShowPDF', + name: 'ShowPDF', + component: ShowPDF, + meta: { + title: '国富健康保终身重大疾病保险条款', + index: 3 + } + }, { path: '/cardList/pay', name: 'pay', @@ -42,6 +53,15 @@ export default [ index: 4 } }, + { + path: '/cardList/payResult', + name: 'payResult', + component: payResult, + meta: { + title: '支付结果', + index: 5 + } + }, { path: '/cardList/paySuccess', name: 'paySuccess', @@ -60,6 +80,4 @@ export default [ index: 6 } } - - ] diff --git a/src/views/ebiz/cardList/CardTotreasure.vue b/src/views/ebiz/cardList/CardTotreasure.vue index 003e7d8fe..1fb9ee09b 100644 --- a/src/views/ebiz/cardList/CardTotreasure.vue +++ b/src/views/ebiz/cardList/CardTotreasure.vue @@ -1,46 +1,47 @@ \ No newline at end of file diff --git a/src/views/ebiz/cardList/Pay.vue b/src/views/ebiz/cardList/Pay.vue index 3b9c9728a..edaa51ed8 100644 --- a/src/views/ebiz/cardList/Pay.vue +++ b/src/views/ebiz/cardList/Pay.vue @@ -1,94 +1,201 @@ @@ -139,23 +410,17 @@ export default { * { box-sizing: border-box; } -.bankCard{ - border-radius: 10em; -} -.oi{ +.oi { font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑'; - font-weight: 700; - font-style: normal; - color: #666666; + font-weight: 700; + font-style: normal; + color: #666666; } .money { display: flex; width: 100%; align-items: center; justify-content: space-between; - position: absolute; - top: 90px; - left: 15px; z-index: 100; background: white; height: 40px; @@ -175,15 +440,6 @@ export default { > div:nth-of-type(2) { display: flex; align-items: center; - // padding-bottom: 15px; } } -.payBtn{ - // margin-top: 10rem; - position: fixed; - bottom:0; -} -.bankCard{ - padding-bottom:25px; -} diff --git a/src/views/ebiz/cardList/PaySuccess.vue b/src/views/ebiz/cardList/PaySuccess.vue index 41a7f51cf..4b2f8366b 100644 --- a/src/views/ebiz/cardList/PaySuccess.vue +++ b/src/views/ebiz/cardList/PaySuccess.vue @@ -1,30 +1,58 @@ diff --git a/src/views/ebiz/cardList/js/methods.js b/src/views/ebiz/cardList/js/methods.js index b2cda7c38..474a37f04 100644 --- a/src/views/ebiz/cardList/js/methods.js +++ b/src/views/ebiz/cardList/js/methods.js @@ -52,29 +52,58 @@ function closeBtn(that) { * @param {*} type 1 投保人 2 被保人 */ export function getIdentityInfo(that, data, type) { - // 正面 - 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 (type == '1') { + // 正面 + 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 + } else { + // 勾选长期 + that.userInfo.effectiveDateType = true + // 长期按钮不禁用 + that.effectiveDateTypeAble = false + // 证件截止日期不需要校验 + that.certiexpiredateRequired = false + } + } } - // 反面 - 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 - } else { - // 勾选长期 - that.userInfo.effectiveDateType = true - // 长期按钮不禁用 - that.effectiveDateTypeAble = false - // 证件截止日期不需要校验 - that.certiexpiredateRequired = false + if (type == '2') { + // 正面 + if (data.name && data.name != '待识别') { + that.userInfo.insuredName = data.name + that.userInfo.insuredidNo = data.idNo + that.userInfo.insuredBirthday = `${data.birthYear}-${data.birthMonth}-${data.birthDay}` + that.userInfo.insuredSex = 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 + } else { + // 勾选长期 + that.userInfo.effectiveDateType = true + // 长期按钮不禁用 + that.effectiveDateTypeAble = false + // 证件截止日期不需要校验 + that.certiexpiredateRequired = false + } } } that.isScan = false diff --git a/src/views/ebiz/cardList/productDetails.vue b/src/views/ebiz/cardList/productDetails.vue index 6c8ba33a6..b14cae2a3 100644 --- a/src/views/ebiz/cardList/productDetails.vue +++ b/src/views/ebiz/cardList/productDetails.vue @@ -1,70 +1,147 @@ \ No newline at end of file From 5a75734fef4f31681ed8d76c2ac83ebac196820c Mon Sep 17 00:00:00 2001 From: nimengmeng_1990 <1175001086@qq.com> Date: Thu, 26 Dec 2019 13:57:01 +0800 Subject: [PATCH 11/61] =?UTF-8?q?[NEW]=20=E6=96=B0=E5=A2=9E=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3=E8=81=94=E8=B0=83?= =?UTF-8?q?=E5=8F=8A=E6=94=AF=E4=BB=98=E4=BF=A1=E6=81=AF=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/ebiz/cardList/cardList.js | 27 ++ src/views/ebiz/cardList/Pay.vue | 161 +++++--- src/views/ebiz/cardList/information.vue | 421 ++++++++++++--------- src/views/ebiz/cardList/productDetails.vue | 180 +++++++-- 4 files changed, 513 insertions(+), 276 deletions(-) diff --git a/src/api/ebiz/cardList/cardList.js b/src/api/ebiz/cardList/cardList.js index 8fa4257a3..ab590d8a4 100644 --- a/src/api/ebiz/cardList/cardList.js +++ b/src/api/ebiz/cardList/cardList.js @@ -38,3 +38,30 @@ export function getProductInfo(data) { data }) } + +// 进行试算 +export function insureTrial(data) { + return request({ + url: getUrl('/sale/insure/trial', 1), + method: 'post', + data + }) +} + +// 保存卡单信息 +export function saveOrUpdateCard(data) { + return request({ + url: getUrl('/sale/card/saveOrUpdateCard', 1), + method: 'post', + data + }) +} + +// 保存卡单支付信息 +export function saveOrUpdateAccount(data) { + return request({ + url: getUrl('/sale/card/saveOrUpdateAccount', 1), + method: 'post', + data + }) +} diff --git a/src/views/ebiz/cardList/Pay.vue b/src/views/ebiz/cardList/Pay.vue index edaa51ed8..8330f6165 100644 --- a/src/views/ebiz/cardList/Pay.vue +++ b/src/views/ebiz/cardList/Pay.vue @@ -4,14 +4,13 @@ - + -
@@ -25,12 +24,12 @@
- - + + 银行卡扫描 +
@@ -88,7 +88,7 @@ - + @@ -103,6 +103,7 @@ Vue.use(Checkbox).use(CheckboxGroup) Vue.use(Field) Vue.use(Button) import { acceptInsurance, getBankList, underWrite, getOrderDetail } from '@/api/ebiz/sale/sale' +import { saveOrUpdateAccount } from '@/api/ebiz/cardList/cardList.js' import BankCardScan from '@/components/ebiz/sale/BankCardScan' import config from '@/config' export default { @@ -119,13 +120,14 @@ export default { }, data() { return { + // trialList: JSON.parse(localStorage.trialList), // 核保数据 underWriteData: { appntName: '国家安全富兴2.0', //产品名称 - orderAmount: 200, //支付金额 + orderAmount: 0, //支付金额 name: '', bankCode: '', //银行卡号 - bankName: '' //开户银行 + bankName: 'ABC' //开户银行 }, radio: '1', result: [], @@ -133,6 +135,7 @@ export default { isClear: false, //是否清空 show: false, // 银行列表弹框 bankList: [], // 银行卡列表 + bankListName: '', // 银行列表ID formActionUrl: config.payUrl, // 支付表单 payParam: { TransSource: '', // 对接系统 @@ -176,26 +179,28 @@ export default { } }, mounted() { + // console.log('trialList', this.trialList[0].prem) + // this.underWrite.orderAmount = this.trialList[0].prem document.body.style.backgroundColor = '#fff' window.appCallBack = this.appCallBack // 获取银行卡 this.getBankList() console.log('----保融form.action', config.payUrl) - if (localStorage.salelist == '1') { - // 第一次支付 调核保获取 - this.underWrite() - this.underWriteData = JSON.parse(window.localStorage.getItem('underWriteData')) - } else { - // 再次支付 调详情 获取信息 - this.twounderWrite() - this.underWriteData = JSON.parse(window.localStorage.getItem('underWriteData')) - } + // if (localStorage.salelist == '1') { + // // 第一次支付 调核保获取 + // this.underWrite() + // this.underWriteData = JSON.parse(window.localStorage.getItem('underWriteData')) + // } else { + // // 再次支付 调详情 获取信息 + // this.twounderWrite() + // this.underWriteData = JSON.parse(window.localStorage.getItem('underWriteData')) + // } console.log('--自核结果--支付信息：', JSON.stringify(this.underWriteData)) }, methods: { - //获取身份证扫描信息 + //获取银行卡扫描信息 getBankCardInfo(data) { - this.bankId = data.name + this.underWriteData.bankCode = data.name this.$jump({ flag: 'navigation', extra: { @@ -257,7 +262,7 @@ export default { getBankList() { let self = this let data = { - operateType: 'enter_bank_type' + operateType: 'bank_type' } getBankList(data).then(res => { if (res.result == '0') { @@ -272,8 +277,7 @@ export default { clickList(item, bankCode) { console.log('英航卡', item, bankCode) let that = this - // that.userInfo.bankName = item - // that.userInfo.bankCode = bankCode + that.bankListName = item that.underWriteData.bankName = bankCode that.show = false }, @@ -349,55 +353,86 @@ export default { }, // 点击支付 payMent() { + let that = this + let data = { + orderDTO: { + orderInfoDTO: { + orderNo: window.localStorage.getItem('orderNo') + }, + orderAccountDTO: { + accountType: '0', + accountName: that.underWriteData.name, + bankName: that.bankListName, + bankCode: that.underWriteData.bankName, + cardBookType: '1', + cardBookCode: that.underWriteData.bankCode, + isAutoPay: '0', + isAutoRenewal: '1' + } + } + } this.$toast.loading({ duration: 0, // 持续展示 toast forbidClick: true, // 禁用背景点击 loadingType: 'spinner', message: '加载中……' }) - let that = this - let data = { - orderNo: window.localStorage.getItem('orderNo') - } - acceptInsurance(data).then(res => { - console.log('----取支付参数结果：', JSON.stringify(res)) - // res = {'result':'0','resultMessage':'','content':null,'prtNo':'8186270000000008','payStatus':'4','amnt':'63700.00','appntName':'投保人','message':null,'brPayReturnData':{'result':'','resultMessage':'','content':null,'businessId':'1569125393518','businessNo':'8186270000000008','tradeSubType':'COMM','businessType':'SALE','systemType':'GF','money':63700,'businessSubType':'XDCB','thirdType':'0002','thirdName':null,'bankCode':'ABC','epayOrderNo':'1909221209536259999900','companyAccount':null,'tradeState':'TRADING','standardCode':'DEALING','standardMsg':null,'thirdOrderNo':null,'respRemark':null,'tradeTime':'2019-09-22T04:09:53.518+0000','description':'','version':'1','sourceNotecode':'8186270000000008','payType':'MIT01','expireDate':'20191010101010','transSeq':'20190922120953782','transSource':'MIT','applyEntity':'11860000','paymentCode':'8186270000000008','transDate':'20190922','rdSeq':'1909221209536259999900','settleMode':null,'cur':'CNY','transTime':'120953','ourAmount':63700,'fixUser':'1','insurer':'投保人','certType':'0','certNum':'110101199009210011','oppBank':'ABC','oppAct':'6228481200290317812','oppActName':'投保人','cellPhone':null,'purpose':null,'memo':null,'returnURL':'http://139.199.50.151/#/sale/payResult','notifyURL':'http://139.199.50.151:7000/api/v1/epay/epay/payResult','s3Sign':'e3f0581ec6b751337e8eca360a0746bc'}} + /* + 支付之前要先保存银行账户信息 + */ + saveOrUpdateAccount(data).then(res => { + console.log('res', res) + that.$toast.clear() if (res.result == '0') { - // 1成 4支付中 2支付失败 8转批扣(无此情况） - this.payStatus = res.payStatus - - if (this.payStatus == '1') { - this.$toast({ message: '当前投保单已支付成功，请返回列表页查询', duration: 5000 }) - return - } - - // 支付参数大小写转换 - let keyMap = {} - for (let key in this.payParam) { - keyMap[key.toLowerCase()] = key - } - let paramKey - for (let rKey in res.brPayReturnData) { - if (keyMap.hasOwnProperty(rKey.toLowerCase())) { - paramKey = keyMap[rKey.toLowerCase()] - this.payParam[paramKey] = res.brPayReturnData[rKey] - } - } - console.log('----支付参数：this.payParam:', JSON.stringify(this.payParam)) - this.gotPayParam = true - this.$forceUpdate() - let thisRef = this - this.$nextTick(() => { - thisRef.$refs.payForm.submit() // 表单提交，发起支付，跳至收银台 + this.$toast.loading({ + duration: 0, // 持续展示 toast + forbidClick: true, // 禁用背景点击 + loadingType: 'spinner', + message: '加载中……' + }) + let that = this + let data = { + orderNo: window.localStorage.getItem('orderNo') + } + acceptInsurance(data).then(res => { + console.log('----取支付参数结果：', JSON.stringify(res)) + // res = {'result':'0','resultMessage':'','content':null,'prtNo':'8186270000000008','payStatus':'4','amnt':'63700.00','appntName':'投保人','message':null,'brPayReturnData':{'result':'','resultMessage':'','content':null,'businessId':'1569125393518','businessNo':'8186270000000008','tradeSubType':'COMM','businessType':'SALE','systemType':'GF','money':63700,'businessSubType':'XDCB','thirdType':'0002','thirdName':null,'bankCode':'ABC','epayOrderNo':'1909221209536259999900','companyAccount':null,'tradeState':'TRADING','standardCode':'DEALING','standardMsg':null,'thirdOrderNo':null,'respRemark':null,'tradeTime':'2019-09-22T04:09:53.518+0000','description':'','version':'1','sourceNotecode':'8186270000000008','payType':'MIT01','expireDate':'20191010101010','transSeq':'20190922120953782','transSource':'MIT','applyEntity':'11860000','paymentCode':'8186270000000008','transDate':'20190922','rdSeq':'1909221209536259999900','settleMode':null,'cur':'CNY','transTime':'120953','ourAmount':63700,'fixUser':'1','insurer':'投保人','certType':'0','certNum':'110101199009210011','oppBank':'ABC','oppAct':'6228481200290317812','oppActName':'投保人','cellPhone':null,'purpose':null,'memo':null,'returnURL':'http://139.199.50.151/#/sale/payResult','notifyURL':'http://139.199.50.151:7000/api/v1/epay/epay/payResult','s3Sign':'e3f0581ec6b751337e8eca360a0746bc'}} + if (res.result == '0') { + // 1成 4支付中 2支付失败 8转批扣(无此情况） + this.payStatus = res.payStatus + if (this.payStatus == '1') { + this.$toast({ message: '当前投保单已支付成功，请返回列表页查询', duration: 5000 }) + return + } + // 支付参数大小写转换 + let keyMap = {} + for (let key in this.payParam) { + keyMap[key.toLowerCase()] = key + } + let paramKey + for (let rKey in res.brPayReturnData) { + if (keyMap.hasOwnProperty(rKey.toLowerCase())) { + paramKey = keyMap[rKey.toLowerCase()] + this.payParam[paramKey] = res.brPayReturnData[rKey] + } + } + console.log('----支付参数：this.payParam:', JSON.stringify(this.payParam)) + this.gotPayParam = true + this.$forceUpdate() + let thisRef = this + this.$nextTick(() => { + thisRef.$refs.payForm.submit() // 表单提交，发起支付，跳至收银台 + }) + window.localStorage.setItem('resMessage', res.resultMessage) + window.localStorage.setItem('payStatus', res.payStatus) + window.localStorage.setItem('payInfo', JSON.stringify(res)) + } else { + that.$toast.clear() + that.$toast(res.resultMessage) + } }) - - window.localStorage.setItem('resMessage', res.resultMessage) - - window.localStorage.setItem('payStatus', res.payStatus) - window.localStorage.setItem('payInfo', JSON.stringify(res)) } else { - that.$toast.clear() - that.$toast(res.resultMessage) + this.$toast(res.resultMessage) } }) } diff --git a/src/views/ebiz/cardList/information.vue b/src/views/ebiz/cardList/information.vue index 6d6084dd9..2e4cd59f8 100644 --- a/src/views/ebiz/cardList/information.vue +++ b/src/views/ebiz/cardList/information.vue @@ -40,14 +40,14 @@ @click="toSelect('2')" /> - + 证件扫描 - + - + @@ -90,15 +90,15 @@ label="出生日期" name="出生日期" required - :value.sync="userInfo.insuredBirthday" + :value.sync="insuredInfo.birthday" type="date" :flag="true" - @confirm="onDateConfirm($event, '2')" - ref="birthday" + @confirm="onDateConfirm($event, '5')" + ref="insuredBirthday" :maxDate="maxDate" > - - 证件扫描 + + 证件扫描 @@ -124,11 +124,11 @@ label="指定生效日期" name="指定生效日期" required - :value.sync="userInfo.birthday" + :value.sync="userInfo.effectiveDate" type="date" :flag="true" - @confirm="onDateConfirm($event, '2')" - ref="birthday" + @confirm="onDateConfirm($event, '6')" + ref="effectiveDate" input-align:right > @@ -173,7 +173,7 @@ import OccupationPicker from '@/components/ebiz/occipation/OccupationPicker' import CustomerPicker from '@/components/ebiz/customer/CustomerPicker' import DataDictionary from '@/assets/js/utils/data-dictionary' import areaList from '@/assets/js/utils/area' -import { saveOrUpdateOrderInfo } from '@/api/ebiz/sale/sale' +import { saveOrUpdateCard } from '@/api/ebiz/cardList/cardList.js' import utilsAge from '@/assets/js/utils/age' import getAreaName from '@/assets/js/utils/get-area-name' import IdentityCardScan from '@/components/ebiz/sale/IdentityCardScan' @@ -208,7 +208,7 @@ export default { data() { return { isScan: false, //是否显示证件扫描组件 - allPrice: '100', + allPrice: 0, result: [], checked: true, sexRadio: [ @@ -234,35 +234,46 @@ export default { maxDate: beforeDate.getBeforeYear(18), popupShow: false, areaShow: false, //省级联动 - homeShow: false, + homeShow: false, //家庭地址联动 censusShow: false, //户籍联动 pickerType: undefined, columns: [], valueKey: 'text', + homeName: '', //家庭地址 + //投保人信息 userInfo: { name: '', //投保人姓名 - insuredName: '', // 被保人姓名 + insuredname: '', sex: '0', //投保人性别 - insuredSex:'0', //被保人性别 - bnfType: '法定受益人', // 受益人类型 + bnfType: '0', // 受益人类型 bnfSelec: '请选择', birthday: '', //投保人出生日期 - insuredBirthday:'', //被保人出生日期 - relationToAppnt: '', + relationToInsured: '', idType: '1', //证件类型 idNo: '', //证件号码 - insuredidNo:'', //被保人证件号码 - areaName: '', // 投保人地址 + homeProvince: '', //家庭省 + homeCity: '', //家庭市 + homeArea: '', //家庭区 + homeAddress: '', //详细地址 mobile: '', //移动电话 - stature: '', //身高 - - email: '' //电子邮箱 + email: '', //电子邮箱 + effectiveDate: '' //指定生效日期 + }, + //被保人信息 + insuredInfo: { + name: '', // 被保人姓名 + idType: '1', //被保人证件类型 + idNo: '', //被保人证件号码 + sex: '0', //被保人性别 + birthday: '' //被保人出生日期 }, areaList: areaList, currentPopupIndex: '', customerShowPicker: false, occupationShowPicker: false, - timeId: null + timeId: null, + chooseProducts: JSON.parse(localStorage.chooseProducts), + trialList: JSON.parse(localStorage.trialList) } }, created() { @@ -291,6 +302,7 @@ export default { mounted() { // 筛选按钮的点击事件 window.appCallBack = this.appCallBack + this.allPrice = this.trialList[0].prem }, methods: { //监听名字变化 @@ -298,6 +310,11 @@ export default { // console.log('name',name) this.userInfo.name = name }, + //监听名字变化 + nameChanges(name) { + // console.log('name',name) + this.insuredInfo.name = name + }, selectClick(index, value) { console.log(index, value) localStorage.setItem('value', value) @@ -396,6 +413,10 @@ export default { this.userInfo.jobStatus = value.id } else if (this.pickerType == '8') { this.userInfo.salarySource = value.id + } else if (this.pickerType == '9') { + this.userInfo.relationToInsured = value.id + } else if (this.pickerType == '11') { + this.insuredInfo.idType = value.id } }, //证件起始截止日期 @@ -481,6 +502,28 @@ export default { // } } break + case '5': + { + //被保人出生日期 + //如果录入日期晚于当前日期 + if (Date.parse(val) > Date.parse(new Date())) { + this.userInfo.insuredBirthday = '' + this.$refs.insuredBirthday.date = '' + return this.$toast('出生日期不晚于当日') + } + } + break + case '6': + { + //指定生效日期 + //如果录入日期晚于当前日期 + if (Date.parse(val) < Date.parse(new Date())) { + this.userInfo.birthday = '' + this.$refs.birthday.date = '' + return this.$toast('当前日期早于当日') + } + } + break } }, //选择客户 @@ -505,6 +548,10 @@ export default { this.userInfo.idNo = data[0][0].customerIdNumber //证件类别 this.userInfo.mobile = data[0][0].customerPhone //移动电话 + this.userInfo.homeProvince = data[0][0].homeProvince //家庭省 + this.userInfo.homeCity = data[0][0].homeCity //家庭市 + this.userInfo.homeArea = data[0][0].homeArea //家庭区 + this.userInfo.homeAddress = data[0][0].homeAddress //家庭详细地址 // 计算年龄 // let age = utilsAge.getAge(this.userInfo.birthday, new Date()) @@ -512,36 +559,37 @@ export default { this.getRelatedData(this.userInfo.idNo) } else if (data[0][1] == '1') { let { customerName, customerSex } = data[0][0] - this.userInfo.insuredName = customerName //用户名 - this.userInfo.sex = String(customerSex) //性别 + this.insuredInfo.name = customerName //用户名 + this.insuredInfo.sex = String(customerSex) //性别 - this.userInfo.birthday = data[0][0].birthday //出生日期 - this.userInfo.idType = data[0][0].customerIdType //证件类型 - this.userInfo.idNo = data[0][0].customerIdNumber //证件类别 - - this.userInfo.mobile = data[0][0].customerPhone //移动电话 + this.insuredInfo.birthday = data[0][0].birthday //出生日期 + this.insuredInfo.idType = data[0][0].customerIdType //证件类型 + this.insuredInfo.idNo = data[0][0].customerIdNumber //证件类别 // 计算年龄 // let age = utilsAge.getAge(this.userInfo.birthday, new Date()) - this.getRelatedData(this.userInfo.idNo) + // 计算年龄 + // let age = utilsAge.getAge(this.userInfo.birthday, new Date()) + + this.getRelatedData(this.insuredInfo.idNo) } // console.log(data, val) }, nextStep() { // console.log(this.userInfo.idType) - console.log(this.userInfo.salarySource) - console.log(this.userInfo.otherSalarySource) + // console.log(this.userInfo.salarySource) + // console.log(this.userInfo.otherSalarySource) //表单校验, 成功跳转 this.$validator.validate().then(valid => { if (true === valid) { - localStorage.chooseProductCodesNew = localStorage.chooseProductCodes + // localStorage.chooseProductCodesNew = localStorage.chooseProductCodes // 计算年龄 let age = utilsAge.getAge(this.userInfo.birthday, new Date()) // 如果是未成年人 - // if (age < 18) { - // return this.$toast('投保人必须是具有民事行为能力且有固定职业和收入的自然人，请确定') - // } + if (age < 18) { + return this.$toast('投保人必须是具有民事行为能力且有固定职业和收入的自然人，请确定') + } //如果证件类型是身份证 if (this.userInfo.idType == '1') { @@ -636,21 +684,21 @@ export default { // } //投保人需大于等于 18 周岁 - if (age < 18) { - return this.$toast('投保人必须是具有民事行为能力且有固定职业和收入的自然人，请确定') - } + // if (age < 18) { + // return this.$toast('投保人必须是具有民事行为能力且有固定职业和收入的自然人，请确定') + // } - //职业类型不能为 '一般学生' - if (this.userInfo.occupationCode == '2099907') { - this.userInfo.occupationName = '' - return this.$toast('学生不可以作为投保人，请更换投保人投保') - } + // //职业类型不能为 '一般学生' + // if (this.userInfo.occupationCode == '2099907') { + // this.userInfo.occupationName = '' + // return this.$toast('学生不可以作为投保人，请更换投保人投保') + // } - if (this.userInfo.salarySource == '4') { - if (!this.userInfo.otherSalarySource) { - return this.$toast('请输入其它收入来源') - } - } + // if (this.userInfo.salarySource == '4') { + // if (!this.userInfo.otherSalarySource) { + // return this.$toast('请输入其它收入来源') + // } + // } //如果是已婚 if ((this.userInfo.sex == '0' && age < 22) || (this.userInfo.sex == '1' && age < 20)) { @@ -676,84 +724,132 @@ export default { //信息变更 infoUpdate() { //local 里面是否存有险种信息 - let chooseProductCodes = localStorage.chooseProductCodes && JSON.parse(localStorage.chooseProductCodes) - if (chooseProductCodes && chooseProductCodes.length) { - console.log('haha') - //获取险种列表 - //取出local中的投保人信息 - let saleInsuredInfo = JSON.parse(localStorage.saleInsuredInfo) - //如果 性别, 出生日期, 有无社保, 职业 发生变化 - if (this.userInfo.sex != saleInsuredInfo.sex || this.userInfo.birthday != saleInsuredInfo.birthday) { - console.log('hehe') - //提示用户 - return this.$dialog - .confirm({ - className: 'dialog-delete', - title: '提示', - message: '当前信息已经发生改变，有可能影响险种费率，是否确认修改并清除险种信息?', - cancelButtonColor: '#E9332E', - confirmButtonColor: '#FFFFFF' - }) - .then(() => { - // on confirm - - this.save('isShow=1') - console.log('success') - }) - .catch(() => { - // on cancel - return - }) - } - } + // let chooseProductCodes = localStorage.chooseProductCodes && JSON.parse(localStorage.chooseProductCodes) + // if (chooseProductCodes && chooseProductCodes.length) { + // console.log('haha') + // //获取险种列表 + // //取出local中的投保人信息 + // let saleInsuredInfo = JSON.parse(localStorage.saleInsuredInfo) + // //如果 性别, 出生日期, 有无社保, 职业 发生变化 + // if (this.userInfo.sex != saleInsuredInfo.sex || this.userInfo.birthday != saleInsuredInfo.birthday) { + // console.log('hehe') + // //提示用户 + // return this.$dialog + // .confirm({ + // className: 'dialog-delete', + // title: '提示', + // message: '当前信息已经发生改变，有可能影响险种费率，是否确认修改并清除险种信息?', + // cancelButtonColor: '#E9332E', + // confirmButtonColor: '#FFFFFF' + // }) + // .then(() => { + // // on confirm + // this.save('isShow=1') + // console.log('success') + // }) + // .catch(() => { + // // on cancel + // return + // }) + // } + // } this.save() }, async save(str = '') { + // console.log('this.riskDTOLst', this.riskDTOLst) let params = { - orderType: 'APPNT_ORDER', orderDTO: { orderInfoDTO: { - orderNo: localStorage.orderNo + bnfFlag: '0' }, - smsCodeDTO: { smsId: this.sessionId, code: this.userInfo.authCode }, - appntDTO: {} + appntDTO: {}, + insuredDTOs: [ + { + riskDTOLst: this.riskDTOLst + } + ] } } - // let params = { - // operateType: 'authmobile', - // type: 'H5', - // system: 'agentApp', - // operateCodeType: '0' - // } params.orderDTO.appntDTO = this.userInfo - let resultData = await saveOrUpdateOrderInfo(params) + params.orderDTO.insuredDTOs = [this.insuredInfo] + //组装险种提交数据 + let [mainRiskCode, riskDTOLst] = ['', []] + let rollInResult = '' //校验预计转入保费结果 + this.chooseProducts.forEach((item, index) => { + console.log('itemssss', item) + if (item.isMainRisk == 0) { + mainRiskCode = item.productCode + } + let riskItem = { + isMainRisk: item.isMainRisk, + riskName: item.riskName, + riskType: item.riskType, + riskCode: item.productCode, + mainRiskCode: mainRiskCode, + prem: this.trialList[index] && this.trialList[index].prem, + standPrem: this.trialList[index] && this.trialList[index].standPrem, + predictTransferPrem: item.predictTransferPrem, + thirdInsuraceNo: this.policyNo, + mult: this.mult + } + if (item.hasPredictTransferPrem && item.hasPredictTransferPrem === '0') { + //增加万能险 预计转入保费校验 + rollInResult = this.rollInCheck(item.predictTransferPrem) + } else { + rollInResult = true + } + //责任险保存参数构建 + if (this.trialList[index].duty) { + riskItem['dutyLst'] = this.trialList[index].duty + //930折中方案，责任险分档 + riskItem['amt'] = this.trialList[index].amt + } + //保费算保额 + if (this.trialList[index].trialType == '1') { + riskItem['amt'] = this.trialList[index].amt + } + //万能型产品保费赋值给保额 + if (this.trialList[index].productCode == 'GFRS_M0003') { + riskItem['amt'] = this.trialList[index].prem + } + // //豁免险保额处理 + // if (item.isRemit == '0') { + // this.trialInfos[index].amt = this.trialList[0].prem + // } + // console.log() + // riskItem = Object.assign(riskItem, this.trialInfos[index]) + riskDTOLst.push(riskItem) + }) + if (!rollInResult) { + return + } + params.orderDTO.insuredDTOs[0].riskDTOLst = riskDTOLst + + let resultData = await saveOrUpdateCard(params) + if (resultData.result == 0) { - //存储被保人信息 - // let age = utilsAge.getAge(this.userInfo.birthday, new Date()) - // localStorage.saleInsuredInfo = JSON.stringify({ - // birthday: this.userInfo.birthday, - // name: this.userInfo.name, - // sex: this.userInfo.sex, - // idType: this.userInfo.idType, - // age - // }) - // this.userInfo.age = age - // localStorage.saleInsuredInfo = JSON.stringify(this.userInfo) - // console.log(this.userInfo) + console.log(' resultData.orderNo', resultData.orderNo) + //存储被保人信息 + // let age = utilsAge.getAge(this.userInfo.birthday, new Date()) + // localStorage.saleInsuredInfo = JSON.stringify({ + // birthday: this.userInfo.birthday, + // name: this.userInfo.name, + // sex: this.userInfo.sex, + // idType: this.userInfo.idType, + // age + // }) + // this.userInfo.age = age + // localStorage.saleInsuredInfo = JSON.stringify(this.userInfo) + // console.log(this.userInfo) localStorage.orderNo = resultData.orderNo - //清理计时器 - window.clearInterval(this.timeId) - this.timeId = null - this.countDown = 60 - this.codeDisabled = false this.$jump({ flag: 'h5', extra: { - url: location.origin + `/#/sale/insuredPerson?${str}` + url: location.origin + `/#/cardList/pay` }, routerInfo: { - path: `/sale/insuredPerson?${str}` + path: `/cardList/pay` } }) } else { @@ -780,19 +876,6 @@ export default { break } }, - //设为联系地址 - setAddress(val) { - console.log(val) - console.log(this.homeDefault) - //上面是0下面是1 - if (this.homeDefault) { - this.userInfo.addressStatus = 1 - } - if (this.companyDefault) { - this.userInfo.addressStatus = 0 - } - }, - //获取身份证扫描信息 getIdentityInfo(data) { getIdentityInfo(this, data, '1') @@ -816,58 +899,30 @@ export default { // } // }) // }, - //校验身高 - checkStature(val) { - console.log(val) - if (val.trim().length == 0) { - return this.$toast('身高不能为空') + getRelatedData(val, ind) { + if (ind == '1') { + if (this.userInfo.idType != '1') { + return + } + //如果证件校验不通过,恢复默认值 + if (idToData(val).text) { + ;[this.userInfo.idNo, this.userInfo.sex, this.userInfo.birthday] = ['', '0', ''] + return this.$toast(idToData(val).text) + } + this.userInfo.birthday = idToData(val).birthday + this.userInfo.sex = idToData(val).sex } - - let res = /^[0-9]{0,3}([.]{1}[0-9]{1})?$/.test(val) && val < 300 && val > 10 - if (!res) { - this.userInfo.stature = '' - return this.$toast('身高输入有误') - } - }, - //校验体重 - checkAvoirdupois(val) { - if (val.trim().length == 0) { - return this.$toast('体重不能为空') - } - - let res = /^[0-9]+([.]{1}[0-9]{1})?$/.test(val) && val > 0.1 - if (!res) { - this.userInfo.avoirdupois = '' - return this.$toast('体重输入有误') - } - }, - getRelatedData(val) { - if (this.userInfo.idType != '1') { - return - } - //如果证件校验不通过,恢复默认值 - if (idToData(val).text) { - ;[this.userInfo.idNo, this.userInfo.sex, this.userInfo.birthday, this.effectiveDateTypeAble] = ['', '0', '', false] - return this.$toast(idToData(val).text) - } - this.userInfo.effectiveDateType = false - this.effectiveDateTypeAble = idToData(val).age < 45 - this.userInfo.birthday = idToData(val).birthday - this.userInfo.sex = idToData(val).sex - }, - // 单选按钮切换 - radioChange(val) { - console.log(val) - this.userInfo.IsElecCont = val - } - }, - computed: { - isShowOthenSalarySource() { - if (this.userInfo.salarySource == '4') { - return true - } else { - this.userInfo.otherSalarySource = '' - return false + if (ind == '2') { + if (this.insuredInfo.idType != '1') { + return + } + //如果证件校验不通过,恢复默认值 + if (idToData(val).text) { + ;[this.insuredInfo.idNo, this.insuredInfo.sex, this.insuredInfo.birthday] = ['', '0', ''] + return this.$toast(idToData(val).text) + } + this.insuredInfo.birthday = idToData(val).birthday + this.insuredInfo.sex = idToData(val).sex } } }, diff --git a/src/views/ebiz/cardList/productDetails.vue b/src/views/ebiz/cardList/productDetails.vue index b14cae2a3..7cde37fe9 100644 --- a/src/views/ebiz/cardList/productDetails.vue +++ b/src/views/ebiz/cardList/productDetails.vue @@ -24,8 +24,8 @@ import Vue from 'vue' import icon1 from '@/assets/images/u10211.jpg' import icon2 from '@/assets/images/u10213.png' import icon3 from '@/assets/images/u10215.png' -import { Cell } from 'vant' -import { getProductDetails, getProductInfo } from '@/api/ebiz/cardList/cardList.js' +import { Cell, Toast } from 'vant' +import { getProductDetails, getProductInfo, insureTrial } from '@/api/ebiz/cardList/cardList.js' export default { name: 'Chanpingxiangqing.vue', components: { @@ -34,19 +34,23 @@ export default { data() { return { introductImages: [], - docuList: [] + docuList: [], + productCode: '', + results:[], + trialInfos: [] } }, - created() { + async created() { let code = this.$route.params.productDetailCode console.log(code) - this.getData(code) - this.getProductDetail(code) + await this.getData(code) + await this.getProductDetail() + await this.insureTrial() }, methods: { goDocu(url, type, name) { let pdfUrl = encodeURIComponent(url) - console.log('pdfUrl',pdfUrl) + console.log('pdfUrl', pdfUrl) this.$jump({ flag: 'h5', extra: { @@ -94,32 +98,12 @@ export default { } }) }, - getProductDetail(code) { - // 获取卡单列表 - let data = { - platform: 'app', - productCodes: [code], - type: '1' - } - getProductInfo(data) - .then(res => { - console.log('res', res) - // if (res.result == 0) { - // this.list = res.productList - // } else { - // Toast.fail(res.resultMessage) - // } - }) - .catch(err => { - console.log('errerr', err) - }) - }, - getData(code) { + async getData(code) { let data = { itemCode: code, platform: 'app' } - getProductDetails(data) + await getProductDetails(data) .then(res => { console.log('res', res) if (res.result == 0) { @@ -127,7 +111,9 @@ export default { this.introductImages = res.productShowInfo.introductImages // 获取产品资料文件 this.docuList = res.productShowInfo.documents - console.log(this.docuList) + this.productCode = res.productShowInfo.itemProductDTOS[0].productCode + this.results = res.productShowInfo.itemProductDTOS[0] + console.log(' this.resultresultss', this.results) } else { Toast.fail(res.resultMessage) } @@ -135,6 +121,140 @@ export default { .catch(err => { console.log('errerr', err) }) + }, + async getProductDetail() { + let that = this + + let data = { + platform: 'app', + productCodes: [that.productCode], + type: '1' + } + console.log('data', data) + await getProductInfo(data) + .then(res => { + if (res.result == 0) { + this.trialInfos = res.trialDTOS[0].productTrialInfoDTO + console.log('this.trialInfos', this.trialInfos) + let resultData = res.trialDTOS[0] + if (resultData.productTrialInfoDTO.dutyGroup != null) { + resultData.productTrialInfoDTO.dutyGroup.map(item => { + if (item.dutyName == '意外身故/伤残保险金') { + item.defaultDutyAmt = '50' + } + }) + } + //保存附加险 + localStorage.addtionRiskLst = JSON.stringify(resultData.productTrialInfoDTO.addtionRiskLst) + // console.log('resultData', resultData) + localStorage.isAutoPay = resultData.isAutoPay + localStorage.isRenew = resultData.isRenew + let calFactorLst = this.getFactorList(resultData) + let hasAddtionRisk = resultData.productTrialInfoDTO.addtionRiskLst ? true : false + console.log('that.results.riskName', that.results.riskName) + let currentProductInfo = { + calFactorLst, + hasAddtionRisk, + isMainRisk: 0, + riskType: resultData.riskType, + riskName: that.results.productName, + productCode: that.results.productCode, + mainRiskCode: that.results.productCode, + documentDTOS: resultData.productTrialInfoDTO.documentDTOS, + influences: resultData.productTrialInfoDTO.influences, + isRemit: resultData.productTrialInfoDTO.isRemit, + hasPredictTransferPrem: resultData.productTrialInfoDTO.hasPredictTransferPrem, //建议书使用 是否展示预计转入保费 + predictTransferPrem: null //建议书使用 预计转入保费字段 + } + + //构建险种数组 + let productsData + // if (localStorage.chooseProducts) { + // productsData = JSON.parse(localStorage.chooseProducts) + // productsData.push(currentProductInfo) + // } else { + productsData = [currentProductInfo] + console.log('productsDataproductsData', productsData) + // } + + //保存选择险种 + localStorage.chooseProducts = JSON.stringify(productsData) + } else { + Toast.fail(res.resultMessage) + } + }) + .catch(err => { + console.log('errerr', err) + }) + }, + insureTrial() { + let that = this + // 获取卡单列表 + let data = { + trialInfos: [{ productCode: that.productCode }] + } + + insureTrial(data) + .then(res => { + console.log('resrrrrrr', res) + if (res.result == 0) { + localStorage.trialList = JSON.stringify(res.trialList) + } else { + Toast.fail(res.resultMessage) + } + }) + .catch(err => { + console.log('errerr', err) + }) + }, + //构建险种因子列表 + getFactorList(resultData) { + let productTrialInfoDTO = resultData.productTrialInfoDTO + console.log(productTrialInfoDTO, 'wode') + let calFactorLst = resultData.productTrialInfoDTO.calFactorLst + console.log('calFactorLst', calFactorLst) + + calFactorLst.forEach(item => { + item['isMainRisk'] = 0 + item.columns = [] + if (item.type == 0) { + //1、type=0 select 2、type=1 input+stepper + productTrialInfoDTO[item.code].forEach(factor => { + if (factor.defaultValue == 0) { + item.showContent = factor.showContent + if (factor[item.code + 'Flag'] != undefined) { + item[item.code] = factor[item.code] + item[item.code + 'Flag'] = factor[item.code + 'Flag'] + item.hasFlag = '1' + } else { + item[item.code] = factor[item.code] + } + } + item.columns.push({ text: factor.showContent, value: factor[item.code], flag: factor[item.code + 'Flag'] }) + }) + } 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) + } + } + //规则储存 + item['rules'] = productTrialInfoDTO[item.code] + }) + // // 用于意外险初始化保额 + // calFactorLst.map(item => { + // if (item.code == '"dutyGroup"') { + // item.rules.map(factor => { + // factor[0].defaultDutyAmt = 50 + // }) + // } + // }) + return calFactorLst } } } From 51de9bff3f3456b05354c5c6c1b07bec44dc1f0d Mon Sep 17 00:00:00 2001 From: nimengmeng_1990 <1175001086@qq.com> Date: Thu, 2 Jan 2020 17:58:11 +0800 Subject: [PATCH 12/61] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=8A=A5=E9=94=99?= =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E8=A2=AB=E4=BF=9D=E4=BA=BA=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E8=81=94=E5=8A=A8=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E6=B3=95=E5=AE=9A=E5=8F=97=E7=9B=8A=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/ebiz/cardList.js | 10 -- src/views/ebiz/cardList/PayResult.vue | 172 ++++++++++++++++++++++++ src/views/ebiz/cardList/information.vue | 9 +- 3 files changed, 177 insertions(+), 14 deletions(-) create mode 100644 src/views/ebiz/cardList/PayResult.vue diff --git a/src/router/ebiz/cardList.js b/src/router/ebiz/cardList.js index db63ad4e4..d22a6a273 100644 --- a/src/router/ebiz/cardList.js +++ b/src/router/ebiz/cardList.js @@ -2,7 +2,6 @@ const information = () => import('@/views/ebiz/cardList/information') const cardTotreasure = () => import('@/views/ebiz/cardList/CardTotreasure') const productDetails = () => import('@/views/ebiz/cardList/productDetails') -const ShowPDF = () => import('@/views/ebiz/cardList/ShowPDF') const pay = () => import('@/views/ebiz/cardList/Pay') const payResult = () => import('@/views/ebiz/cardList/PayResult') const paySuccess = () => import('@/views/ebiz/cardList/PaySuccess') @@ -35,15 +34,6 @@ export default [ index: 3 } }, - { - path: '/cardList/ShowPDF', - name: 'ShowPDF', - component: ShowPDF, - meta: { - title: '国富健康保终身重大疾病保险条款', - index: 3 - } - }, { path: '/cardList/pay', name: 'pay', diff --git a/src/views/ebiz/cardList/PayResult.vue b/src/views/ebiz/cardList/PayResult.vue new file mode 100644 index 000000000..ffcc0ef6e --- /dev/null +++ b/src/views/ebiz/cardList/PayResult.vue @@ -0,0 +1,172 @@ + + + + + diff --git a/src/views/ebiz/cardList/information.vue b/src/views/ebiz/cardList/information.vue index 2e4cd59f8..b94cfb82e 100644 --- a/src/views/ebiz/cardList/information.vue +++ b/src/views/ebiz/cardList/information.vue @@ -109,14 +109,14 @@ @click="toSelect('11')" /> - + 证件扫描

受益人信息

- +

产品信息

Date: Mon, 20 Apr 2020 14:33:45 +0800 Subject: [PATCH 13/61] =?UTF-8?q?=E3=80=90fix=E3=80=91=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=A4=84=E7=90=86=E5=86=B2=E7=AA=81=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E5=BC=95=E8=B5=B7=E7=9A=84=E9=A1=B9=E7=9B=AE=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E6=AD=A3=E5=B8=B8=E5=90=AF=E5=8A=A8=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/utils/request.js | 1 - src/router/ebiz/index.js | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/assets/js/utils/request.js b/src/assets/js/utils/request.js index afafcf814..51f26db92 100644 --- a/src/assets/js/utils/request.js +++ b/src/assets/js/utils/request.js @@ -65,7 +65,6 @@ let survey = [ let manpower = [ '/customer/answer/queryList' //DISC性格分析 ] -] // 卡单 let cardList = [] let whiteList = ['/customer/agent/getCustomersList', ...proposal, ...sale, ...agentEnter, ...claims, ...survey, ...manpower] diff --git a/src/router/ebiz/index.js b/src/router/ebiz/index.js index 2ebd1640a..1b4815862 100644 --- a/src/router/ebiz/index.js +++ b/src/router/ebiz/index.js @@ -13,4 +13,5 @@ import report from './report' import survey from './survey' import nbs from './nbs' import manpower from './manpower' +import cardList from './cardList' export default [...proposal, ...sale, ...customer, ...my, ...serve, ...common, ...product, ...cardList ,...agentEenter, ...milestone, ...poster, ...report, ...survey, ...nbs, ...manpower] //根据需要进行删减 From fcde3c97bd23fce34039fcf9f1dbd981d4b7b243 Mon Sep 17 00:00:00 2001 From: yuweiqi Date: Mon, 20 Apr 2020 16:20:33 +0800 Subject: [PATCH 14/61] =?UTF-8?q?[FIX]=E5=8D=A1=E5=8D=95-=E5=9B=9E?= =?UTF-8?q?=E6=BB=9A=E5=8D=A1=E5=8D=95=E5=88=86=E6=94=AF=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E6=97=B6=E5=BD=B1=E5=93=8D=E5=88=B0=E7=9A=84customer=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/ebiz/customer/Customer.vue | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/components/ebiz/customer/Customer.vue b/src/components/ebiz/customer/Customer.vue index 72e75cf5b..827a9fc04 100644 --- a/src/components/ebiz/customer/Customer.vue +++ b/src/components/ebiz/customer/Customer.vue @@ -52,7 +52,6 @@ export default { mounted() {}, methods: { choose(data) { - console.log(data) let params = { customerNumber: data.customerNumber } @@ -60,21 +59,17 @@ export default { console.log(res, '详情') if (res.result == '0') { this.isSuccess = true - let Data = [] let content = res.content - let value = localStorage.getItem('value') - Data.push(content) - Data.push(value) if (content.birthday) { content.age = utils.jsGetAge(content.birthday) } - this.$emit('on-choose', Data) + this.$emit('on-choose', content) } }) }, getList() { getCustomersList({}).then(res => { - // console.log(res) + console.log(res) if (res.result == '0') { let customerList = [] //根据数据字典中的客户等级 展示 From d97bba7845096b336a1db8a048032b19eeaf1f84 Mon Sep 17 00:00:00 2001 From: "tian.guangyuan" Date: Tue, 21 Apr 2020 11:37:00 +0800 Subject: [PATCH 15/61] =?UTF-8?q?=E3=80=90fix=E3=80=91=20=E5=8D=A1?= =?UTF-8?q?=E5=8D=95=E6=B5=81=E7=A8=8B=E5=AE=8C=E6=88=90=EF=BC=8C=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E7=BB=99=E5=90=8E=E7=AB=AF=E4=B8=8E=E6=A0=B8=E5=BF=83?= =?UTF-8?q?=E8=81=94=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/cardList/Pay.vue | 96 +++++++++++++------------ src/views/ebiz/cardList/information.vue | 87 +++++++++++++--------- src/views/ebiz/cardList/js/methods.js | 7 +- 3 files changed, 112 insertions(+), 78 deletions(-) diff --git a/src/views/ebiz/cardList/Pay.vue b/src/views/ebiz/cardList/Pay.vue index 8330f6165..3a450a37d 100644 --- a/src/views/ebiz/cardList/Pay.vue +++ b/src/views/ebiz/cardList/Pay.vue @@ -123,11 +123,11 @@ export default { // trialList: JSON.parse(localStorage.trialList), // 核保数据 underWriteData: { - appntName: '国家安全富兴2.0', //产品名称 - orderAmount: 0, //支付金额 + appntName: '', //产品名称 + orderAmount: '', //支付金额 name: '', bankCode: '', //银行卡号 - bankName: 'ABC' //开户银行 + bankName: '' //开户银行 }, radio: '1', result: [], @@ -185,17 +185,18 @@ export default { window.appCallBack = this.appCallBack // 获取银行卡 this.getBankList() - console.log('----保融form.action', config.payUrl) + this.getOrderDetail() + // console.log('----保融form.action', config.payUrl) // if (localStorage.salelist == '1') { - // // 第一次支付 调核保获取 - // this.underWrite() - // this.underWriteData = JSON.parse(window.localStorage.getItem('underWriteData')) + // 第一次支付 调核保获取 + // this.underWrite() + // this.underWriteData = JSON.parse(window.localStorage.getItem('underWriteData')) // } else { - // // 再次支付 调详情 获取信息 - // this.twounderWrite() - // this.underWriteData = JSON.parse(window.localStorage.getItem('underWriteData')) + // 再次支付 调详情 获取信息 + this.getOrderDetail() + // this.underWriteData = JSON.parse(window.localStorage.getItem('underWriteData')) // } - console.log('--自核结果--支付信息：', JSON.stringify(this.underWriteData)) + // console.log('--自核结果--支付信息：', JSON.stringify(this.underWriteData)) }, methods: { //获取银行卡扫描信息 @@ -282,18 +283,17 @@ export default { that.show = false }, // 再次支付 - twounderWrite() { - let _this = this + getOrderDetail() { getOrderDetail({ orderNo: window.localStorage.getItem('orderNo') }).then(res => { console.log(res) if (res.result == '0') { this.$toast.clear() console.log(res.orderDTO.orderAccountDTO.bankCode) - let underWriteData = { - accountName: res.orderDTO.orderAccountDTO.accountName, - appntName: res.orderDTO.appntDTO.name, - bankCode: _this.typebank[res.orderDTO.orderAccountDTO.bankCode], - bankName: res.orderDTO.orderAccountDTO.bankName, + this.underWriteData = { + appntName: res.orderDTO.insuredDTOs[0].riskDTOLst[0].riskName, + name: res.orderDTO.orderAccountDTO.accountName, + bankCode: res.orderDTO.orderAccountDTO.cardBookCode, + bankName: res.orderDTO.orderAccountDTO.bankCode, cardBookCode: res.orderDTO.orderAccountDTO.cardBookCode, orderAmount: res.orderDTO.orderInfoDTO.orderAmount, orderNo: res.orderDTO.orderAccountDTO.orderNo, @@ -301,9 +301,10 @@ export default { resultMessage: '交易处理成功', uwResult: '02' } - window.localStorage.setItem('underWriteData', JSON.stringify(underWriteData)) + this.bankListName = res.orderDTO.orderAccountDTO.bankName + // window.localStorage.setItem('underWriteData', JSON.stringify(underWriteData)) } else { - let underWriteData = { + this.underWriteData = { accountName: '', appntName: '', bankCode: '', @@ -315,13 +316,13 @@ export default { resultMessage: '交易处理失败', uwResult: '00' } - window.localStorage.setItem('underWriteData', JSON.stringify(underWriteData)) + // window.localStorage.setItem('underWriteData', JSON.stringify(underWriteData)) this.$toast(res.resultMessage) } }) }, // 获取支付信息 - underWrite() { + async underWrite() { let data = { platform: 'app', type: '1', @@ -331,28 +332,27 @@ export default { } } } - underWrite(data).then(res => { - if (res.result == '0') { - this.$toast.clear() - if (res.uwResult == '02') { - // window.localStorage.setItem('uwResult', res.uwResult) - window.localStorage.setItem('underWriteData', JSON.stringify(res)) - } else if (res.uwResult == '33') { - window.localStorage.setItem('underWriteData', JSON.stringify(res)) - window.localStorage.setItem('uwResult', res.uwResult) - window.localStorage.setItem('resultMessage', res.message) - } else { - window.localStorage.setItem('uwResult', res.uwResult) - window.localStorage.setItem('underWriteData', JSON.stringify(res)) - // window.localStorage.setItem('resultMessage', res.resultMessage) - } - } else { - this.$toast(res.resultMessage) - } - }) + return underWrite(data) + // .then(res => { + // console.log(res); + // if (res.result == '0') { + // this.$toast.clear() + // if (res.uwResult == '33') { + // window.localStorage.setItem('uwResult', res.uwResult) + // window.localStorage.setItem('resultMessage', res.message) + // } else { + // window.localStorage.setItem('uwResult', res.uwResult) + // } + // this.underWriteData = res + // return true + // } else { + // return false + // this.$toast(res.resultMessage) + // } + // }) }, // 点击支付 - payMent() { + async payMent() { let that = this let data = { orderDTO: { @@ -380,7 +380,8 @@ export default { /* 支付之前要先保存银行账户信息 */ - saveOrUpdateAccount(data).then(res => { + let res = await saveOrUpdateAccount(data) + // .then(res => { console.log('res', res) that.$toast.clear() if (res.result == '0') { @@ -394,6 +395,13 @@ export default { let data = { orderNo: window.localStorage.getItem('orderNo') } + let rs = await this.underWrite() + + if (rs.result != '0') { + this.$toast.clear() + this.$toast(rs.resultMessage) + } + acceptInsurance(data).then(res => { console.log('----取支付参数结果：', JSON.stringify(res)) // res = {'result':'0','resultMessage':'','content':null,'prtNo':'8186270000000008','payStatus':'4','amnt':'63700.00','appntName':'投保人','message':null,'brPayReturnData':{'result':'','resultMessage':'','content':null,'businessId':'1569125393518','businessNo':'8186270000000008','tradeSubType':'COMM','businessType':'SALE','systemType':'GF','money':63700,'businessSubType':'XDCB','thirdType':'0002','thirdName':null,'bankCode':'ABC','epayOrderNo':'1909221209536259999900','companyAccount':null,'tradeState':'TRADING','standardCode':'DEALING','standardMsg':null,'thirdOrderNo':null,'respRemark':null,'tradeTime':'2019-09-22T04:09:53.518+0000','description':'','version':'1','sourceNotecode':'8186270000000008','payType':'MIT01','expireDate':'20191010101010','transSeq':'20190922120953782','transSource':'MIT','applyEntity':'11860000','paymentCode':'8186270000000008','transDate':'20190922','rdSeq':'1909221209536259999900','settleMode':null,'cur':'CNY','transTime':'120953','ourAmount':63700,'fixUser':'1','insurer':'投保人','certType':'0','certNum':'110101199009210011','oppBank':'ABC','oppAct':'6228481200290317812','oppActName':'投保人','cellPhone':null,'purpose':null,'memo':null,'returnURL':'http://139.199.50.151/#/sale/payResult','notifyURL':'http://139.199.50.151:7000/api/v1/epay/epay/payResult','s3Sign':'e3f0581ec6b751337e8eca360a0746bc'}} @@ -434,7 +442,7 @@ export default { } else { this.$toast(res.resultMessage) } - }) + // }) } } } diff --git a/src/views/ebiz/cardList/information.vue b/src/views/ebiz/cardList/information.vue index b94cfb82e..7f379c72b 100644 --- a/src/views/ebiz/cardList/information.vue +++ b/src/views/ebiz/cardList/information.vue @@ -79,7 +79,7 @@ name="被保险人姓名" label="被保险人姓名" required - :parentShowPicker.sync="customerShowPicker" + :parentShowPicker.sync="customerShowPicker2" :value.sync="insuredInfo.name" @nameChange="nameChanges" @on-click="selectClick('1','1')" @@ -124,6 +124,7 @@ label="指定生效日期" name="指定生效日期" required + :minDate="now" :value.sync="userInfo.effectiveDate" type="date" :flag="true" @@ -207,6 +208,7 @@ export default { }, data() { return { + now : new Date(), isScan: false, //是否显示证件扫描组件 allPrice: 0, result: [], @@ -268,9 +270,11 @@ export default { sex: '0', //被保人性别 birthday: '' //被保人出生日期 }, + selectUser: '', areaList: areaList, currentPopupIndex: '', customerShowPicker: false, + customerShowPicker2: false, occupationShowPicker: false, timeId: null, chooseProducts: JSON.parse(localStorage.chooseProducts), @@ -317,8 +321,11 @@ export default { this.insuredInfo.name = name }, selectClick(index, value) { - console.log(index, value) - localStorage.setItem('value', value) + if(value !== undefined){ + this.selectUser = value + } + // console.log(index, value) + // localStorage.setItem('value', value) selectComp(this, index, '1') }, // closeBtn() { @@ -345,7 +352,11 @@ export default { } }) if (this.currentPopupIndex == 1) { - this.customerShowPicker = false + if(this.selectUser == '1'){ + this.customerShowPicker2 = false + }else{ + this.customerShowPicker = false + } } else if (this.currentPopupIndex == 2) { this.occupationShowPicker = false } else if (this.currentPopupIndex == 3) { @@ -518,20 +529,27 @@ export default { { //指定生效日期 //如果录入日期晚于当前日期 - if (Date.parse(val) < Date.parse(new Date())) { - this.userInfo.birthday = '' - this.$refs.birthday.date = '' - return this.$toast('当前日期早于当日') - } + // if (Date.parse(val) < Date.parse(new Date())) { + // this.userInfo.birthday = '' + // this.$refs.birthday.date = '' + // return this.$toast('当前日期早于当日') + // } } break } }, //选择客户 chooseCustomer(data) { + data = data[0] console.log(data) - console.log(data[0][0], data[0][1]) - this.customerShowPicker = false + console.log(typeof this.selectUser) + + if(this.selectUser == '1'){ + this.customerShowPicker2 = false + }else{ + this.customerShowPicker = false + } + this.$jump({ flag: 'navigation', extra: { @@ -539,33 +557,35 @@ export default { hiddenRight: '1' } }) - if (data[0][1] == '0') { - let { customerName, customerSex } = data[0][0] + if (this.selectUser == '0') { + let { customerName, customerSex } = data this.userInfo.name = customerName //用户名 - this.userInfo.sex = String(customerSex) //性别 + this.userInfo.sex = customerSex ? customerSex.toString() : '0' //性别 + this.userInfo.birthday = data.birthday //出生日期 + this.userInfo.idType = data.customerIdType //证件类型 + this.userInfo.idNo = data.customerIdNumber //证件类别 - this.userInfo.birthday = data[0][0].birthday //出生日期 - this.userInfo.idType = data[0][0].customerIdType //证件类型 - this.userInfo.idNo = data[0][0].customerIdNumber //证件类别 - - this.userInfo.mobile = data[0][0].customerPhone //移动电话 - this.userInfo.homeProvince = data[0][0].homeProvince //家庭省 - this.userInfo.homeCity = data[0][0].homeCity //家庭市 - this.userInfo.homeArea = data[0][0].homeArea //家庭区 - this.userInfo.homeAddress = data[0][0].homeAddress //家庭详细地址 + this.userInfo.mobile = data.customerPhone //移动电话 + this.userInfo.homeProvince = data.homeProvince //家庭省 + this.userInfo.homeCity = data.homeCity //家庭市 + this.userInfo.homeArea = data.homeArea //家庭区 + if(data.homeProvince && data.homeCity && data.homeArea){ + this.homeName = getAreaName([{ code: data.homeProvince }, { code: data.homeCity }, { code: data.homeArea }]) //家庭地址 + } + this.userInfo.homeAddress = data.homeAddress //家庭详细地址 // 计算年龄 // let age = utilsAge.getAge(this.userInfo.birthday, new Date()) - + this.getRelatedData(this.userInfo.idNo,'1') - } else if (data[0][1] == '1') { - let { customerName, customerSex } = data[0][0] + } else if (this.selectUser == '1') { + let { customerName, customerSex } = data this.insuredInfo.name = customerName //用户名 - this.insuredInfo.sex = String(customerSex) //性别 + this.insuredInfo.sex = customerSex ? customerSex.toString() : '0' //性别 - this.insuredInfo.birthday = data[0][0].birthday //出生日期 - this.insuredInfo.idType = data[0][0].customerIdType //证件类型 - this.insuredInfo.idNo = data[0][0].customerIdNumber //证件类别 + this.insuredInfo.birthday = data.birthday //出生日期 + this.insuredInfo.idType = data.customerIdType //证件类型 + this.insuredInfo.idNo = data.customerIdNumber //证件类别 // 计算年龄 // let age = utilsAge.getAge(this.userInfo.birthday, new Date()) @@ -829,7 +849,7 @@ export default { let resultData = await saveOrUpdateCard(params) if (resultData.result == 0) { - console.log(' resultData.orderNo', resultData.orderNo) + console.log(' resultData.orderNo', resultData.content.object) //存储被保人信息 // let age = utilsAge.getAge(this.userInfo.birthday, new Date()) // localStorage.saleInsuredInfo = JSON.stringify({ @@ -843,11 +863,12 @@ export default { // localStorage.saleInsuredInfo = JSON.stringify(this.userInfo) // console.log(this.userInfo) - localStorage.orderNo = resultData.orderNo + localStorage.orderNo = resultData.content.object this.$jump({ flag: 'h5', extra: { - url: location.origin + `/#/cardList/pay` + url: location.origin + `/#/cardList/pay`, + forbidSwipeBack: 1 }, routerInfo: { path: `/cardList/pay` diff --git a/src/views/ebiz/cardList/js/methods.js b/src/views/ebiz/cardList/js/methods.js index 474a37f04..9afcad1c6 100644 --- a/src/views/ebiz/cardList/js/methods.js +++ b/src/views/ebiz/cardList/js/methods.js @@ -3,7 +3,12 @@ export function selectComp(that, index, type = '') { that.currentPopupIndex = index let title = '' if (index == 1) { - ;[that.customerShowPicker, title] = [true, '客户列表'] + if(that.selectUser == '1'){ + ;[that.customerShowPicker2, title] = [true, '客户列表'] + }else{ + ;[that.customerShowPicker, title] = [true, '客户列表'] + } + // ;[that.customerShowPicker, title] = [true, '客户列表'] } else if (index == 2) { ;[that.occupationShowPicker, title] = [true, '职业类别'] } else if (index == 3) { From 8b32ccdbaa44843985ceaea5183567e34758bb37 Mon Sep 17 00:00:00 2001 From: "tian.guangyuan" Date: Tue, 21 Apr 2020 14:48:00 +0800 Subject: [PATCH 16/61] =?UTF-8?q?[fix]=20=E6=B7=BB=E5=8A=A0=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E6=9D=A1=E6=AC=BE=E5=8A=9F=E8=83=BD=EF=BC=8C=E5=B9=B6?= =?UTF-8?q?=E9=80=9A=E8=BF=87eslint=20--fix=20=E4=BF=AE=E5=A4=8D=E5=8D=A1?= =?UTF-8?q?=E5=8D=95=E6=A8=A1=E5=9D=97=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/ebiz/cardList.js | 12 ++ src/views/ebiz/cardList/CardTotreasure.vue | 55 +++--- src/views/ebiz/cardList/Pay.vue | 203 ++++++++++---------- src/views/ebiz/cardList/PayLoser.vue | 83 ++++---- src/views/ebiz/cardList/PayResult.vue | 2 +- src/views/ebiz/cardList/PaySuccess.vue | 17 +- src/views/ebiz/cardList/ShowPDF.vue | 29 +++ src/views/ebiz/cardList/information.vue | 210 +++++++++++++-------- src/views/ebiz/cardList/js/methods.js | 4 +- src/views/ebiz/cardList/productDetails.vue | 38 ++-- 10 files changed, 372 insertions(+), 281 deletions(-) create mode 100644 src/views/ebiz/cardList/ShowPDF.vue diff --git a/src/router/ebiz/cardList.js b/src/router/ebiz/cardList.js index d22a6a273..66a345730 100644 --- a/src/router/ebiz/cardList.js +++ b/src/router/ebiz/cardList.js @@ -6,6 +6,8 @@ const pay = () => import('@/views/ebiz/cardList/Pay') const payResult = () => import('@/views/ebiz/cardList/PayResult') const paySuccess = () => import('@/views/ebiz/cardList/PaySuccess') const payLoser = () => import('@/views/ebiz/cardList/PayLoser') +const ShowPDF = () => import('@/views/ebiz/cardList/ShowPDF') + export default [ { path: '/cardList/information', @@ -69,5 +71,15 @@ export default [ title: '支付失败', index: 6 } + }, + { + path: '/cardList/ShowPDF', + name: 'ShowPDF', + component: ShowPDF, + meta: { + title: '', + index: 7 + } } ] + diff --git a/src/views/ebiz/cardList/CardTotreasure.vue b/src/views/ebiz/cardList/CardTotreasure.vue index 1fb9ee09b..025988623 100644 --- a/src/views/ebiz/cardList/CardTotreasure.vue +++ b/src/views/ebiz/cardList/CardTotreasure.vue @@ -3,43 +3,45 @@
-
- {{item}} +
+ {{ item }}
-
    -
  • +
      +
    • - +
      -

      {{itemIcon.productName}}

      - {{itemIcon.productDesc}} +

      {{ itemIcon.productName }}

      + {{ itemIcon.productDesc }}
    -
      -
    • -

      {{itemiNow.h}}

      - {{itemiNow.span1}} - {{itemiNow.span2}} - {{itemiNow.span3}} - {{itemiNow.span4}} +
        +
      • +

        {{ itemiNow.h }}

        + {{ itemiNow.span1 }} + {{ itemiNow.span2 }} + {{ itemiNow.span3 }} + {{ itemiNow.span4 }}
        • - - \ No newline at end of file +.PayLoser > div:nth-of-type(1) { + display: flex; + align-items: center; + justify-content: center; + flex-direction: column; + box-sizing: border-box; + margin-top: 100px; + p { + margin-top: 30px; + } +} + diff --git a/src/views/ebiz/cardList/PayResult.vue b/src/views/ebiz/cardList/PayResult.vue index ffcc0ef6e..185423e18 100644 --- a/src/views/ebiz/cardList/PayResult.vue +++ b/src/views/ebiz/cardList/PayResult.vue @@ -115,7 +115,7 @@ export default { this.$toast(res.resultMessage) } }) - }, + } // // 重新支付 // rePayMent() { // // localStorage.orderNo = order.orderInfoDTO.orderNo diff --git a/src/views/ebiz/cardList/PaySuccess.vue b/src/views/ebiz/cardList/PaySuccess.vue index 4b2f8366b..d342c0d90 100644 --- a/src/views/ebiz/cardList/PaySuccess.vue +++ b/src/views/ebiz/cardList/PaySuccess.vue @@ -2,7 +2,7 @@
        - diff --git a/src/views/ebiz/cardList/information.vue b/src/views/ebiz/cardList/information.vue index 7f379c72b..95c4b6b0f 100644 --- a/src/views/ebiz/cardList/information.vue +++ b/src/views/ebiz/cardList/information.vue @@ -12,10 +12,10 @@ :parentShowPicker.sync="customerShowPicker" :value.sync="userInfo.name" @nameChange="nameChange" - @on-click="selectClick('1','0')" + @on-click="selectClick('1', '0')" > - - + - + > + - + 证件扫描 - + - - - + + - - + +

        被保人信息

        - - + - - + + 证件扫描 -         +

        受益人信息

        - -         -

        产品信息

        + + +

        产品信息

        - - - 我已阅读并同意《投保须知》 - - - - 总保费:{{allPrice}}元 - - + v-validate="'required'" + label="指定生效日期" + name="指定生效日期" + required + :minDate="now" + :value.sync="userInfo.effectiveDate" + type="date" + :flag="true" + @confirm="onDateConfirm($event, '6')" + ref="effectiveDate" + input-align:right + > + + + 我已阅读并同意《投保须知》 + - + + 总保费:{{ allPrice }}元 + + @@ -208,7 +238,7 @@ export default { }, data() { return { - now : new Date(), + now: new Date(), isScan: false, //是否显示证件扫描组件 allPrice: 0, result: [], @@ -242,7 +272,7 @@ export default { columns: [], valueKey: 'text', homeName: '', //家庭地址 - bnfTypeVal:'法定受益人', //受益人类型文字展示 + bnfTypeVal: '法定受益人', //受益人类型文字展示 //投保人信息 userInfo: { name: '', //投保人姓名 @@ -321,7 +351,7 @@ export default { this.insuredInfo.name = name }, selectClick(index, value) { - if(value !== undefined){ + if (value !== undefined) { this.selectUser = value } // console.log(index, value) @@ -352,9 +382,9 @@ export default { } }) if (this.currentPopupIndex == 1) { - if(this.selectUser == '1'){ + if (this.selectUser == '1') { this.customerShowPicker2 = false - }else{ + } else { this.customerShowPicker = false } } else if (this.currentPopupIndex == 2) { @@ -386,7 +416,10 @@ export default { } else if (pickerType == '3') { this.columns = DataDictionary.degree } else if (pickerType == '4') { - this.columns = [{ id: 0, text: '有' }, { id: 1, text: '无' }] + this.columns = [ + { id: 0, text: '有' }, + { id: 1, text: '无' } + ] } else if (pickerType == '5') { this.columns = DataDictionary.taxIdentity } else if (pickerType == '6') { @@ -397,6 +430,8 @@ export default { this.columns = DataDictionary.salarySource } else if (pickerType == '9') { this.columns = DataDictionary.relationToAppnt + } else if (pickerType == '11') { + this.columns = DataDictionary.insuredIdType } }, //确认选择字段 @@ -427,6 +462,10 @@ export default { this.userInfo.salarySource = value.id } else if (this.pickerType == '9') { this.userInfo.relationToInsured = value.id + // 如果关系为本人，将投保人信息带入到被保人信息上 + if(this.userInfo.relationToInsured == 1){ + Object.assign(this.insuredInfo , this.userInfo) + } } else if (this.pickerType == '11') { this.insuredInfo.idType = value.id } @@ -530,9 +569,9 @@ export default { //指定生效日期 //如果录入日期晚于当前日期 // if (Date.parse(val) < Date.parse(new Date())) { - // this.userInfo.birthday = '' - // this.$refs.birthday.date = '' - // return this.$toast('当前日期早于当日') + // this.userInfo.birthday = '' + // this.$refs.birthday.date = '' + // return this.$toast('当前日期早于当日') // } } break @@ -543,13 +582,13 @@ export default { data = data[0] console.log(data) console.log(typeof this.selectUser) - - if(this.selectUser == '1'){ + + if (this.selectUser == '1') { this.customerShowPicker2 = false - }else{ + } else { this.customerShowPicker = false } - + this.$jump({ flag: 'navigation', extra: { @@ -564,20 +603,21 @@ export default { this.userInfo.birthday = data.birthday //出生日期 this.userInfo.idType = data.customerIdType //证件类型 this.userInfo.idNo = data.customerIdNumber //证件类别 + this.userInfo.email = data.email //证件类别 this.userInfo.mobile = data.customerPhone //移动电话 this.userInfo.homeProvince = data.homeProvince //家庭省 this.userInfo.homeCity = data.homeCity //家庭市 this.userInfo.homeArea = data.homeArea //家庭区 - if(data.homeProvince && data.homeCity && data.homeArea){ + if (data.homeProvince && data.homeCity && data.homeArea) { this.homeName = getAreaName([{ code: data.homeProvince }, { code: data.homeCity }, { code: data.homeArea }]) //家庭地址 } this.userInfo.homeAddress = data.homeAddress //家庭详细地址 // 计算年龄 // let age = utilsAge.getAge(this.userInfo.birthday, new Date()) - - this.getRelatedData(this.userInfo.idNo,'1') + + this.getRelatedData(this.userInfo.idNo, '1') } else if (this.selectUser == '1') { let { customerName, customerSex } = data this.insuredInfo.name = customerName //用户名 @@ -593,7 +633,7 @@ export default { // 计算年龄 // let age = utilsAge.getAge(this.userInfo.birthday, new Date()) - this.getRelatedData(this.insuredInfo.idNo,'2') + this.getRelatedData(this.insuredInfo.idNo, '2') } // console.log(data, val) }, @@ -602,7 +642,11 @@ export default { // console.log(this.userInfo.salarySource) // console.log(this.userInfo.otherSalarySource) //表单校验, 成功跳转 + + // if() + this.$validator.validate().then(valid => { + if (true === valid) { // localStorage.chooseProductCodesNew = localStorage.chooseProductCodes // 计算年龄 @@ -849,19 +893,19 @@ export default { let resultData = await saveOrUpdateCard(params) if (resultData.result == 0) { - console.log(' resultData.orderNo', resultData.content.object) - //存储被保人信息 - // let age = utilsAge.getAge(this.userInfo.birthday, new Date()) - // localStorage.saleInsuredInfo = JSON.stringify({ - // birthday: this.userInfo.birthday, - // name: this.userInfo.name, - // sex: this.userInfo.sex, - // idType: this.userInfo.idType, - // age - // }) - // this.userInfo.age = age - // localStorage.saleInsuredInfo = JSON.stringify(this.userInfo) - // console.log(this.userInfo) + console.log(' resultData.orderNo', resultData.content.object) + //存储被保人信息 + // let age = utilsAge.getAge(this.userInfo.birthday, new Date()) + // localStorage.saleInsuredInfo = JSON.stringify({ + // birthday: this.userInfo.birthday, + // name: this.userInfo.name, + // sex: this.userInfo.sex, + // idType: this.userInfo.idType, + // age + // }) + // this.userInfo.age = age + // localStorage.saleInsuredInfo = JSON.stringify(this.userInfo) + // console.log(this.userInfo) localStorage.orderNo = resultData.content.object this.$jump({ diff --git a/src/views/ebiz/cardList/js/methods.js b/src/views/ebiz/cardList/js/methods.js index 9afcad1c6..5660096f3 100644 --- a/src/views/ebiz/cardList/js/methods.js +++ b/src/views/ebiz/cardList/js/methods.js @@ -3,9 +3,9 @@ export function selectComp(that, index, type = '') { that.currentPopupIndex = index let title = '' if (index == 1) { - if(that.selectUser == '1'){ + if (that.selectUser == '1') { ;[that.customerShowPicker2, title] = [true, '客户列表'] - }else{ + } else { ;[that.customerShowPicker, title] = [true, '客户列表'] } // ;[that.customerShowPicker, title] = [true, '客户列表'] diff --git a/src/views/ebiz/cardList/productDetails.vue b/src/views/ebiz/cardList/productDetails.vue index 7cde37fe9..d97c1b05a 100644 --- a/src/views/ebiz/cardList/productDetails.vue +++ b/src/views/ebiz/cardList/productDetails.vue @@ -5,17 +5,17 @@
-
- 下一步 -
+
+ 下一步 +
@@ -36,7 +36,7 @@ export default { introductImages: [], docuList: [], productCode: '', - results:[], + results: [], trialInfos: [] } }, @@ -49,14 +49,18 @@ export default { }, methods: { goDocu(url, type, name) { - let pdfUrl = encodeURIComponent(url) - console.log('pdfUrl', pdfUrl) + // let pdfUrl = //encodeURIComponent(url) + localStorage.setItem('cardListPDF', JSON.stringify({ documentUrl: url, title: name })) + console.log('url', url) this.$jump({ flag: 'h5', extra: { title: name, // url: 'http://47.96.143.111/pdfjs/web/viewer.html?file=' + url //测试代码 - url: this.$mainUrl + '/pdfjs/web/viewer.html?file=' + pdfUrl + url: location.origin + '/#/cardList/ShowPDF' + }, + routerInfo: { + path: '/cardList/ShowPDF' } }) // 跳转到产品资料详情 @@ -173,8 +177,8 @@ export default { // productsData = JSON.parse(localStorage.chooseProducts) // productsData.push(currentProductInfo) // } else { - productsData = [currentProductInfo] - console.log('productsDataproductsData', productsData) + productsData = [currentProductInfo] + console.log('productsDataproductsData', productsData) // } //保存选择险种 @@ -260,8 +264,8 @@ export default { } - \ No newline at end of file + From 5395a6953657937c6c95115cc96609e036f3b428 Mon Sep 17 00:00:00 2001 From: "tian.guangyuan" Date: Tue, 21 Apr 2020 19:01:05 +0800 Subject: [PATCH 17/61] =?UTF-8?q?[fix]=20=E5=8D=A1=E5=8D=95=E5=BC=80?= =?UTF-8?q?=E5=8F=91=EF=BC=8C=20=E4=B8=B4=E6=97=B6=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/cardList/Pay.vue | 39 +++++++++++ src/views/ebiz/cardList/information.vue | 88 ++++++++++++------------- 2 files changed, 82 insertions(+), 45 deletions(-) diff --git a/src/views/ebiz/cardList/Pay.vue b/src/views/ebiz/cardList/Pay.vue index d2d996990..f138b00cf 100644 --- a/src/views/ebiz/cardList/Pay.vue +++ b/src/views/ebiz/cardList/Pay.vue @@ -183,6 +183,16 @@ export default { payStatus: '' // 接口返回的支付状态 } }, + created() { + setTimeout(() => { + // eslint-disable-next-line no-undef + EWebBridge.webCallAppInJs('webview_left_button', { + img: this.$assetsUrl + 'images/del-close-btn@3x.png', + intercept: '1' //是否拦截原生返回事件 1是 其他否 + }) + }, 100) + window.appCallBack = this.appCallBack + }, mounted() { // console.log('trialList', this.trialList[0].prem) // this.underWrite.orderAmount = this.trialList[0].prem @@ -204,6 +214,35 @@ export default { // console.log('--自核结果--支付信息：', JSON.stringify(this.underWriteData)) }, methods: { + appCallBack(data) { + if (data.trigger == 'left_button_click') { + return this.$dialog + .confirm({ + className: 'dialog-delete', + title: '提示', + message: '是否确认退出？', + cancelButtonColor: '#E9332E', + confirmButtonColor: '#FFFFFF' + }) + .then(() => { + this.$jump({ + flag: 'h5', + extra: { + title: '产品列表', + forbidSwipeBack: 1, //当前页面禁止右滑返回 + url: location.origin + `/#/cardList/CardTotreasure` + }, + routerInfo: { + path: `/cardList/CardTotreasure`, + type: '1' + } + }) + }) + .catch(() => { + return + }) + } + }, //获取银行卡扫描信息 getBankCardInfo(data) { this.underWriteData.bankCode = data.name diff --git a/src/views/ebiz/cardList/information.vue b/src/views/ebiz/cardList/information.vue index 95c4b6b0f..bf1d678a4 100644 --- a/src/views/ebiz/cardList/information.vue +++ b/src/views/ebiz/cardList/information.vue @@ -14,20 +14,6 @@ @nameChange="nameChange" @on-click="selectClick('1', '0')" > - - - 证件扫描 + + + - +