From df6264edf6dc16aa391e349b660304389f25b02f Mon Sep 17 00:00:00 2001
From: Tevin <tingquanren@163.com>
Date: Thu, 06 Apr 2023 11:57:46 +0800
Subject: [PATCH] 调整工具集内容，创建小功能集Helper新文件
---
common/Tools.js | 39 ++++++++++++++++++++++-----------------
1 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/common/Tools.js b/common/Tools.js
index 2f36e53..d7f7179 100644
--- a/common/Tools.js
+++ b/common/Tools.js
@@ -1,5 +1,5 @@
/**
- * Tools
+ * Tools - 工具集
* @author Tevin
*/
@@ -41,20 +41,6 @@
} else {
return null;
}
- }
-
- /**
- * 读取文件 base64
- * @param {File} file
- * @return {Promise<string>}
- */
- static getFileBase64(file) {
- return new Promise((resolve, reject) => {
- const reader = new FileReader();
- reader.onload = () => resolve(reader.result);
- reader.onerror = error => reject(error);
- reader.readAsDataURL(file);
- });
}
/**
@@ -103,7 +89,7 @@
img.onerror = null;
callback && callback(false);
};
- img.src = 'http://tt.zhiheiot.com/static/online.png?t=' + Date.now();
+ img.src = 'http://gz.zhiheiot.com/disp/download/buildArchive/online.png?t=' + Date.now();
}
// 网络未开启
else {
@@ -516,6 +502,23 @@
return /^1[3456789]\d{9}$/.test('' + phone);
}
+ /**
+ * 转换周数到日期
+ * @param year
+ * @param week
+ * @param weekDay 需要输出星期几对应的日期 (1~7)
+ * @return {Date}
+ */
+ static transWeekIndexToDate(year, week, weekDay) {
+ const yearStart = moment([year, 0, 1]);
+ const dayLong = 24 * 60 * 60 * 1000;
+ const firstWeekLong = (7 - yearStart.day()) * dayLong;
+ const weeksLong = (week - 1) * 7 * dayLong;
+ const weekDayLong = weekDay * dayLong;
+ const dayTimestamp = yearStart.valueOf() + firstWeekLong + weeksLong + weekDayLong;
+ return moment(dayTimestamp).format('YYYY-MM-DD');
+ }
+
}
// h5 中，实现 rem 转换 px
@@ -531,4 +534,6 @@
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
+}
+
+global.Tools = Tools;
\ No newline at end of file
--
Gitblit v1.9.1