From fa2f172812de8344fa22c4ef088ea2a67257a0d3 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 05 九月 2023 10:21:17 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/dmMes into dev

---
 minipro_standard/common/config.js |   33 +++++++++++++++++++++++++++++----
 1 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/minipro_standard/common/config.js b/minipro_standard/common/config.js
index 15d4a4d..0d13af6 100644
--- a/minipro_standard/common/config.js
+++ b/minipro_standard/common/config.js
@@ -1,5 +1,30 @@
-module.exports = {
-    // baseUrl: 'http://106.14.20.42/test_hfznzz/',
-    // baseUrl: 'https://hefei.dtkey.cn/test_hfznzz/',
-    baseUrl: 'https://dmtest.ahapp.net/doumeeplant_api/'
+module.exports = {
+	// baseUrl: 'http://106.14.20.42/test_hfznzz/',
+	// baseUrl: 'https://hefei.dtkey.cn/test_hfznzz/',
+	baseUrl: 'http://192.168.0.15:10021/',
+	// baseUrl: 'https://dmtest.ahapp.net/doumeeplant_api',
+	phoneRegular: /^1[3456789]\d{9}$/,
+	mailboxRegular: /^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/,
+	positiveInteger: /^[0-9]*[1-9][0-9]*$/,
+	decimal: /^0$|^[1-9]\d{0,15}$|^[1-9]\d{0,15}\.{1}\d{1,4}$|^0\.{1}\d{1,4}$/g,
+	positiveIntegerDecimal: /^([1-9][0-9]*|0)(\.[0-9]?[1-9][1-9][1-9])?$/,
+	number: /^\d+(?:\.\d{1,4})?$/,
+	Attribute: {
+		HH: 'APPLIANCE_MIX',
+		HG: 'APPLIANCE_ONTEST',
+		BL: 'APPLIANCE_OFFTEST',
+		BF: 'APPLIANCE_USELESS'
+	},
+	QRCodeType: {
+		WL: 'WL',
+		CK: 'CK',
+		HW: 'HW',
+		GD: 'GD',
+		GZ: 'GZ',
+		SB: 'SB',
+		YG: 'YG',
+		ZKD: 'ZKD',
+		CKD: 'CKD',
+		RKD: 'RKD'
+	}
 }

--
Gitblit v1.9.3