Merge branch 'master' into release

This commit is contained in:
Jay 2018-08-23 23:40:13 +08:00
commit 4b9e881599

View File

@ -173,7 +173,7 @@ r.get('/channel/:chid/opay/bar', async (c, n) => {
text, values text, values
}) })
if (priceResult.rowCount > 0) { if (priceResult.rowCount > 0) {
setting.total = priceResult.rows[0].price setting.total = priceResult.rows[0].total
} else { } else {
setting.total = 0 setting.total = 0
} }