From f1dbe5c709c5ab50e78c70da0092310a2aee15e4 Mon Sep 17 00:00:00 2001
From: yuweiqi <yu.weiqi@ebiz-fooge.com>
Date: Fri, 12 Jun 2020 15:27:58 +0800
Subject: [PATCH] =?UTF-8?q?[FIX]=E3=80=90=E4=BF=9D=E5=85=A8=E3=80=91?=
 =?UTF-8?q?=E5=8F=97=E7=9B=8A=E4=BA=BA=E7=A1=AE=E8=AE=A4=E9=A1=B5=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=EF=BC=9B=E5=8F=97=E7=9B=8A=E4=BA=BA=E5=8F=98=E6=9B=B4?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=8E=A5=E5=8F=A3=E5=AD=97=E6=AE=B5=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=EF=BC=9B=E8=BE=85=E5=8A=A9=E6=B5=8B=E8=AF=95=E2=80=94?=
 =?UTF-8?q?=E4=B8=B4=E6=97=B6=E5=85=B3=E9=97=AD=E4=BA=BA=E8=84=B8=E8=AF=86?=
 =?UTF-8?q?=E5=88=AB=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../preserve/bc/BeneficiaryConfirmation.vue   |  9 +++---
 .../ebiz/preserve/bc/BeneficiaryInfo.vue      |  3 ++
 .../ebiz/preserve/common/HandleResult.vue     | 31 ++++++++-----------
 src/views/ebiz/preserve/ct/SurrenderInfo.vue  |  1 -
 4 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/src/views/ebiz/preserve/bc/BeneficiaryConfirmation.vue b/src/views/ebiz/preserve/bc/BeneficiaryConfirmation.vue
index ff4d2843d..2c29cdb25 100644
--- a/src/views/ebiz/preserve/bc/BeneficiaryConfirmation.vue
+++ b/src/views/ebiz/preserve/bc/BeneficiaryConfirmation.vue
@@ -28,7 +28,7 @@
             </div>
             <p class="mt20">
               <span class="c-gray-dark">是被保险人的</span>
-              <span class="ml20">{{ item.relationToInsured | idToText('relationToAppnt') }}</span>
+              <span class="ml20">{{ item.relationToInsured | idToText('edorRelationToAppnt') }}</span>
             </p>
             <p class="mt10">
               <span class="c-gray-dark">受益份额</span>
@@ -69,9 +69,6 @@ export default {
     [Icon.name]: Icon,
     [Dialog.name]: Dialog
   },
-  filters: {
-    mask: filters.mask
-  },
   data() {
     // let feachData = {
     //   surrenderDTOList: [
@@ -218,6 +215,10 @@ export default {
         }
       })
     }
+  },
+  filters: {
+    idToText: filters.idToText,
+    mask: filters.mask
   }
 }
 </script>
diff --git a/src/views/ebiz/preserve/bc/BeneficiaryInfo.vue b/src/views/ebiz/preserve/bc/BeneficiaryInfo.vue
index 7041204d6..414e906dc 100644
--- a/src/views/ebiz/preserve/bc/BeneficiaryInfo.vue
+++ b/src/views/ebiz/preserve/bc/BeneficiaryInfo.vue
@@ -161,6 +161,9 @@ export default {
       }
       let beneficiaries = [...this.beneficiariesOld, ...this.beneficiariesNew]
       beneficiaries = businessCommon.unrepeatObj(beneficiaries, 'idNo')
+      beneficiaries.forEach(i => {
+        i.contNo = this.policy.contNo
+      })
       let feachData = {
         platformType: 'app',
         edorType: 'BC',
diff --git a/src/views/ebiz/preserve/common/HandleResult.vue b/src/views/ebiz/preserve/common/HandleResult.vue
index 33f53ce6c..97e5f8968 100644
--- a/src/views/ebiz/preserve/common/HandleResult.vue
+++ b/src/views/ebiz/preserve/common/HandleResult.vue
@@ -123,26 +123,21 @@ export default {
     toFace(config) {
       console.log('----------', config)
       // eslint-disable-next-line no-undef
-      EWebBridge.webCallAppInJs('face_auth', config)
-        // 跳过人脸识别
-        // new Promise(resolve => {
-        //   console.log('--跳过人脸识别--返回识别成功')
-        //   resolve(JSON.stringify({ state: '1' }))
-        // })
-        .then(data => {
-          if (JSON.parse(data).state == '1') {
-            this.jumpNextPage(this.path)
-          } else {
-            // eslint-disable-next-line no-undef
-            EWebBridge.webCallAppInJs('webview_toast', '人脸检测失败')
-          }
-        })
+      // EWebBridge.webCallAppInJs('face_auth', config)
+      // 跳过人脸识别
+      new Promise(resolve => {
+        console.log('--跳过人脸识别--返回识别成功')
+        resolve(JSON.stringify({ state: '1' }))
+      }).then(data => {
+        if (JSON.parse(data).state == '1') {
+          this.jumpNextPage(this.path)
+        } else {
+          // eslint-disable-next-line no-undef
+          EWebBridge.webCallAppInJs('webview_toast', '人脸检测失败')
+        }
+      })
     }
   }
-  // beforeRouteLeave(to, from, next) {
-  //   // document.body.style.backgroundColor = ''
-  //   next()
-  // }
 }
 </script>
 
diff --git a/src/views/ebiz/preserve/ct/SurrenderInfo.vue b/src/views/ebiz/preserve/ct/SurrenderInfo.vue
index f094f3814..14c58979e 100644
--- a/src/views/ebiz/preserve/ct/SurrenderInfo.vue
+++ b/src/views/ebiz/preserve/ct/SurrenderInfo.vue
@@ -238,7 +238,6 @@ export default {
                 }
               })
               this.ctBonusDTO = Object.assign({}, this.ctBonusDTO, this.ctTrialDTO, this.ctAccountDTO)
-              this.ctTrialDTO.surrenderRate = res.content.feeRate == '0' ? res.content.feeRate : res.content.feeRate + '%'
               resolve()
             } else {
               reject(this.$toast(res.resultMessage))