From d66ea987a3926731bff1582b2d5d0e90635c9976 Mon Sep 17 00:00:00 2001
From: Tevin <tingquanren@163.com>
Date: Sun, 24 Apr 2022 18:30:10 +0800
Subject: [PATCH] 调整公共样式
---
common/Tools.js | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/common/Tools.js b/common/Tools.js
index 6bd9169..9ef30a2 100644
--- a/common/Tools.js
+++ b/common/Tools.js
@@ -86,7 +86,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 +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 {
@@ -355,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