Merge branch 'liuxin' into develop

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

@@ -92,7 +92,7 @@ export default {
       vm.hlsHttp.post(url, param).then(function (res) {
         vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
-          this.$router.push({
+          vm.$router.push({
             name: 'MarginPayEntry',
             params: {
               order_id: res.order_id,

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

@@ -230,6 +230,7 @@ export default {
       vm.showOutside = false
       vm.downNum = false
       vm.name = from.name
+      vm.money = vm.$route.params.money
       vm.getType()
       vm.nongBank = []
       vm.getPayType()
@@ -237,7 +238,7 @@ export default {
   },
 
   activated () {
-    this.money = this.$route.params.money
+    // this.money = this.$route.params.money
   },
   methods: {
     selectPayType (e) {