From 329d65b41ac627a2824c06c6dcfda26e95703c49 Mon Sep 17 00:00:00 2001
From: Tevin <tingquanren@163.com>
Date: Wed, 20 Jul 2022 17:48:38 +0800
Subject: [PATCH] 修复主机地址管理工具，App的Sever参数为网址时无效的问题
---
common/Tools.js | 128 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 115 insertions(+), 13 deletions(-)
diff --git a/common/Tools.js b/common/Tools.js
index 3cc3497..3fbb8a8 100644
--- a/common/Tools.js
+++ b/common/Tools.js
@@ -5,21 +5,42 @@
import moment from 'moment';
import Taro from '@tarojs/taro';
-import { $ } from '@tarojs/extend';
export class Tools {
/**
* 显示消息
* @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,
});
+ }
+
+ /**
+ * URL参数解析
+ * @param {String} name
+ * @param {String} [search]
+ * @return {String|Null}
+ */
+ 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;
+ }
}
/**
@@ -46,6 +67,50 @@
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;
+ }
+
+ /**
+ * 检查网络状态
+ */
+ 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://gz.zhiheiot.com/disp/download/buildArchive/online.png?t=' + Date.now();
+ }
+ // 网络未开启
+ else {
+ callback && callback(false);
+ }
+ }
+ // 补充：小程序模式用 getNetworkType
}
/**
@@ -103,12 +168,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]';
}
/**
@@ -288,7 +362,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 {
@@ -298,7 +381,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);
@@ -332,7 +423,7 @@
if (minutes) {
words = minutes + '分' + words;
}
- const hours = duration.get('hours');
+ const hours = parseInt(duration.as('hours'));
if (hours) {
words = hours + '小时' + words;
}
@@ -345,16 +436,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);
}
/**
@@ -428,5 +516,19 @@
return /^1[3456789]\d{9}$/.test('' + phone);
}
+}
+// 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');
+ };
}
\ No newline at end of file
--
Gitblit v1.9.1