From 27e315223bee73db65ebc919859364c4e9ef781c Mon Sep 17 00:00:00 2001
From: Tevin <tingquanren@163.com>
Date: Wed, 08 Jun 2022 17:50:20 +0800
Subject: [PATCH] 实现主机地址独立管理工具
---
common/Tools.js | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/common/Tools.js b/common/Tools.js
index 6bd9169..7a9af98 100644
--- a/common/Tools.js
+++ b/common/Tools.js
@@ -12,12 +12,13 @@
* 显示消息
* @param msg
* @param [duration=2000]
+ * @param [mask=false]
*/
- static toast(msg, duration = 2000) {
+ static toast(msg, duration = 2000, mask = false) {
Taro.showToast({
title: msg,
icon: 'none',
- mask: true,
+ mask,
duration,
});
}
@@ -86,7 +87,7 @@
img.onerror = null;
callback && callback(false);
};
- img.src = 'http://test.zhiheiot.com/download/buildArchive/online.png?t=' + Date.now();
+ img.src = 'http://tt.zhiheiot.com/static/online.png?t=' + Date.now();
}
// 网络未开启
else {
@@ -345,7 +346,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 {
@@ -355,7 +365,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