Merge branch 'liuxin' into develop

src/pages/pay/firstPay/contract-record.vue

@@ -160,17 +160,20 @@ export default {
       vm.$post(url, param).then(function (res) {
         vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
-          vm.toPayEntry(vm.money)
+          let e = res.order_id
+          vm.toPayEntry(e)
         } else {
           hlsPopup.showLongCenter(res.message)
         }
       })
     },
-    toPayEntry (money) {
+    toPayEntry (e) {
       this.$router.push({
         name: 'PayEntry',
         params: {
-          money,
+          money: this.money,
+          order_id: e,
+
         },
       })
     },

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

@@ -123,17 +123,19 @@ export default {
       vm.$post(url, param).then(function (res) {
         vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
-          vm.toPayEntry(vm.money)
+          let e = res.order_id
+          vm.toPayEntry(e)
         } else {
           hlsPopup.showLongCenter(res.message)
         }
       })
     },
-    toPayEntry (money) {
+    toPayEntry (e) {
       this.$router.push({
         name: 'PayEntry',
         params: {
-          money,
+          money: this.money,
+          order_id: e,
         },
       })
     },

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

@@ -22,7 +22,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" >
@@ -38,7 +38,7 @@
                   <img v-show="select !== `nong${index}`" src="@/assets/payment/unselect.png" alt >
                 </section>
               </item>
-              <item :proportion="[7,1,1]" @click.native="isSelect('one');ischeck('one')">
+              <!-- <item :proportion="[7,1,1]" @click.native="isSelect('one');ischeck('one')">
                 <div slot="name">
                   <img src="@/assets/payment/alipay.png" alt class="icon1" > 支付宝
                 </div>
@@ -55,12 +55,12 @@
                   <img v-show="select === 'two'" src="@/assets/payment/select.png" alt >
                   <img v-show="select !== 'two'" src="@/assets/payment/unselect.png" alt >
                 </section>
-              </item>
+              </item> -->
               <item
                 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" >
@@ -111,7 +111,7 @@
             </div>
           </div>
           <bottom-tab>
-            <tab-button class="foot" @click.native="pay">立即支付</tab-button>
+            <tab-button class="foot" @click.native="checkPay">立即支付</tab-button>
           </bottom-tab>
         </div>
       </div>
@@ -212,28 +212,15 @@ export default {
     },
     newList () {
       let vm = this
-      vm.nongBank = []
-      vm.lists.forEach((item, i) => {
-        if (item.bank_full_name.indexOf('农业') !== -1) {
-          vm.nongBank.push(vm.lists[i])
-          vm.flag = true
-        }
-      })
       let notNong = vm.lists.filter(i => {
         return i.bank_full_name.indexOf('农业') === -1
       })
-      if (vm.flag) {
-        vm.select = 'nong0'
-        vm.checkType.bank_full_name = '农业银行'
-        vm.checkType.img = ny
-        vm.checkType.bank_account_num = this.nongBank[0].bank_account_num
-        vm.sectctNong = true
-      } else {
-        vm.select = 'one'
-        vm.checkType.bank_full_name = '支付宝'
-        vm.checkType.img = zfb
-        vm.sectctNong = false
-      }
+      // else {
+      //   vm.select = 'one'
+      //   vm.checkType.bank_full_name = '支付宝'
+      //   vm.checkType.img = zfb
+      //   vm.sectctNong = false
+      // }
       return notNong
     },
   },
@@ -310,17 +297,50 @@ export default {
       }
       this.show = false
     },
+    confirmToPay (e) {
+      let vm = this
+      let url = process.env.basePath + 'update_order_info'
+      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,
+        },
+      }
+      hlsPopup.showLoading('请稍候')
+      vm.$post(url, param).then(function (res) {
+        if (res.result === 'S') {
+          vm.hlsPopup.hideLoading()
+        } else {
+          hlsPopup.showLongCenter(res.message)
+        }
+      })
+    },
+    checkPay () {
+      let vm = this
+      if (parseFloat(vm.sumMoney) === 0) {
+        hlsPopup.showLongCenter('您支付的金额为0元')
+        console.log('您支付的金额为0元')
+      } else if (parseFloat(vm.sumMoney) > 0) {
+        vm.pay()
+      }
+    },
     pay () {
       let vm = this
+      let url = process.env.basePath + 'merchant_payment'
+      let param = {
+        order_id: vm.$route.params.order_id,
+      }
       hlsPopup.showLoading('请稍候')
-      setTimeout(() => {
+      vm.$post(url, param).then(function (res) {
         vm.hlsPopup.hideLoading()
-        if (vm.money === 0) {
-          vm.downNum = true
+        if (res.result === 'S') {
+          window.open(res.paymentURL)
         } else {
-          vm.changePage()
+          hlsPopup.showLongCenter(res.message)
         }
-      }, 2000)
+      })
     },
     affirm () {
       this.confirm = true
@@ -346,6 +366,32 @@ export default {
         vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
           vm.lists = res.lists
+          vm.nongBank = []
+          vm.lists.forEach((item, i) => {
+            if (item.bank_full_name.indexOf('农业') !== -1) {
+              vm.nongBank.push(vm.lists[i])
+              vm.flag = true
+            }
+          })
+          if (vm.flag) {
+            vm.select = 'nong0'
+            vm.checkType.bank_full_name = '农业银行'
+            vm.checkType.img = ny
+            vm.checkType.bank_account_num = vm.nongBank[0].bank_account_num
+            vm.sectctNong = true
+            vm.confirmToPay(vm.nongBank[0])
+          } 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])
+          } else if (!vm.flag && vm.lists === 0) {
+            vm.sectctNong = false
+            hlsPopup.showLongCenter('请先绑定银行卡')
+            vm.checkType.bank_full_name = '（无）'
+          }
         } else {
           hlsPopup.showLongCenter(res.message)
         }
@@ -356,7 +402,7 @@ export default {
 </script>
 <style lang='less' >
 #pay-entry {
-.vue-better-scroll__wrapper{
+  .vue-better-scroll__wrapper {
     padding: 0;
   }
   .trans-enter-active,
@@ -379,8 +425,8 @@ export default {
     .down {
       height: 466px;
       width: 100%;
-     position: relative;
-      top:18%;
+      position: relative;
+      top: 18%;
       background: #fff;
       border-radius: 12px 12px 0 0;
       overflow: scroll;
@@ -422,8 +468,8 @@ export default {
     .down {
       height: 466px;
       width: 100%;
-     position: relative;
-      top:18%;
+      position: relative;
+      top: 18%;
       background: #fff;
       border-radius: 12px 12px 0 0;
       overflow: scroll;
@@ -453,7 +499,7 @@ export default {
         //width: 350px;
         //margin: 0 auto;
         width: 100%;
-       padding: 0 4% 0 4%;
+        padding: 0 4% 0 4%;
         background: #fff;
         .hls-item {
           padding-left: 12px;
@@ -463,7 +509,7 @@ export default {
             font-family: PingFangSC-Regular;
             font-size: 14px;
             color: #656464;
-            div{
+            div {
               display: flex;
               justify-content: center;
               align-items: center;
@@ -485,7 +531,7 @@ export default {
             }
             .icon {
               width: 30px;
-             /* display: block;
+              /* display: block;
               float: left;
               position: relative;*/
               margin: 0 8px 0 3px;
@@ -565,7 +611,7 @@ export default {
     }
   }
   .push {
-   /* position: absolute;
+    /* position: absolute;
     top: 10px;
     margin-left: 10px;*/
     width: 35px;

src/pages/pay/payment/contract-record.vue

@@ -212,18 +212,19 @@ export default {
       vm.$post(url, param).then(function (res) {
         vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
-          vm.toPayEntry(vm.sumMoney)
+          vm.toPayEntry(res.order_id)
         } else {
           hlsPopup.showLongCenter(res.message)
         }
       })
     },
-    toPayEntry (money) {
+    toPayEntry (e) {
       this.$router.push({
         name: 'PaymentPayEntry',
         params: {
           sumMoney: this.sumMoney,
           money: this.money,
+          order_id: e,
         },
       })
     },

src/pages/pay/payment/new-list.vue

@@ -132,7 +132,7 @@ export default {
       vm.$post(url, param).then(function (res) {
         vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
-          vm.toPayEntry(vm.money)
+          vm.toPayEntry(res.order_id)
         } else {
           hlsPopup.showLongCenter(res.message)
         }
@@ -157,11 +157,12 @@ export default {
         }
       })
     },
-    toPayEntry () {
+    toPayEntry (e) {
       this.$router.push({
         name: 'PaymentPayEntry',
         params: {
           money: this.money,
+          order_id: e,
         },
       })
     },

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

@@ -22,7 +22,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" >
@@ -38,7 +38,7 @@
                   <img v-show="select !== `nong${index}`" src="@/assets/payment/unselect.png" alt >
                 </section>
               </item>
-              <item :proportion="[7,1,1]" @click.native="isSelect('one');ischeck('one')">
+              <!-- <item :proportion="[7,1,1]" @click.native="isSelect('one');ischeck('one')">
                 <div slot="name">
                   <img src="@/assets/payment/alipay.png" alt class="icon1" > 支付宝
                 </div>
@@ -55,12 +55,12 @@
                   <img v-show="select === 'two'" src="@/assets/payment/select.png" alt >
                   <img v-show="select !== 'two'" src="@/assets/payment/unselect.png" alt >
                 </section>
-              </item>
+              </item> -->
               <item
                 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" >
@@ -110,7 +110,7 @@
             </div>
           </div>
           <bottom-tab>
-            <tab-button class="footer" @click.native="pay">立即支付</tab-button>
+            <tab-button class="footer" @click.native="checkPay">立即支付</tab-button>
           </bottom-tab>
         </div>
       </div>
@@ -210,28 +210,11 @@ export default {
     },
     newList () {
       let vm = this
-      vm.nongBank = []
-      vm.lists.forEach((item, i) => {
-        if (item.bank_full_name.indexOf('农业') !== -1) {
-          vm.nongBank.push(vm.lists[i])
-          vm.flag = true
-        }
-      })
+
       let notNong = vm.lists.filter(i => {
         return i.bank_full_name.indexOf('农业') === -1
       })
-      if (vm.flag) {
-        vm.select = 'nong0'
-        vm.checkType.bank_full_name = '农业银行'
-        vm.checkType.img = ny
-        vm.checkType.bank_account_num = this.nongBank[0].bank_account_num
-        vm.sectctNong = true
-      } else {
-        vm.select = 'one'
-        vm.checkType.bank_full_name = '支付宝'
-        vm.checkType.img = zfb
-        vm.sectctNong = false
-      }
+
       return notNong
     },
   },
@@ -254,17 +237,50 @@ export default {
     affirm () {
       this.confirm = true
     },
+    confirmToPay (e) {
+      let vm = this
+      let url = process.env.basePath + 'update_order_info'
+      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,
+        },
+      }
+      hlsPopup.showLoading('请稍候')
+      vm.$post(url, param).then(function (res) {
+        if (res.result === 'S') {
+          vm.hlsPopup.hideLoading()
+        } else {
+          hlsPopup.showLongCenter(res.message)
+        }
+      })
+    },
+    checkPay () {
+      let vm = this
+      if (parseFloat(vm.sumMoney) === 0) {
+        hlsPopup.showLongCenter('您支付的金额为0元')
+        console.log('您支付的金额为0元')
+      } else if (parseFloat(vm.sumMoney) > 0) {
+        vm.pay()
+      }
+    },
     pay () {
       let vm = this
+      let url = process.env.basePath + 'merchant_payment'
+      let param = {
+        order_id: vm.$route.params.order_id,
+      }
       hlsPopup.showLoading('请稍候')
-      setTimeout(() => {
+      vm.$post(url, param).then(function (res) {
         vm.hlsPopup.hideLoading()
-        if (vm.money === 0) {
-          vm.downNum = true
+        if (res.result === 'S') {
+          window.open(res.paymentURL)
         } else {
-          vm.goSuccess()
+          hlsPopup.showLongCenter(res.message)
         }
-      }, 2000)
+      })
     },
     ischeck (way) {
       if (way === 'one') {
@@ -342,6 +358,32 @@ export default {
         vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
           vm.lists = res.lists
+          vm.nongBank = []
+          vm.lists.forEach((item, i) => {
+            if (item.bank_full_name.indexOf('农业') !== -1) {
+              vm.nongBank.push(vm.lists[i])
+              vm.flag = true
+            }
+          })
+          if (vm.flag) {
+            vm.select = 'nong0'
+            vm.checkType.bank_full_name = '农业银行'
+            vm.checkType.img = ny
+            vm.checkType.bank_account_num = vm.nongBank[0].bank_account_num
+            vm.sectctNong = true
+            vm.confirmToPay(vm.nongBank[0])
+          } 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])
+          } else if (!vm.flag && vm.lists === 0) {
+            vm.sectctNong = false
+            hlsPopup.showLongCenter('请先绑定银行卡')
+            vm.checkType.bank_full_name = '（无）'
+          }
         } else {
           hlsPopup.showLongCenter(res.message)
         }