From 36f9b3bec3f8df0da0d8d1e1cc63eb7f53765be3 Mon Sep 17 00:00:00 2001
From: Tevin <tingquanren@163.com>
Date: Fri, 22 Mar 2024 14:22:45 +0800
Subject: [PATCH] 修复签名组件的上传的问题
---
common/Tools.js | 162 +++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 137 insertions(+), 25 deletions(-)
diff --git a/common/Tools.js b/common/Tools.js
index 0c4fb41..251ef03 100644
--- a/common/Tools.js
+++ b/common/Tools.js
@@ -1,5 +1,5 @@
/**
- * Tools
+ * Tools - 工具集
* @author Tevin
*/
@@ -11,28 +11,36 @@
/**
* 显示消息
* @param msg
+ * @param [duration=2000]
+ * @param [mask=false]
*/
- static toast(msg) {
+ static toast(msg, duration = 2000, mask = false) {
Taro.showToast({
title: msg,
icon: 'none',
- mask: true,
- duration: 2000,
+ mask,
+ duration,
});
}
/**
- * 读取文件 base64
- * @param {File} file
- * @return {Promise<string>}
+ * URL参数解析
+ * @param {String} name
+ * @param {String} [search]
+ * @return {String|Null}
*/
- 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);
- });
+ 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) {
+ return decodeURIComponent(r[2]);
+ } else {
+ return null;
+ }
}
/**
@@ -45,6 +53,22 @@
v = c === 'x' ? r : ((r & 0x3) | 0x8);
return v.toString(16);
});
+ }
+
+ /**
+ * 获取随机字符串
+ * @param {number} long
+ * @return {string}
+ */
+ static getRandomString(long) {
+ long = long || 32;
+ const template = 'ABCDEFGHJKMNPQRSTWXYZabcdefhijkmnprstwxyz2345678';
+ const count = template.length;
+ let result = '';
+ for (let i = 0; i < long; i++) {
+ result += template.charAt(Math.floor(Math.random() * count));
+ }
+ return result;
}
/**
@@ -102,12 +126,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]';
}
/**
@@ -274,6 +307,26 @@
}
/**
+ * 数组元素交换位置
+ * @param {array} arr 数组
+ * @param {number} fromIndex 要交换项目的位置
+ * @param {number} toIndex 被交换项目的位置
+ */
+ static swapArray(arr, fromIndex, toIndex) {
+ // 先在目标位置新增一个和当前元素一样的元素，再把当前元素删除掉
+ arr.splice(toIndex, 0, arr[fromIndex]);
+ // 如果拖动元素上移动，当前元素下标为 fromIndex+1
+ if (fromIndex > toIndex) {
+ arr.splice(fromIndex + 1, 1);
+ }
+ // 如果拖动元素下移，当前元素下标还是 fromIndex
+ else {
+ arr.splice(fromIndex, 1);
+ }
+ return arr;
+ }
+
+ /**
* 使用 moment.js 格式化时间戳
* @param {Number|String} timestamp
* @param {String} [type='date']
@@ -287,7 +340,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 {
@@ -297,8 +359,28 @@
}
}
}
- if (timestamp < 9 * 10e8) {
+ // 数值转换：8位整型日期 转 时间戳
+ if (timestamp < 9 * 10e6) {
+ const timeStr = timestamp + '';
+ const dateStr = timeStr.slice(0, 4) + '-' + timeStr.slice(4, 6) + '-' + timeStr.slice(6);
+ if (type === 'date') {
+ return dateStr;
+ }
+ timestamp = (new Date(dateStr)).getTime();
+ }
+ // 数值转换：时间戳 秒 转 毫秒
+ else if (timestamp < 9 * 10e8) {
timestamp *= 1000;
+ }
+ // 数值转换：14位整型日期 转 时间戳
+ else if (/^2[012]\d{2}[01]\d[0123]\d[012]\d[0-5]\d[0-5]\d/.test(timestamp + '')) {
+ const timeStr = timestamp + '';
+ const dateStr = timeStr.slice(0, 4) + '-' + timeStr.slice(4, 6) + '-' + timeStr.slice(6, 8)
+ + ' ' + timeStr.slice(8, 10) + ':' + timeStr.slice(10, 12) + ':' + timeStr.slice(12, 14);
+ if (type === 'dateTimeFull') {
+ return dateStr;
+ }
+ timestamp = (new Date(dateStr)).getTime();
}
const curMoment = moment(timestamp);
if (type === 'date') {
@@ -331,7 +413,7 @@
if (minutes) {
words = minutes + '分' + words;
}
- const hours = duration.get('hours');
+ const hours = parseInt(duration.as('hours'));
if (hours) {
words = hours + '小时' + words;
}
@@ -344,16 +426,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);
}
/**
@@ -407,7 +486,7 @@
/**
* 求小数点后的数据长度
* @param {Number|String} num
- * @private
+ * @return {Number}
*/
static getDecimalLength(num) {
let t = 0;
@@ -427,5 +506,38 @@
return /^1[3456789]\d{9}$/.test('' + phone);
}
+ /**
+ * 转换周数到日期
+ * @param {Number} year
+ * @param {Number} week
+ * @param {Number} weekDay 需要输出星期几对应的日期 (1~7)
+ * @return {String}
+ */
+ 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');
+ }
-}
\ No newline at end of file
+}
+
+// h5 中，实现 rem 转换 px
+if (process.env.NODE_ENV === 'development' && process.env.TARO_ENV === 'h5') {
+ window.rem = val => {
+ 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');
+ };
+}
+
+global.Tools = Tools;
\ No newline at end of file
--
Gitblit v1.9.1