Commit 41b53b1d authored by linxin's avatar linxin

Merge branch 'liuxin' into develop

parents b7b6406b 2b55eb76
Pipeline #4087 canceled with stages
......@@ -88,10 +88,14 @@ export default {
})
if (notNaN.length !== 0) {
notNaN.forEach(i => {
a = a + parseFloat(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
}
}
......
......@@ -144,12 +144,15 @@ export default {
})
if (notNaN.length !== 0) {
notNaN.forEach(i => {
a = a + parseFloat(i)
if (vm.money !== '') {
vm.sumMoney = parseFloat(a + parseFloat(vm.money))
} else {
vm.sumMoney = a
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 !== '') {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment