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

合并

Browse Source
dev_cs_new
杨树明 6 years ago
parent d84fd9654b eb76067751
commit d00bc73e2e
4 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File

2
public/react/src/modules/message/js/MessagChat.js
Unescape View File

@ -402,7 +402,7 @@ class MessagChat extends Component{
myuserl:user, myuserl:user,
}) })
this.props.history.replace(`/messages/${this.props.current_user.user_id}/message_detail?target_ids=${user.id}`); this.props.history.replace(`/messages/${this.props.current_user.login}/message_detail?target_ids=${user.id}`);
// this.getdatatwo(this.state.page); // this.getdatatwo(this.state.page);
this.getChatListtwo(1,this.state.mypagey,user.id); this.getChatListtwo(1,this.state.mypagey,user.id);

2
public/react/src/modules/message/js/MessagSub.js
Unescape View File

@ -200,7 +200,7 @@ class MessagSub extends Component{
// 课堂详情页 :id = container_id // 课堂详情页 :id = container_id
return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`; return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`;
case "Shixun" : case "Shixun" :
return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`; return window.location.href=`/shixuns/${item.identifier}/challenges`;
case "Subject" : case "Subject" :
// 实践课程详情页 :id = container_id // 实践课程详情页 :id = container_id
return window.location.href=`/paths/${item.identifier}`; return window.location.href=`/paths/${item.identifier}`;

33
public/react/src/modules/message/js/Messagerouting.js
Unescape View File

@ -43,7 +43,8 @@ class Messagerouting extends Component{
// // courstype=courstype[3]; // // courstype=courstype[3];
// // console.log("45"); // // console.log("45");
// console.log(courstype); // console.log(courstype);
// console.log("Messagerouting46");
// console.log(this.props.current_user);
} }
@ -54,7 +55,9 @@ class Messagerouting extends Component{
// console.log(this.props); // console.log(this.props);
// console.log("33333333333"); // console.log("33333333333");
if(prevProps.current_user !== this.props.current_user){ if(prevProps.current_user !== this.props.current_user){
this.Messageprivatemessageunreadmessage(this.props.current_user.user_id); this.Messageprivatemessageunreadmessage(this.props.current_user.login);
// console.log("Messagerouting59");
// console.log(this.props.current_user);
} }
} }
//消息未读 //消息未读
@ -79,13 +82,13 @@ class Messagerouting extends Component{
this.setState({ this.setState({
routing:value, routing:value,
}); });
this.Messageprivatemessageunreadmessage(this.props.current_user.user_id); this.Messageprivatemessageunreadmessage(this.props.current_user.login);
if(value===1){ if(value===1){
this.props.history.replace(`/messages/${this.props.current_user.user_id}/user_tidings`); this.props.history.replace(`/messages/${this.props.current_user.login}/user_tidings`);
this.homeworkendss1(child); this.homeworkendss1(child);
} }
if(value===2){ if(value===2){
this.props.history.replace(`/messages/${this.props.current_user.user_id}/private_messages`); this.props.history.replace(`/messages/${this.props.current_user.login}/private_messages`);
this.homeworkendss2(child); this.homeworkendss2(child);
} }
@ -114,10 +117,10 @@ class Messagerouting extends Component{
routing:i, routing:i,
}); });
if(i===1){ if(i===1){
this.props.history.replace(`/messages/${this.props.current_user.user_id}/user_tidings`); this.props.history.replace(`/messages/${this.props.current_user.login}/user_tidings`);
} }
if(i===2){ if(i===2){
this.props.history.replace(`/messages/${this.props.current_user.user_id}/private_messages`); this.props.history.replace(`/messages/${this.props.current_user.login}/private_messages`);
} }
}else { }else {
@ -125,7 +128,7 @@ class Messagerouting extends Component{
routing:i, routing:i,
}); });
console.log("22222222222"); console.log("22222222222");
this.props.history.replace(`/messages/${this.props.current_user.user_id}/message_detail?target_ids=${id}`); this.props.history.replace(`/messages/${this.props.current_user.login}/message_detail?target_ids=${id}`);
} }
}; };
@ -156,14 +159,24 @@ class Messagerouting extends Component{
// console.log(child); // console.log(child);
// // console.log(this.refs.childModel); // // console.log(this.refs.childModel);
// console.log(child); // console.log(child);
child.getdatas(); try {
child.getdatas();
}catch (e) {
}
// //
} }
homeworkendss2(child){ homeworkendss2(child){
// console.log(child); // console.log(child);
// // console.log(this.refs.childModel); // // console.log(this.refs.childModel);
// console.log(child); // console.log(child);
child.getdatas2(); try {
child.getdatas2();
}catch (e) {
}
// //
} }
render() { render() {

6
public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js
Unescape View File

@ -297,8 +297,8 @@ class PackageIndexNEITaskDetails extends Component {
onMouseOver={this.setover} onMouseOver={this.setover}
onMouseOut={this.setout} onMouseOut={this.setout}
> >
{overtype===false?<a className="ContacttheTA fl" target="_blank" href={`/messages/${this.props.current_user&&this.props.current_user.user_id}/message_detail?target_ids=${data&&data.creator.id}`}> <img alt="头像" class="mr5" src={require('./newsone.png')} />联系TA</a>: {overtype===false?<a className="ContacttheTA fl" target="_blank" href={`/messages/${this.props.current_user&&this.props.current_user.login}/message_detail?target_ids=${data&&data.creator.login}`}> <img alt="头像" class="mr5" src={require('./newsone.png')} />联系TA</a>:
<a className="ContacttheTAs fl" target="_blank" href={`/messages/${this.props.current_user&&this.props.current_user.user_id}/message_detail?target_ids=${data&&data.creator.id}`}> <img alt="头像" className="mr5" <a className="ContacttheTAs fl" target="_blank" href={`/messages/${this.props.current_user&&this.props.current_user.login}/message_detail?target_ids=${data&&data.creator.login}`}> <img alt="头像" className="mr5"
src={require('./newstwo.png')}/>联系TA</a>} src={require('./newstwo.png')}/>联系TA</a>}
</div>} </div>}
</div> </div>
@ -411,7 +411,7 @@ class PackageIndexNEITaskDetails extends Component {
{item.status==="bidding_won"?<img src={gouxuan} className="yslgouxuanimg"/>:""} {item.status==="bidding_won"?<img src={gouxuan} className="yslgouxuanimg"/>:""}
<a href={`/users/${item.login}`}><img className="div1imgs" src={getImageUrl("images/"+item.image_url)}/></a> <a href={`/users/${item.login}`}><img className="div1imgs" src={getImageUrl("images/"+item.image_url)}/></a>
<div className="textall mt10" title={item.name}> <p className="ptext">{item.name}</p></div> <div className="textall mt10" title={item.name}> <p className="ptext">{item.name}</p></div>
{this.props.current_user&&this.props.current_user.login!=item.login?<a className="ContacttheTAs fl none" target="_blank" href={`/messages/${this.props.current_user&&this.props.current_user.user_id}/message_detail?target_ids=${item.id}`}> {this.props.current_user&&this.props.current_user.login!=item.login?<a className="ContacttheTAs fl none" target="_blank" href={`/messages/${this.props.current_user&&this.props.current_user.login}/message_detail?target_ids=${item.login}`}>
<img alt="头像" className="mr5" src={require('./newstwo.png')}/>联系TA <img alt="头像" className="mr5" src={require('./newstwo.png')}/>联系TA
</a>:""} </a>:""}
</div> </div>

Write Preview
Loading…
Cancel
Save