diff --git a/src/pages/login/loginPhone.js b/src/pages/login/loginPhone.js index 80cf905e..12c6f32f 100644 --- a/src/pages/login/loginPhone.js +++ b/src/pages/login/loginPhone.js @@ -97,18 +97,22 @@ function FormDom(props) { //发送短信验证码 const sendCode=()=>{ let startTime=localStorage.getItem('now'); - console.log(100,startTime); + let sendPhone=localStorage.getItem('phone'); if(!startTime){ sendCodeApi(); }else{ - let stopTime=startTime*1+60000;//一分钟后的时间戳 - let currentime=new Date().getTime(); //点击获取当前的时间戳 - if(currentime-startTime<=stopTime-startTime){//一分钟内 - Notify.clear(); - Notify.warn('发送过于频繁,请稍后再试'); - console.log(109,currentime-startTime<=stopTime-startTime); + if(sendPhone==phone){ + let stopTime=startTime*1+60000;//一分钟后的时间戳 + let currentime=new Date().getTime(); //点击获取当前的时间戳 + if(currentime-startTime<=stopTime-startTime){//一分钟内 + Notify.clear(); + Notify.warn('发送过于频繁,请稍后再试'); + }else{ + localStorage.removeItem('now'); + localStorage.removeItem('phone'); + sendCodeApi(); + } }else{ - localStorage.removeItem('now'); sendCodeApi(); } } @@ -121,6 +125,7 @@ function FormDom(props) { handelResponse(res,(response,msg)=>{ let clickNow=new Date().getTime();//当前时间 localStorage.setItem('now',clickNow); + localStorage.setItem('phone',phone); let timer=60; let timecount=setInterval(()=>{ let timerId=timer--; @@ -136,6 +141,7 @@ function FormDom(props) { },(err)=>{ Notify.error(err) localStorage.setItem('now',new Date().getTime()); + localStorage.setItem('phone',phone); }) }).catch(err=>{ diff --git a/src/pages/system/account/list/delAuth.js b/src/pages/system/account/list/delAuth.js index 47beda85..9fe8763f 100644 --- a/src/pages/system/account/list/delAuth.js +++ b/src/pages/system/account/list/delAuth.js @@ -78,11 +78,11 @@ export default class acclistDom extends React.Component{ } getsubAppoint(aid,data).then(res=>{ handelResponse(res,(response,msg)=>{ - let authdata=response.data; + let authdata=response.data.filter(item=>item.status==1); let authData=authdata.map(item=>{ - return { - text:item.real_name, - key:item.id + return { + text:item.real_name, + key:item.id } }) self.setState({downLevel:authData.length>0,authperson:authData,downLeveldata:authData});