From 546ffb4331a557cd6ed1d1570dae16c16a69fc40 Mon Sep 17 00:00:00 2001
From: "tian.guangyuan" <tian.guangyuan@ebiz-fooge.com>
Date: Mon, 27 Apr 2020 17:39:17 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=E3=80=91=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E7=BB=93=E6=9E=9C=E9=A1=B5=E9=9D=A2=EF=BC=8C?=
 =?UTF-8?q?=E4=BA=A7=E5=93=81=E5=90=8D=E7=A7=B0=E6=98=BE=E7=A4=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/cardList/CardTotreasure.vue |  2 +-
 src/views/ebiz/cardList/PayResult.vue      | 16 ++++++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/views/ebiz/cardList/CardTotreasure.vue b/src/views/ebiz/cardList/CardTotreasure.vue
index 697b4b31a..0529980b9 100644
--- a/src/views/ebiz/cardList/CardTotreasure.vue
+++ b/src/views/ebiz/cardList/CardTotreasure.vue
@@ -290,7 +290,7 @@ export default {
         currentTime = dateToday.getTime()
         compareTime = new Date(orderItem.orderInfoDTO.appntDate).getTime()
         let tmpSub = compareTime - currentTime
-        if( tmpSub > 0 && tmp < 24*60*60*1000){
+        if( tmpSub > 0 && tmpSub < 24*60*60*1000){
           orderObj.isCanPay = true
         }
         NewItems.push(orderObj)
diff --git a/src/views/ebiz/cardList/PayResult.vue b/src/views/ebiz/cardList/PayResult.vue
index 3967124c9..bcac265d8 100644
--- a/src/views/ebiz/cardList/PayResult.vue
+++ b/src/views/ebiz/cardList/PayResult.vue
@@ -15,9 +15,9 @@
     </div>
 
     <van-cell-group v-if="payStatus == 1">
-      <van-cell title="产品名称" :value="payInfo.productName" v-if="payInfo.appntName != ''" />
+      <van-cell title="产品名称" :value="card.appntName" />
       <van-cell title="支付金额" :value="`${payInfo.amnt}元` | moneyFormat" v-if="payInfo.amnt != ''" />
-      <van-cell title="卡号" :value="payInfo.bankCardNumber" />
+      <van-cell title="卡号" :value="card.cardBookCode" />
     </van-cell-group>
     <!-- <div v-if="payStatus != '2' && payStatus != '1'" class=" p10 pb250  bg-white">
       <span class="pt150 fs14"> 如有相关问题，请联系信息技术部运维人员</span>
@@ -32,10 +32,10 @@
       <span v-html="resMessage"></span>
     </div> -->
 
-    <div class="bottom-btn bg-white" v-if="payStatus == '1' || payStatus == '4' || payStatus == '8'">
+    <!-- <div class="bottom-btn bg-white" v-if="payStatus == '1' || payStatus == '4' || payStatus == '8'">
       <van-button type="danger" size="large" @click="next" v-no-more-click="1000">返回首页</van-button>
-    </div>
-    <div class="bottom-area bottom-btn flex" v-if="payStatus == '2'">
+    </div> -->
+    <div class="bottom-area bottom-btn flex">
       <!-- <van-button class="m-btn w250" type="danger" size="normal" @click="rePayMent">重新支付</van-button> -->
       <van-button size="large" type="danger" @click="next" v-no-more-click="1000">返回首页</van-button>
     </div>
@@ -63,6 +63,9 @@ export default {
         appntName: '', // 投保人
         prtNo: '', // 投保单号
         amnt: '' // 支付金额
+      },
+      card:{
+        
       },
       // 图片
       srcSuccess: this.$assetsUrl + 'images/success.png',
@@ -120,7 +123,7 @@ export default {
         console.log('----支付结果查询', JSON.stringify(res))
         if (res.result == '0') {
           this.payStatus = res.payStatus
-          this.payInfo = { appntName: res.appntName, prtNo: res.prtNo, amnt: res.amnt }
+          this.payInfo = res
 
           // 如果是支付中，2秒后，重新获取一次支付状态
           if (this.payStatus == '4' && !this.isReloaded) {
@@ -164,6 +167,7 @@ export default {
     let that = this
     // document.body.style.backgroundColor = '#fff'
     that.payStatus = window.localStorage.getItem('payStatus')
+    this.card = JSON.parse(window.localStorage.getItem('cardList-detail'))
     that.payInfo = JSON.parse(window.localStorage.getItem('payInfo'))
     if (window.localStorage.getItem('resMessage') != null) {
       that.resMessage = window.localStorage.getItem('resMessage').replace(/\\n/g, '<br>')