From 946e17bb1fb7da1eb7811223aaccbdec4981c5a2 Mon Sep 17 00:00:00 2001
From: "li.yuetong" <li.yuetong@ebiz-digits.com>
Date: Fri, 24 Jun 2022 14:53:46 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=9B=BD=E5=AF=8C=E6=83=A0=E6=A1=82?=
 =?UTF-8?q?=E4=BF=9D=E5=9B=A2=E4=BD=93=E5=8C=BB=E7=96=97=E4=BF=9D=E9=99=A9?=
 =?UTF-8?q?=E4=BA=A7=E5=93=81=E4=B8=8A=E7=BA=BF=E9=87=91=E6=8E=8C=E6=A1=82?=
 =?UTF-8?q?=E6=8A=95=E4=BF=9D=E5=BC=80=E5=8F=91=E9=9C=80=E6=B1=82=E3=80=91?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E9=A1=B5=E9=9D=A2--=E4=BF=9D=E8=B4=B9?=
 =?UTF-8?q?=E4=BB=8E=E8=BF=99=E9=87=8CorderInfoDTO.orderAmount=E5=8F=96?=
 =?UTF-8?q?=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/cardList/Pay.vue        | 31 +++++---------------------
 src/views/ebiz/cardList/cardDetail.vue |  3 ++-
 2 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/src/views/ebiz/cardList/Pay.vue b/src/views/ebiz/cardList/Pay.vue
index 7b8e20b4c..a0cc2a81e 100644
--- a/src/views/ebiz/cardList/Pay.vue
+++ b/src/views/ebiz/cardList/Pay.vue
@@ -5,7 +5,9 @@
         <van-field v-model="underWriteData.riskName" type="textarea" autosize readonly label="产品名称：" class="projuct" />
         <van-field v-model="underWriteData.schemeName" readonly label="保障方案：" class="projuct" />
         <van-field v-if="!isWeixin" v-model="underWriteData.appntName" readonly label="投保人姓名：" class="projuct" />
-        <van-field v-if="!isWeixin" v-model="underWriteData.insuredName" readonly label="被保人姓名：" class="projuct" />
+        <template v-if="!isWeixin">
+          <van-field v-for="item in insuredDTOs" :key="item.name" v-model="item.name" readonly label="被保人姓名：" class="projuct" />
+        </template>
         <van-field :value="underWriteData.orderAmount == undefined ? '' : `${underWriteData.orderAmount} 元`" readonly label="支付金额：" />
       </van-cell-group>
       <!-- 银行卡支付开始 -->
@@ -217,6 +219,7 @@ export default {
   data() {
     let isWeixin = this.$utils.device().isWeixin //判断环境
     return {
+      insuredDTOs:[],//被保人信息
       // 银行卡支付图片地址
       src: this.$assetsUrl + 'images/cardImg.png',
       // 微信支付图片地址
@@ -303,18 +306,6 @@ export default {
         cardBookCode: orderDetail.orderAccountDTO.cardBookCode,
         bankName: orderDetail.orderAccountDTO.bankCode
       }
-      // 团险产品团险产品显示多个被保人姓名
-      if(orderDetail.insuredDTOs.length == 1){
-        this.underWriteData.insuredName = orderDetail.insuredDTOs[0].name
-      }else if(orderDetail.insuredDTOs.length > 1){
-        orderDetail.insuredDTOs.forEach((item, index) => {
-          if(index == orderDetail.insuredDTOs.length -1){
-            this.underWriteData.insuredName += item.name
-          }else{
-            this.underWriteData.insuredName += item.name+'/'
-          }           
-        })
-      }
       this.bankListName = orderDetail.orderAccountDTO.bankName
       this.orderStatus = orderDetail.orderInfoDTO.orderStatus
       localStorage.orderNo = orderDetail.orderInfoDTO.orderNo
@@ -520,6 +511,7 @@ export default {
     getOrderDetail() {
       getOrderDetail({ orderNo: window.localStorage.getItem('orderNo') }).then(res => {
         if (res.result == '0') {
+          this.insuredDTOs = res.orderDTO.insuredDTOs
           this.orderStatus = res.orderDTO.orderInfoDTO.orderStatus
           try {
             if (this.noEdit) {
@@ -548,19 +540,6 @@ export default {
             resultMessage: '交易处理成功',
             uwResult: '02'
           }
-          let orderDetail =  res.orderDTO
-          // 团险产品团险产品显示多个被保人姓名
-          if(orderDetail.insuredDTOs.length == 1){
-            this.underWriteData.insuredName = orderDetail.insuredDTOs[0].name
-          }else if(orderDetail.insuredDTOs.length > 1){
-            orderDetail.insuredDTOs.forEach((item, index) => {
-              if(index == orderDetail.insuredDTOs.length -1){
-                this.underWriteData.insuredName += item.name
-              }else{
-                this.underWriteData.insuredName += item.name+'/'
-              }           
-            })
-          }
           // this.bankListName = res.orderDTO.orderAccountDTO.bankName
           this.underWriteData.bankCode =
             res.orderDTO.orderAccountDTO.cardBookCode !== null ? res.orderDTO.orderAccountDTO.cardBookCode : this.$route.query.bankCode
diff --git a/src/views/ebiz/cardList/cardDetail.vue b/src/views/ebiz/cardList/cardDetail.vue
index 91a70865c..e340b3d58 100644
--- a/src/views/ebiz/cardList/cardDetail.vue
+++ b/src/views/ebiz/cardList/cardDetail.vue
@@ -43,7 +43,7 @@
     <van-goods-action style='z-index: 99'>
       <van-button type='default' style='width: 50%; font-size: 14px; height: 40px; background: white'>总保费:<span
         style='color: red; font-weight: bold; font-size: 18px; font-weight: 400'>{{
-          riskDTO.prem }}</span>元
+          orderAmount }}</span>元
       </van-button>
       <van-goods-action-button type='danger' text='确认' @click='nextStep' v-no-more-click='1000'
                                style='border-radius: 0em; width: 50%; height: 40px' />
@@ -127,6 +127,7 @@ export default {
     insuYearD = productDate.getDate() < 10 ? '0' + productDate.getDate() : productDate.getDate()
     productDateTime = productDate.getFullYear() + '年' + insuYearM + '月' + insuYearD + '日'
     this.productDate = currentData + '0时至' + productDateTime + '24时止'
+    this.orderAmount = this.orderDTO.orderInfoDTO.orderAmount
   },
   methods: {
     nextStep() {