From 4180ae1a509c161eaf07e7544f284e0212edda1a Mon Sep 17 00:00:00 2001
From: YFeng <tingquanren@163.com>
Date: Tue, 11 May 2021 16:45:18 +0800
Subject: [PATCH] 全局公共色
---
common/Tools.js | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/common/Tools.js b/common/Tools.js
index a7a9a44..e1e650f 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,
});
}
@@ -454,7 +455,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