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 +