From 4288ad7b520930815f6ff758c68f13c7341d9140 Mon Sep 17 00:00:00 2001
From: wangmingzhe <wmz_0826@163.com>
Date: Wed, 29 Apr 2020 14:18:01 +0800
Subject: [PATCH] =?UTF-8?q?[NEW]=20=E6=94=BE=E5=BC=80=E5=8D=A1=E5=8D=95?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98=E9=A1=B5=E9=9D=A2loading?=
 =?UTF-8?q?=EF=BC=8C=E6=B5=8B=E8=AF=95=E5=AE=8C=E6=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/cardList/Pay.vue | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/views/ebiz/cardList/Pay.vue b/src/views/ebiz/cardList/Pay.vue
index ade40277a..84a43c2e7 100644
--- a/src/views/ebiz/cardList/Pay.vue
+++ b/src/views/ebiz/cardList/Pay.vue
@@ -228,13 +228,9 @@ export default {
       this.radio = '3'
       let token = this.$route.query.token
       let orderNo = this.$route.query.orderNo
-      this.bankListName = this.$route.query.bankListName
-      this.underWriteData.name = this.$route.query.name
-      this.underWriteData.bankName = this.$route.query.bankName
-      this.underWriteData.bankCode = this.$route.query.bankCode
       localStorage.token = token
       localStorage.orderNo = orderNo
-      // this.isLoading = true
+      this.isLoading = true
       // 再次支付 调详情 获取信息
       this.getOrderDetail()
     }
@@ -407,6 +403,9 @@ export default {
           this.underWriteData = {
             appntName: res.orderDTO.insuredDTOs[0].riskDTOLst[0].riskName,
             name: res.orderDTO.appntDTO.name,
+            bankName: res.orderDTO.orderAccountDTO.bankCode,
+            bankCode: res.orderDTO.orderAccountDTO.cardBookCode,
+            cardBookCode: res.orderDTO.orderAccountDTO.cardBookCode,
             idType: res.orderDTO.appntDTO.idType,
             orderAmount: res.orderDTO.orderInfoDTO.orderAmount,
             orderNo: res.orderDTO.orderAccountDTO.orderNo,
@@ -414,12 +413,15 @@ export default {
             resultMessage: '交易处理成功',
             uwResult: '02'
           }
-          this.underWriteData.bankCode =
-            res.orderDTO.orderAccountDTO.cardBookCode !== null ? res.orderDTO.orderAccountDTO.cardBookCode : this.$route.query.bankCode
-          this.underWriteData.bankName = res.orderDTO.orderAccountDTO.bankCode !== null ? res.orderDTO.orderAccountDTO.bankCode : this.$route.query.bankName
-          this.underWriteData.cardBookCode =
-            res.orderDTO.orderAccountDTO.cardBookCode !== null ? res.orderDTO.orderAccountDTO.cardBookCode : this.$route.query.bankCode
-          this.bankListName = res.orderDTO.orderAccountDTO.bankName !== null ? res.orderDTO.orderAccountDTO.bankName : this.$route.query.bankListName
+          this.bankListName = res.orderDTO.orderAccountDTO.bankName
+          if (this.isWeixin) {
+            this.underWriteData.bankCode =
+              res.orderDTO.orderAccountDTO.cardBookCode !== null ? res.orderDTO.orderAccountDTO.cardBookCode : this.$route.query.bankCode
+            this.underWriteData.bankName = res.orderDTO.orderAccountDTO.bankCode !== null ? res.orderDTO.orderAccountDTO.bankCode : this.$route.query.bankName
+            this.underWriteData.cardBookCode =
+              res.orderDTO.orderAccountDTO.cardBookCode !== null ? res.orderDTO.orderAccountDTO.cardBookCode : this.$route.query.bankCode
+            this.bankListName = res.orderDTO.orderAccountDTO.bankName !== null ? res.orderDTO.orderAccountDTO.bankName : this.$route.query.bankListName
+          }
 
           if (this.isWeixin) {
             this.pay()