From 63129eec2b3f78d8a34e1501d562fc2746ee3276 Mon Sep 17 00:00:00 2001
From: Tevin <tingquanren@163.com>
Date: Sun, 08 Aug 2021 09:36:53 +0800
Subject: [PATCH] 调整静态文件地址，调整请求提示时间
---
common/Tools.js | 40 ++++++++++++++++++++++++----------------
1 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/common/Tools.js b/common/Tools.js
index a7a9a44..2b2b6a3 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,
});
}
@@ -118,12 +119,21 @@
}
/**
+ * 判断是否为未定义
+ * @param {*} data
+ * @return {Boolean}
+ */
+ static isUndefined(data) {
+ return Object.prototype.toString.call(data) === '[object Undefined]';
+ }
+
+ /**
* 判断是否为 null
* @param {*} data
* @return {Boolean}
*/
static isNull(data) {
- return data === null;
+ return Object.prototype.toString.call(data) === '[object Null]';
}
/**
@@ -347,7 +357,7 @@
if (minutes) {
words = minutes + '分' + words;
}
- const hours = duration.get('hours');
+ const hours = parseInt(duration.as('hours'));
if (hours) {
words = hours + '小时' + words;
}
@@ -360,16 +370,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);
}
/**
@@ -447,14 +454,15 @@
// h5 中，实现 rem 转换 px
if (process.env.NODE_ENV === 'development' && process.env.TARO_ENV === 'h5') {
- const p1 = {
- x: parseFloat(Taro.pxTransform(10, 750)), y: 10,
- };
- const p2 = {
- 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 p1 = {
+ x: parseFloat(Taro.pxTransform(10, 750)), y: 10,
+ };
+ const p2 = {
+ x: parseFloat(Taro.pxTransform(1000, 750)), y: 1000,
+ };
+ 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