From 125ed17a6df700406b29700b5563d054688895d1 Mon Sep 17 00:00:00 2001
From: "bai.jinyan" <baijinyan>
Date: Wed, 7 Apr 2021 21:18:43 +0800
Subject: [PATCH] =?UTF-8?q?GFRS-2215=E3=80=90=E5=BE=85=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E3=80=91=E9=87=8D=E6=96=B0=E6=8A=95=E4=BF=9D--=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E9=A1=B5=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E5=8F=8A=E6=94=AF=E4=BB=98=E9=A1=B5=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E5=8F=B7=E7=BC=93=E5=AD=98=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/insureAgain/Payment.vue |  2 +-
 src/views/ebiz/insureAgain/index.vue   | 53 ++++++++++----------------
 2 files changed, 21 insertions(+), 34 deletions(-)

diff --git a/src/views/ebiz/insureAgain/Payment.vue b/src/views/ebiz/insureAgain/Payment.vue
index 01dbb65bd..a251f734d 100644
--- a/src/views/ebiz/insureAgain/Payment.vue
+++ b/src/views/ebiz/insureAgain/Payment.vue
@@ -159,7 +159,7 @@ export default {
     }
   },
   mounted() {
-    this.orderNo = window.localStorage.getItem('newOrderNo')
+    this.orderNo = window.localStorage.getItem('orderNo')
     console.log('----保融form.action', config.payUrl)
     document.body.style.backgroundColor = '#fff'
     // 不在微信环境下
diff --git a/src/views/ebiz/insureAgain/index.vue b/src/views/ebiz/insureAgain/index.vue
index 2880446cd..b5729d424 100644
--- a/src/views/ebiz/insureAgain/index.vue
+++ b/src/views/ebiz/insureAgain/index.vue
@@ -160,43 +160,26 @@ export default {
   computed: {
     NewItems() {
       var NewItems = []
-      // let item1 = ['1','4','0'];
-      // let item2 = ['19','38','39','40'];
-      // let item3 = ['1','2','3'];
-      // let item4 = ['0','1','2','3','4'];
       this.policyListDTOList.map((item) => {
         if (item.riskName.search(this.searchName) != -1 || item.policyNo.search(this.searchName) != -1 || item.appntName.search(this.searchName) != -1) {
-          // item.policyNo = '23424333333331';
-          // item.orderStatus = item1[Math.floor(Math.random()*item1.length)];
-          // item.newOrderNo = '32422222222222234';
-          // item.newOrderStatus = item2[Math.floor(Math.random()*item2.length)];
-          // item.reInsuranceFlag = '3';
-          // item.reInsuranceState = item4[Math.floor(Math.random()*item4.length)];
-
-          if (this.active === 'uncommit' && item.reInsuranceFlag === '3' && item.reInsuranceState === '0') {
-            if (
-              item.newOrderStatus === null ||
-              item.newOrderStatus === '02' ||
-              item.newOrderStatus === '05' ||
-              item.newOrderStatus === '06' ||
-              item.newOrderStatus === '08' ||
-              item.newOrderStatus === '38' ||
-              item.newOrderStatus === '39' ||
-              item.newOrderStatus === '40'
-            ) {
-              NewItems.push(item)
-            }
-          } else if (
-            this.active === 'commit' &&
-            item.reInsuranceFlag === '3' &&
-            (item.reInsuranceState === '1' || item.reInsuranceState === '2' || item.reInsuranceState === '3')
-          ) {
-            if (item.newOrderStatus === '07' || item.newOrderStatus === '19' || item.newOrderStatus === '55') {
-              NewItems.push(item)
+          if (item.reInsuranceState != null && item.reInsuranceState != '') {
+            if (this.active === 'uncommit') {
+              if (
+                      item.newOrderStatus === null ||
+                      item.newOrderStatus === '01' ||
+                      item.newOrderStatus === '02' ||
+                      item.newOrderStatus === '38' ||
+                      item.newOrderStatus === '39' ||
+                      item.newOrderStatus === '40'
+              ) {
+                NewItems.push(item)
+              }
+            } else if (this.active === 'commit') {
+              if (item.newOrderStatus === '07' || item.newOrderStatus === '19' || item.newOrderStatus === '55' || item.newOrderStatus === '08') {
+                NewItems.push(item)
+              }
             }
           }
-
-          // NewItems.push(item)
         }
       })
       console.log(NewItems, '======================NewItems===================')
@@ -300,6 +283,10 @@ export default {
             url = '/insureAgain/Notification'
           } else if (order.newOrderStatus === '40') {
             url = '/insureAgain/SignatureConfirmation'
+          } else if (order.newOrderStatus === '01') {
+            url = '/insureAgain/SignatureConfirmation'
+          } else if (order.newOrderStatus === '02') {
+            url = '/insureAgain/Payment'
           } else {
             this.isAgreementShow = true
             return false