From 897c9822a47cf22146176208610635a660992b3d Mon Sep 17 00:00:00 2001
From: Tevin <tingquanren@163.com>
Date: Fri, 29 Apr 2022 16:25:38 +0800
Subject: [PATCH] 微调微信支付弹窗显示

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

diff --git a/common/Tools.js b/common/Tools.js
index a7a9a44..9ef30a2 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,
         });
     }
 
@@ -27,7 +28,11 @@
      * @param {String} [search]
      * @return {String|Null}
      */
-    static getUrlParam(name, search = window.location.search) {
+    static getUrlParam(name, search) {
+        if (process.env.TARO_ENV === 'weapp') {
+            return null;
+        }
+        search = search || window.location.search;
         const reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)', 'i');
         const r = search.substr(1).match(reg);
         if (r !== null) {
@@ -61,6 +66,34 @@
                 v = c === 'x' ? r : ((r & 0x3) | 0x8);
             return v.toString(16);
         });
+    }
+
+    /**
+     * 检查网络状态
+     */
+    static checkOnlineState(callback) {
+        // 网页模式
+        if (process.env.TARO_ENV === 'h5') {
+            // 网络已开启
+            if (navigator.onLine) {
+                // 用图片资源测试网络状态
+                const img = new Image();
+                img.onload = () => {
+                    img.onload = null;
+                    callback && callback(true);
+                };
+                img.onerror = () => {
+                    img.onerror = null;
+                    callback && callback(false);
+                };
+                img.src = 'http://tt.zhiheiot.com/static/online.png?t=' + Date.now();
+            }
+            // 网络未开启
+            else {
+                callback && callback(false);
+            }
+        }
+        // 补充：小程序模式用 getNetworkType
     }
 
     /**
@@ -118,12 +151,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]';
     }
 
     /**
@@ -303,7 +345,16 @@
         if (Tools.isString(timestamp)) {
             // 全数值
             if (/^\d+$/.test(timestamp)) {
-                timestamp = parseInt(timestamp);
+                // 8位视为无连接符日期
+                if (timestamp.length === 8) {
+                    const day = timestamp.substr(0, 4) + '-' +
+                        timestamp.substr(4, 2) + '-' + timestamp.substr(6, 2);
+                    timestamp = (new Date(timestamp)).getTime();
+                }
+                // 超过8位，视为时间戳
+                else if (timestamp.length > 8) {
+                    timestamp = parseInt(timestamp);
+                }
             }
             // 日期
             else {
@@ -313,7 +364,15 @@
                 }
             }
         }
-        if (timestamp < 9 * 10e8) {
+        // 转为数值的无连接符日期
+        if (timestamp < 9 * 10e6) {
+            const timeStr = timestamp + '';
+            const day = timeStr.substr(0, 4) + '-' +
+                timeStr.substr(4, 2) + '-' + timeStr.substr(6, 2);
+            timestamp = (new Date(day)).getTime();
+        }
+        // 按秒时间戳
+        else if (timestamp < 9 * 10e8) {
             timestamp *= 1000;
         }
         const curMoment = moment(timestamp);
@@ -347,7 +406,7 @@
         if (minutes) {
             words = minutes + '分' + words;
         }
-        const hours = duration.get('hours');
+        const hours = parseInt(duration.as('hours'));
         if (hours) {
             words = hours + '小时' + words;
         }
@@ -360,16 +419,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 +503,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