diff --git a/public/react/src/modules/courses/coursesPublic/SelectResource.js b/public/react/src/modules/courses/coursesPublic/SelectResource.js index 0e76059c8..a49319eca 100644 --- a/public/react/src/modules/courses/coursesPublic/SelectResource.js +++ b/public/react/src/modules/courses/coursesPublic/SelectResource.js @@ -421,7 +421,7 @@ class Selectresource extends Component{ 立即发布 - + 延迟发布 立即发布 - + 延迟发布 {/*提示*/} @@ -396,7 +398,7 @@ class Sendresource extends Component{ 立即发布 - + 延迟发布 { } { this.props.Headertop && this.props.Headertop.laboratory_user && -
  • 后台管理
  • +
  • 后台管理
  • }
  • 账号管理
  • diff --git a/public/react/src/modules/user/account/AccountBinding.js b/public/react/src/modules/user/account/AccountBinding.js index 98ebc6a66..c1974a746 100644 --- a/public/react/src/modules/user/account/AccountBinding.js +++ b/public/react/src/modules/user/account/AccountBinding.js @@ -38,6 +38,7 @@ class AccountSecure extends Component { } return flag; } + componentDidMount() { let {basicInfo}=this.props; let {list}=this.state; @@ -47,7 +48,7 @@ class AccountSecure extends Component { }else{ basicInfo&&basicInfo.open_users.map((item,key)=>{ newlist.map((items,keys)=>{ - if(item.en_type===items.en_type){ + if(items.en_type===item.en_type){ items.id=item.id; items.nickname=item.nickname; } @@ -60,6 +61,30 @@ class AccountSecure extends Component { }) } + + componentDidUpdate=(prevProps)=>{ + if(prevProps!=this.props){ + let {basicInfo}=this.props; + let {list}=this.state; + let newlist=list; + if(basicInfo===undefined||JSON.stringify(basicInfo) == "{}"||basicInfo&&basicInfo.open_users.length===0){ + + }else{ + basicInfo&&basicInfo.open_users.map((item,key)=>{ + newlist.map((items,keys)=>{ + if(items.en_type===item.en_type){ + items.id=item.id; + items.nickname=item.nickname; + } + }) + }) + } + + this.setState({ + list:newlist + }) + } + } showModal=()=>{ this.setState({ visible: true, @@ -86,11 +111,21 @@ class AccountSecure extends Component { }) } - Saveundologin=(id)=>{ + Saveundologin=(type,id)=>{ let {basicInfo}=this.props; + let {list}=this.state; + let newlist=list; let url=`/users/accounts/${basicInfo.id}/open_users/${id}.json`; axios.delete(url).then((result)=>{ if(result.data.status===0){ + newlist.map((item,key)=>{ + if(item.en_type===type){ + item.id=null + } + }) + this.setState({ + list:newlist + }) this.props.showNotification('解绑成功'); this.Cancelundologins() this.props.getBasicInfo() @@ -105,7 +140,7 @@ class AccountSecure extends Component { Modalstype:true, Modalstopval:type==="wechat"?"是否确定解绑微信账号?":"是否确定解绑QQ账号?", ModalCancel:this.Cancelundologins, - ModalSave:()=>this.Saveundologin(id), + ModalSave:()=>this.Saveundologin(type,id), }) } openqqlogin=()=>{ @@ -120,6 +155,7 @@ class AccountSecure extends Component { render() { let flag = this.IsPC(); //true为PC端,false为手机端 let {list}=this.state; + console.log(window.location.host) return (
    @@ -217,7 +253,7 @@ class AccountSecure extends Component {
    - {item.nickname} + {item.id===null?"":item.nickname}
    @@ -227,7 +263,7 @@ class AccountSecure extends Component { } >{item.id===null?"绑定":"解绑"}: this.openphoneqqlogin():() => this.openqqlogin():() => this.undologin("qq",item.id) + item.id===null?flag===true?() => this.openqqlogin():() => this.openphoneqqlogin():() => this.undologin("qq",item.id) } >{item.id===null?"绑定":"解绑"}}