解决冲突

src/pages/pay/firstPay/pay-entry.vue

@@ -81,7 +81,7 @@
         </div>
       </div>
     </transition>
-     <transition name="trans">
+    <transition name="trans">
       <div v-show="showOutside" class="modal-show-bank">
         <div class="down">
           <div class="top">
@@ -94,7 +94,7 @@
                 v-for="(item,index) in nongBank"
                 :proportion="[7,1,1]"
                 :key="item.bank_account_num"
-                @click.native="isSelect(`nong${index}`);ischeck(item)"
+                @click.native="isSelect(`nong${index}`);ischeck(item);confirmToPay(item)"
               >
                 <div slot="name" style="flex=3">
                   <img :src="selectImg(item)" alt class="icon" >
@@ -114,7 +114,7 @@
                 v-for="(item,index) in newList"
                 :proportion="[7,1,1]"
                 :key="index"
-                @click.native="isSelect(`three${index}`);ischeck(item)"
+                @click.native="isSelect(`three${index}`);ischeck(item);confirmToPay(item)"
               >
                 <div slot="name" style="flex=3">
                   <img :src="selectImg(item)" alt class="icon" >
@@ -165,7 +165,7 @@
             </div>
           </div>
           <bottom-tab>
-            <tab-button :disable="isReturn" class="foot" @click.native="checkPay">立即支付</tab-button>
+            <tab-button class="foot" @click.native="checkPay">立即支付</tab-button>
           </bottom-tab>
         </div>
       </div>
@@ -205,7 +205,7 @@
       </div>
     </h-content>
     <bottom-tab>
-      <tab-button class="foot" @click.native="affirm">确认支付</tab-button>
+      <tab-button class="foot" @click.native="affirm();pay()">确认支付</tab-button>
     </bottom-tab>
   </h-view>
 </template>
@@ -239,7 +239,6 @@ export default {
       select: 'three0',
       name: '',
       sectctNong: false,
-      isReturn:true,
       pay_type: '',
       bank_account_id: '',
       checkType: {
@@ -249,7 +248,7 @@ export default {
       },
       confirm: false,
       show: false,
-      showOutside:false,
+      showOutside: false,
       downNum: false,
       recommand: false,
       userName: window.localStorage.getItem('bp_name'),
@@ -290,7 +289,6 @@ export default {
       vm.show = false
       vm.showOutside = false
       vm.downNum = false
-      vm.isReturn = true
       vm.name = from.name
       vm.getType()
       vm.nongBank = []
@@ -377,8 +375,8 @@ export default {
       }
       hlsPopup.showLoading('请稍候')
       vm.$post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
-            vm.pay()
         } else {
           hlsPopup.showLongCenter(res.message)
         }
@@ -388,9 +386,10 @@ export default {
       let vm = this
       if (parseFloat(vm.sumMoney) === 0) {
         hlsPopup.showLongCenter('您支付的金额为0元')
-        console.log('您支付的金额为0元')
-      } else if (parseFloat(vm.sumMoney) > 0) {
+      } else if (parseFloat(vm.sumMoney) > 0 && vm.pay_type === 'ABC') {
         window.open(vm.url)
+      } else {
+        vm.pay()
       }
     },
     pay () {
@@ -405,7 +404,6 @@ export default {
         if (res.result === 'S') {
           if (res.return_code !== '0000') {
             hlsPopup.showLongCenter(res.error_message)
-            vm.isReturn = true
           } else {
             // vm.$router.push({
             //   name: 'PayPage',
@@ -414,7 +412,6 @@ export default {
             //   },
             // })
             vm.url = res.paymentURL
-            vm.isReturn = false
           }
         } else {
           hlsPopup.showLongCenter(res.message)