From 45f3a541e16fc0a5a64354b008cf2c80bbbf7286 Mon Sep 17 00:00:00 2001
From: "tian.guangyuan" <tian.guangyuan@ebiz-fooge.com>
Date: Wed, 22 Apr 2020 15:23:33 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=20=E5=AE=8C=E5=96=84=E5=8D=A1=E5=8D=95?=
 =?UTF-8?q?=E4=BA=A7=E5=93=81=E6=8A=95=E4=BF=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/cardList/CardTotreasure.vue | 11 ++++++-----
 src/views/ebiz/cardList/Pay.vue            | 15 +++++++++------
 src/views/ebiz/cardList/PayResult.vue      | 14 +++++++-------
 src/views/ebiz/cardList/PaySuccess.vue     | 22 +++++++++++++---------
 4 files changed, 35 insertions(+), 27 deletions(-)

diff --git a/src/views/ebiz/cardList/CardTotreasure.vue b/src/views/ebiz/cardList/CardTotreasure.vue
index 025988623..f70716983 100644
--- a/src/views/ebiz/cardList/CardTotreasure.vue
+++ b/src/views/ebiz/cardList/CardTotreasure.vue
@@ -2,11 +2,11 @@
   <div class="card-Insurance">
     <div class="card-Insurance-box">
       <div class="card-Insurance-header">
-        <div class="Tab">
+        <!-- <div class="Tab">
           <div class="tab" v-for="(item, index) in arr" :key="index" @click="fnTab(index)">
             <span :class="{ ac: iNow == index }">{{ item }}</span>
           </div>
-        </div>
+        </div> -->
         <div class="show">
           <ul class="card-Products" :style="this.iNow == 0 ? 'display:block' : 'display:none'">
             <li v-for="(itemIcon, index) in list" :key="index" class="border-gb" @click="formsD(itemIcon.productCode)">
@@ -25,7 +25,7 @@
               </li>
             </template>
           </ul>
-          <ul class="myCard" :style="this.iNow == 1 ? 'display:block' : 'display:none'">
+          <!-- <ul class="myCard" :style="this.iNow == 1 ? 'display:block' : 'display:none'">
             <li
               v-for="(itemiNow, index) in tAb"
               style=" border: 1px solid #dadada;box-shadow: 0 3px 9px 1px hsla(0, 0%, 80%, 0.35);"
@@ -44,7 +44,7 @@
                 <p class="gray text-center pt20">暂无产品</p>
               </li>
             </template>
-          </ul>
+          </ul> -->
         </div>
       </div>
     </div>
@@ -57,7 +57,8 @@ export default {
   name: 'kadantoubao.vue',
   data() {
     return {
-      arr: ['产品列表', '我的卡单'],
+      arr: ['产品列表'],
+      // , '我的卡单'
       list: [
         // {
         //   headImgUrl: icon1,
diff --git a/src/views/ebiz/cardList/Pay.vue b/src/views/ebiz/cardList/Pay.vue
index f138b00cf..cb43fbba9 100644
--- a/src/views/ebiz/cardList/Pay.vue
+++ b/src/views/ebiz/cardList/Pay.vue
@@ -177,7 +177,7 @@ export default {
         ReqReserved4: '', // 备用字段4
         ReqReserved5: '', // 备用字段5
         S3Sign: '', // 验签信息
-        tradeState: '' // 状态
+        tradeState: '' ,// 状态
       },
       gotPayParam: false, // 是否已正确获取支付参数,
       payStatus: '' // 接口返回的支付状态
@@ -436,8 +436,9 @@ export default {
           message: '加载中……'
         })
         let that = this
-        let data = {
-          orderNo: window.localStorage.getItem('orderNo')
+        data = {
+          orderNo: window.localStorage.getItem('orderNo'),
+          cardOrder: 'cardOrder'
         }
         let rs = await this.underWrite()
 
@@ -471,13 +472,15 @@ export default {
             console.log('----支付参数：this.payParam:', JSON.stringify(this.payParam))
             this.gotPayParam = true
             this.$forceUpdate()
+            window.localStorage.setItem('resMessage', res.resultMessage)
+            window.localStorage.setItem('payStatus', res.payStatus)
+            window.localStorage.setItem('payInfo', JSON.stringify(res))
+            this.underWriteData.bankListName = this.bankListName
+            localStorage['cardList-detail'] = JSON.stringify(this.underWriteData)
             let thisRef = this
             this.$nextTick(() => {
               thisRef.$refs.payForm.submit() // 表单提交，发起支付，跳至收银台
             })
-            window.localStorage.setItem('resMessage', res.resultMessage)
-            window.localStorage.setItem('payStatus', res.payStatus)
-            window.localStorage.setItem('payInfo', JSON.stringify(res))
           } else {
             that.$toast.clear()
             that.$toast(res.resultMessage)
diff --git a/src/views/ebiz/cardList/PayResult.vue b/src/views/ebiz/cardList/PayResult.vue
index 185423e18..3b29af613 100644
--- a/src/views/ebiz/cardList/PayResult.vue
+++ b/src/views/ebiz/cardList/PayResult.vue
@@ -31,11 +31,11 @@
     </div> -->
 
     <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>
+      <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'">
-      <van-button class="m-btn w250" type="danger" size="normal" @click="rePayMent">重新支付</van-button>
-      <van-button class="m-btn w250" type="danger" size="normal" @click="next">返回列表页</van-button>
+      <!-- <van-button class="m-btn w250" type="danger" size="normal" @click="rePayMent">重新支付</van-button> -->
+      <van-button class="m-btn w250" type="danger" size="normal" @click="next">返回首页</van-button>
     </div>
   </div>
 </template>
@@ -148,10 +148,10 @@ export default {
       this.queryPayState()
     }
   },
-  beforeRouteLeave(to, from, next) {
-    document.body.style.backgroundColor = ''
-    next()
-  }
+  // beforeRouteLeave(to, from, next) {
+  //   document.body.style.backgroundColor = ''
+  //   next()
+  // }
 }
 </script>
 
diff --git a/src/views/ebiz/cardList/PaySuccess.vue b/src/views/ebiz/cardList/PaySuccess.vue
index d528d0766..fb297144b 100644
--- a/src/views/ebiz/cardList/PaySuccess.vue
+++ b/src/views/ebiz/cardList/PaySuccess.vue
@@ -5,15 +5,15 @@
         <van-icon name="passed" size="100px" color="#1296DB" />
         <span>支付成功</span>
       </div>
-      <van-cell-group>
-        <van-field v-model="productName" clearable label="产品名称" placeholder="国富安全出行2.0" />
-        <van-field v-model="paymentAmount" clearable label="支付金额" placeholder="100.00元" />
-        <van-field v-model="bankCardNumber" clearable label="卡号" placeholder="1297793740298" />
+      <van-cell-group name="payInfo">
+        <van-field v-model="payInfo.productName" readonly clearable label="产品名称" name="产品名称" placeholder="国富安全出行2.0" />
+        <van-field v-model="payInfo.paymentAmount" readonly clearable label="支付金额" name="支付金额" placeholder="100.00元" />
+        <van-field v-model="payInfo.bankCardNumber" readonly clearable label="卡号" name="卡号" placeholder="1297793740298" />
       </van-cell-group>
     </template>
     <template v-else-if="payStatus == '2'">
       <div class="flex flex-direction-colunm align-items-c pt100">
-        <img src="../../../assets/images/u10608.svg" class="w100 h100" alt="" />
+        <img :src="this.$assetsUrl + 'images/fail.png'" class="w100 h100" alt="" />
         <p class="mt30">支付失败</p>
       </div>
     </template>
@@ -25,14 +25,17 @@
 
 <script>
 import Vue from 'vue'
-import { Field } from 'vant'
+import { Field, CellGroup } from 'vant'
 
 Vue.use(Field)
 export default {
   name: 'paySuccess',
+  components: {
+    [CellGroup.name]: CellGroup,
+  },
   data() {
     return {
-      payStatus: '2',
+      payStatus: '1',
       productName: '',
       paymentAmount: '',
       bankCardNumber: '',
@@ -44,8 +47,6 @@ export default {
       isReloaded: false,
       // 结果原因
       resMessage: '',
-      // 支付结果
-      payStatus: '',
       // 支付信息
       payInfo: {
         appntName: '', // 投保人
@@ -54,6 +55,9 @@ export default {
       }
     }
   },
+  created() {
+    this.payInfo = JSON.parse( window.localStorage.getItem('payInfo'))
+  },
   methods: {
     goHome() {
       this.$jump({