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

src/views/ebiz/cardList/Pay.vue

@@ -37,7 +37,9 @@
           </van-cell>
         </van-cell-group>
       </div>
-      <!-- 银行卡支付结束 -->
+
+
+       <!-- 银行卡支付结束 -->
       <van-cell-group v-if="radio != '3'">
         <van-field
           v-model="underWriteData.appntName"
@@ -51,7 +53,7 @@
           required
         />
 
-        <!-- <template v-if="noEdit">
+        <template v-if="noEdit">
           <van-field
             v-model="underWriteData.bankCode"
             maxlength="19"
@@ -76,8 +78,8 @@
             data-vv-name="开户银行"
             required
           />
-        </template> -->
-        <template>
+        </template>
+        <template v-else>
           <van-field
             v-model="underWriteData.bankCode"
             maxlength="19"
@@ -256,7 +258,7 @@ export default {
       },
       gotPayParam: false, // 是否已正确获取支付参数,
       payStatus: '', // 接口返回的支付状态
-      noEdit: true, //是否为编辑
+      noEdit: false, //是否为编辑
       isWeixin, // 是否为微信环境
       isLoading: false, // 分享到微信后的页面loading
     }
@@ -452,7 +454,7 @@ export default {
       getPayTemp({ orderNo: window.localStorage.getItem('orderNo') })
         .then((res) => {
           if (res.result == '0') {
-            this.noEdit = res.content.flag != 'false'
+            this.noEdit = res.content.flag != 'false'               
           }
         })
         .catch((e) => {
@@ -461,8 +463,7 @@ export default {
     },
     // 获取支付详情
     getOrderDetail() {
-      getOrderDetail({ orderNo: window.localStorage.getItem('orderNo') }).then((res) => {
-        console.log('getOrderDetail', res)
+      getOrderDetail({ orderNo: window.localStorage.getItem('orderNo') }).then((res) => {        
         if (res.result == '0') {
           this.orderStatus = res.orderDTO.orderInfoDTO.orderStatus
           try {
@@ -470,14 +471,13 @@ export default {
               if (res.orderDTO.paymentDTO.cardBookType == '3') {
                 this.radio = '3'
               } else {
-                this.radio = ''
+                this.radio = '' 
               }
-            }
+            }            
           } catch (e) {
             //TODO handle the exception
           }
-          this.$toast.clear()
-          console.log(res.orderDTO.orderAccountDTO.bankCode)
+          this.$toast.clear()          
           this.underWriteData = {
             riskName: res.orderDTO.insuredDTOs[0].riskDTOLst[0].riskName,
             appntName: res.orderDTO.appntDTO.name,
@@ -557,10 +557,8 @@ export default {
     //   // })
     // },
     async pay() {
-      let valid = await this.$validator.validate()
-      console.log(valid)
-      if (true !== valid) {
-        console.log(this.$validator)
+      let valid = await this.$validator.validate()      
+      if (true !== valid) {        
         return this.$toast(this.$validator.errors.all()[0])
       }
       switch (this.orderStatus) {
@@ -610,8 +608,7 @@ export default {
         //     type: '1',
         //   },
         // })
-        // return
-        console.log('----取支付参数结果：', JSON.stringify(res))
+        // return        
         // 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') {
           // 1成 4支付中 2支付失败 8转批扣(无此情况）