From 12685997de37901f19d70d357d59ec4ee425e14a Mon Sep 17 00:00:00 2001 From: "tian.guangyuan" Date: Tue, 28 Apr 2020 14:35:54 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E3=80=90fix=E3=80=91=20=E6=88=91=E7=9A=84?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=8A=95=E4=BF=9D?= =?UTF-8?q?=E5=8D=95=E5=8F=B7=E3=80=81=E8=AE=A2=E5=8D=95=E5=8F=B7=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E3=80=82=E6=8A=95=E4=BF=9D=E6=B5=81=E7=A8=8B=E4=B8=AD?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E9=82=AE=E7=AE=B1=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/cardList/CardTotreasure.vue | 6 +++++- src/views/ebiz/cardList/Pay.vue | 3 ++- src/views/ebiz/cardList/information.vue | 8 ++++---- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/views/ebiz/cardList/CardTotreasure.vue b/src/views/ebiz/cardList/CardTotreasure.vue index f1f815949..a1158a0a6 100644 --- a/src/views/ebiz/cardList/CardTotreasure.vue +++ b/src/views/ebiz/cardList/CardTotreasure.vue @@ -43,7 +43,10 @@
{{ orderItem.riskName }}
- 投保单号：{{ orderItem.orderNo }} + 投保单号：{{ orderItem.prtNo }} +
+
+ 订单号：{{ orderItem.orderNo }}
投保人：{{ orderItem.appantName }} @@ -279,6 +282,7 @@ export default { orderObj = { riskName: orderItem.insuredDTOs[0].riskDTOLst[0].riskName, orderNo: orderItem.orderInfoDTO.orderNo, + prtNo: orderItem.orderInfoDTO.prtNo, appantName: orderItem.appntDTO.name, insuredName: orderItem.insuredDTOs[0].name, orderStatus: orderItem.orderInfoDTO.orderStatus diff --git a/src/views/ebiz/cardList/Pay.vue b/src/views/ebiz/cardList/Pay.vue index be6b66fdf..208f5a9e4 100644 --- a/src/views/ebiz/cardList/Pay.vue +++ b/src/views/ebiz/cardList/Pay.vue @@ -21,7 +21,7 @@ v-model="underWriteData.name" label="姓名" name="姓名" - :readonly="orderStatus != '56'" + readonly placeholder="请输入" v-validate="'required|name'" maxlength="6" @@ -425,6 +425,7 @@ export default { switch (this.orderStatus) { case '56': + case '57': this.payMent() break case '02': diff --git a/src/views/ebiz/cardList/information.vue b/src/views/ebiz/cardList/information.vue index 6ff472aa2..cbec4b5a0 100644 --- a/src/views/ebiz/cardList/information.vue +++ b/src/views/ebiz/cardList/information.vue @@ -63,9 +63,9 @@ v-validate="'required|mobile'" maxlength="11" /> +
- + @@ -28,13 +25,25 @@
- +
+ {{ resMessage }} +
+ + +
返回首页 @@ -136,22 +145,22 @@ export default { this.$toast(res.resultMessage) } }) + }, + // 重新支付 + rePayMent() { + // localStorage.orderNo = order.orderInfoDTO.orderNo + // 重新支付 salelist为 0 + // localStorage.salelist = '0' + this.$jump({ + flag: 'h5', + extra: { + url: location.origin + '/#/cardList/pay' + }, + routerInfo: { + path: '/cardList/pay' + } + }) } - // // 重新支付 - // rePayMent() { - // // localStorage.orderNo = order.orderInfoDTO.orderNo - // // 再次支付 salelist为 0 - // localStorage.salelist = '0' - // this.$jump({ - // flag: 'h5', - // extra: { - // url: location.origin + '/#/sale/payMent' - // }, - // routerInfo: { - // path: '/sale/payMent' - // } - // }) - // } }, created() { setTimeout(() => { From eec20d7e3f177ae977c1bc3dc4f6a4a2d3f50897 Mon Sep 17 00:00:00 2001 From: "tian.guangyuan" Date: Tue, 28 Apr 2020 17:39:03 +0800 Subject: [PATCH 3/8] =?UTF-8?q?[FIX]=20=E4=BF=AE=E6=94=B9=20pdf=20?= =?UTF-8?q?=E7=9A=84=20url=E5=9C=B0=E5=9D=80=EF=BC=8C=E5=B0=86=E5=86=99?= =?UTF-8?q?=E6=AD=BB=E6=94=B9=E4=B8=BA=E4=BC=9A=E9=9A=8F=20=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=20=E5=8F=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/cardList/Pay.vue | 1 - src/views/ebiz/cardList/information.vue | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/views/ebiz/cardList/Pay.vue b/src/views/ebiz/cardList/Pay.vue index 208f5a9e4..6b6f10ef3 100644 --- a/src/views/ebiz/cardList/Pay.vue +++ b/src/views/ebiz/cardList/Pay.vue @@ -433,7 +433,6 @@ export default { break default: return this.$toast('当前不可支付') - break } }, acceptInsurance() { diff --git a/src/views/ebiz/cardList/information.vue b/src/views/ebiz/cardList/information.vue index cbec4b5a0..3d0479d27 100644 --- a/src/views/ebiz/cardList/information.vue +++ b/src/views/ebiz/cardList/information.vue @@ -213,10 +213,10 @@ 本人已仔细阅读并了解 - 《投保须知》 - 《投保声明》 + 《投保须知》 + 《投保声明》 和 - 《国富人寿综合交通工具意外伤害保险（2020版）条款》 等内容，自愿为被保险人投保本保险。
From caacb5672ccbba544249205f4b0fe9c6a142301a Mon Sep 17 00:00:00 2001 From: "tian.guangyuan" Date: Wed, 29 Apr 2020 14:13:24 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E3=80=90fix=E3=80=91=20=E5=8D=A1=E5=8D=95?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=A2=9E=E5=8A=A0=E6=8D=A2=E5=8D=A1=E6=94=AF?= =?UTF-8?q?=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/ebiz/cardList/cardList.js | 9 ++ src/views/ebiz/cardList/Pay.vue | 115 ++++++++++++++++++-------- src/views/ebiz/cardList/PayResult.vue | 12 +-- 3 files changed, 96 insertions(+), 40 deletions(-) diff --git a/src/api/ebiz/cardList/cardList.js b/src/api/ebiz/cardList/cardList.js index 4fdf38588..e950a5f92 100644 --- a/src/api/ebiz/cardList/cardList.js +++ b/src/api/ebiz/cardList/cardList.js @@ -74,3 +74,12 @@ export function getOrderList(data) { data }) } + +// 获取订单支付状态 +export function getPayTemp(data) { + return request({ + url: getUrl('/sale/insure/getPayTemp', 1), + method: 'post', + data + }) +} diff --git a/src/views/ebiz/cardList/Pay.vue b/src/views/ebiz/cardList/Pay.vue index 6b6f10ef3..172ccef88 100644 --- a/src/views/ebiz/cardList/Pay.vue +++ b/src/views/ebiz/cardList/Pay.vue @@ -28,32 +28,62 @@ clearable required /> - - 银行卡扫描 - - + + + + @@ -115,7 +145,7 @@ Vue.use(Checkbox).use(CheckboxGroup) Vue.use(Field) Vue.use(Button) import { acceptInsurance, getBankList, underWrite, getOrderDetail } from '@/api/ebiz/sale/sale' -import { saveOrUpdateAccount } from '@/api/ebiz/cardList/cardList.js' +import { saveOrUpdateAccount, getPayTemp } from '@/api/ebiz/cardList/cardList.js' import BankCardScan from '@/components/ebiz/sale/BankCardScan' import config from '@/config' export default { @@ -188,7 +218,8 @@ export default { tradeState: '' // 状态 }, gotPayParam: false, // 是否已正确获取支付参数, - payStatus: '' // 接口返回的支付状态 + payStatus: '' ,// 接口返回的支付状态 + noEdit: true } }, created() {}, @@ -216,6 +247,8 @@ export default { // } else { // 再次支付 调详情 获取信息 this.getOrderDetail() + + this.getPayTemp() // this.underWriteData = JSON.parse(window.localStorage.getItem('underWriteData')) // } // console.log('--自核结果--支付信息：', JSON.stringify(this.underWriteData)) @@ -319,9 +352,9 @@ export default { }, // 获取银行列表的focus focus() { - if (this.orderStatus == '56') { + // if (this.orderStatus == '56') { this.show = true - } + // } }, // 获取银行卡列表 getBankList() { @@ -345,6 +378,16 @@ export default { this.underWriteData.bankName = bankCode this.show = false }, + getPayTemp(){ + getPayTemp({ orderNo: window.localStorage.getItem('orderNo') }) + .then(res => { + if (res.result == '0') { + this.noEdit = res.content.flag != 'false' + } + }).catch( e=>{ + console.error(e); + } ) + }, // 再次支付 getOrderDetail() { getOrderDetail({ orderNo: window.localStorage.getItem('orderNo') }).then(res => { @@ -422,16 +465,20 @@ export default { console.log(this.$validator) return this.$toast(this.$validator.errors.all()[0]) } + + if(this.noEdit){ + this.acceptInsurance() + } switch (this.orderStatus) { case '56': case '57': this.payMent() break - case '02': - this.acceptInsurance() - break + // case '02': + // break default: + this.acceptInsurance() return this.$toast('当前不可支付') } }, @@ -472,7 +519,7 @@ export default { localStorage['cardList-detail'] = JSON.stringify(this.underWriteData) let thisRef = this this.$nextTick(() => { - thisRef.$refs.payForm.submit() // 表单提交，发起支付，跳至收银台 + // thisRef.$refs.payForm.submit() // 表单提交，发起支付，跳至收银台 setTimeout(() => { // eslint-disable-next-line no-undef EWebBridge.webCallAppInJs('webview_left_button', { diff --git a/src/views/ebiz/cardList/PayResult.vue b/src/views/ebiz/cardList/PayResult.vue index 6c0280de6..03c59cd57 100644 --- a/src/views/ebiz/cardList/PayResult.vue +++ b/src/views/ebiz/cardList/PayResult.vue @@ -32,22 +32,22 @@ - - -
+ - 返回首页 -
+ +
From 81f5427c1e4e2bdb701c85b509f09a19462ec1ec Mon Sep 17 00:00:00 2001 From: "tian.guangyuan" Date: Wed, 29 Apr 2020 14:26:22 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E3=80=90fix=E3=80=91=20=E5=AE=8C=E5=96=84?= =?UTF-8?q?=20=E6=94=AF=E4=BB=98=E5=A4=B1=E8=B4=A5=E5=90=8E=E7=9A=84=20?= =?UTF-8?q?=E6=8D=A2=E5=8D=A1=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/cardList/Pay.vue | 44 ++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/src/views/ebiz/cardList/Pay.vue b/src/views/ebiz/cardList/Pay.vue index 172ccef88..0de52b90b 100644 --- a/src/views/ebiz/cardList/Pay.vue +++ b/src/views/ebiz/cardList/Pay.vue @@ -465,10 +465,6 @@ export default { console.log(this.$validator) return this.$toast(this.$validator.errors.all()[0]) } - - if(this.noEdit){ - this.acceptInsurance() - } switch (this.orderStatus) { case '56': @@ -478,8 +474,13 @@ export default { // case '02': // break default: - this.acceptInsurance() - return this.$toast('当前不可支付') + if(!this.noEdit){ + this.payMent(true) + return true; + } else { + this.acceptInsurance() + return this.$toast('当前不可支付') + } } }, acceptInsurance() { @@ -519,7 +520,7 @@ export default { localStorage['cardList-detail'] = JSON.stringify(this.underWriteData) let thisRef = this this.$nextTick(() => { - // thisRef.$refs.payForm.submit() // 表单提交，发起支付，跳至收银台 + thisRef.$refs.payForm.submit() // 表单提交，发起支付，跳至收银台 setTimeout(() => { // eslint-disable-next-line no-undef EWebBridge.webCallAppInJs('webview_left_button', { @@ -534,7 +535,7 @@ export default { }) }, // 点击支付 - async payMent() { + async payMent(flag) { let data = { orderDTO: { orderInfoDTO: { @@ -572,19 +573,22 @@ export default { loadingType: 'spinner', message: '加载中……' }) - - let rs = await this.underWrite() - - if (rs.result != '0') { - this.$toast.clear() - return this.$toast(rs.resultMessage) - } - - if (rs.uwResult != '02') { - return this.$toast(rs.message) - } else { - this.acceptInsurance() + + if( !flag ){ + let rs = await this.underWrite() + + if (rs.result != '0') { + this.$toast.clear() + return this.$toast(rs.resultMessage) + } + + if (rs.uwResult != '02') { + return this.$toast(rs.message) + } } + + this.acceptInsurance() + } else { this.$toast(res.resultMessage) } From 2691c797009a8d1f103ffc2464b24eb56be90a62 Mon Sep 17 00:00:00 2001 From: "tian.guangyuan" Date: Wed, 29 Apr 2020 14:29:05 +0800 Subject: [PATCH 6/8] =?UTF-8?q?[fix]=20=E4=BF=AE=E5=A4=8D=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=20eslint=20--fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/cardList/CardTotreasure.vue | 6 +-- src/views/ebiz/cardList/Pay.vue | 46 +++++++++++----------- src/views/ebiz/cardList/PayResult.vue | 14 +++---- src/views/ebiz/cardList/information.vue | 2 +- 4 files changed, 33 insertions(+), 35 deletions(-) diff --git a/src/views/ebiz/cardList/CardTotreasure.vue b/src/views/ebiz/cardList/CardTotreasure.vue index a1158a0a6..ee9211e0a 100644 --- a/src/views/ebiz/cardList/CardTotreasure.vue +++ b/src/views/ebiz/cardList/CardTotreasure.vue @@ -79,7 +79,7 @@ import { getCardList, getOrderList } from '@/api/ebiz/cardList/cardList.js' import { Tab, Tabs, List, Sticky } from 'vant' import dataDictionary from '@/assets/js/utils/data-dictionary' //根据数据字典找到订单状态 -import formatDate from '@/assets/js/utils/date-utils' +// import formatDate from '@/assets/js/utils/date-utils' export default { name: 'kadantoubao.vue', @@ -292,9 +292,9 @@ export default { dateToday.setMinutes(0) dateToday.setSeconds(0) currentTime = dateToday.getTime() - compareTime = new Date(orderItem.orderInfoDTO.appntDateStr.replace(/-/g, "/")).getTime() + compareTime = new Date(orderItem.orderInfoDTO.appntDateStr.replace(/-/g, '/')).getTime() let tmpSub = compareTime - currentTime - if( tmpSub > 0 && tmpSub < 24*60*60*1000){ + if (tmpSub > 0 && tmpSub < 24 * 60 * 60 * 1000) { orderObj.isCanPay = true } NewItems.push(orderObj) diff --git a/src/views/ebiz/cardList/Pay.vue b/src/views/ebiz/cardList/Pay.vue index 0de52b90b..d216a982f 100644 --- a/src/views/ebiz/cardList/Pay.vue +++ b/src/views/ebiz/cardList/Pay.vue @@ -28,7 +28,7 @@ clearable required /> - + - + @@ -218,7 +218,7 @@ export default { tradeState: '' // 状态 }, gotPayParam: false, // 是否已正确获取支付参数, - payStatus: '' ,// 接口返回的支付状态 + payStatus: '', // 接口返回的支付状态 noEdit: true } }, @@ -247,7 +247,7 @@ export default { // } else { // 再次支付 调详情 获取信息 this.getOrderDetail() - + this.getPayTemp() // this.underWriteData = JSON.parse(window.localStorage.getItem('underWriteData')) // } @@ -353,7 +353,7 @@ export default { // 获取银行列表的focus focus() { // if (this.orderStatus == '56') { - this.show = true + this.show = true // } }, // 获取银行卡列表 @@ -378,15 +378,16 @@ export default { this.underWriteData.bankName = bankCode this.show = false }, - getPayTemp(){ + getPayTemp() { getPayTemp({ orderNo: window.localStorage.getItem('orderNo') }) - .then(res => { - if (res.result == '0') { - this.noEdit = res.content.flag != 'false' - } - }).catch( e=>{ - console.error(e); - } ) + .then(res => { + if (res.result == '0') { + this.noEdit = res.content.flag != 'false' + } + }) + .catch(e => { + console.error(e) + }) }, // 再次支付 getOrderDetail() { @@ -472,11 +473,11 @@ export default { this.payMent() break // case '02': - // break + // break default: - if(!this.noEdit){ + if (!this.noEdit) { this.payMent(true) - return true; + return true } else { this.acceptInsurance() return this.$toast('当前不可支付') @@ -573,22 +574,21 @@ export default { loadingType: 'spinner', message: '加载中……' }) - - if( !flag ){ + + if (!flag) { let rs = await this.underWrite() - + if (rs.result != '0') { this.$toast.clear() return this.$toast(rs.resultMessage) } - + if (rs.uwResult != '02') { return this.$toast(rs.message) } } - + this.acceptInsurance() - } else { this.$toast(res.resultMessage) } diff --git a/src/views/ebiz/cardList/PayResult.vue b/src/views/ebiz/cardList/PayResult.vue index 03c59cd57..26e9f0381 100644 --- a/src/views/ebiz/cardList/PayResult.vue +++ b/src/views/ebiz/cardList/PayResult.vue @@ -10,7 +10,7 @@ 银行扣款中，请稍后查询 线下批扣中……
- + @@ -39,14 +39,14 @@ 重新支付 返回首页 - - + - - + + @@ -73,9 +73,7 @@ export default { prtNo: '', // 投保单号 amnt: '' // 支付金额 }, - card:{ - - }, + card: {}, // 图片 srcSuccess: this.$assetsUrl + 'images/success.png', srcPending: this.$assetsUrl + 'images/pending.png', diff --git a/src/views/ebiz/cardList/information.vue b/src/views/ebiz/cardList/information.vue index 3d0479d27..6c58cc9f4 100644 --- a/src/views/ebiz/cardList/information.vue +++ b/src/views/ebiz/cardList/information.vue @@ -358,7 +358,7 @@ export default { // homeArea: '1', //家庭区 // homeAddress: '1', //详细地址 mobile: '', //移动电话 - email: '', //电子邮箱 + email: '' //电子邮箱 // effectiveDate: '' //指定生效日期 }, //被保人信息 From 59e66114aa8be04d79bd5ea1963d3e7868b327fa Mon Sep 17 00:00:00 2001 From: "tian.guangyuan" Date: Wed, 29 Apr 2020 15:17:35 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E3=80=90fix=E3=80=91=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=8D=A1=E5=8D=95=E5=9C=A8=E6=8D=A2=E5=8D=A1=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E9=93=B6=E8=A1=8C=E5=8D=A1=E6=89=AB=E6=8F=8F?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=9C=AA=E5=91=88=E7=8E=B0=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/cardList/Pay.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/views/ebiz/cardList/Pay.vue b/src/views/ebiz/cardList/Pay.vue index d216a982f..05435b3ba 100644 --- a/src/views/ebiz/cardList/Pay.vue +++ b/src/views/ebiz/cardList/Pay.vue @@ -56,7 +56,6 @@ />