From ab2ef4179fffac489aa09316859ff28d8334e77f Mon Sep 17 00:00:00 2001 From: "li.yuetong" Date: Fri, 2 Sep 2022 11:09:07 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=85=B3=E4=BA=8E=E9=99=84=E5=8A=A0?= =?UTF-8?q?=E7=BB=BC=E5=90=88=E6=84=8F=E5=A4=96=E4=BC=A4=E5=AE=B3=E4=BF=9D?= =?UTF-8?q?=E9=99=A9=EF=BC=88=E4=B9=90=E4=BA=AB=E7=89=88=EF=BC=89=E6=8A=95?= =?UTF-8?q?=E4=BF=9D=E6=B5=81=E7=A8=8B=E5=A2=9E=E5=8A=A0=E3=80=8A=E4=B8=AA?= =?UTF-8?q?=E4=BA=BA=E4=BF=A1=E6=81=AF=E4=BD=BF=E7=94=A8=E6=8E=88=E6=9D=83?= =?UTF-8?q?=E3=80=8B=E9=98=85=E7=9F=A5=E5=8B=BE=E9=80=89=E7=9A=84=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E3=80=91SignatureOfElectronic=E6=8A=95=E4=BF=9D?= =?UTF-8?q?=E5=8D=95=E5=88=86=E4=BA=AB=E5=88=B0=E5=BE=AE=E4=BF=A1=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/sale/PersonalInformation.vue | 33 +-- src/views/ebiz/sale/SignatureOfElectronic.vue | 208 ++++++++---------- 2 files changed, 88 insertions(+), 153 deletions(-) diff --git a/src/views/ebiz/sale/PersonalInformation.vue b/src/views/ebiz/sale/PersonalInformation.vue index a55e8b0de..37e2d41a0 100644 --- a/src/views/ebiz/sale/PersonalInformation.vue +++ b/src/views/ebiz/sale/PersonalInformation.vue @@ -45,28 +45,10 @@ export default { productCode: localStorage.productCode, //获取产品编号 protocol: false, activeType: '', - isFrom:'', pdfUrl: '', - src: location.origin + '/pdfjs/web/viewer.html?file=', - cvalidateStr:'', //活动生效日 - cvalidateStrToFormat:'',//活动生效日--格式化年月日 - cvalidateStrOneDayOff:''//活动生效日--格式化年月日并减少一天 + src: location.origin + '/pdfjs/web/viewer.html?file=' } }, - // computed: { - // cvalidateStrToFormat() { - // console.log(this.cvalidateStr,'computed') - // return utils.formatDate(new Date('2021-07-01'), 'yyyy年MM月dd日') - // }, - // cvalidateStrOneDayOff() { - // console.log(this.cvalidateStr,'computed1') - // let date = new Date(this.cvalidateStr) - // let dateTime - // dateTime=date.setDate(date.getDate()-1); - // dateTime=utils.formatDate(new Date(dateTime), 'yyyy年MM月dd日'); - // return dateTime - // } - // }, components: { [RadioGroup.name]: RadioGroup, [Radio.name]: Radio, @@ -105,18 +87,6 @@ export default { }, methods: { async init(){ - this.isFrom = window.localStorage.isFrom - const orderNo = this.$CacheUtils.getLocItem('orderNo') - let detailPromise = this.isFrom === 'proposal' ? localStorage.proposalMedical : await getOrderDetail({ orderNo }) - if(this.isFrom != 'proposal'){ - //活动生效日期 - this.cvalidateStr = detailPromise.orderDTO.orderInfoDTO.cvaliDate - } - this.cvalidateStrToFormat = utils.formatDate(new Date(this.cvalidateStr), 'yyyy年MM月dd日') - let date = new Date(this.cvalidateStr) - let dateTime - dateTime=date.setDate(date.getDate()-1); - this.cvalidateStrOneDayOff = utils.formatDate(new Date(dateTime), 'yyyy年MM月dd日'); this.getOrderDetail() }, timeOut() { @@ -287,6 +257,7 @@ export default { }) } } else { + //在app let that = this this.$toast.loading({ duration: 0, // 持续展示 toast diff --git a/src/views/ebiz/sale/SignatureOfElectronic.vue b/src/views/ebiz/sale/SignatureOfElectronic.vue index f082238de..700102ac3 100644 --- a/src/views/ebiz/sale/SignatureOfElectronic.vue +++ b/src/views/ebiz/sale/SignatureOfElectronic.vue @@ -436,70 +436,52 @@ export default { if (res.result == '0') { this.$toast.clear() window.localStorage.setItem('jumpFromSign', '1') + let url + if(this.isPersonalInformation != '-1'){ + url= '/sale/PersonalInformation' + }else{ + url= '/sale/signatureConfirmation' + } if (this.isWeixin) { localStorage.removeItem('signInfo') - if(this.isPersonalInformation != '-1'){ - this.$jump({ - flag: 'h5', - extra: { - url: location.origin + '/#/sale/PersonalInformation', - pullRefresh: '1', - backToFirst: '1' - }, - routerInfo: { - path: - '/sale/PersonalInformation?orderNo=' + - localStorage.orderNo + - '&token=' + - localStorage.token + - '&saleInsuredInfo=' + - this.$CacheUtils.getLocItem('saleInsuredInfo') + - '&saleInsuredPersonInfo=' + - this.$CacheUtils.getLocItem('saleInsuredPersonInfo') + - '&relationToAppnt=' + - JSON.parse(this.$CacheUtils.getLocItem('saleInsuredPersonInfo')).relationToAppnt + - '&attachmentShow=' + - window.localStorage.getItem('attachmentShow') + - '&signInvalid=' + - sessionStorage.getItem('signInvalid') + - '&airSign=1' - } - }) - }else{ - this.$jump({ - flag: 'h5', - extra: { - url: location.origin + '/#/sale/signatureConfirmation' - }, - routerInfo: { - path: '/sale/signatureConfirmation' - } - }) - } + this.$jump({ + flag: 'h5', + extra: { + url: location.origin + '/#'+ url, + pullRefresh: '1', + backToFirst: '1' + }, + routerInfo: { + path: + url +'?orderNo=' + + localStorage.orderNo + + '&token=' + + localStorage.token + + '&saleInsuredInfo=' + + this.$CacheUtils.getLocItem('saleInsuredInfo') + + '&saleInsuredPersonInfo=' + + this.$CacheUtils.getLocItem('saleInsuredPersonInfo') + + '&relationToAppnt=' + + JSON.parse(this.$CacheUtils.getLocItem('saleInsuredPersonInfo')).relationToAppnt + + '&attachmentShow=' + + window.localStorage.getItem('attachmentShow') + + '&signInvalid=' + + sessionStorage.getItem('signInvalid') + + '&airSign=1' + } + }) } else { - if(this.isPersonalInformation != '-1'){ - this.$jump({ - flag: 'h5', - extra: { - url: location.origin + '/#/sale/PersonalInformation', - pullRefresh: '1', - backToFirst: '1' - }, - routerInfo: { - path: '/sale/PersonalInformation' - } - }) - }else{ - this.$jump({ - flag: 'h5', - extra: { - url: location.origin + '/#/sale/signatureConfirmation' - }, - routerInfo: { - path: '/sale/signatureConfirmation' - } - }) - } + this.$jump({ + flag: 'h5', + extra: { + url: location.origin + '/#' + url, + pullRefresh: '1', + backToFirst: '1' + }, + routerInfo: { + path: url + } + }) } } else { that.$toast(res.resultMessage) @@ -531,70 +513,52 @@ export default { if (res.result == '0') { this.$toast.clear() window.localStorage.setItem('jumpFromSign', '1') + let url + if(this.isPersonalInformation != '-1'){ + url= '/sale/PersonalInformation' + }else{ + url= '/sale/signatureConfirmation' + } if (this.isWeixin) { localStorage.removeItem('signInfo') - if(this.isPersonalInformation != '-1'){ - this.$jump({ - flag: 'h5', - extra: { - url: location.origin + '/#/sale/PersonalInformation', - pullRefresh: '1', - backToFirst: '1' - }, - routerInfo: { - path: - '/sale/PersonalInformation?orderNo=' + - localStorage.orderNo + - '&token=' + - localStorage.token + - '&saleInsuredInfo=' + - this.$CacheUtils.getLocItem('saleInsuredInfo') + - '&saleInsuredPersonInfo=' + - this.$CacheUtils.getLocItem('saleInsuredPersonInfo') + - '&relationToAppnt=' + - JSON.parse(this.$CacheUtils.getLocItem('saleInsuredPersonInfo')).relationToAppnt + - '&attachmentShow=' + - window.localStorage.getItem('attachmentShow') + - '&signInvalid=' + - sessionStorage.getItem('signInvalid') + - '&airSign=1' - } - }) - }else{ - this.$jump({ - flag: 'h5', - extra: { - url: location.origin + '/#/sale/signatureConfirmation' - }, - routerInfo: { - path: '/sale/signatureConfirmation' - } - }) - } + this.$jump({ + flag: 'h5', + extra: { + url: location.origin + '/#'+ url, + pullRefresh: '1', + backToFirst: '1' + }, + routerInfo: { + path: + url + + localStorage.orderNo + + '&token=' + + localStorage.token + + '&saleInsuredInfo=' + + this.$CacheUtils.getLocItem('saleInsuredInfo') + + '&saleInsuredPersonInfo=' + + this.$CacheUtils.getLocItem('saleInsuredPersonInfo') + + '&relationToAppnt=' + + JSON.parse(this.$CacheUtils.getLocItem('saleInsuredPersonInfo')).relationToAppnt + + '&attachmentShow=' + + window.localStorage.getItem('attachmentShow') + + '&signInvalid=' + + sessionStorage.getItem('signInvalid') + + '&airSign=1' + } + }) } else { - if(this.isPersonalInformation != '-1'){ - this.$jump({ - flag: 'h5', - extra: { - url: location.origin + '/#/sale/PersonalInformation', - pullRefresh: '1', - backToFirst: '1' - }, - routerInfo: { - path: '/sale/PersonalInformation' - } - }) - }else{ - this.$jump({ - flag: 'h5', - extra: { - url: location.origin + '/#/sale/signatureConfirmation' - }, - routerInfo: { - path: '/sale/signatureConfirmation' - } - }) - } + this.$jump({ + flag: 'h5', + extra: { + url: location.origin + '/#'+ url, + pullRefresh: '1', + backToFirst: '1' + }, + routerInfo: { + path: url + } + }) } } else { that.$toast(res.resultMessage)