From acc04455c4e252b60c7b9841aae720626c506d58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 6 Dec 2019 13:55:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/user/account/AccountBasicEdit.js  | 30 +++++++++----------
 .../user/modal/RealNameCertificationModal.js  | 26 ++++++++--------
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/public/react/src/modules/user/account/AccountBasicEdit.js b/public/react/src/modules/user/account/AccountBasicEdit.js
index 892fe10a6..7d6fc13d2 100644
--- a/public/react/src/modules/user/account/AccountBasicEdit.js
+++ b/public/react/src/modules/user/account/AccountBasicEdit.js
@@ -413,7 +413,7 @@ class AccountBasic extends Component {
   //昵称
 	handleSubmitName(rule, value, callback){
 		if (value) {
-			let iconRule1 = /[`~!@#$%^&()\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘’，。、]/im;
+			let iconRule1 = /[`~!@#$%^&*()\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘’，。、]/im;
 // 判断是否含有emoji表情
 			let iconRule2 = /[\uD83C|\uD83D|\uD83E][\uDC00-\uDFFF][\u200D|\uFE0F]|[\uD83C|\uD83D|\uD83E][\uDC00-\uDFFF]|[0-9|*|#]\uFE0F\u20E3|[0-9|#]\u20E3|[\u203C-\u3299]\uFE0F\u200D|[\u203C-\u3299]\uFE0F|[\u2122-\u2B55]|\u303D|[\A9|\AE]\u3030|\uA9|\uAE|\u3030/ig;
 // 如果为true，字符串含有emoji表情 ，false不含
@@ -436,22 +436,22 @@ class AccountBasic extends Component {
 	// 姓名
 	handleSubmitNames(rule, value, callback){
 		if (value) {
-			let iconRule1 = /[`~!@#$%^&()_\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘’，。、]/im;
+				let iconRule1 = /[`~!@#$%^&()_\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥%……&（）——\-+={}|《》？：“”【】、；‘’，。、]/im;
 // 判断是否含有emoji表情
-			let iconRule2 = /[\uD83C|\uD83D|\uD83E][\uDC00-\uDFFF][\u200D|\uFE0F]|[\uD83C|\uD83D|\uD83E][\uDC00-\uDFFF]|[0-9|*|#]\uFE0F\u20E3|[0-9|#]\u20E3|[\u203C-\u3299]\uFE0F\u200D|[\u203C-\u3299]\uFE0F|[\u2122-\u2B55]|\u303D|[\A9|\AE]\u3030|\uA9|\uAE|\u3030/ig;
+				let iconRule2 = /[\uD83C|\uD83D|\uD83E][\uDC00-\uDFFF][\u200D|\uFE0F]|[\uD83C|\uD83D|\uD83E][\uDC00-\uDFFF]|[0-9|*|#]\uFE0F\u20E3|[0-9|#]\u20E3|[\u203C-\u3299]\uFE0F\u200D|[\u203C-\u3299]\uFE0F|[\u2122-\u2B55]|\u303D|[\A9|\AE]\u3030|\uA9|\uAE|\u3030/ig;
 // 如果为true，字符串含有emoji表情 ，false不含
-			const iconRule2s =iconRule2.test(value);
+				const iconRule2s =iconRule2.test(value);
 // 如果为true，字符串含有特殊符号 ，false不
-			const iconRule1s =iconRule1.test(value);
-
-			if (iconRule2s===true|| iconRule1s===true) {
-				callback('2-10位中英文、数字');
-			}
-			else if(value.length<2){
-				callback('2-10位中英文、数字');
-			}else if(value.length>=11){
-				callback('2-10位中英文、数字');
-			}
+				const iconRule1s =iconRule1.test(value);
+
+				if (iconRule2s===true|| iconRule1s===true) {
+					callback('2-10位中英文、数字');
+				}
+				else if(value.length<2){
+					callback('2-10位中英文、数字');
+				}else if(value.length>=11){
+					callback('2-10位中英文、数字');
+				}
 		}
 		callback();
 	}
@@ -606,7 +606,7 @@ class AccountBasic extends Component {
 
                   ],
 									validateTrigger: 'onSubmit', // 设置进行表单验证的时机为onSubmit
-                })(
+								})(
                   <Input placeholder={`请输入真实姓名，最大限制${MAX_NAME_LENGTH}个字符`} className="yslgraduainputedit"  disabled={!showRealName && this.state.forDisable == true } addonAfter={
                     <i className={showRealName?"iconfont icon-xianshi font-18 color-blue":"iconfont icon-yincang font-18 color-blue"}
                           onClick={()=>this.showOrHide(showRealName)}></i>
diff --git a/public/react/src/modules/user/modal/RealNameCertificationModal.js b/public/react/src/modules/user/modal/RealNameCertificationModal.js
index 3fa4ac0ea..b24a743a9 100644
--- a/public/react/src/modules/user/modal/RealNameCertificationModal.js
+++ b/public/react/src/modules/user/modal/RealNameCertificationModal.js
@@ -453,22 +453,22 @@ class RealNameCertificationModal extends Component{
 	// 姓名
 	handleSubmitNames(rule, value, callback){
 		if (value) {
-			let iconRule1 = /[`~!@#$%^&()_\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘’，。、]/im;
+				let iconRule1 = /[`~!@#$%^&()_\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥%……&（）——\-+={}|《》？：“”【】、；‘’，。、]/im;
 // 判断是否含有emoji表情
-			let iconRule2 = /[\uD83C|\uD83D|\uD83E][\uDC00-\uDFFF][\u200D|\uFE0F]|[\uD83C|\uD83D|\uD83E][\uDC00-\uDFFF]|[0-9|*|#]\uFE0F\u20E3|[0-9|#]\u20E3|[\u203C-\u3299]\uFE0F\u200D|[\u203C-\u3299]\uFE0F|[\u2122-\u2B55]|\u303D|[\A9|\AE]\u3030|\uA9|\uAE|\u3030/ig;
+				let iconRule2 = /[\uD83C|\uD83D|\uD83E][\uDC00-\uDFFF][\u200D|\uFE0F]|[\uD83C|\uD83D|\uD83E][\uDC00-\uDFFF]|[0-9|*|#]\uFE0F\u20E3|[0-9|#]\u20E3|[\u203C-\u3299]\uFE0F\u200D|[\u203C-\u3299]\uFE0F|[\u2122-\u2B55]|\u303D|[\A9|\AE]\u3030|\uA9|\uAE|\u3030/ig;
 // 如果为true，字符串含有emoji表情 ，false不含
-			const iconRule2s =iconRule2.test(value);
+				const iconRule2s =iconRule2.test(value);
 // 如果为true，字符串含有特殊符号 ，false不
-			const iconRule1s =iconRule1.test(value);
-
-			if (iconRule2s===true|| iconRule1s===true) {
-				callback('2-10位中英文、数字');
-			}
-			else if(value.length<2){
-				callback('2-10位中英文、数字');
-			}else if(value.length>=11){
-				callback('2-10位中英文、数字');
-			}
+				const iconRule1s =iconRule1.test(value);
+
+				if (iconRule2s===true|| iconRule1s===true) {
+					callback('2-10位中英文、数字');
+				}
+				else if(value.length<2){
+					callback('2-10位中英文、数字');
+				}else if(value.length>=11){
+					callback('2-10位中英文、数字');
+				}
 		}
 		callback();
 	}