From 9be9b99abf7d2c7cf14be45a89d2d44784b3ccd6 Mon Sep 17 00:00:00 2001 From: lyt Date: Tue, 4 Apr 2023 15:29:01 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=BB=BA=E8=AE=AE=E4=B9=A6=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E9=9C=80=E6=B1=82=E3=80=91=E5=8E=9F=E7=94=9F=E6=96=B9?= =?UTF-8?q?=E6=B3=95jump=E8=B7=B3=E8=BD=AC=E6=94=B9=E4=B8=BA=E9=87=87?= =?UTF-8?q?=E7=94=A8VUE=E7=9A=84router=E8=B7=AF=E7=94=B1=E8=B7=B3=E8=BD=AC?= =?UTF-8?q?=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/index.js | 42 +++++----- src/router/ebiz/proposal.js | 3 +- src/views/ebiz/common/CalculatePremium.vue | 1 + src/views/ebiz/common/MainRiskList.vue | 19 ++--- src/views/ebiz/common/SelectedProduct.vue | 58 +++++++------- src/views/ebiz/proposal/Appnt.vue | 38 ++++----- .../ebiz/proposal/ChooseInsuredPerson.vue | 78 ++++++++++--------- src/views/ebiz/proposal/Exhibition.vue | 38 ++++----- src/views/ebiz/proposal/InsuredPerson.vue | 19 ++--- src/views/ebiz/proposal/List.vue | 59 +++++++------- src/views/ebiz/proposal/ProposalInfo.vue | 59 +++++++------- 11 files changed, 217 insertions(+), 197 deletions(-) diff --git a/src/config/index.js b/src/config/index.js index 1d80d7f05..cb8c296d6 100644 --- a/src/config/index.js +++ b/src/config/index.js @@ -27,27 +27,27 @@ 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) -} +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) { diff --git a/src/router/ebiz/proposal.js b/src/router/ebiz/proposal.js index 320001cc4..21ad89c3a 100644 --- a/src/router/ebiz/proposal.js +++ b/src/router/ebiz/proposal.js @@ -86,7 +86,8 @@ export default [ name: 'caluePdf', component: caluePdf, meta: { - title: '条款PDF查看' + //条款PDF查看 + title: '条款' } }, { diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue index 9a253e230..9bcdc1cb3 100644 --- a/src/views/ebiz/common/CalculatePremium.vue +++ b/src/views/ebiz/common/CalculatePremium.vue @@ -2351,6 +2351,7 @@ export default { } else if (this.$route.query.proposalOrderNo) { thismyurl = '?proposalOrderNo=' + this.$route.query.proposalOrderNo } + this.$router.push({ path: '/common/addRiskList' + yurl }) this.$jump({ flag: 'h5', extra: { diff --git a/src/views/ebiz/common/MainRiskList.vue b/src/views/ebiz/common/MainRiskList.vue index 7e3aee2e0..c52f7317e 100644 --- a/src/views/ebiz/common/MainRiskList.vue +++ b/src/views/ebiz/common/MainRiskList.vue @@ -536,15 +536,16 @@ export default { } else if (this.$route.query.proposalOrderNo) { thismyurl = '?proposalOrderNo=' + this.$route.query.proposalOrderNo } - this.$jump({ - flag: 'h5', - extra: { - url: location.origin + '/#/common/calculatePremium' + thismyurl - }, - routerInfo: { - path: '/common/calculatePremium' + thismyurl - } - }) + this.$router.push({ path: '/common/calculatePremium' + thismyurl }) + // this.$jump({ + // flag: 'h5', + // extra: { + // url: location.origin + '/#/common/calculatePremium' + // }, + // routerInfo: { + // path: '/common/calculatePremium' + // } + // }) } } } diff --git a/src/views/ebiz/common/SelectedProduct.vue b/src/views/ebiz/common/SelectedProduct.vue index 16e60fcc1..332e57d74 100644 --- a/src/views/ebiz/common/SelectedProduct.vue +++ b/src/views/ebiz/common/SelectedProduct.vue @@ -483,16 +483,16 @@ export default { url = `/proposal/chooseInsuredPerson?proposalOrderNo=${proposalOrderNo}` } let page = this.$route.query.proposalEdit == '1' ? '-1' : '-2' - - this.$jump({ - flag: 'h5', - extra: { - url: location.origin + `/#${url}` - }, - routerInfo: { - path: url - } - }) + this.$router.push({ path: url }) + // this.$jump({ + // flag: 'h5', + // extra: { + // url: location.origin + `/#${url}` + // }, + // routerInfo: { + // path: url + // } + // }) } else { let showFlag = this.showTipForDoubleRecord() if (showFlag) { @@ -575,15 +575,16 @@ export default { } else if (this.$route.query.proposalOrderNo) { thismyurl = '?proposalOrderNo=' + this.$route.query.proposalOrderNo } - this.$jump({ - flag: 'h5', - extra: { - url: location.origin + '/#/common/mainRiskList' + thismyurl - }, - routerInfo: { - path: '/common/mainRiskList' + thismyurl - } - }) + this.$router.push({ path: '/common/mainRiskList' + thismyurl }) + // this.$jump({ + // flag: 'h5', + // extra: { + // url: location.origin + '/#/common/mainRiskList' + // }, + // routerInfo: { + // path: '/common/mainRiskList' + // } + // }) }, //选择活动还是普通产品，弹框确认按钮 comfirmCheckActive(type) { @@ -628,15 +629,16 @@ export default { } else if (this.$route.query.proposalOrderNo) { thismyurl = '?proposalOrderNo=' + this.$route.query.proposalOrderNo } - this.$jump({ - flag: 'h5', - extra: { - url: location.origin + '/#/common/mainRiskList' + thismyurl - }, - routerInfo: { - path: '/common/mainRiskList' + thismyurl - } - }) + this.$router.push({ path: '/common/mainRiskList' + thismyurl }) + // this.$jump({ + // flag: 'h5', + // extra: { + // url: location.origin + '/#/common/mainRiskList' + // }, + // routerInfo: { + // path: '/common/mainRiskList' + // } + // }) } else { this.$toast(res.resultMessage) } diff --git a/src/views/ebiz/proposal/Appnt.vue b/src/views/ebiz/proposal/Appnt.vue index 34bd8f7ed..bd3a17564 100644 --- a/src/views/ebiz/proposal/Appnt.vue +++ b/src/views/ebiz/proposal/Appnt.vue @@ -125,16 +125,17 @@ export default { } }, stepIn() { - this.$jump({ - flag: 'h5', - extra: { - url: location.origin + '/#/proposal/appnt', - needRefresh: '1' - }, - routerInfo: { - path: '/proposal/appnt' - } - }) + this.$router.push({ path: '/proposal/appnt' }) + // this.$jump({ + // flag: 'h5', + // extra: { + // url: location.origin + '/#/proposal/appnt', + // needRefresh: '1' + // }, + // routerInfo: { + // path: '/proposal/appnt' + // } + // }) }, init() { // 筛选按钮的点击事件 @@ -257,14 +258,15 @@ export default { if (this.appntDTO.socialSecurity) { localStorage.orderNoSocialSecurity = this.appntDTO.socialSecurity } - this.$jump({ - flag: 'h5', - extra: { - url: location.origin + `/#${url}`, - needRefresh: '1' - }, - routerInfo: { path: url } - }) + this.$router.push({ path: url }) + // this.$jump({ + // flag: 'h5', + // extra: { + // url: location.origin + `/#${url}`, + // needRefresh: '1' + // }, + // routerInfo: { path: url } + // }) } else { this.$toast(res.resultMessage) } diff --git a/src/views/ebiz/proposal/ChooseInsuredPerson.vue b/src/views/ebiz/proposal/ChooseInsuredPerson.vue index 7166623ae..66f9e4920 100644 --- a/src/views/ebiz/proposal/ChooseInsuredPerson.vue +++ b/src/views/ebiz/proposal/ChooseInsuredPerson.vue @@ -174,16 +174,17 @@ export default { }, methods: { stepIn() { - this.$jump({ - flag: 'h5', - extra: { - url: location.origin + '/#/proposal/appnt', - needRefresh: '1' - }, - routerInfo: { - path: '/proposal/appnt' - } - }) + this.$router.push({ path: '/proposal/appnt' }) + // this.$jump({ + // flag: 'h5', + // extra: { + // url: location.origin + '/#/proposal/appnt', + // needRefresh: '1' + // }, + // routerInfo: { + // path: '/proposal/appnt' + // } + // }) }, //生成建议书 produceProposal() { @@ -222,16 +223,17 @@ export default { if (res.result == '0') { this.$CacheUtils.setLocItem('proposalNo', res.content.orderNo) let url = `/proposal/proposalInfo?proposalOrderNo=${res.content.orderNo}` + this.$router.push({ path: url }) //调用保存接口 - this.$jump({ - flag: 'h5', - extra: { - url: location.origin + `/#${url}` - }, - routerInfo: { - path: url - } - }) + // this.$jump({ + // flag: 'h5', + // extra: { + // url: location.origin + `/#${url}` + // }, + // routerInfo: { + // path: url + // } + // }) }else{ this.$toast(res.resultMessage) return @@ -349,15 +351,16 @@ export default { localStorage.chooseProductCodes = '' //置空所选险种 let url = `/proposal/insuredPerson?proposalOrderNo=${this.proposalOrderNo}` - this.$jump({ - flag: 'h5', - extra: { - url: location.origin + `/#${url}` - }, - routerInfo: { - path: url - } - }) + this.$router.push({ path: url }) + // this.$jump({ + // flag: 'h5', + // extra: { + // url: location.origin + `/#${url}` + // }, + // routerInfo: { + // path: url + // } + // }) }, //编辑被保险人 edit(item) { @@ -366,15 +369,16 @@ export default { this.$CacheUtils.setLocItem('saleInsuredPersonInfo', JSON.stringify(item)) //存储被保险人信息 localStorage.isFrom = 'proposal' let url = `/common/selectedProduct?proposalEdit=1&proposalOrderNo=${item.orderNo}` - this.$jump({ - flag: 'h5', - extra: { - url: location.origin + `/#${url}` - }, - routerInfo: { - path: url - } - }) + this.$router.push({ path: url }) + // this.$jump({ + // flag: 'h5', + // extra: { + // url: location.origin + `/#${url}` + // }, + // routerInfo: { + // path: url + // } + // }) }, //添加被保险人 添加一个没有险种的被保险人 addPerson(item) { diff --git a/src/views/ebiz/proposal/Exhibition.vue b/src/views/ebiz/proposal/Exhibition.vue index 83498e6eb..fb678a5da 100644 --- a/src/views/ebiz/proposal/Exhibition.vue +++ b/src/views/ebiz/proposal/Exhibition.vue @@ -482,27 +482,29 @@ export default { }, // 跳转到公司介绍 goToCompanyProfile() { - this.$jump({ - flag: 'h5', - extra: { - url: location.origin + '/#/proposal/companyProfile' - }, - routerInfo: { - path: '/proposal/companyProfile' - } - }) + this.$router.push({ path: '/proposal/companyProfile' }) + // this.$jump({ + // flag: 'h5', + // extra: { + // url: location.origin + '/#/proposal/companyProfile' + // }, + // routerInfo: { + // path: '/proposal/companyProfile' + // } + // }) }, //跳转到pdf 进入建议书后 根据建议书编码来查找相应的pdf async goPDF() { - this.$jump({ - flag: 'h5', - extra: { - url: location.origin + '/#/proposal/pdf' - }, - routerInfo: { - path: '/proposal/pdf' - } - }) + this.$router.push({ path: '/proposal/pdf' }) + // this.$jump({ + // flag: 'h5', + // extra: { + // url: location.origin + '/#/proposal/pdf' + // }, + // routerInfo: { + // path: '/proposal/pdf' + // } + // }) // let params = { // proposalInfoDTO: { diff --git a/src/views/ebiz/proposal/InsuredPerson.vue b/src/views/ebiz/proposal/InsuredPerson.vue index e2ef5c568..85d842039 100644 --- a/src/views/ebiz/proposal/InsuredPerson.vue +++ b/src/views/ebiz/proposal/InsuredPerson.vue @@ -317,15 +317,16 @@ export default { insuredInfo = Object.assign(cacheInfo, this.insured) this.$CacheUtils.setLocItem('saleInsuredPersonInfo', JSON.stringify(insuredInfo)) let url = `/common/selectedProduct?proposalOrderNo=${proposalOrderNo}` - this.$jump({ - flag: 'h5', - extra: { - url: location.origin + `/#${url}` - }, - routerInfo: { - path: url - } - }) + this.$router.push({ path: url }) + // this.$jump({ + // flag: 'h5', + // extra: { + // url: location.origin + `/#${url}` + // }, + // routerInfo: { + // path: url + // } + // }) }, //选择客户列表中的客户 chooseCustomer(data) { diff --git a/src/views/ebiz/proposal/List.vue b/src/views/ebiz/proposal/List.vue index d9893f829..ad2adf4b7 100644 --- a/src/views/ebiz/proposal/List.vue +++ b/src/views/ebiz/proposal/List.vue @@ -234,15 +234,16 @@ export default { }, //点我新增 addProposal() { - this.$jump({ - flag: 'h5', - extra: { - url: location.origin + '/#/proposal/appnt' - }, - routerInfo: { - path: '/proposal/appnt' - } - }) + // this.$jump({ + // flag: 'h5', + // extra: { + // url: location.origin + '/#/proposal/appnt' + // }, + // routerInfo: { + // path: '/proposal/appnt' + // } + // }) + this.$router.push({ path: '/proposal/appnt' }) }, //编辑 edit(item) { @@ -250,16 +251,17 @@ export default { this.$CacheUtils.setLocItem('proposalNo', item.orderInfoDTO.orderNo) this.$CacheUtils.setLocItem('canMoveOn', 1) let url = `/proposal/chooseInsuredPerson?proposalOrderNo=${item.orderInfoDTO.orderNo}` - this.$jump({ - flag: 'h5', - extra: { - url: location.origin + `/#${url}`, - needRefresh: '1' - }, - routerInfo: { - path: url - } - }) + this.$router.push({ path: url }) + // this.$jump({ + // flag: 'h5', + // extra: { + // url: location.origin + `/#${url}`, + // needRefresh: '1' + // }, + // routerInfo: { + // path: url + // } + // }) }, //预览 跳转至利益演示 preview(item) { @@ -268,15 +270,16 @@ export default { //新增 解决直接点击预览报错问题 localStorage.mainRiskCode = item.insuredDTOs[0].mainRisk[0].mainRiskCode let url = `/proposal/proposalInfo?proposalOrderNo=${item.orderInfoDTO.orderNo}` - this.$jump({ - flag: 'h5', - extra: { - url: location.origin + `/#${url}`, - }, - routerInfo: { - path: url - } - }) + this.$router.push({ path: url }) + // this.$jump({ + // flag: 'h5', + // extra: { + // url: location.origin + `/#${url}`, + // }, + // routerInfo: { + // path: url + // } + // }) }, //转投保 async toInsurance(item) { diff --git a/src/views/ebiz/proposal/ProposalInfo.vue b/src/views/ebiz/proposal/ProposalInfo.vue index 688969db6..b43c276bc 100644 --- a/src/views/ebiz/proposal/ProposalInfo.vue +++ b/src/views/ebiz/proposal/ProposalInfo.vue @@ -849,41 +849,44 @@ export default { }, // 跳转到公司介绍 goToCompanyProfile() { - this.$jump({ - flag: 'h5', - extra: { - url: location.origin + '/#/proposal/companyProfile' - }, - routerInfo: { - path: '/proposal/companyProfile' - } - }) + this.$router.push({ path: '/proposal/companyProfile' }) + // this.$jump({ + // flag: 'h5', + // extra: { + // url: location.origin + '/#/proposal/companyProfile' + // }, + // routerInfo: { + // path: '/proposal/companyProfile' + // } + // }) }, //跳转到pdf 进入建议书后 根据建议书编码来查找相应的pdf async goPDF() { - this.$jump({ - flag: 'h5', - extra: { - url: location.origin + '/#/proposal/pdf' - }, - routerInfo: { - path: '/proposal/pdf' - } - }) + this.$router.push({ path: '/proposal/pdf' }) + // this.$jump({ + // flag: 'h5', + // extra: { + // url: location.origin + '/#/proposal/pdf' + // }, + // routerInfo: { + // path: '/proposal/pdf' + // } + // }) }, // 条款PDF async goCaluePDF(riskItem) { localStorage.showCaluePDFUrl = riskItem.url - this.$jump({ - flag: 'h5', - extra: { - url: location.origin + '/#/proposal/caluePdf?', - title: '条款' - }, - routerInfo: { - path: '/proposal/caluePdf' - } - }) + this.$router.push({ path: 'proposal/caluePdf' }) + // this.$jump({ + // flag: 'h5', + // extra: { + // url: location.origin + '/#/proposal/caluePdf?', + // title: '条款' + // }, + // routerInfo: { + // path: '/proposal/caluePdf' + // } + // }) }, //写成标准的方法(数组是object的一种)： getObjectKeys(object) {