From 9842802a547a53ea8d82d65c2e7d0e1c3acbd888 Mon Sep 17 00:00:00 2001
From: Tevin <tingquanren@163.com>
Date: Wed, 21 Apr 2021 18:04:09 +0800
Subject: [PATCH] 数值增减组件增加奇偶修正功能
---
common/Tools.js | 41 ++++++++++++++++++++++++++++-------------
1 files changed, 28 insertions(+), 13 deletions(-)
diff --git a/common/Tools.js b/common/Tools.js
index b1c436c..e1e650f 100644
--- a/common/Tools.js
+++ b/common/Tools.js
@@ -5,35 +5,36 @@
import moment from 'moment';
import Taro from '@tarojs/taro';
-import { $ } from '@tarojs/extend';
export class Tools {
/**
* 显示消息
* @param msg
+ * @param [duration=2000]
*/
- static toast(msg) {
+ static toast(msg, duration = 2000) {
Taro.showToast({
title: msg,
icon: 'none',
mask: true,
- duration: 2000,
+ duration,
});
}
/**
- * 锁定页面
- * @param type - lock / unlock
+ * URL参数解析
+ * @param {String} name
+ * @param {String} [search]
+ * @return {String|Null}
*/
- static lockScreen(type) {
- if (typeof Tools.$lock) {
- Tools.$lock = $('#lock');
- }
- if (type === 'lock') {
- Tools.$lock.show();
- } else if (type === 'unlock') {
- Tools.$lock.hide();
+ static getUrlParam(name, 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;
}
}
@@ -443,5 +444,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