Merge branch 'liuxin' into develop

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

@@ -88,10 +88,14 @@ export default {
           })
           if (notNaN.length !== 0) {
             notNaN.forEach(i => {
+              if (!isNaN(parseFloat(i))) {
                 a = a + parseFloat(i)
                 vm.money = a
+              }
+              vm.money = a
             })
-          } else {
+          } else if (notNaN.length === 0) {
+            debugger
             vm.money = 0
           }
         }

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

@@ -144,12 +144,15 @@ export default {
           })
           if (notNaN.length !== 0) {
             notNaN.forEach(i => {
+              if (!isNaN(parseFloat(i))) {
                 a = a + parseFloat(i)
                 if (vm.money !== '') {
                   vm.sumMoney = parseFloat(a + parseFloat(vm.money))
                 } else {
                   vm.sumMoney = a
                 }
+              }
+              vm.money = a
             })
           } else {
             if (vm.money !== '') {