diff --git a/src/assets/js/utils/request.js b/src/assets/js/utils/request.js
index e40136ac9..bda4b3f47 100644
--- a/src/assets/js/utils/request.js
+++ b/src/assets/js/utils/request.js
@@ -133,6 +133,10 @@ service.interceptors.request.use(
message: '加载中……'
})
}
+ let obj = Object.assign({},config.data)
+ console.log('请求入参')
+ console.log(obj)
+ console.log(config)
/**
* 请求拦截处理(待添加 判断走统一网关处理)
*/
@@ -188,6 +192,9 @@ service.interceptors.response.use(
res = JSON.parse(AESTools.AESDecrypt(res.response, configApp.REQ_PWD))
}
}
+ console.log('请求结果')
+ console.log(response)
+ console.log(res)
Toast.clear()
if (res.code != 0) {
if (res.code == 10001 || res.code == 10002) {
diff --git a/src/router/ebiz/cardList.js b/src/router/ebiz/cardList.js
index 66a345730..d5981432b 100644
--- a/src/router/ebiz/cardList.js
+++ b/src/router/ebiz/cardList.js
@@ -7,6 +7,9 @@ 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')
+const phoneCode = () => import('@/views/ebiz/cardList/phoneCode')
+const cardDetail = () => import('@/views/ebiz/cardList/cardDetail')
+const SignatureConfirmation = () => import('@/views/ebiz/cardList/SignatureConfirmation')
export default [
{
@@ -80,6 +83,33 @@ export default [
title: '',
index: 7
}
- }
+ },
+ {
+ path: '/cardList/phoneCode',
+ name: 'phoneCode',
+ component: phoneCode,
+ meta: {
+ title: '短信验证',
+ index: 8
+ }
+ },
+ {
+ path: '/cardList/cardDetail',
+ name: 'cardDetail',
+ component: cardDetail,
+ meta: {
+ title: '核对投被保人信息',
+ index: 9
+ }
+ },
+ {
+ path: '/cardList/SignatureConfirmation',
+ name: 'SignatureConfirmation',
+ component: SignatureConfirmation,
+ meta: {
+ title: '阅读确认',
+ index: 10
+ }
+ },
]
diff --git a/src/store/index.js b/src/store/index.js
index 4cfef017e..bb373c12b 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -19,9 +19,14 @@ export default new Vuex.Store({
eodrApplyNo: '', //保全-保全受理号
agentGrade: '', //用户的agentGrade,判断用户权限
secondManageCode: '', //内勤所需参数
- thirdManageCode: '' //内勤所需参数
+ thirdManageCode: '' ,//内勤所需参数
+ orderDetail:{},//无优卡分享微信端订单信息
},
mutations: {
+ setOrderDetail(state,data){
+ console.log('更新订单信息')
+ state.orderDetail = data;
+ },
setThirdManageCode(state, code) {
state.thirdManageCode = code
},
diff --git a/src/views/ebiz/cardList/Pay.vue b/src/views/ebiz/cardList/Pay.vue
index d6f0cfa47..9f47d98ef 100644
--- a/src/views/ebiz/cardList/Pay.vue
+++ b/src/views/ebiz/cardList/Pay.vue
@@ -2,7 +2,10 @@
-
+
+
+
+
@@ -15,27 +18,29 @@
-->
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
- 支付
-
-
支付
-
分享
+
+
+ 支付分享
+
支付
-
+
-
+
-
+
@@ -182,7 +187,7 @@ export default {
[Cell.name]: Cell,
[RadioGroup.name]: RadioGroup,
[Radio.name]: Radio,
- Loading
+ Loading,
},
data() {
let isWeixin = this.$utils.device().isWeixin //判断环境
@@ -199,7 +204,7 @@ export default {
orderAmount: '', //支付金额
name: '',
bankCode: '', //银行卡号
- bankName: '' //开户银行
+ bankName: '', //开户银行
},
radio: '3',
result: [],
@@ -244,42 +249,46 @@ export default {
ReqReserved4: '', // 备用字段4
ReqReserved5: '', // 备用字段5
S3Sign: '', // 验签信息
- tradeState: '' // 状态
+ tradeState: '', // 状态
},
gotPayParam: false, // 是否已正确获取支付参数,
payStatus: '', // 接口返回的支付状态
noEdit: true, //是否为编辑
isWeixin, // 是否为微信环境
- isLoading: false // 分享到微信后的页面loading
+ isLoading: false, // 分享到微信后的页面loading
}
},
created() {
if (this.isWeixin) {
- this.radio = '3'
- let token = this.$route.query.token
- let orderNo = this.$route.query.orderNo
- localStorage.token = token
- localStorage.orderNo = orderNo
- this.isLoading = true
- this.$toast.loading({
- duration: 0, // 持续展示 toast
- forbidClick: true, // 禁用背景点击
- loadingType: 'spinner',
- message: '加载中……'
- })
- setTimeout(() => {
- this.pay()
- }, 500)
+ let orderDetail = JSON.parse(sessionStorage.orderDetail)
+ this.underWriteData.riskName = orderDetail.insuredDTOs[0].riskDTOLst[0].riskName
+ this.underWriteData.appntName = orderDetail.appntDTO.name
+ this.underWriteData.insuredName = orderDetail.insuredDTOs[0].name
+ this.underWriteData.orderAmount = orderDetail.insuredDTOs[0].riskDTOLst[0].prem
+ this.orderStatus = orderDetail.orderInfoDTO.orderStatus
+ this.underWriteData.idType = orderDetail.appntDTO.idType
+ // this.radio = '3'
+ // this.isLoading = true
+ // this.$toast.loading({
+ // duration: 0, // 持续展示 toast
+ // forbidClick: true, // 禁用背景点击
+ // loadingType: 'spinner',
+ // message: '加载中……'
+ // })
+ // setTimeout(() => {
+ // this.pay()
+ // }, 500)
+ } else {
+ // 再次支付 调详情 获取信息
+ this.getOrderDetail()
}
- // 再次支付 调详情 获取信息
- this.getOrderDetail()
},
mounted() {
setTimeout(() => {
// eslint-disable-next-line no-undef
EWebBridge.webCallAppInJs('webview_left_button', {
img: this.$assetsUrl + 'images/del-close-btn@3x.png',
- intercept: '1' //是否拦截原生返回事件 1是 其他否
+ intercept: '1', //是否拦截原生返回事件 1是 其他否
})
}, 100)
// window.appCallBack = this.appCallBack
@@ -287,27 +296,24 @@ export default {
// this.underWrite.orderAmount = this.trialList[0].prem
document.body.style.backgroundColor = '#fff'
window.appCallBack = this.appCallBack
-
- // 不在微信环境下
- // if (!this.isWeixin) {
// 获取银行卡
this.getBankList()
- // this.getOrderDetail()
- // console.log('----保融form.action', config.payUrl)
- // if (localStorage.salelist == '1') {
- // 第一次支付 调核保获取
- // this.underWrite()
- // this.underWriteData = JSON.parse(window.localStorage.getItem('underWriteData'))
- // } else {
- // 再次支付 调详情 获取信息
- this.getOrderDetail()
- // this.underWriteData = JSON.parse(window.localStorage.getItem('underWriteData'))
- // }
- // console.log('--自核结果--支付信息:', JSON.stringify(this.underWriteData))
- this.getPayTemp()
-
-
- // }
+ // 不在微信环境下
+ if (!this.isWeixin) {
+ // this.getOrderDetail()
+ // console.log('----保融form.action', config.payUrl)
+ // if (localStorage.salelist == '1') {
+ // 第一次支付 调核保获取
+ // this.underWrite()
+ // this.underWriteData = JSON.parse(window.localStorage.getItem('underWriteData'))
+ // } else {
+ // 再次支付 调详情 获取信息
+ this.getOrderDetail()
+ // this.underWriteData = JSON.parse(window.localStorage.getItem('underWriteData'))
+ // }
+ // console.log('--自核结果--支付信息:', JSON.stringify(this.underWriteData))
+ this.getPayTemp()
+ }
},
beforeRouteLeave(to, from, next) {
document.body.style.backgroundColor = ''
@@ -317,7 +323,7 @@ export default {
setTimeout(() => {
// eslint-disable-next-line no-undef
EWebBridge.webCallAppInJs('webview_left_button', {
- intercept: '0' //是否拦截原生返回事件 1是 其他否
+ intercept: '0', //是否拦截原生返回事件 1是 其他否
})
// window.appCallBack = this.appCallBack
}, 100)
@@ -331,7 +337,7 @@ export default {
title: '提示',
message: '是否确认退出?',
cancelButtonColor: '#E9332E',
- confirmButtonColor: '#FFFFFF'
+ confirmButtonColor: '#FFFFFF',
})
.then(() => {
this.$jump({
@@ -339,12 +345,12 @@ export default {
extra: {
title: '产品列表',
forbidSwipeBack: 1, //当前页面禁止右滑返回
- url: location.origin + `/#/cardList/CardTotreasure`
+ url: location.origin + `/#/cardList/CardTotreasure`,
},
routerInfo: {
path: `/cardList/CardTotreasure`,
- type: '1'
- }
+ type: '1',
+ },
})
})
.catch(() => {
@@ -356,8 +362,8 @@ export default {
flag: 'navigation',
extra: {
title: '支付',
- hiddenRight: '1'
- }
+ hiddenRight: '1',
+ },
})
this.isScan = false
}
@@ -369,8 +375,8 @@ export default {
flag: 'navigation',
extra: {
title: '账户信息',
- hiddenRight: '1'
- }
+ hiddenRight: '1',
+ },
})
this.isScan = false
},
@@ -386,8 +392,8 @@ export default {
flag: 'navigation',
extra: {
title,
- hiddenLeft: '1'
- }
+ hiddenLeft: '1',
+ },
})
this.closeBtn()
}, 400)
@@ -400,10 +406,10 @@ export default {
btns: [
{
img: this.$assetsUrl + 'images/del-close.png',
- route: { flag: '', extra: {} }
- }
- ]
- }
+ route: { flag: '', extra: {} },
+ },
+ ],
+ },
})
},
// 获取银行列表的focus
@@ -416,9 +422,9 @@ export default {
getBankList() {
let self = this
let data = {
- operateType: 'bank_type'
+ operateType: 'bank_type',
}
- getBankList(data).then(res => {
+ getBankList(data).then((res) => {
if (res.result == '0') {
console.log('银行卡列表', res.content)
self.bankList = res.content
@@ -436,18 +442,18 @@ export default {
},
getPayTemp() {
getPayTemp({ orderNo: window.localStorage.getItem('orderNo') })
- .then(res => {
+ .then((res) => {
if (res.result == '0') {
this.noEdit = res.content.flag != 'false'
}
})
- .catch(e => {
+ .catch((e) => {
console.error(e)
})
},
- // 再次支付
+ // 获取支付详情
getOrderDetail() {
- getOrderDetail({ orderNo: window.localStorage.getItem('orderNo') }).then(res => {
+ getOrderDetail({ orderNo: window.localStorage.getItem('orderNo') }).then((res) => {
console.log('getOrderDetail', res)
if (res.result == '0') {
this.orderStatus = res.orderDTO.orderInfoDTO.orderStatus
@@ -465,8 +471,9 @@ export default {
this.$toast.clear()
console.log(res.orderDTO.orderAccountDTO.bankCode)
this.underWriteData = {
- appntName: res.orderDTO.insuredDTOs[0].riskDTOLst[0].riskName,
- name: res.orderDTO.appntDTO.name,
+ riskName: res.orderDTO.insuredDTOs[0].riskDTOLst[0].riskName,
+ appntName: res.orderDTO.appntDTO.name,
+ insuredName: res.orderDTO.insuredDTOs[0].name,
// bankName: res.orderDTO.orderAccountDTO.bankCode,
// bankCode: res.orderDTO.orderAccountDTO.cardBookCode,
// cardBookCode: res.orderDTO.orderAccountDTO.cardBookCode,
@@ -475,7 +482,7 @@ export default {
orderNo: res.orderDTO.orderAccountDTO.orderNo,
result: '',
resultMessage: '交易处理成功',
- uwResult: '02'
+ uwResult: '02',
}
// this.bankListName = res.orderDTO.orderAccountDTO.bankName
this.underWriteData.bankCode =
@@ -491,7 +498,9 @@ export default {
} else {
this.underWriteData = {
accountName: '',
+ riskName: '',
appntName: '',
+ insuredName: '',
idType: '',
bankCode: '',
bankName: '',
@@ -500,7 +509,7 @@ export default {
orderNo: '',
result: '',
resultMessage: '交易处理失败',
- uwResult: '00'
+ uwResult: '00',
}
// window.localStorage.setItem('underWriteData', JSON.stringify(underWriteData))
this.$toast(res.resultMessage)
@@ -565,9 +574,33 @@ export default {
let data = {
orderNo: window.localStorage.getItem('orderNo'),
cardOrder: 'cardOrder',
- payType: this.radio
+ payType: this.radio,
}
- acceptInsurance(data).then(res => {
+ acceptInsurance(data).then((res) => {
+ // this.$jump({
+ // flag: 'h5',
+ // extra: {
+ // forbidSwipeBack: 1, //当前页面禁止右滑返回
+ // url: location.origin + `/#/cardList/payLoser`,
+ // },
+ // routerInfo: {
+ // path: `/cardList/payLoser`,
+ // type: '1',
+ // },
+ // })
+ // return;
+ this.$jump({
+ flag: 'h5',
+ extra: {
+ forbidSwipeBack: 1, //当前页面禁止右滑返回
+ url: location.origin + `/#/cardList/paySuccess`,
+ },
+ routerInfo: {
+ path: `/cardList/paySuccess`,
+ type: '1',
+ },
+ })
+ return
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') {
@@ -596,7 +629,7 @@ export default {
window.localStorage.setItem('payStatus', res.payStatus)
window.localStorage.setItem('payInfo', JSON.stringify(res))
this.underWriteData.bankListName = this.bankListName
- if(this.radio == '3'){
+ if (this.radio == '3') {
this.underWriteData.bankCode = ''
}
localStorage['cardList-detail'] = JSON.stringify(this.underWriteData)
@@ -606,7 +639,7 @@ export default {
setTimeout(() => {
// eslint-disable-next-line no-undef
EWebBridge.webCallAppInJs('webview_left_button', {
- intercept: '0' //是否拦截原生返回事件 1是 其他否
+ intercept: '0', //是否拦截原生返回事件 1是 其他否
})
}, 100)
})
@@ -626,7 +659,7 @@ export default {
let data = {
orderDTO: {
orderInfoDTO: {
- orderNo: window.localStorage.getItem('orderNo')
+ orderNo: window.localStorage.getItem('orderNo'),
},
orderAccountDTO: {
accountType: '0',
@@ -636,15 +669,15 @@ export default {
cardBookType: '1',
cardBookCode: this.underWriteData.bankCode,
isAutoPay: '0',
- isAutoRenewal: '1'
- }
- }
+ isAutoRenewal: '1',
+ },
+ },
}
this.$toast.loading({
duration: 0, // 持续展示 toast
forbidClick: true, // 禁用背景点击
loadingType: 'spinner',
- message: '加载中……'
+ message: '加载中……',
})
/*
支付之前要先保存银行账户信息
@@ -658,7 +691,7 @@ export default {
duration: 0, // 持续展示 toast
forbidClick: true, // 禁用背景点击
loadingType: 'spinner',
- message: '加载中……'
+ message: '加载中……',
})
// if (!flag) {
@@ -685,7 +718,7 @@ export default {
duration: 0, // 持续展示 toast
forbidClick: true, // 禁用背景点击
loadingType: 'spinner',
- message: '加载中……'
+ message: '加载中……',
})
// if (!flag) {
@@ -710,7 +743,7 @@ export default {
this.$dialog
.confirm({
message: '证件类型不是身份证,无法使用微信支付',
- showCancelButton: false
+ showCancelButton: false,
})
.then(() => {
this.radio = ''
@@ -724,13 +757,13 @@ export default {
console.log(this.$validator)
return this.$toast(this.$validator.errors.all()[0])
}
- let shareName = this.underWriteData.name
- localStorage.name = this.underWriteData.name
+ let shareName = this.underWriteData.appntName
+ localStorage.appntName = this.underWriteData.appntName
localStorage.bankName = this.underWriteData.bankName
localStorage.bankCode = this.underWriteData.bankCode
localStorage.bankListName = this.bankListName
console.log(this.underWriteData.bankName, this.underWriteData.bankCode, this.bankListName, this.underWriteData.name)
- let url = location.origin + '/#/cardList/pay?orderNo=' + localStorage.orderNo + '&token=' + localStorage.token
+ let url = location.origin + '/#/cardList/phoneCode?orderNo=' + localStorage.orderNo + '&token=' + localStorage.token
console.log(url)
EWebBridge.webCallAppInJs('bridge', {
flag: 'share',
@@ -738,11 +771,11 @@ export default {
title: `国富人寿卡单投保(${shareName})付款`,
content: '付款进行',
url: url,
- img: this.$assetsUrl + 'images/logo.png'
- }
+ img: this.$assetsUrl + 'images/logo.png',
+ },
})
- }
- }
+ },
+ },
}
@@ -759,4 +792,8 @@ export default {
padding-right: 3px;
box-sizing: content-box;
}
+.bottom-btn {
+ display: flex;
+ justify-content: center;
+}
diff --git a/src/views/ebiz/cardList/PayLoser.vue b/src/views/ebiz/cardList/PayLoser.vue
index be53ad562..b9a6846b9 100644
--- a/src/views/ebiz/cardList/PayLoser.vue
+++ b/src/views/ebiz/cardList/PayLoser.vue
@@ -1,10 +1,11 @@
-
+
+
支付失败
-
返回首页
+
返回首页
diff --git a/src/views/ebiz/cardList/PaySuccess.vue b/src/views/ebiz/cardList/PaySuccess.vue
index 90194d543..46db6149a 100644
--- a/src/views/ebiz/cardList/PaySuccess.vue
+++ b/src/views/ebiz/cardList/PaySuccess.vue
@@ -1,22 +1,22 @@
-
+
-
+
支付成功
-
-
-
+
+
+
-
+
返回首页
diff --git a/src/views/ebiz/cardList/ShowPDF.vue b/src/views/ebiz/cardList/ShowPDF.vue
index 56766cf26..e3fd6e0c1 100644
--- a/src/views/ebiz/cardList/ShowPDF.vue
+++ b/src/views/ebiz/cardList/ShowPDF.vue
@@ -1,29 +1,65 @@
diff --git a/src/views/ebiz/cardList/SignatureConfirmation.vue b/src/views/ebiz/cardList/SignatureConfirmation.vue
new file mode 100644
index 000000000..fc0988a32
--- /dev/null
+++ b/src/views/ebiz/cardList/SignatureConfirmation.vue
@@ -0,0 +1,217 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 投保人
+ {{ appntInfo.name }}
+
+ 以下内容需要您按照顺序阅读确认:
+
+
需阅读
+
+ {{ item.documentName }}
+
+
+
+ 点击【下一步】按钮,进行相关操作
+
+
+
+
+
+
+ 下一步
+
+
+
+
+
+
+
diff --git a/src/views/ebiz/cardList/cardDetail.vue b/src/views/ebiz/cardList/cardDetail.vue
new file mode 100644
index 000000000..892c94b02
--- /dev/null
+++ b/src/views/ebiz/cardList/cardDetail.vue
@@ -0,0 +1,107 @@
+
+
+
+ 投保人信息
+
+
+
+
+
+
+
+
+
+ 被保人信息
+
+
+
+
+
+
+
+
+
+ 受益人信息
+
+
+
+ 产品信息
+
+
+
+
+
+
注:2020年04月03日0时至2021年04月02日24时止。
+
+ 总保费:{{ riskDTO.prem }} 元
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/ebiz/cardList/information.vue b/src/views/ebiz/cardList/information.vue
index 19b50e869..e0b74bea0 100644
--- a/src/views/ebiz/cardList/information.vue
+++ b/src/views/ebiz/cardList/information.vue
@@ -65,12 +65,49 @@
/>
-
+
+
+
- -->
+
- 被保险人信息
+ 被保人信息
+
+
+
+
+
+
+
被保人信息
@@ -187,14 +284,85 @@
:flag="true"
ref="insuredBirthday"
:maxDate="maxDate"
- >
+ >
+
+
+
+
+
+
受益人信息
-
+
- 产品信息
+ 产品信息
+
-
-
+
+
+
-
- 总保费:{{ allPrice }}
+ 总保费:{{ allPrice }} 元
-
+
@@ -283,9 +445,7 @@ import Vue from 'vue'
import { GoodsAction, GoodsActionIcon, GoodsActionButton } from 'vant'
DataDictionary.relationToAppnt = DataDictionary.relationToAppnt.slice(0, 4)
Vue.use(Checkbox).use(CheckboxGroup)
-Vue.use(GoodsAction)
- .use(GoodsActionIcon)
- .use(GoodsActionButton)
+Vue.use(GoodsAction).use(GoodsActionIcon).use(GoodsActionButton)
export default {
name: 'insuredInfo',
components: {
@@ -301,35 +461,39 @@ export default {
[Area.name]: Area,
[RadioGroup.name]: RadioGroup,
[Radio.name]: Radio,
- [IdentityCardScan.name]: IdentityCardScan
+ [IdentityCardScan.name]: IdentityCardScan,
},
data() {
return {
+ schemeName:'',//保障方案
+ schemeCode:'',
+ productDate:'',//保险期间
now: afterDate.getAfterDays(1), //指定生效日期最小值
insuredSex: '男',
isScan: false, //是否显示证件扫描组件
allPrice: 0,
result: [],
checked: true,
+ current:'userInfo',
sexRadio: [
{
label: '男',
- value: '0'
+ value: '0',
},
{
label: '女',
- value: '1'
- }
+ value: '1',
+ },
],
medicalRadio: [
{
label: '有',
- value: '0'
+ value: '0',
},
{
label: '无',
- value: '1'
- }
+ value: '1',
+ },
],
maxDate: beforeDate.getBeforeYear(18), //投保人出生日期可选最大值
insuredMaxDate: beforeDate.getBeforeDays(28), //被保人出生日期可选最大值
@@ -354,12 +518,19 @@ export default {
relationToInsured: '1',
idType: '1', //证件类型
idNo: '', //证件号码
- // homeProvince: '1', //家庭省
- // homeCity: '1', //家庭市
- // homeArea: '1', //家庭区
- // homeAddress: '1', //详细地址
+ occupationCode:'',//职业代码
+ occupationName:'',//职业名称
+ lifeGrade:'',//寿险等级
+ healthGrade:'',//健康等级
+ nativeplace: '1', //国家地区
+ marriageStatus:'',//婚姻状况
+ homeProvince: '1', //家庭省
+ homeCity: '1', //家庭市
+ homeArea: '1', //家庭区
+ homeName: '', //联系地址
+ homeAddress: '', //详细地址
mobile: '', //移动电话
- email: '' //电子邮箱
+ email: '', //电子邮箱
// effectiveDate: '' //指定生效日期
},
//被保人信息
@@ -368,7 +539,20 @@ export default {
idType: '1', //被保人证件类型
idNo: '', //被保人证件号码
sex: '0', //被保人性别
- birthday: '' //被保人出生日期
+ birthday: '', //被保人出生日期
+ occupationCode:'',//职业代码
+ occupationName:'',//职业名称
+ lifeGrade:'',//寿险等级
+ healthGrade:'',//健康等级
+ nativeplace: '1', //国家地区
+ marriageStatus:'',//婚姻状况
+ homeProvince: '1', //家庭省
+ homeCity: '1', //家庭市
+ homeArea: '1', //家庭区
+ homeName: '', //联系地址
+ homeAddress: '1', //详细地址
+ mobile: '', //移动电话
+ email: '', //电子邮箱
},
selectUser: '',
areaList: areaList,
@@ -379,7 +563,7 @@ export default {
timeId: null,
chooseProducts: JSON.parse(localStorage.chooseProducts),
trialList: JSON.parse(localStorage.trialList),
- pdf: ['', '', '']
+ pdf: ['', '', ''],
}
},
created() {
@@ -417,13 +601,12 @@ export default {
type: '1',
orderDTO: {
orderInfoDTO: {
- orderNo: orderNo
- }
- }
+ orderNo: orderNo,
+ },
+ },
}
- underWrite(data)
- .then(res => {
- console.log(res);
+ underWrite(data).then((res) => {
+ console.log(res)
if (res.result == '0') {
this.$toast.clear()
if (res.uwResult == '33') {
@@ -437,11 +620,11 @@ export default {
flag: 'h5',
extra: {
url: location.origin + `/#/cardList/pay`,
- forbidSwipeBack: 1
+ forbidSwipeBack: 1,
},
routerInfo: {
- path: `/cardList/pay`
- }
+ path: `/cardList/pay`,
+ },
})
return true
} else {
@@ -459,11 +642,11 @@ export default {
extra: {
title: name,
// url: 'http://47.96.143.111/pdfjs/web/viewer.html?file=' + url //测试代码
- url: location.origin + '/#/cardList/ShowPDF'
+ url: location.origin + '/#/cardList/ShowPDF',
},
routerInfo: {
- path: '/cardList/ShowPDF'
- }
+ path: '/cardList/ShowPDF',
+ },
})
},
//监听名字变化
@@ -504,8 +687,8 @@ export default {
flag: 'navigation',
extra: {
title: '投被保人信息',
- hiddenRight: '1'
- }
+ hiddenRight: '1',
+ },
})
if (this.currentPopupIndex == 1) {
if (this.selectUser == '1') {
@@ -524,8 +707,8 @@ export default {
flag: 'navigation',
extra: {
title: '投被保人信息',
- hiddenRight: '1'
- }
+ hiddenRight: '1',
+ },
})
this.occupationShowPicker = false
},
@@ -544,7 +727,7 @@ export default {
} else if (pickerType == '4') {
this.columns = [
{ id: 0, text: '有' },
- { id: 1, text: '无' }
+ { id: 1, text: '无' },
]
} else if (pickerType == '5') {
this.columns = DataDictionary.taxIdentity
@@ -556,8 +739,17 @@ export default {
this.columns = DataDictionary.salarySource
} else if (pickerType == '9') {
this.columns = DataDictionary.relationToAppnt
+ } else if (pickerType == '10') {
+ this.columns = DataDictionary.marriage
} else if (pickerType == '11') {
this.columns = DataDictionary.insuredIdType
+ } else if (pickerType == '12') {
+ this.trialList.forEach((item)=>{
+ this.columns.push({
+ id:schemeCode,
+ text:item.schemeName
+ })
+ })
}
},
//确认选择字段
@@ -582,14 +774,21 @@ export default {
this.userInfo.taxResidentId = value.id
} else if (this.pickerType == '6') {
this.userInfo.marriage = value.id
+ this.userInfo.marriageStatus = value.text
} else if (this.pickerType == '7') {
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 == '10') {
+ this.insuredInfo.marriage = value.text
+ this.insuredInfo.marriageStatus = value.text
} else if (this.pickerType == '11') {
this.insuredInfo.idType = value.id
+ } else if (this.pickerType == '12') {
+ this.schemeName = value.text
+ this.schemeCode = value.id
}
},
//证件起始截止日期
@@ -695,6 +894,15 @@ export default {
// this.$refs.birthday.date = ''
// return this.$toast('当前日期早于当日')
// }
+ // console.log(val)
+ // console.log(Date.parse(val))
+ // console.log(new Date())
+ // let str = '',flag='',date='',valArr=val.split('-');
+ // switch (flag){
+ // case 'd':
+ // str = valArr[2]+date
+ // break;
+ // }
}
break
}
@@ -715,8 +923,8 @@ export default {
flag: 'navigation',
extra: {
title: '投被保人信息',
- hiddenRight: '1'
- }
+ hiddenRight: '1',
+ },
})
if (this.selectUser == '0') {
let { customerName, customerSex } = data
@@ -724,19 +932,26 @@ export default {
this.userInfo.sex = customerSex ? customerSex.toString() : '0' //性别
this.userInfo.birthday = data.birthday //出生日期
if (data.customerIdType == 1) {
+ console.log(data)
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) {
- // this.homeName = getAreaName([{ code: data.homeProvince }, { code: data.homeCity }, { code: data.homeArea }]) //家庭地址
- // }
- // this.userInfo.homeAddress = data.homeAddress //家庭详细地址
+ this.userInfo.homeProvince = data.homeProvince //家庭省
+ this.userInfo.homeCity = data.homeCity //家庭市
+ this.userInfo.homeArea = data.homeArea //家庭区
+ if (data.homeProvince && data.homeCity && data.homeArea) {
+ this.userInfo.homeName = getAreaName([{ code: data.homeProvince }, { code: data.homeCity }, { code: data.homeArea }]) //家庭地址
+ }
+ this.userInfo.homeAddress = data.homeAddress //家庭详细地址
+ this.userInfo.occupationCode = data.occupationCode
+ this.userInfo.occupationName = data.occupationName
+ this.userInfo.lifeGrade = data.lifeGrade
+ this.userInfo.healthGrade = data.healthGrade
+ this.userInfo.nativeplace = data.country
+ this.userInfo.marriage = data.marryStatus
// 计算年龄
// let age = utilsAge.getAge(this.userInfo.birthday, new Date())
@@ -772,7 +987,7 @@ export default {
Object.assign(this.insuredInfo, this.userInfo)
}
- this.$validator.validate().then(valid => {
+ this.$validator.validate().then((valid) => {
if (true === valid) {
// localStorage.chooseProductCodesNew = localStorage.chooseProductCodes
//投保人校验
@@ -987,16 +1202,16 @@ export default {
let params = {
orderDTO: {
orderInfoDTO: {
- bnfFlag: '0'
+ bnfFlag: '0',
// cvaliDate: this.cvaliDate
},
appntDTO: {},
insuredDTOs: [
{
- riskDTOLst: this.riskDTOLst
- }
- ]
- }
+ riskDTOLst: this.riskDTOLst,
+ },
+ ],
+ },
}
params.orderDTO.appntDTO = this.userInfo
params.orderDTO.insuredDTOs = [this.insuredInfo]
@@ -1019,7 +1234,7 @@ export default {
standPrem: this.trialList[index] && this.trialList[index].standPrem,
predictTransferPrem: item.predictTransferPrem,
thirdInsuraceNo: this.policyNo,
- mult: this.mult
+ mult: this.mult,
}
if (item.hasPredictTransferPrem && item.hasPredictTransferPrem === '0') {
//增加万能险 预计转入保费校验
@@ -1070,10 +1285,9 @@ export default {
// localStorage.saleInsuredInfo = JSON.stringify(this.userInfo)
// console.log(this.userInfo)
- let orderNo = localStorage.orderNo = resultData.content.object
-
+ let orderNo = (localStorage.orderNo = resultData.content.object)
+
this.underWrite(orderNo)
-
} else {
console.error(resultData.resultMessage)
this.$toast(resultData.resultMessage)
@@ -1088,7 +1302,7 @@ export default {
this.areaShow = false
break
case '2': //家庭地址
- this.homeName = getAreaName(area)
+ this.userInfo.homeName = getAreaName(area)
;[this.userInfo.homeProvince, this.userInfo.homeCity, this.userInfo.homeArea] = [area[0].code, area[1].code, area[2].code]
this.homeShow = false
break
@@ -1147,7 +1361,7 @@ export default {
this.insuredInfo.birthday = idToData(val).birthday
this.insuredInfo.sex = idToData(val).sex
}
- }
+ },
},
// beforeDestroy() {
// //清理计时器
@@ -1166,9 +1380,9 @@ export default {
}
},
immediate: true,
- deep: true
- }
- }
+ deep: true,
+ },
+ },
}
diff --git a/src/views/ebiz/cardList/phoneCode.vue b/src/views/ebiz/cardList/phoneCode.vue
new file mode 100644
index 000000000..0b671f870
--- /dev/null
+++ b/src/views/ebiz/cardList/phoneCode.vue
@@ -0,0 +1,134 @@
+
+
+
+
+
+ {{
+ codeDisabled ? `${countDown}s后重新获取` : '发送验证码'
+ }}
+
+
下一步
+
+
+
+
\ No newline at end of file
diff --git a/src/views/ebiz/cardList/productDetails.vue b/src/views/ebiz/cardList/productDetails.vue
index 21a90f628..09ec4cade 100644
--- a/src/views/ebiz/cardList/productDetails.vue
+++ b/src/views/ebiz/cardList/productDetails.vue
@@ -15,19 +15,19 @@
下一步
- 分享
+ 分享
+