From a0d9841298f6f5cbcb9c1afdebc8a22f50389947 Mon Sep 17 00:00:00 2001 From: "liu.xiaofeng@ebiz-digits.com" Date: Fri, 3 Nov 2023 18:32:25 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=A0=A1=E9=AA=8C=E5=81=A5?= =?UTF-8?q?=E5=BA=B7=E9=99=A9=E4=BF=9D=E5=8D=95=E8=B4=B9=E7=94=A8=E8=90=BD?= =?UTF-8?q?=E5=9C=B0=E7=AE=A1=E6=8E=A7=E8=A7=84=E5=88=99=E7=9A=84=E7=94=B3?= =?UTF-8?q?=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/index.js | 46 +++++++++---------- .../cardList/GroupAttachmentManagement.vue | 31 ++++++++++++- src/views/ebiz/cardList/information.vue | 35 ++++++++++++-- 3 files changed, 85 insertions(+), 27 deletions(-) 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/cardList/GroupAttachmentManagement.vue b/src/views/ebiz/cardList/GroupAttachmentManagement.vue index 2c7dcc58b..28d8cc26d 100644 --- a/src/views/ebiz/cardList/GroupAttachmentManagement.vue +++ b/src/views/ebiz/cardList/GroupAttachmentManagement.vue @@ -133,7 +133,7 @@ class="attachmentManagement-next" size="large" :disabled="isDisabled" - @click="next" + @click="appntIsAgent" @touchstart="beforeNext(isDisabled)" v-no-more-click="1000" >立即投保{ + if(res.result == '0') { + if(res.content.isAgengFlag == '0') { + this.$dialog.confirm({ + className: 'dialog-delete', + title: '提示', + message: '投保人/法人同时为代理人，此代理人费用为0。（虚拟账号的提示虚拟代理人费用为0。）请确认提交审核或者退回修改！', + cancelButtonColor: '#E9332E', + confirmButtonColor: '#FFFFFF', + cancelButtonText: '退回' + }) + .then(() => { + this.next() + }) + .catch(() => { + return + }) + } else { + this.next() + } + } else { + this.$toast(res.resultMessage) + } + }) + }, // 点击下一步 next() { diff --git a/src/views/ebiz/cardList/information.vue b/src/views/ebiz/cardList/information.vue index 7d53f4d0d..47ab0facb 100644 --- a/src/views/ebiz/cardList/information.vue +++ b/src/views/ebiz/cardList/information.vue @@ -579,7 +579,7 @@ import CustomerPicker from '@/components/ebiz/customer/CustomerPicker' import DataDictionary from '@/assets/js/utils/data-dictionary' import areaList from '@/assets/js/utils/areaForSale' import { getProductInfo,saveOrUpdateCard,insureTrial } from '@/api/ebiz/cardList/cardList.js' -import { underWrite } from '@/api/ebiz/sale/sale' +import { underWrite, appntIsAgent } from '@/api/ebiz/sale/sale' import utilsAge from '@/assets/js/utils/age' import getAreaName from '@/assets/js/utils/getAreaNameForSale' import IdentityCardScan from '@/components/ebiz/sale/IdentityCardScan' @@ -1097,6 +1097,35 @@ export default { this.areaCode = this.insuredInfo.homeArea } }, + appntIsAgent(orderNo){ + let params = { + orderNo: orderNo + } + appntIsAgent(params).then(res=>{ + if(res.result == '0') { + if(res.content.isAgengFlag == '0') { + this.$dialog.confirm({ + className: 'dialog-delete', + title: '提示', + message: '投保人/法人同时为代理人，此代理人费用为0。（虚拟账号的提示虚拟代理人费用为0。）请确认提交审核或者退回修改！', + cancelButtonColor: '#E9332E', + confirmButtonColor: '#FFFFFF', + cancelButtonText: '退回' + }) + .then(() => { + this.underWrite(orderNo) + }) + .catch(() => { + return + }) + } else { + this.underWrite(orderNo) + } + } else { + this.$toast(res.resultMessage) + } + }) + }, underWrite(orderNo) { let data = { platform: 'app', @@ -2401,8 +2430,8 @@ export default { // console.log(this.userInfo) let orderNo = (localStorage.orderNo = resultData.content.object) - - this.underWrite(orderNo) + this.appntIsAgent(orderNo) + // this.underWrite(orderNo) } else { console.error(resultData.resultMessage) this.$toast(resultData.resultMessage)