From b83cc623364f6db26c1bb55c0086c2bb4e5552b5 Mon Sep 17 00:00:00 2001
From: Tevin <tingquanren@163.com>
Date: Wed, 31 Mar 2021 15:09:22 +0800
Subject: [PATCH] 还原无限滚动加载时间的延后
---
common/Tools.js | 194 +++++++-----------------------------------------
1 files changed, 30 insertions(+), 164 deletions(-)
diff --git a/common/Tools.js b/common/Tools.js
index cebd493..3c235cd 100644
--- a/common/Tools.js
+++ b/common/Tools.js
@@ -4,8 +4,22 @@
*/
import moment from 'moment';
+import Taro from '@tarojs/taro';
export class Tools {
+
+ /**
+ * 显示消息
+ * @param msg
+ */
+ static toast(msg) {
+ Taro.showToast({
+ title: msg,
+ icon: 'none',
+ mask: true,
+ duration: 2000,
+ });
+ }
/**
* URL参数解析
@@ -24,19 +38,6 @@
}
/**
- * 深度获取 url 参数
- * @param {String} name
- * @return {String}
- */
- static getTopUrlParam(name) {
- if (window.top !== window) {
- return Tools.getUrlParam(name, window.top.location.search);
- } else {
- return Tools.getUrlParam(name);
- }
- }
-
- /**
* 读取文件 base64
* @param {File} file
* @return {Promise<string>}
@@ -48,116 +49,6 @@
reader.onerror = error => reject(error);
reader.readAsDataURL(file);
});
- }
-
- /**
- * 关闭页面 loading
- */
- static closePageLoading() {
- const $Loading = document.getElementById('loading');
- $Loading.className = 'loading off';
- setTimeout(() => {
- if ($Loading.parentNode) {
- $Loading.parentNode.removeChild($Loading);
- }
- }, 300);
- }
-
- /**
- * 计算浏览器滚动条宽度
- * @param {HTMLElement} elm
- * @return {Number}
- */
- static getScrollbarWidth(elm) {
- // 传入了元素，计算元素滚动条宽度
- if (elm) {
- return elm.offsetWidth - elm.clientWidth;
- }
- // 没传入元素，计算系统滚动条宽度
- else {
- let dom = document.createElement('div'),
- styles = {
- width: '100px',
- height: '100px',
- // 设置滚动条
- overflowY: 'scroll',
- }, i, scrollbarWidth;
- for (i in styles) dom.style[i] = styles[i];
- document.body.appendChild(dom);
- scrollbarWidth = dom.offsetWidth - dom.clientWidth;
- dom.remove();
- return scrollbarWidth;
- }
- }
-
- /**
- * 设置元素样式
- * @param {HTMLElement} elm
- * @param {Object} styles
- */
- static setElementStyles(elm, styles) {
- Object.keys(styles).forEach(prop => {
- elm.style[prop] = styles[prop];
- });
- }
-
- /**
- * 创建 css 带前缀样式
- * @param {String} key
- * @param {String} value
- * @return {Object}
- */
- static createPrefixesCss(key, value) {
- return {
- ['Webkit' + key.substr(0, 1).toUpperCase() + key.substr(1)]: value,
- ['Moz' + key.substr(0, 1).toUpperCase() + key.substr(1)]: value,
- key: value,
- };
- }
-
- /**
- * 创建 transform translate3d 样式
- * @param {Number} x = 0
- * @param {Number} y = 0
- * @param {Number} z = 0
- * @return {Object}
- */
- static createTransformTs3d(x = 0, y = 0, z = 0) {
- return Tools.createPrefixesCss('transform', `translate3d(${x}px, ${y}px, ${z}px)`);
- }
-
- /**
- * 获取元素计算后的样式
- * @param {HTMLElement} element
- * @param {String} styleName
- * @return {String}
- */
- static getComputedStyle(element, styleName) {
- if (element.currentStyle) {
- return element.currentStyle[styleName];
- } else {
- return window.getComputedStyle(element, null)[styleName] ||
- document.defaultView.getComputedStyle(element, null)[styleName];
- }
- }
-
- /**
- * 判断元素是否在容器内
- * @param {HTMLElement} targetElm
- * @param {HTMLElement} containerElm
- * @return {Boolean}
- */
- static isElementInsideContainer(targetElm, containerElm) {
- let inside = false;
- while (targetElm.parentElement) {
- if (targetElm.parentElement === containerElm) {
- inside = true;
- break;
- } else {
- targetElm = targetElm.parentElement;
- }
- }
- return inside;
}
/**
@@ -271,33 +162,6 @@
}
}
return true;
- }
-
- static getObjDataByPath(obj, path) {
- const arr = path.split('.');
- const reg2 = /\[(.*)]/g;
- const reg4 = /\w+(?=\[)|(?<=\[)(.*?)(?=])/g;
- let stack = [];
- let temp;
- arr.forEach(item => {
- if (reg2.test(item)) {
- while ((temp = reg4.exec(item))) {
- stack.push(temp[0]);
- }
- } else {
- stack.push(item);
- }
- });
- stack = stack.map(item => {
- return item.replace(/^['"`]|['"`]$/g, '');
- });
- try {
- return stack.reduce((pre, next) => {
- return pre[next];
- }, obj);
- } catch (err) {
- return undefined;
- }
}
/**
@@ -426,18 +290,6 @@
}
/**
- * 数组元素交换位置
- * @param {array} arr 数组
- * @param {number} index1 要交换项目的位置
- * @param {number} index2 被交换项目的位置
- * @tutorial 例如：1，5就是数组中下标为1和5的两个元素交换位置
- */
- static swapArray(arr, index1, index2) {
- arr[index1] = arr.splice(index2, 1, arr[index1])[0];
- return arr;
- }
-
- /**
* 使用 moment.js 格式化时间戳
* @param {Number|String} timestamp
* @param {String} [type='date']
@@ -508,11 +360,11 @@
* @return {string}
*/
static moneyFormat(number) {
- if (typeof number !== 'number' && !number) {
+ if (!number && typeof number !== 'number') {
return '';
}
if (typeof number === 'string') {
- number = parseInt(number) || 0;
+ number = Number(number) || 0;
}
const numFixed = number.toFixed(2);
const integer = parseInt(numFixed);
@@ -591,5 +443,19 @@
return /^1[3456789]\d{9}$/.test('' + phone);
}
+}
+// h5 中，实现 rem 转换 px
+if (process.env.NODE_ENV === 'development' && process.env.TARO_ENV === 'h5') {
+ const p1 = {
+ x: parseFloat(Taro.pxTransform(10, 750)), y: 10,
+ };
+ const p2 = {
+ x: parseFloat(Taro.pxTransform(1000, 750)), y: 1000,
+ };
+ window.rem = val => {
+ 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