From 045b88b31958b2b639c2cb6a8476960ad5293007 Mon Sep 17 00:00:00 2001
From: Tevin <tingquanren@163.com>
Date: Thu, 25 Mar 2021 08:58:48 +0800
Subject: [PATCH] Merge branch 'master' of ssh://dev.zhiheiot.com:29418/mob-components
---
common/Tools.js | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/common/Tools.js b/common/Tools.js
index a7a9a44..3c235cd 100644
--- a/common/Tools.js
+++ b/common/Tools.js
@@ -454,7 +454,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