From 903d7cddf91315d0cc5c2c24393f4d24088298e9 Mon Sep 17 00:00:00 2001
From: "tian.guangyuan" <tian.guangyuan@ebiz-fooge.com>
Date: Sat, 23 May 2020 20:15:19 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90fix=E3=80=91=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E9=93=B6=E8=A1=8C=E5=8D=A1=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/ebiz/sale/sale.js                  |  8 ++++++++
 src/views/ebiz/sale/AccountInformation.vue | 22 ++++++++++++++++++++--
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/src/api/ebiz/sale/sale.js b/src/api/ebiz/sale/sale.js
index 269c01e7f..79a1edeb3 100644
--- a/src/api/ebiz/sale/sale.js
+++ b/src/api/ebiz/sale/sale.js
@@ -195,3 +195,11 @@ export function getPayState(data) {
   })
 }
 
+// 2.1.	校验银行卡信息
+export function checkCard(data) {
+  return request({
+    url: getUrl('/customer/checkCard', 1),
+    method: 'post',
+    data
+  })
+}
\ No newline at end of file
diff --git a/src/views/ebiz/sale/AccountInformation.vue b/src/views/ebiz/sale/AccountInformation.vue
index 137a29633..5f3eeda77 100644
--- a/src/views/ebiz/sale/AccountInformation.vue
+++ b/src/views/ebiz/sale/AccountInformation.vue
@@ -113,7 +113,7 @@
 
 <script>
 import { Cell, CellGroup, Field, RadioGroup, Radio, Popup, List, Switch, Toast, SwitchCell, Icon } from 'vant'
-import { saveInformation, getBankList, getOrderDetail } from '@/api/ebiz/sale/sale'
+import { saveInformation, getBankList, getOrderDetail, checkCard } from '@/api/ebiz/sale/sale'
 import utilsAge from '@/assets/js/utils/age'
 import BankCardScan from '@/components/ebiz/sale/BankCardScan'
 import IndexBar from '@/components/ebiz/sale/IndexBar'
@@ -281,11 +281,29 @@ export default {
       that.name = val
     },
     // 下一步
-    next() {
+    async next() {
       if (this.productNo === 'GFRS_M0016' && this.age > 65) {
         this.$toast('本产品年龄大于65岁不能投保')
         return
       }
+      let data = {
+        "account": this.bankId,
+        "idNo": this.saleInsuredInfo.idNo,
+        "idType": this.saleInsuredInfo.idType,
+        "mobile": this.saleInsuredInfo.mobile,
+        "name": this.saleInsuredInfo.name
+      }
+      this.$toast.loading({
+        duration: 0, // 持续展示 toast
+        forbidClick: true, // 禁用背景点击
+        loadingType: 'spinner',
+        message: '加载中……'
+      })
+      let res = await checkCard(data)
+      this.$toast.clear()
+      if(res.result != '0'){
+        return this.$toast(res.resultMessage)
+      }
       let that = this
       that.$validator.validate().then(valid => {
         if (valid === true) {

From d25a031927589089a16b3e4f2233619fa2867d4b Mon Sep 17 00:00:00 2001
From: "tian.guangyuan" <tian.guangyuan@ebiz-fooge.com>
Date: Thu, 28 May 2020 17:09:18 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90fix=E3=80=91=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=9C=A8=E9=83=A8=E5=88=86=E6=83=85=E5=86=B5=E4=B8=8B=EF=BC=8C?=
 =?UTF-8?q?=E9=93=B6=E8=A1=8C=E5=8D=A1=E9=89=B4=E6=9D=83=E7=9A=84=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=8F=96=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/sale/AccountInformation.vue | 30 +++++++++++++++++-----
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/src/views/ebiz/sale/AccountInformation.vue b/src/views/ebiz/sale/AccountInformation.vue
index 5f3eeda77..309fbfc5f 100644
--- a/src/views/ebiz/sale/AccountInformation.vue
+++ b/src/views/ebiz/sale/AccountInformation.vue
@@ -160,7 +160,8 @@ export default {
       changeCard: localStorage.changeCard,
       age: null,
       productNo: null,
-      salePageFlag: '6'
+      salePageFlag: '6',
+      appntDTO: null
     }
   },
   methods: {
@@ -286,13 +287,25 @@ export default {
         this.$toast('本产品年龄大于65岁不能投保')
         return
       }
-      let data = {
-        "account": this.bankId,
-        "idNo": this.saleInsuredInfo.idNo,
-        "idType": this.saleInsuredInfo.idType,
-        "mobile": this.saleInsuredInfo.mobile,
-        "name": this.saleInsuredInfo.name
+      let data
+      if(this.saleInsuredInfo.idNo){
+        data = {
+          "account": this.bankId,
+          "idNo": this.saleInsuredInfo.idNo,
+          "idType": this.saleInsuredInfo.idType,
+          "mobile": this.saleInsuredInfo.mobile,
+          "name": this.saleInsuredInfo.name
+        }
+      }else {
+        data = {
+          "account": this.bankId,
+          "idNo": this.appntDTO.idNo,
+          "idType": this.appntDTO.idType,
+          "mobile": this.appntDTO.mobile,
+          "name": this.appntDTO.name
+        }
       }
+      
       this.$toast.loading({
         duration: 0, // 持续展示 toast
         forbidClick: true, // 禁用背景点击
@@ -453,6 +466,9 @@ export default {
     getOrderDetail({ orderNo: localStorage.orderNo }).then(res => {
       console.log(res)
       if (res.result == 0) {
+        
+        this.appntDTO = res.orderDTO.appntDTO
+        
         //如果是从编辑进来的
         if (this.$route.query.edit) {
           //投被保险人关系