Merge branch 'develop' of https://hel.hand-china.com/xugong/hls-xcmg-vue-app into develop

src/pages/contractSigning/contract-signing.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-11-25 15:50:46
+ * @LastEditTime: 2019-11-28 10:53:27
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->

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

@@ -183,6 +183,8 @@ export default {
       select: 'three0',
       name: '',
       sectctNong: false,
+      pay_type: '',
+      bank_account_id: '',
       checkType: {
         img: '',
         bank_full_name: '',
@@ -300,12 +302,16 @@ export default {
     confirmToPay (e) {
       let vm = this
       let url = process.env.basePath + 'update_order_info'
+      if (e) {
+        vm.pay_type = e.pay_type
+        vm.bank_account_id = e.bank_account_id
+      }
       let param = {
         info: {
           order_id: vm.$route.params.order_id,
-          fee: vm.sumMoney,
-          bank_account_id: e.bank_account_id,
-          pay_type: e.pay_type,
+          fee: vm.serviceCharge,
+          bank_account_id: vm.bank_account_id,
+          pay_type: vm.pay_type,
         },
       }
       hlsPopup.showLoading('请稍候')
@@ -353,6 +359,7 @@ export default {
     },
     affirm () {
       this.confirm = true
+      this.confirmToPay()
     },
     changePage () {
       this.$router.push({
@@ -388,14 +395,18 @@ export default {
             vm.checkType.img = ny
             vm.checkType.bank_account_num = vm.nongBank[0].bank_account_num
             vm.sectctNong = true
-            vm.confirmToPay(vm.nongBank[0])
+            // vm.confirmToPay(vm.nongBank[0])
+            vm.pay_type = vm.nongBank[0].pay_type
+            vm.bank_account_id = vm.nongBank[0].bank_account_id
           } else if (!vm.flag && vm.lists.length !== 0) {
             vm.select = 'three0'
             vm.checkType.bank_full_name = vm.newList[0].bank_full_name
             vm.checkType.img = vm.selectImg(vm.newList[0])
             vm.checkType.bank_account_num = vm.newList[0].bank_account_num
             vm.sectctNong = true
-            vm.confirmToPay(vm.lists[0])
+            vm.pay_type = vm.lists[0].pay_type
+            vm.bank_account_id = vm.lists[0].bank_account_id
+            // vm.confirmToPay(vm.lists[0])
           } else if (!vm.flag && vm.lists === 0) {
             vm.sectctNong = false
             hlsPopup.showLongCenter('请先绑定银行卡')

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

@@ -181,6 +181,8 @@ export default {
       money: '',
       select: 'one',
       name: '',
+      pay_type: '',
+      bank_account_id: '',
       sectctNong: false,
       checkType: {
         img: '',
@@ -236,16 +238,21 @@ export default {
   methods: {
     affirm () {
       this.confirm = true
+      this.confirmToPay()
     },
     confirmToPay (e) {
       let vm = this
       let url = process.env.basePath + 'update_order_info'
+      if (e) {
+        vm.pay_type = e.pay_type
+        vm.bank_account_id = e.bank_account_id
+      }
       let param = {
         info: {
           order_id: vm.$route.params.order_id,
-          fee: vm.sumMoney,
-          bank_account_id: e.bank_account_id,
-          pay_type: e.pay_type,
+          fee: vm.serviceCharge,
+          bank_account_id: vm.bank_account_id,
+          pay_type: vm.pay_type,
         },
       }
       hlsPopup.showLoading('请稍候')
@@ -380,14 +387,18 @@ export default {
             vm.checkType.img = ny
             vm.checkType.bank_account_num = vm.nongBank[0].bank_account_num
             vm.sectctNong = true
-            vm.confirmToPay(vm.nongBank[0])
+            // vm.confirmToPay(vm.nongBank[0])
+            vm.pay_type = vm.nongBank[0].pay_type
+            vm.bank_account_id = vm.nongBank[0].bank_account_id
           } else if (!vm.flag && vm.lists.length !== 0) {
             vm.select = 'three0'
             vm.checkType.bank_full_name = vm.newList[0].bank_full_name
             vm.checkType.img = vm.selectImg(vm.newList[0])
             vm.checkType.bank_account_num = vm.newList[0].bank_account_num
             vm.sectctNong = true
-            vm.confirmToPay(vm.lists[0])
+            vm.pay_type = vm.lists[0].pay_type
+            vm.bank_account_id = vm.lists[0].bank_account_id
+            // vm.confirmToPay(vm.lists[0])
           } else if (!vm.flag && vm.lists === 0) {
             vm.sectctNong = false
             hlsPopup.showLongCenter('请先绑定银行卡')

src/pages/userBind/org/enterprise.vue

@@ -2,7 +2,7 @@
  * @Description: In User Settings Edit
  * @Author: your name
  * @Date: 2019-09-19 09:31:19
- * @LastEditTime: 2019-11-28 09:16:46
+ * @LastEditTime: 2019-11-28 14:13:20
  * @LastEditors: Please set LastEditors
  -->
 <template>