Merge branch 'StableVersion' into develop

src/tool/util.js

@@ -1,6 +1,7 @@
 import Fingerprint2 from 'fingerprintjs2';//获取浏览器唯一标识
-const isEmail = (email) => {//判断邮箱格式
-	let reg = /^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/
+const isEmail = (email) => {
+	// let reg = /^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,})$/
+	let reg = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/
 	let result = reg.test(email)
 	return result
 }