From 60b13bcffb073f28159b91b38ecd0cc824e1a7f9 Mon Sep 17 00:00:00 2001 From: "bai.jinyan" Date: Tue, 27 Jul 2021 13:45:06 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=93=B6=E8=A1=8C=E5=8D=A1=E7=AD=BE?= =?UTF-8?q?=E7=BA=A6=E9=9C=80=E6=B1=82-=E5=89=8D=E7=AB=AF=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/sale/PayMent.vue | 40 ++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/src/views/ebiz/sale/PayMent.vue b/src/views/ebiz/sale/PayMent.vue index 177bc61f2..4d0601222 100644 --- a/src/views/ebiz/sale/PayMent.vue +++ b/src/views/ebiz/sale/PayMent.vue @@ -409,11 +409,19 @@ export default { }, async checkBankCardSign(){ + // 是否需要签约标识 + let isNeedSignFlag = true; // 1.短期险不需要签约 console.log("是否是长险", this.$CacheUtils.getLocItem('isLongInsuranceFlag')) if (this.$CacheUtils.getLocItem('isLongInsuranceFlag') === 'N') { - return true; + isNeedSignFlag = false; } + const bankCode = JSON.parse(window.localStorage.getItem('underWriteData')).bankCode; + // 1.微信支付方式 2.银行卡支付 且 招商银行卡 需要签约 + if (!((this.radio == '' && ('CMB' == bankCode || '308' == bankCode)) || this.radio == '3')){ + isNeedSignFlag = false; + } + this.$toast.clear() this.$toast.loading({ duration: 0, // 持续展示 toast @@ -423,25 +431,27 @@ export default { }) //校验 let data = { orderNo: this.orderNo } - console.log("orderNo", data) - return new Promise((resolve, reject) => { + return new Promise((resolve) => { + if (!isNeedSignFlag) { + resolve(true) + return + } getBankCardSignState(data).then(checkRes => { if (checkRes.result == '0') { this.$toast.clear() console.log("=========", checkRes) - if (checkRes.signState == '2') { - // 不需签约 或 已签约 不做处理 发起支付 + if (checkRes.signState == '2' || checkRes.needSign == '0') { + // 不需签约 或 已签约 不做处理 可以发起支付 localStorage.removeItem('changeCard') resolve(true); - } else { - const bankCode = JSON.parse(window.localStorage.getItem('underWriteData')).bankCode; + } else if (checkRes.needSign == '1'){ + // 需要签约 const shortUrl = checkRes.shortUrl; - // 招商银行卡 提示去官微签约 - if(checkRes.signState == '1' && checkRes.needSign == '1' && this.radio == '' && ('CMB' == bankCode || '308' == bankCode)){ + if(checkRes.signState == '1'){ + // 需签约 且 未签约 this.bankSignJump(shortUrl) resolve(false); - } - if (checkRes.signState == '4') { + }else if (checkRes.signState == '4') { // 签约中 this.$toast('亲，您的银行卡正在签约中，请稍后再试') resolve(false); @@ -466,12 +476,10 @@ export default { // on cancel resolve(false); }); - } else if (checkRes.signState == '1' && checkRes.needSign == '1' && this.radio == '3') { - // 需签约 且 未签约 - // 提示去签约 - this.bankSignJump(shortUrl) - resolve(false); } + } else { + this.$toast(checkRes.resultMessage) + resolve(false); } }else{ this.$toast(checkRes.resultMessage) From a1ed6c1c59adaf2bca6c39a58c8460eda63027cd Mon Sep 17 00:00:00 2001 From: dwq <15731277156@163.com> Date: Tue, 27 Jul 2021 16:07:50 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E3=80=90=E9=94=80=E7=AE=A1=E4=BA=8C?= =?UTF-8?q?=E6=AC=A1=E4=BC=98=E5=8C=96=E9=9C=80=E6=B1=82=E3=80=91=20=20?= =?UTF-8?q?=E5=AE=B6=E5=BA=AD=E4=BF=A1=E6=81=AF=E5=85=B3=E7=B3=BB=E6=9E=9A?= =?UTF-8?q?=E4=B8=BE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/agentEenter/approve/BasicInfo.vue | 2 +- src/views/ebiz/agentEenter/approve/RecordDetail.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/ebiz/agentEenter/approve/BasicInfo.vue b/src/views/ebiz/agentEenter/approve/BasicInfo.vue index 77b0ae0be..9493cb59f 100644 --- a/src/views/ebiz/agentEenter/approve/BasicInfo.vue +++ b/src/views/ebiz/agentEenter/approve/BasicInfo.vue @@ -330,7 +330,7 @@ export default { } }, familyRelationFilter(val) { - for (let item of dictionary.relationType) { + for (let item of dictionary.agentEenterBasicFamilyRelationType) { if (item.id === val) { return item.text } diff --git a/src/views/ebiz/agentEenter/approve/RecordDetail.vue b/src/views/ebiz/agentEenter/approve/RecordDetail.vue index 13e7e1c2a..e25d69d76 100644 --- a/src/views/ebiz/agentEenter/approve/RecordDetail.vue +++ b/src/views/ebiz/agentEenter/approve/RecordDetail.vue @@ -341,7 +341,7 @@ export default { } }, familyRelationFilter(val) { - for (let item of dictionary.relationType) { + for (let item of dictionary.agentEenterBasicFamilyRelationType) { if (item.id === val) { return item.text } From 81d584eaf72d024c821299a8d4ea9ce714f8fd1c Mon Sep 17 00:00:00 2001 From: dwq <15731277156@163.com> Date: Tue, 27 Jul 2021 16:28:35 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E3=80=90=E9=94=80=E7=AE=A1=E4=BA=8C?= =?UTF-8?q?=E6=AC=A1=E4=BC=98=E5=8C=96=E9=9C=80=E6=B1=82=E3=80=91=20?= =?UTF-8?q?=E5=85=A5=E5=8F=B8=E5=AE=A1=E6=89=B9=E5=BD=B1=E5=83=8F=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=20=E4=B8=8E=E7=94=9F=E4=BA=A7=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E4=B8=8D=E4=B8=80=E6=A0=B7[=E5=86=8D=E6=AC=A1=E4=BF=AE?= =?UTF-8?q?=E6=94=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/agentEenter/approve/BasicInfo.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/ebiz/agentEenter/approve/BasicInfo.vue b/src/views/ebiz/agentEenter/approve/BasicInfo.vue index 9493cb59f..33570a6a6 100644 --- a/src/views/ebiz/agentEenter/approve/BasicInfo.vue +++ b/src/views/ebiz/agentEenter/approve/BasicInfo.vue @@ -270,8 +270,9 @@ export default { } }, handlePhoto(url) { - let index = url.indexOf('images') - return this.$assetsUpUrl + url.substring(index) + //let index = url.indexOf('images') + //return this.$assetsUpUrl + url.substring(index) + return this.$assetsUpUrl + url; }, handlePdf(url) { this.pdfShow = true