Merge branch 'feature/GFRS-247【卡单】部分变动保存' into feature/GFRS-247【待确定】卡单产品投保

src/views/ebiz/cardList/PayResult.vue

@@ -3,15 +3,12 @@
     <div class="payResult-header flex justify-content-c align-items-c m15 bg-white flex-direction-colunm">
       <img :src="srcSuccess" class="payResult-img mb15 pt15" v-if="payStatus == '1'" />
       <img :src="srcPending" class="payResult-img mb15 pt15" v-if="payStatus == '4' || payStatus == '8'" />
-      <img :src="srcFail" class="payResult-img mb15 pt15" v-if="payStatus == '2'" />
+      <img :src="srcFail" class="payResult-img mb15 pt15" v-if="payStatus == '2' || payStatus == '9'" />
-      <img :src="srcFail" class="payResult-img mb15 pt15" v-if="payStatus == '9'" />
       <h3 v-if="payStatus == '1'" class="mb10">支付成功</h3>
       <h3 v-if="payStatus == '4'" class="mb10">支付中...</h3>
-      <h3 v-if="payStatus == '2'" class="mb10">支付失败</h3>
+      <h3 v-if="payStatus == '2' || payStatus == '9'" class="mb10">支付失败</h3>
-      <h3 v-if="payStatus == '9'" class="mb10">支付失败</h3>
       <span v-if="payStatus == '4'" class="pb10">银行扣款中，请稍后查询</span>
       <span v-if="payStatus == '8'" class="pb10">线下批扣中……</span>
-      <!-- <span v-if="payStatus == '8'">{{ resMessage }}</span> -->
     </div>
     
     <van-cell-group v-if="payStatus == 1">
@@ -28,13 +25,25 @@
     <div v-if="payStatus == '2' || payStatus == '4' || payStatus == '8'" class=" p10 pb250  bg-white">
       <span v-html="resMessage"></span>
     </div>
-    <!-- <div class=" p10 pb250  bg-white">
+    <div class=" p10 pb250  bg-white" v-if="payStatus == '9'">
-      <span v-html="resMessage"></span>
+      <span class="pt150 fs14">{{ resMessage }}</span>
-    </div> -->
+    </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>
     </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>
+    </div>
+    <div class="bottom-area bottom-btn flex" v-if="payStatus == '2' || payStatus == '9'">
+      <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 class="bottom-area bottom-btn flex" v-if="payStatus == '9'">
+      <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="changeCard">换卡支付</van-button>
+    </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>
@@ -136,22 +145,22 @@ export default {
           this.$toast(res.resultMessage)
         }
       })
-    }
+    },
-    // // 重新支付
+    // 重新支付
-    // rePayMent() {
+    rePayMent() {
-    //   //  localStorage.orderNo = order.orderInfoDTO.orderNo
+      //  localStorage.orderNo = order.orderInfoDTO.orderNo
-    //   // 再次支付 salelist为 0
+      // 重新支付 salelist为 0
       // localStorage.salelist = '0'
-    //   this.$jump({
+      this.$jump({
-    //     flag: 'h5',
+        flag: 'h5',
-    //     extra: {
+        extra: {
-    //       url: location.origin + '/#/sale/payMent'
+          url: location.origin + '/#/cardList/pay'
-    //     },
+        },
-    //     routerInfo: {
+        routerInfo: {
-    //       path: '/sale/payMent'
+          path: '/cardList/pay'
-    //     }
+        }
-    //   })
+      })
-    // }
+    }
   },
   created() {
     setTimeout(() => {