m52mxtq3o
/
educoder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

Browse Source
dev_daiao
cxt 5 years ago
parent 7fc259c562 78d5b8dcbc
commit 2568ef861f
3 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File

1
app/views/stages/_stage.json.jbuilder
Unescape View File

@ -15,6 +15,7 @@ json.shixuns_list do
json.shixun_name shixun.name json.shixun_name shixun.name
json.shixun_hidden shixun.hidden json.shixun_hidden shixun.hidden
json.identifier shixun.identifier json.identifier shixun.identifier
json.challenges_count shixun.challenges_count
json.complete_status stage_myshixun_status(myshixuns.select{|ms| ms.shixun_id == shixun.id}.first) json.complete_status stage_myshixun_status(myshixuns.select{|ms| ms.shixun_id == shixun.id}.first)
json.shixun_status stage_shixun_status(subject.status, shixun.status, shixun.hidden) json.shixun_status stage_shixun_status(subject.status, shixun.status, shixun.hidden)
end end

30
public/react/src/modules/user/account/AccountBasicEdit.js
Unescape View File

@ -413,7 +413,7 @@ class AccountBasic extends Component {
//昵称 //昵称
handleSubmitName(rule, value, callback){ handleSubmitName(rule, value, callback){
if (value) { if (value) {
let iconRule1 = /[`~!@#$%^&()\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘’，。、]/im; let iconRule1 = /[`~!@#$%^&*()\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘’，。、]/im;
// 判断是否含有emoji表情 // 判断是否含有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不含 // 如果为true，字符串含有emoji表情 ，false不含
@ -436,22 +436,22 @@ class AccountBasic extends Component {
// 姓名 // 姓名
handleSubmitNames(rule, value, callback){ handleSubmitNames(rule, value, callback){
if (value) { if (value) {
let iconRule1 = /[`~!@#$%^&()_\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘’，。、]/im; let iconRule1 = /[`~!@#$%^&()_\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥%……&（）——\-+={}|《》？：“”【】、；‘’，。、]/im;
// 判断是否含有emoji表情 // 判断是否含有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不含 // 如果为true，字符串含有emoji表情 ，false不含
const iconRule2s =iconRule2.test(value); const iconRule2s =iconRule2.test(value);
// 如果为true，字符串含有特殊符号 ，false不 // 如果为true，字符串含有特殊符号 ，false不
const iconRule1s =iconRule1.test(value); const iconRule1s =iconRule1.test(value);
if (iconRule2s===true|| iconRule1s===true) { if (iconRule2s===true|| iconRule1s===true) {
callback('2-10位中英文、数字'); callback('2-10位中英文、数字');
} }
else if(value.length<2){ else if(value.length<2){
callback('2-10位中英文、数字'); callback('2-10位中英文、数字');
}else if(value.length>=11){ }else if(value.length>=11){
callback('2-10位中英文、数字'); callback('2-10位中英文、数字');
} }
} }
callback(); callback();
} }
@ -606,7 +606,7 @@ class AccountBasic extends Component {
], ],
validateTrigger: 'onSubmit', // 设置进行表单验证的时机为onSubmit validateTrigger: 'onSubmit', // 设置进行表单验证的时机为onSubmit
})( })(
<Input placeholder={`请输入真实姓名，最大限制${MAX_NAME_LENGTH}个字符`} className="yslgraduainputedit" disabled={!showRealName && this.state.forDisable == true } addonAfter={ <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"} <i className={showRealName?"iconfont icon-xianshi font-18 color-blue":"iconfont icon-yincang font-18 color-blue"}
onClick={()=>this.showOrHide(showRealName)}></i> onClick={()=>this.showOrHide(showRealName)}></i>

26
public/react/src/modules/user/modal/RealNameCertificationModal.js
Unescape View File

@ -453,22 +453,22 @@ class RealNameCertificationModal extends Component{
// 姓名 // 姓名
handleSubmitNames(rule, value, callback){ handleSubmitNames(rule, value, callback){
if (value) { if (value) {
let iconRule1 = /[`~!@#$%^&()_\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘’，。、]/im; let iconRule1 = /[`~!@#$%^&()_\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥%……&（）——\-+={}|《》？：“”【】、；‘’，。、]/im;
// 判断是否含有emoji表情 // 判断是否含有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不含 // 如果为true，字符串含有emoji表情 ，false不含
const iconRule2s =iconRule2.test(value); const iconRule2s =iconRule2.test(value);
// 如果为true，字符串含有特殊符号 ，false不 // 如果为true，字符串含有特殊符号 ，false不
const iconRule1s =iconRule1.test(value); const iconRule1s =iconRule1.test(value);
if (iconRule2s===true|| iconRule1s===true) { if (iconRule2s===true|| iconRule1s===true) {
callback('2-10位中英文、数字'); callback('2-10位中英文、数字');
} }
else if(value.length<2){ else if(value.length<2){
callback('2-10位中英文、数字'); callback('2-10位中英文、数字');
}else if(value.length>=11){ }else if(value.length>=11){
callback('2-10位中英文、数字'); callback('2-10位中英文、数字');
} }
} }
callback(); callback();
} }

Write Preview
Loading…
Cancel
Save