From 6338006e0f85af8d4915abfbe67696b2b17dd6ce Mon Sep 17 00:00:00 2001
From: Tevin <tingquanren@163.com>
Date: Thu, 13 May 2021 21:10:19 +0800
Subject: [PATCH] Merge branch 'master' of ssh://dev.zhiheiot.com:29418/mob-components
---
common/Tools.js | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/common/Tools.js b/common/Tools.js
index 5aac0e5..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,
});
}
@@ -443,5 +444,19 @@
return /^1[3456789]\d{9}$/.test('' + phone);
}
+}
+// 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 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