From 7f1612506533a6e91ae8c5a76e027d7c4a6be09f Mon Sep 17 00:00:00 2001 From: Tevin <tingquanren@163.com> Date: Thu, 19 May 2022 15:21:15 +0800 Subject: [PATCH] 优化输入框组件兼容性 --- common/Tools.js | 49 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 47 insertions(+), 2 deletions(-) diff --git a/common/Tools.js b/common/Tools.js index e4e7403..9ef30a2 100644 --- a/common/Tools.js +++ b/common/Tools.js @@ -69,6 +69,34 @@ } /** + * 检查网络状态 + */ + 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 + } + + /** * 判断是否是数字 * @param {*} data * @return {Boolean} @@ -317,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 { @@ -327,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); -- Gitblit v1.9.1