From 897c9822a47cf22146176208610635a660992b3d Mon Sep 17 00:00:00 2001
From: Tevin <tingquanren@163.com>
Date: Fri, 29 Apr 2022 16:25:38 +0800
Subject: [PATCH] 微调微信支付弹窗显示
---
common/Tools.js | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 52 insertions(+), 3 deletions(-)
diff --git a/common/Tools.js b/common/Tools.js
index 2b2b6a3..9ef30a2 100644
--- a/common/Tools.js
+++ b/common/Tools.js
@@ -28,7 +28,11 @@
* @param {String} [search]
* @return {String|Null}
*/
- static getUrlParam(name, search = window.location.search) {
+ 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) {
@@ -62,6 +66,34 @@
v = c === 'x' ? r : ((r & 0x3) | 0x8);
return v.toString(16);
});
+ }
+
+ /**
+ * 检查网络状态
+ */
+ 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://tt.zhiheiot.com/static/online.png?t=' + Date.now();
+ }
+ // 网络未开启
+ else {
+ callback && callback(false);
+ }
+ }
+ // 补充：小程序模式用 getNetworkType
}
/**
@@ -313,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 {
@@ -323,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