diff --git a/pages-biz/bill/payHistory.vue b/pages-biz/bill/payHistory.vue index 1067b97..938745a 100644 --- a/pages-biz/bill/payHistory.vue +++ b/pages-biz/bill/payHistory.vue @@ -174,8 +174,13 @@ this.resetAndLoad(); }, formatMoney(val) { - if (!val && val !== 0) return '—'; - return '¥' + Number(val).toFixed(2); + if (val === null || val === undefined || isNaN(val)) return '—'; + val = Number(val); + if (val >= 100000) { + const wan = val / 10000; + return '¥' + wan + '万'; + } + return '¥' + val.toFixed(2); }, resetAndLoad(){ this.loadStatus = 'more'; diff --git a/pages-biz/unpaid/unpaid.vue b/pages-biz/unpaid/unpaid.vue index c44e04d..6c53a8c 100644 --- a/pages-biz/unpaid/unpaid.vue +++ b/pages-biz/unpaid/unpaid.vue @@ -162,8 +162,9 @@ formatMoney(val) { if (val === null || val === undefined || isNaN(val)) return '—'; val = Number(val); - if (val >= 10000) { - return '¥' + (val / 10000).toFixed(2) + '万'; + if (val >= 100000) { + const wan = val / 10000; + return '¥' + wan + '万'; } return '¥' + val.toFixed(2); }, @@ -255,14 +256,14 @@ signType: order.miniPayRequest.signType, paySign: order.miniPayRequest.paySign, success: () => { + this.isPaying = false; billList.forEach(b => b.checked = false); this.updateSelected(); this.refresh(); - this.isPaying = false; }, fail: (err) => { - this.payFailCallback(err, orderId); this.isPaying = false; + this.payFailCallback(err, orderId); } }); diff --git a/pages-biz/unpaid/unpaidMargin.vue b/pages-biz/unpaid/unpaidMargin.vue index eda82d8..e8621f8 100644 --- a/pages-biz/unpaid/unpaidMargin.vue +++ b/pages-biz/unpaid/unpaidMargin.vue @@ -164,8 +164,9 @@ formatMoney(val) { if (val === null || val === undefined || isNaN(val)) return '—'; val = Number(val); - if (val >= 10000) { - return '¥' + (val / 10000).toFixed(2) + '万'; + if (val >= 100000) { + const wan = val / 10000; + return '¥' + wan + '万'; } return '¥' + val.toFixed(2); }, @@ -257,14 +258,14 @@ signType: order.miniPayRequest.signType, paySign: order.miniPayRequest.paySign, success: () => { + this.isPaying = false; billList.forEach(b => b.checked = false); this.updateSelected(); this.refresh(); - this.isPaying = false; }, fail: (err) => { - this.payFailCallback(err, orderId); this.isPaying = false; + this.payFailCallback(err, orderId); } }); diff --git a/pages-biz/wae/wae.vue b/pages-biz/wae/wae.vue index e0d3754..7771183 100644 --- a/pages-biz/wae/wae.vue +++ b/pages-biz/wae/wae.vue @@ -161,8 +161,9 @@ formatMoney(val) { if (val === null || val === undefined || isNaN(val)) return '—'; val = Number(val); - if (val >= 10000) { - return '¥' + (val / 10000).toFixed(2) + '万'; + if (val >= 100000) { + const wan = val / 10000; + return '¥' + wan + '万'; } return '¥' + val.toFixed(2); }, @@ -233,14 +234,14 @@ signType: order.miniPayRequest.signType, paySign: order.miniPayRequest.paySign, success: () => { + this.isPaying = false; billList.forEach(b => b.checked = false); this.updateSelected(); this.refresh(); - this.isPaying = false; }, fail: (err) => { - this.payFailCallback(err, orderId); this.isPaying = false; + this.payFailCallback(err, orderId); } });