From 4db5d1b113d76a26b48834909cbdd03b3286e85d Mon Sep 17 00:00:00 2001
From: Tevin <tingquanren@163.com>
Date: Fri, 18 Jun 2021 14:57:35 +0800
Subject: [PATCH] Merge branch 'master' of ssh://dev.zhiheiot.com:29418/mob-components
---
common/Tools.js | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/common/Tools.js b/common/Tools.js
index a7a9a44..90c1848 100644
--- a/common/Tools.js
+++ b/common/Tools.js
@@ -11,13 +11,14 @@
/**
* 显示消息
* @param msg
+ * @param [duration=2000]
*/
- static toast(msg) {
+ static toast(msg, duration = 2000) {
Taro.showToast({
title: msg,
icon: 'none',
mask: true,
- duration: 2000,
+ duration,
});
}
@@ -360,16 +361,13 @@
* @return {string}
*/
static moneyFormat(number) {
- if (!number && typeof number !== 'number') {
+ if (!number && typeof number !== 'number' && typeof number !== 'string') {
return '';
}
if (typeof number === 'string') {
number = Number(number) || 0;
}
- const numFixed = number.toFixed(2);
- const integer = parseInt(numFixed);
- const decimal = numFixed.split('.')[1];
- return integer.toLocaleString() + '.' + decimal;
+ return number.toFixed(2);
}
/**
@@ -454,7 +452,8 @@
x: parseFloat(Taro.pxTransform(1000, 750)), y: 1000,
};
window.rem = val => {
- const px = (val - p1.x) * (p2.y - p1.y) / (p2.x - p1.x) + p1.y;
+ const value = typeof val === 'number' ? val : parseFloat(val);
+ const px = (value - p1.x) * (p2.y - p1.y) / (p2.x - p1.x) + p1.y;
console.info(Math.round(px) + 'px');
};
}
\ No newline at end of file
--
Gitblit v1.9.1