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

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

Browse Source 
# Conflicts:
#	public/react/src/modules/message/js/MessagePrivate.js
#	public/react/src/modules/message/js/Messagerouting.js
dev_cs_new
杨树林 6 years ago
parent 73b1d61df2 32bad947ba
commit 1fbb368fd8
5 changed files with 36 additions and 34 deletions
Show Stats Download Patch File Download Diff File

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

@ -24,8 +24,8 @@ class MessagChat extends Component{
componentDidMount(){
this.getdata(1);
console.log("MessagChat111111");
console.log(this.props);
// console.log("MessagChat111111");
// console.log(this.props);
this.setState({
myyslusers:this.props.myysluser
})
@ -35,7 +35,7 @@ class MessagChat extends Component{
//滑动到底判断
if(e.currentTarget.scrollHeight-e.currentTarget.scrollTop===e.currentTarget.clientHeight){
console.log("滑动到底判断");
// console.log("滑动到底判断");
let {page}=this.state;
let newpage=page+1
this.getdata(newpage);
@ -98,6 +98,7 @@ class MessagChat extends Component{
// 点击了用户
Clickedontheuser=(user)=>{
debugger
// console.log("点击了用户");
// console.log(user);
this.setState({
@ -117,7 +118,7 @@ class MessagChat extends Component{
content: contents
})
.then((response) => {
console.log(response);
// console.log(response);
})
.catch(function (error) {
console.log(error);

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

@ -80,7 +80,7 @@ class MessagSub extends Component{
render() {
let{page,limit,typeysl,count,isSpin,data}=this.state;
// console.log("6868686868");
// console.log(data);
console.log(data);
return (
<div className="clearfix ml20">
{/*头部筛选数据*/}
@ -116,6 +116,7 @@ class MessagSub extends Component{
<p className="edu-nodata-p mb20">暂无数据哦~</p>
</div>
:data.map((item,key)=>{
console.log(data)
return(
<div className="pl25 ridinglist edu-back-white" key={key}>
<div className="ridinglist-sub clearfix df tiding_item">

22
public/react/src/modules/message/js/MessagePrivate.js
Unescape View File

@ -25,18 +25,18 @@ class MessagePrivate extends Component{
}
componentDidMount(){
this.getdata(1);
this.getdata(1);
};
// componentDidUpdate(prevProps) {
// // console.log("11111111111");
// // console.log(prevProps);
// // console.log("22222222222");
// // console.log(this.props);
// // console.log("33333333333");
// if(prevProps.current_user !== this.props.current_user){
// this.getdata(1);
// }
// }
componentDidUpdate(prevProps) {
// console.log("11111111111");
// console.log(prevProps);
// console.log("22222222222");
// console.log(this.props);
// console.log("33333333333");
if(prevProps.current_user !== this.props.current_user){
this.getdata(1);
}
}
//获取数据地方
getdata=(page)=>{
this.setState({

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

@ -142,8 +142,8 @@ class Messagerouting extends Component{
};
render() {
let{routing,unread_message_count,unread_tiding_count} =this.state;
console.log("Messagerouting2222");
console.log(this.props);
console.log(routing);
return (
<div className="newMain clearfix">
<div className="educontent mt20 mb80 clearfix">

34
public/react/src/modules/message/messagemodal/WriteaprivateletterModal.js
Unescape View File

@ -26,7 +26,7 @@ class WriteaprivateletterModal extends Component {
}
componentDidMount() {
//用户id
console.log(this.props.current_user.user_id);
//console.log(this.props.current_user.user_id);
this.Recentcontacts();
}
@ -40,7 +40,7 @@ class WriteaprivateletterModal extends Component {
if(result===undefined){
return
}
console.log(result);
//console.log(result);
this.setState({
users:result.data.users,
Recentcontacts:false,
@ -48,7 +48,7 @@ class WriteaprivateletterModal extends Component {
isSpin:false
})
}).catch((error) => {
console.log(error)
//console.log(error)
this.setState({
isSpin:false
})
@ -71,9 +71,9 @@ class WriteaprivateletterModal extends Component {
Pleaseselectthesender:false,
});
this.props.smyJump(3,this.state.users);
console.log(result);
//console.log(result);
}).catch((error) => {
console.log(error)
//console.log(error)
})
};
@ -95,9 +95,9 @@ class WriteaprivateletterModal extends Component {
floatingboxdisplay:true,
isSpin:false
})
console.log(result);
//console.log(result);
}).catch((error) => {
console.log(error)
//console.log(error)
this.setState({
isSpin:false
})
@ -124,7 +124,7 @@ class WriteaprivateletterModal extends Component {
// 搜索
search_message_person=()=>{
console.log("点击搜索按钮");
//console.log("点击搜索按钮");
if(this.state.inputvulue.length===0){
this.Recentcontacts();
}else {
@ -174,7 +174,7 @@ class WriteaprivateletterModal extends Component {
// 回车事件
Myοnkeydοwn=()=>{
console.log("点击了回车事件");
//console.log("点击了回车事件");
if(this.state.inputvulue.length===0){
this.Recentcontacts();
}else {
@ -185,7 +185,7 @@ class WriteaprivateletterModal extends Component {
//判断点击的键盘的keyCode是否为13，是就调用上面的搜索函数
handleEnterKey = (e) => {
console.log("");
//console.log("");
if(e.nativeEvent.keyCode === 13){ //e.nativeEvent获取原生的事件对像
this.Myοnkeydοwn()
}
@ -208,11 +208,11 @@ class WriteaprivateletterModal extends Component {
});
}
console.log(e.target.value);
//console.log(e.target.value);
};
// 输入内容
setdatafunsvals=(e)=>{
console.log(e.target.value);
//console.log(e.target.value);
this.setState({
inputvulues:e.target.value,
Pleaseselectthesenders:false,
@ -222,7 +222,7 @@ class WriteaprivateletterModal extends Component {
}
//失去焦点
myonBlur=(e)=>{
console.log("失去焦点了");
//console.log("失去焦点了");
e.preventDefault();
this.setState({
// floatingboxdisplay:false,
@ -230,7 +230,7 @@ class WriteaprivateletterModal extends Component {
};
//获取焦点
myonFocus=(e)=>{
console.log("获取到焦点了");
//console.log("获取到焦点了");
this.setState({
floatingboxdisplay:true,
})
@ -238,8 +238,8 @@ class WriteaprivateletterModal extends Component {
//获取用户信息
Getuserinformation=(item)=>{
console.log("获取到了用户信息");
console.log(item.id);
//console.log("获取到了用户信息");
//console.log(item.id);
this.setState({
Personalid:item.id===undefined?undefined:item.id===null?undefined:item.id,
inputvulue:item.name,
@ -251,7 +251,7 @@ class WriteaprivateletterModal extends Component {
render() {
let{Pleaseselectthesender,inputvulue,inputvulues,floatingboxdisplay,users,floatingboxdisplays,Recentcontacts,isSpin}=this.state;
console.log(floatingboxdisplay);
//console.log(floatingboxdisplay);
return(
<Modal
keyboard={false}

Write Preview
Loading…
Cancel
Save