HandOver-liuwu
/
frontend
mirror of https://codeup.aliyun.com/lsxd/marketing/frontend.git
4
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

线上1_0_2邮箱规则调整分支

This commit is contained in:
red-deng-deng 2021-12-24 11:11:33 +08:00
parent 72592d6f14
commit c702ea5078
5 changed files with 23 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
build.zip Normal file
View File

Binary file not shown.

11
src/pages/exchangecode/add/add.js
View File

@ -687,8 +687,7 @@ export default class acclist extends React.Component{
} }
let phoneReg = new RegExp("^[1][3,4,5,6,7,8,9][0-9]{9}$"); let phoneReg = new RegExp("^[1][3,4,5,6,7,8,9][0-9]{9}$");
let emailReg = new RegExp( "^[A-Za-z0-9\u4e00-\u9fa5\.]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$"); // let emailReg = new RegExp( "\w+@\w+\.\w+(\.\w+){0,1}");
@ -696,10 +695,10 @@ export default class acclist extends React.Component{
Notify.error("手机号格式不正确") Notify.error("手机号格式不正确")
return; return;
} }
if(!emailReg.test(data.email)){ // if(!emailReg.test(data.email)){
Notify.error("邮箱格式不正确") // Notify.error("邮箱格式不正确")
return; // return;
} // }
postKeyEmail(key_id,data).then((res)=>{ postKeyEmail(key_id,data).then((res)=>{

12
src/pages/plan/add/add.js
View File

@ -218,9 +218,7 @@ export default class add extends React.Component{
} }
let phoneReg = new RegExp("^[1][3,4,5,6,7,8,9][0-9]{9}$"); let phoneReg = new RegExp("^[1][3,4,5,6,7,8,9][0-9]{9}$");
let emailReg = new RegExp( "^[A-Za-z0-9\u4e00-\u9fa5\.]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$"); // let emailReg = new RegExp( "\w+@\w+\.\w+(\.\w+){0,1}");
if (!phoneReg.test(data.phone)) { if (!phoneReg.test(data.phone)) {
@ -228,12 +226,12 @@ export default class add extends React.Component{
Notify.error("手机号格式不正确") Notify.error("手机号格式不正确")
return; return;
} }
if(!emailReg.test(data.email)){ // if(!emailReg.test(data.email)){
Notify.error("邮箱格式不正确") // Notify.error("邮箱格式不正确")
return; // return;
} // }
planSend(plan_id,data).then((res)=>{ planSend(plan_id,data).then((res)=>{

10
src/pages/plan/add/edit.js
View File

@ -275,7 +275,7 @@ export default class add extends React.Component{
} }
let phoneReg = new RegExp("^[1][3,4,5,6,7,8,9][0-9]{9}$"); let phoneReg = new RegExp("^[1][3,4,5,6,7,8,9][0-9]{9}$");
let emailReg = new RegExp( "^[A-Za-z0-9\u4e00-\u9fa5\.]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$"); // let emailReg = new RegExp( "\w+@\w+\.\w+(\.\w+){0,1}");
if (!phoneReg.test(data.phone)) { if (!phoneReg.test(data.phone)) {
@ -283,12 +283,12 @@ export default class add extends React.Component{
Notify.error("手机号格式不正确") Notify.error("手机号格式不正确")
return; return;
} }
if(!emailReg.test(data.email)){ // if(!emailReg.test(data.email)){
Notify.error("邮箱格式不正确") // Notify.error("邮箱格式不正确")
return; // return;
} // }

14
src/pages/plan/list/list.js
View File

@ -67,7 +67,7 @@ export default class acclist extends React.Component{
send(e) send(e)
{ {
let phoneReg = new RegExp("^[1][3,4,5,6,7,8,9][0-9]{9}$"); let phoneReg = new RegExp("^[1][3,4,5,6,7,8,9][0-9]{9}$");
let emailReg = new RegExp( "^[A-Za-z0-9\u4e00-\u9fa5\.]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$"); let emailReg = new RegExp( "\w+@\w+\.\w+(\.\w+){0,1}");
@ -348,11 +348,11 @@ export default class acclist extends React.Component{
Notify.error("接收邮箱不能为空") Notify.error("接收邮箱不能为空")
return return
}else{ }else{
let reg=/^[A-Za-z0-9\u4e00-\u9fa5\.]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/; // let reg=/\w+@\w+\.\w+(\.\w+){0,1}/;
if(!reg.test(this.state.email)){ // if(!reg.test(this.state.email)){
Notify.clear(); // Notify.clear();
Notify.error("接收邮箱格式不正确") // Notify.error("接收邮箱格式不正确")
}else{ // }else{
let plan_id = row.id let plan_id = row.id
let data ={ let data ={
type:"email", type:"email",
@ -368,7 +368,7 @@ export default class acclist extends React.Component{
Notify.error(err) Notify.error(err)
}) })
}) })
} // }
} }
}}>发送</Button>, }}>发送</Button>,
onClose() { onClose() {