Merge branch 'dev' of 112.124.100.131:GFRS/ebiz-h5 into dev

src/views/ebiz/cardList/Pay.vue

@@ -201,7 +201,7 @@ export default {
         bankCode: '', //银行卡号
         bankName: '' //开户银行
       },
-      radio: '',
+      radio: '3',
       result: [],
       isScan: false, //是否显示证件扫描组件
       isClear: false, //是否清空
@@ -258,16 +258,15 @@ export default {
       this.radio = '3'
       let token = this.$route.query.token
       let orderNo = this.$route.query.orderNo
-      this.bankListName = this.$route.query.bankListName
-      this.underWriteData.name = this.$route.query.name
-      this.underWriteData.bankName = this.$route.query.bankName
-      this.underWriteData.bankCode = this.$route.query.bankCode
       localStorage.token = token
       localStorage.orderNo = orderNo
       this.isLoading = true
+      setTimeout(() => {
+        this.pay()
+      }, 1000)
     }
-      // 再次支付 调详情 获取信息
-      this.getOrderDetail()
+    // 再次支付 调详情 获取信息
+    this.getOrderDetail()
   },
   mounted() {
     setTimeout(() => {
@@ -285,21 +284,23 @@ export default {
 
     // 不在微信环境下
     // if (!this.isWeixin) {
-      // 获取银行卡
-      this.getBankList()
-      // this.getOrderDetail()
-      // console.log('----保融form.action', config.payUrl)
-      // if (localStorage.salelist == '1') {
-      // 第一次支付 调核保获取
-      // this.underWrite()
-      // this.underWriteData = JSON.parse(window.localStorage.getItem('underWriteData'))
-      // } else {
-      // 再次支付 调详情 获取信息
-      this.getOrderDetail()
-      // this.underWriteData = JSON.parse(window.localStorage.getItem('underWriteData'))
-      // }
-      // console.log('--自核结果--支付信息：', JSON.stringify(this.underWriteData))
-      this.getPayTemp()
+    // 获取银行卡
+    this.getBankList()
+    // this.getOrderDetail()
+    // console.log('----保融form.action', config.payUrl)
+    // if (localStorage.salelist == '1') {
+    // 第一次支付 调核保获取
+    // this.underWrite()
+    // this.underWriteData = JSON.parse(window.localStorage.getItem('underWriteData'))
+    // } else {
+    // 再次支付 调详情 获取信息
+    this.getOrderDetail()
+    // this.underWriteData = JSON.parse(window.localStorage.getItem('underWriteData'))
+    // }
+    // console.log('--自核结果--支付信息：', JSON.stringify(this.underWriteData))
+    this.getPayTemp()
+    
+    
     // }
   },
   beforeRouteLeave(to, from, next) {
@@ -444,15 +445,15 @@ export default {
         console.log('getOrderDetail', res)
         if (res.result == '0') {
           this.orderStatus = res.orderDTO.orderInfoDTO.orderStatus
-          try{
-            if( this.noEdit ){
-              if( res.orderDTO.paymentDTO.cardBookType == '3'){
+          try {
+            if (this.noEdit) {
+              if (res.orderDTO.paymentDTO.cardBookType == '3') {
                 this.radio = '3'
-              }else{
+              } else {
                 this.radio = ''
               }
             }
-          }catch(e){
+          } catch (e) {
             //TODO handle the exception
           }
           this.$toast.clear()
@@ -478,9 +479,9 @@ export default {
             res.orderDTO.orderAccountDTO.cardBookCode !== null ? res.orderDTO.orderAccountDTO.cardBookCode : this.$route.query.bankCode
           this.bankListName = res.orderDTO.orderAccountDTO.bankName !== null ? res.orderDTO.orderAccountDTO.bankName : this.$route.query.bankListName
 
-          if (this.isWeixin) {
-            this.pay()
-          }
+          // if (this.isWeixin) {
+          //   this.pay()
+          // }
         } else {
           this.underWriteData = {
             accountName: '',
@@ -589,6 +590,9 @@ export default {
           window.localStorage.setItem('payStatus', res.payStatus)
           window.localStorage.setItem('payInfo', JSON.stringify(res))
           this.underWriteData.bankListName = this.bankListName
+          if(this.radio == '3'){
+            this.underWriteData.bankCode = ''
+          }
           localStorage['cardList-detail'] = JSON.stringify(this.underWriteData)
           let thisRef = this
           this.$nextTick(() => {
@@ -612,7 +616,7 @@ export default {
     },
     // 点击支付
     async payMent(flag) {
-      if(this.radio == ''){
+      if (this.radio == '') {
         let data = {
           orderDTO: {
             orderInfoDTO: {
@@ -650,47 +654,47 @@ export default {
             loadingType: 'spinner',
             message: '加载中……'
           })
-        
+
           if (!flag) {
             let rs = await this.underWrite()
-        
+
             if (rs.result != '0') {
               this.$toast.clear()
               return this.$toast(rs.resultMessage)
             }
-        
+
             if (rs.uwResult != '02') {
               return this.$toast(rs.message)
             }
           }
-        
+
           this.acceptInsurance()
         } else {
           this.$toast(res.resultMessage)
           this.isLoading = false
         }
         // })
-      }else{
+      } else {
         this.$toast.loading({
           duration: 0, // 持续展示 toast
           forbidClick: true, // 禁用背景点击
           loadingType: 'spinner',
           message: '加载中……'
         })
-                
+
         if (!flag) {
           let rs = await this.underWrite()
-                
+
           if (rs.result != '0') {
             this.$toast.clear()
             return this.$toast(rs.resultMessage)
           }
-                
+
           if (rs.uwResult != '02') {
             return this.$toast(rs.message)
           }
         }
-                
+
         this.acceptInsurance()
       }
     },
@@ -720,12 +724,8 @@ export default {
       localStorage.bankCode = this.underWriteData.bankCode
       localStorage.bankListName = this.bankListName
       console.log(this.underWriteData.bankName, this.underWriteData.bankCode, this.bankListName, this.underWriteData.name)
-      let url = location.origin +
-            '/#/cardList/pay?orderNo=' +
-            localStorage.orderNo +
-            '&token=' +
-            localStorage.token
-      console.log(url);
+      let url = location.origin + '/#/cardList/pay?orderNo=' + localStorage.orderNo + '&token=' + localStorage.token
+      console.log(url)
       EWebBridge.webCallAppInJs('bridge', {
         flag: 'share',
         extra: {