Merge branch 'feature/GFRS-2301【需求】健康险渠道国富无忧卡金掌桂开发的需求' into dev

src/views/ebiz/cardList/Pay.vue

@@ -598,18 +598,18 @@ export default {
         //   },
         // })
         // return;
-        this.$jump({
+        // this.$jump({
-          flag: 'h5',
+        //   flag: 'h5',
-          extra: {
+        //   extra: {
-            forbidSwipeBack: 1, //当前页面禁止右滑返回
+        //     forbidSwipeBack: 1, //当前页面禁止右滑返回
-            url: location.origin + `/#/cardList/PayResult`,
+        //     url: location.origin + `/#/cardList/PayResult`,
-          },
+        //   },
-          routerInfo: {
+        //   routerInfo: {
-            path: `/cardList/PayResult`,
+        //     path: `/cardList/PayResult`,
-            type: '1',
+        //     type: '1',
-          },
+        //   },
-        })
+        // })
-        return
+        // return
         console.log('----取支付参数结果：', JSON.stringify(res))
         // res = {'result':'0','resultMessage':'','content':null,'prtNo':'8186270000000008','payStatus':'4','amnt':'63700.00','appntName':'投保人','message':null,'brPayReturnData':{'result':'','resultMessage':'','content':null,'businessId':'1569125393518','businessNo':'8186270000000008','tradeSubType':'COMM','businessType':'SALE','systemType':'GF','money':63700,'businessSubType':'XDCB','thirdType':'0002','thirdName':null,'bankCode':'ABC','epayOrderNo':'1909221209536259999900','companyAccount':null,'tradeState':'TRADING','standardCode':'DEALING','standardMsg':null,'thirdOrderNo':null,'respRemark':null,'tradeTime':'2019-09-22T04:09:53.518+0000','description':'','version':'1','sourceNotecode':'8186270000000008','payType':'MIT01','expireDate':'20191010101010','transSeq':'20190922120953782','transSource':'MIT','applyEntity':'11860000','paymentCode':'8186270000000008','transDate':'20190922','rdSeq':'1909221209536259999900','settleMode':null,'cur':'CNY','transTime':'120953','ourAmount':63700,'fixUser':'1','insurer':'投保人','certType':'0','certNum':'110101199009210011','oppBank':'ABC','oppAct':'6228481200290317812','oppActName':'投保人','cellPhone':null,'purpose':null,'memo':null,'returnURL':'http://139.199.50.151/#/sale/payResult','notifyURL':'http://139.199.50.151:7000/api/v1/epay/epay/payResult','s3Sign':'e3f0581ec6b751337e8eca360a0746bc'}}
         if (res.result == '0') {

src/views/ebiz/cardList/PayResult.vue

@@ -33,21 +33,21 @@
       <van-button type="danger" size="large" @click="next" v-no-more-click="1000">返回首页</van-button>
     </div> -->
     <template v-if="!isWeixin">
-      <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> -->
       <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>
+        <!-- <van-button class="m-btn w250" type="danger" size="normal" @click="next">返回首页</van-button> -->
       </div>
     </template>
     <template v-else>
       <div class="bottom-btn bg-white" v-if="payStatus == '1' || payStatus == '4' || payStatus == '8'">
-        <van-button type="danger" size="large" @click="close" v-no-more-click="1000">返回</van-button>
+        <!-- <van-button type="danger" size="large" @click="close" 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>
+        <!-- <van-button class="m-btn w250" type="danger" size="normal" @click="next">返回</van-button> -->
       </div>
     </template>
     <!--    <div class="bottom-area bottom-btn flex" v-if="payStatus == '9'">

src/views/ebiz/cardList/cardDetail.vue

@@ -31,7 +31,7 @@
         <van-field value="保额" label="保险责任" name="保险责任" readonly />
       </div>      
       <div class="duty" v-for="(item, index) in riskDTO.dutyLst" :key="index">
-        <van-field :value="item.prem" :label="item.dutyName" :name="item.dutyName" readonly />
+        <van-field :value="item.amt + '元'" :label="item.dutyName" :name="item.dutyName" readonly />
       </div>
       <van-field :value="riskDTO.prem" label="保费" name="保费" readonly />
       <van-field :value="riskDTO.insuYear + riskDTO.dateCN" label="保险期间" name="保险期间" readonly />