diff --git a/src/config/index.js b/src/config/index.js index 31873aeb8..8563bb643 100644 --- a/src/config/index.js +++ b/src/config/index.js @@ -29,29 +29,29 @@ function getSearchString (key) { } return obj[key] } -let apiVersion = 'v2' -var ua = window.navigator.userAgent.toLowerCase() -//通过正则表达式匹配ua中是否含有MicroMessenger字符串, 在微信 -if (localStorage.getItem('apiVersion')) { - apiVersion = localStorage.getItem('apiVersion') -} else { - if (ua.match(/MicroMessenger/i) == 'micromessenger') { - //report/reportList数据报表页面在浏览器可以打开了,但在微信或企业微信中打开不了,接口请求不需要token - if (window.location.href.indexOf('apiVersion') > 0) { - apiVersion = getSearchString('apiVersion') == 'V3' ? 'v3' : 'v2';//url中apiVersion没有时,为v2 - } else { - apiVersion = 'v3' - } - } else { - // 在app - if (navigator.userAgent.indexOf('JZG_') > 0) { - apiVersion = navigator.userAgent.split('JZG_')[1].split('/')[0].split('_')[1] == 'V3' ? 'v3' : 'v2' - } - } - window.localStorage.setItem('apiVersion', apiVersion) -} -// 可以多个接口域名,按需添加 -console.log('环境:', process.env.VUE_APP_FLAG) +let apiVersion = 'v1' +// var ua = window.navigator.userAgent.toLowerCase() +// //通过正则表达式匹配ua中是否含有MicroMessenger字符串, 在微信 +// if (localStorage.getItem('apiVersion')) { +// apiVersion = localStorage.getItem('apiVersion') +// } else { +// if (ua.match(/MicroMessenger/i) == 'micromessenger') { +// //report/reportList数据报表页面在浏览器可以打开了,但在微信或企业微信中打开不了,接口请求不需要token +// if (window.location.href.indexOf('apiVersion') > 0) { +// apiVersion = getSearchString('apiVersion') == 'V3' ? 'v3' : 'v2';//url中apiVersion没有时,为v2 +// } else { +// apiVersion = 'v3' +// } +// } else { +// // 在app +// if (navigator.userAgent.indexOf('JZG_') > 0) { +// apiVersion = navigator.userAgent.split('JZG_')[1].split('/')[0].split('_')[1] == 'V3' ? 'v3' : 'v2' +// } +// } +// window.localStorage.setItem('apiVersion', apiVersion) +// } +// // 可以多个接口域名,按需添加 +// console.log('环境:', process.env.VUE_APP_FLAG) switch (process.env.VUE_APP_FLAG) { case 'dev': apiDomain = 'https://iagentsales-test2.e-guofu.com:5200/api/' + apiVersion // 国富api ///api/v1 diff --git a/src/views/ebiz/sale/InsuredInfo.vue b/src/views/ebiz/sale/InsuredInfo.vue index 4ef134e67..11fd8d5eb 100644 --- a/src/views/ebiz/sale/InsuredInfo.vue +++ b/src/views/ebiz/sale/InsuredInfo.vue @@ -773,8 +773,6 @@ this.isNewPeopleFlagTipshow = true }, workcompanys(list) { - // 单位数据 - console.log(list) this.userWorkcompanys = list }, setCustomerMarriage(marriageCode) { @@ -1606,35 +1604,42 @@ } }, getRelatedData(val, source) { - if (this.userInfo.idType != '1') { + if (this.userInfo.idType != '1' && this.userInfo.idType != '8') { return } - //如果证件校验不通过,恢复默认值 - if (idToData(val).text) { - ;[this.userInfo.idNo, this.userInfo.sex, this.userInfo.birthday, this.effectiveDateTypeAble] = ['', '0', '', false] - return this.$toast(idToData(val).text) - } - // // 判断投保人年龄是否大于16周岁 - // if (idToData(val).age <= 16) { - // ;[this.userInfo.idNo, this.userInfo.sex, this.userInfo.birthday, this.effectiveDateTypeAble] = ['', '0', '', false] - // return this.$toast('亲,投保人年龄必须大于等于16周岁哦~') - // } - - this.userInfo.effectiveDateType = false - this.effectiveDateTypeAble = idToData(val).age <= 45 - this.userInfo.birthday = idToData(val).birthday - this.userInfo.sex = idToData(val).sex - //年龄小于18周岁,工作单位默认值为‘无’ - if (idToData(val).age < 18) { - this.userInfo.workcompany = this.userInfo.workcompany || '无' - } - if (idToData(val).age > 45) { - if (source) { - this.userInfo.effectiveDateType = true + if(this.userInfo.idType == '1'){ + //如果证件校验不通过,恢复默认值 + if (idToData(val).text) { + ;[this.userInfo.idNo, this.userInfo.sex, this.userInfo.birthday, this.effectiveDateTypeAble] = ['', '0', '', false] + return this.$toast(idToData(val).text) } - this.effectiveDateTypeAble = false - } else { - // this.userInfo.effectiveDateType = false + // // 判断投保人年龄是否大于16周岁 + // if (idToData(val).age <= 16) { + // ;[this.userInfo.idNo, this.userInfo.sex, this.userInfo.birthday, this.effectiveDateTypeAble] = ['', '0', '', false] + // return this.$toast('亲,投保人年龄必须大于等于16周岁哦~') + // } + + this.userInfo.effectiveDateType = false + this.effectiveDateTypeAble = idToData(val).age <= 45 + this.userInfo.birthday = idToData(val).birthday + this.userInfo.sex = idToData(val).sex + //年龄小于18周岁,工作单位默认值为‘无’ + if (idToData(val).age < 18) { + this.userInfo.workcompany = this.userInfo.workcompany || '无' + } + if (idToData(val).age > 45) { + if (source) { + this.userInfo.effectiveDateType = true + } + this.effectiveDateTypeAble = false + } else { + // this.userInfo.effectiveDateType = false + } + } + if(this.userInfo.idType == '8'){ + this.userInfo.birthday = idToData(val).birthday + this.userInfo.sex = idToData(val).sex + console.log(this.userInfo.birthday) } }, }, diff --git a/src/views/ebiz/sale/js/verification.js b/src/views/ebiz/sale/js/verification.js index 42748b8b1..affcb0609 100644 --- a/src/views/ebiz/sale/js/verification.js +++ b/src/views/ebiz/sale/js/verification.js @@ -24,6 +24,30 @@ export function idToData(idNo) { text: '您填写的证件号码有误' } } + console.log('12321321321') + let birthday = getBirthById(idNo) + let age = utilsAge.getAge(birthday, new Date()) + let sex = getSexById(idNo) + return { + birthday, + age, + sex + } +} + +//外国人永久居留身份证带出出生日期,性别,年龄 +export function idToData8(idNo) { + //非空 + if (!idNo.trim()) { + return { + text: '证件号码不能为空' + } + } + if (idNo.length != 15 && idNo.length != 18) { + return { + text: '外国人永久居留身份证位数有误' + } + } let birthday = getBirthById(idNo) let age = utilsAge.getAge(birthday, new Date()) let sex = getSexById(idNo)