From 20ef1d98b58ac24ae7de0e40111082a382f00abf Mon Sep 17 00:00:00 2001
From: Tevin <tingquanren@163.com>
Date: Sat, 19 Jun 2021 20:24:33 +0800
Subject: [PATCH] 实现图片压缩组件,第一部分、第二部分

---
 common/Tools.js |   19 ++++++++-----------
 1 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/common/Tools.js b/common/Tools.js
index e1e650f..476235e 100644
--- a/common/Tools.js
+++ b/common/Tools.js
@@ -361,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);
     }
 
     /**
@@ -448,13 +445,13 @@
 
 // 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 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');

--
Gitblit v1.9.1