From 106fc09e267f67bb35a279ed1bf71068a61e73c4 Mon Sep 17 00:00:00 2001
From: Jacob <hlnie@tohours.com>
Date: 星期五, 23 十月 2026 13:26:24 +0800
Subject: [PATCH] Merge branch 'dev' into sit
---
main.js | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/main.js b/main.js
index 7755f77..06ff883 100644
--- a/main.js
+++ b/main.js
@@ -228,16 +228,21 @@
Vue.mixin(pageLog);
import BigNumber from 'bignumber.js';
Vue.prototype.toNumber = function(number) {
- if (isNaN(number)) {
- return number;
- } else {
- return BigNumber(number).toNumber();
+ // null / undefined / 绌哄�� / 闈炴暟瀛楃粺涓�杩斿洖 0锛岄伩鍏嶉〉闈㈡樉绀� null銆乽ndefined銆丯aN
+ if (number === null || number === undefined || number === '' || isNaN(number)) {
+ return 0;
}
+ const result = BigNumber(number).toNumber();
+ return isNaN(result) ? 0 : result;
}
Vue.prototype.toThousands = function(num) {
- if (num < 1000) return num;
- if (Number.isInteger(num)) {
+ // null / undefined / 绌哄�� / 闈炴暟瀛楃粺涓�杩斿洖 0锛岄伩鍏嶉〉闈㈡樉绀� null銆乽ndefined銆丯aN
+ if (num === null || num === undefined || num === '' || isNaN(num)) {
+ return 0;
+ }
+ if (Number(num) < 1000) return num;
+ if (Number.isInteger(Number(num))) {
return String(num).replace(/(?!^)(?=(\d{3})+$)/g, ',')
} else {
return String(num).replace(/(?!^)(?=(\d{3})+\.)/g, ',')
--
Gitblit v1.4.0