From 159bf6c5de6293faabf987cf1d6d4ad61111058c Mon Sep 17 00:00:00 2001
From: "bai.jinyan" <baijinyan>
Date: Fri, 28 May 2021 09:55:32 +0800
Subject: [PATCH] =?UTF-8?q?GFRS-2223=20=E3=80=90=E9=87=8D=E6=96=B0?=
 =?UTF-8?q?=E6=8A=95=E4=BF=9D=E3=80=91-=E4=BF=9D=E9=A2=9D=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E5=8F=8A=E5=BE=85=E6=94=AF=E4=BB=98=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=E4=BA=BA=E8=84=B8=E8=AF=86=E5=88=AB---?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BA=BA=EF=BC=9A=E7=99=BD=E9=87=91=E5=B2=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ebiz/insureAgain/ProductInformation.vue   |  2 +-
 src/views/ebiz/insureAgain/index.vue          | 62 ++++++++++---------
 2 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/src/views/ebiz/insureAgain/ProductInformation.vue b/src/views/ebiz/insureAgain/ProductInformation.vue
index 69211bc7b..219e0785f 100644
--- a/src/views/ebiz/insureAgain/ProductInformation.vue
+++ b/src/views/ebiz/insureAgain/ProductInformation.vue
@@ -22,7 +22,7 @@
               <InfoCell v-else label="">{{ item2.dutyName }}</InfoCell>
             </div>
           </div>
-          <InfoCell label="保额(万元)">{{ item.amt }}</InfoCell>
+          <InfoCell label="保额(元)">{{ item.amt | moneyFormat }}</InfoCell>
           <InfoCell>
             <template #cellLabel>
               <span style="font-weight: bold">保费(元)</span>
diff --git a/src/views/ebiz/insureAgain/index.vue b/src/views/ebiz/insureAgain/index.vue
index d8d1e7789..c85dfc148 100644
--- a/src/views/ebiz/insureAgain/index.vue
+++ b/src/views/ebiz/insureAgain/index.vue
@@ -292,38 +292,44 @@ export default {
       }, 100)
       getReAppntPolicy({ policyNo: order.policyNo }).then(async (res) => {
         if (res.result == 0) {
-          this.orderInfo.sex = res.orderDTO.appntDTO.sex
-          if (res.orderDTO.appntDTO.idType == '1') {
-            // 白名单校验
-            const resData = await getWhitelist({
-              idNo: res.orderDTO.appntDTO.idNo,
-              name: res.orderDTO.appntDTO.name,
-              whiteType: 'reOrder_face_show'
-            })
-            if (resData.result === '0') {
-              // 在白名单内
-              if (resData.content && resData.content.length) {
-                this.goUrl(res, order)
-                return
+          // 待支付订单 不需再次人脸识别
+          if (order.newOrderStatus == '02') {
+            this.goUrl(res, order)
+            return
+          }else {
+            this.orderInfo.sex = res.orderDTO.appntDTO.sex
+            if (res.orderDTO.appntDTO.idType == '1') {
+              // 白名单校验
+              const resData = await getWhitelist({
+                idNo: res.orderDTO.appntDTO.idNo,
+                name: res.orderDTO.appntDTO.name,
+                whiteType: 'reOrder_face_show'
+              })
+              if (resData.result === '0') {
+                // 在白名单内
+                if (resData.content && resData.content.length) {
+                  this.goUrl(res, order)
+                  return
+                } else {
+                  // 人脸识别
+                  window.EWebBridge.webCallAppInJs('face_auth', {
+                    businessSource: '1', //业务来源:1-电投，2-入司，3-理赔，4-保全
+                    number: res.orderDTO.appntDTO.idNo, //身份证号码
+                    name: res.orderDTO.appntDTO.name //姓名
+                  }).then((data) => {
+                    if (JSON.parse(data).state == '1') {
+                      this.goUrl(res, order)
+                    } else {
+                      return this.$toast('人脸识别，验证失败！')
+                    }
+                  })
+                }
               } else {
-                // 人脸识别
-                window.EWebBridge.webCallAppInJs('face_auth', {
-                  businessSource: '1', //业务来源:1-电投，2-入司，3-理赔，4-保全
-                  number: res.orderDTO.appntDTO.idNo, //身份证号码
-                  name: res.orderDTO.appntDTO.name //姓名
-                }).then((data) => {
-                  if (JSON.parse(data).state == '1') {
-                    this.goUrl(res, order)
-                  } else {
-                    return this.$toast('人脸识别，验证失败！')
-                  }
-                })
+                this.$toast(resData.resultMessage)
               }
             } else {
-              this.$toast(resData.resultMessage)
+              return this.$toast('人脸识别，证件类型不为身份证！')
             }
-          } else {
-            return this.$toast('人脸识别，证件类型不为身份证！')
           }
         } else {
           this.$toast(res.resultMessage)