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

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

Browse Source 
# Conflicts:
#	public/react/src/modules/message/js/MessagSub.js
dev_cs_new
杨树林 6 years ago
parent f294d8ec94
commit 292a782435
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File

19
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(`/message/${this.props.current_user.user_id}/user_tidings`); this.props.history.replace(`/message/${this.props.current_user.login}/user_tidings`);
this.homeworkendss1(child); this.homeworkendss1(child);
} }
if(value===2){ if(value===2){
this.props.history.replace(`/message/${this.props.current_user.user_id}/private_messages`); this.props.history.replace(`/message/${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(`/message/${this.props.current_user.user_id}/user_tidings`); this.props.history.replace(`/message/${this.props.current_user.login}/user_tidings`);
} }
if(i===2){ if(i===2){
this.props.history.replace(`/message/${this.props.current_user.user_id}/private_messages`); this.props.history.replace(`/message/${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(`/message/${this.props.current_user.user_id}/message_detail?target_ids=${id}`); this.props.history.replace(`/message/${this.props.current_user.login}/message_detail?target_ids=${id}`);
} }
}; };

Write Preview
Loading…
Cancel
Save