diff --git a/public/react/src/modules/message/js/MessagChat.js b/public/react/src/modules/message/js/MessagChat.js index 666ba535d..f652ea81a 100644 --- a/public/react/src/modules/message/js/MessagChat.js +++ b/public/react/src/modules/message/js/MessagChat.js @@ -18,7 +18,7 @@ class MessagChat extends Component{ limit:20, page:1, datay:[], - limits:40, + limits:20, mess:false, myuserl:[], pages:1, @@ -33,7 +33,7 @@ class MessagChat extends Component{ let target_ids=this.props.match.params.private; this.getChatList(1,this.state.limits,target_ids); // console.log("MessagChat111111"); - console.log(this.props.myysluser); + // console.log(this.props.myysluser); this.setState({ myyslusers:this.props.myysluser }) @@ -42,9 +42,9 @@ class MessagChat extends Component{ }catch (e) { } - console.log("MessagChat111111"); - console.log(this.props); - console.log(this.props.match.params.userid); + // console.log("MessagChat111111"); + // console.log(this.props); + // console.log(this.props.match.params.userid); this.scrollToBottom(); } @@ -100,43 +100,40 @@ class MessagChat extends Component{ per_page:listl, }}).then((result) => { if (result) { + // if (result.data.status === 0) { + if (result.data !== null) { + var datas = [] + var datay = result.data.messages; + datay = datay.reverse(); + var obj = {}; + for (var i = 0; i < datay.length; i++) { + if (i === 0) { + obj = datay[i]; + datas.push(datay[i]); + } else { + + if (moment(obj.send_day).isSame(datay[i].send_day)) { + datay[i].send_day = ""; + } else { + obj = datay[i]; + } - if(result.data.message!==undefined){ - return; - } - - if(result.data!==null){ - var datas=[] - var datay=result.data.messages; - var obj={}; - for (var i=0;i { console.log(error); @@ -156,44 +153,41 @@ class MessagChat extends Component{ per_page:listls, }}).then((result) => { if (result) { + // if (result.data.status === 0) { + if (result.data !== null) { + var datas = [] + var datay = result.data.messages; + datay = datay.reverse(); + var obj = {}; + for (var i = 0; i < datay.length; i++) { + if (i === 0) { + obj = datay[i]; + datas.push(datay[i]); + } else { + + if (moment(obj.send_day).isSame(datay[i].send_day)) { + datay[i].send_day = ""; + } else { + obj = datay[i]; + } - if(result.data.message!==undefined){ - return; - } - - if(result.data!==null){ - var datas=[] - var datay=result.data.messages; - var obj={}; - for (var i=0;i { console.log(error); @@ -216,31 +210,29 @@ class MessagChat extends Component{ if (result) { // console.log(types); // console.log(result); - if(result.data.message!==undefined){ - // console.log("5151515151"); - return; - } // console.log("调用了消失的方法"); // console.log("5454545454"); + // if(result.data.status===0) { - if(result.data!==null){ - if(result.data.private_messages!==null){ - if(result.data.private_messages.length>0){ - for (var i=0;i 0) { + for (var i = 0; i < result.data.private_messages.length; i++) { + this.state.datay.push(result.data.private_messages[i]); + } + } } - } } + this.setState({ + page: page, + isSpins: false, + datay: this.state.datay, + data: result.data.private_messages === null ? undefined : result.data.private_messages === undefined ? undefined : result.data.private_messages === [] ? undefined : result.data.private_messages === "[]" ? undefined : result.data.private_messages.length === 0 ? undefined : result.data.private_messages, + }); } - this.setState({ - page:page, - isSpins:false, - datay:this.state.datay, - data:result.data.private_messages===null?undefined:result.data.private_messages===undefined?undefined:result.data.private_messages===[]?undefined:result.data.private_messages==="[]"?undefined:result.data.private_messages.length===0?undefined:result.data.private_messages, - }); // console.log(this.state.datay); - } + // } }).catch((error) => { console.log(error); this.setState({ @@ -259,30 +251,14 @@ class MessagChat extends Component{ per_page:limits, }}).then((result) => { if (result) { - // console.log(types); - // console.log(result); - if(result.data.message!==undefined){ - // console.log("5151515151"); - return; - } - // console.log("调用了消失的方法"); - // console.log("5454545454"); - - // - // if(result.data!==null){ - // if(result.data.private_messages!==null){ - // if(result.data.private_messages.length>0){ - // for (var i=0;i { @@ -324,7 +300,36 @@ class MessagChat extends Component{ content: contents }) .then((response) => { - // console.log(response); + if(response===undefined){ + return + } + if(response.data.status===0){ + // console.log("回复成功"); + // console.log(response); + var datas=[]; + var dataso=this.state.messages; + var datays=response.data.private_message; + var obj={}; + for (var i=0;i{ //user_id不用 - console.log("311"); + // console.log("311"); this.setState({ isSpin:true, }); @@ -375,6 +380,8 @@ class MessagChat extends Component{ + + render() { let{isSpins,datay,myyslusers,mess,limits,myuserl,messages,isSpin}=this.state; // console.log(mess); @@ -382,9 +389,9 @@ class MessagChat extends Component{ // console.log("MessagChat"); // console.log(this.state); // console.log("112"); - console.log(limits); - console.log(myuserl); - console.log(messages); + // console.log(limits); + // console.log(myuserl); + // console.log(messages); return (
{/*私信对话框*/} @@ -461,7 +468,7 @@ class MessagChat extends Component{
在问题反馈时,请同时发送问题发生页的网址链接,以便我们高效的为您服务 - 回复 + this.setreplyfun()}>回复
diff --git a/public/react/src/modules/message/js/MessagSub.js b/public/react/src/modules/message/js/MessagSub.js index 479401681..8c99d785e 100644 --- a/public/react/src/modules/message/js/MessagSub.js +++ b/public/react/src/modules/message/js/MessagSub.js @@ -21,8 +21,8 @@ class MessagSub extends Component{ } // 初始化数据 componentDidMount(){ - console.log("初始化数据了MessagSub"); - console.log(this.props); + // console.log("初始化数据了MessagSub"); + // console.log(this.props); this.getdata("",this.state.page); // this.Messageprivatemessageunreadmessage(); try { @@ -53,21 +53,16 @@ class MessagSub extends Component{ per_page:limit, }}).then((result) => { if (result) { - // console.log(types); - // console.log(result); - if(result.data.message!==undefined){ - // console.log("5151515151"); - return; - } - // console.log("调用了消失的方法"); - // console.log("5454545454"); - this.setState({ - page:page, - count:result.data.count, - typeysl:types, - isSpin:false, - data:result.data.tidings===null?undefined:result.data.tidings===undefined?undefined:result.data.tidings===[]?undefined:result.data.tidings==="[]"?undefined:result.data.tidings.length===0?undefined:result.data.tidings, - }) + // if (result.data.status === 0) { + + this.setState({ + page: page, + count: result.data.count, + typeysl: types, + isSpin: false, + data: result.data.tidings === null ? undefined : result.data.tidings === undefined ? undefined : result.data.tidings === [] ? undefined : result.data.tidings === "[]" ? undefined : result.data.tidings.length === 0 ? undefined : result.data.tidings, + }) + // } } }).catch((error) => { console.log(error); @@ -86,7 +81,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 (
{/*头部筛选数据*/} diff --git a/public/react/src/modules/message/js/MessagePrivate.js b/public/react/src/modules/message/js/MessagePrivate.js index b0a137042..3f52343a2 100644 --- a/public/react/src/modules/message/js/MessagePrivate.js +++ b/public/react/src/modules/message/js/MessagePrivate.js @@ -20,8 +20,8 @@ class MessagePrivate extends Component{ isSpin:false, modalsType:false, }; - console.log("MessagePrivate"); - console.log(this.props); + // console.log("MessagePrivate"); + // console.log(this.props); } componentDidMount(){ @@ -31,9 +31,9 @@ class MessagePrivate extends Component{ }catch (e) { } - console.log("MessagePrivate"); - console.log(this.props); - console.log(this.props.match.params.userid); + // console.log("MessagePrivate"); + // console.log(this.props); + // console.log(this.props.match.params.userid); }; componentDidUpdate(prevProps) { // console.log("11111111111"); @@ -60,18 +60,18 @@ class MessagePrivate extends Component{ if (result) { // console.log(types); // console.log(result); - if(result.data.message!==undefined){ - // console.log("5151515151"); - return; - } + // console.log("调用了消失的方法"); // console.log("5454545454"); - this.setState({ - page:page, - count:result.data.count, - isSpin:false, - data:result.data.private_messages===null?undefined:result.data.private_messages===undefined?undefined:result.data.private_messages===[]?undefined:result.data.private_messages==="[]"?undefined:result.data.private_messages.length===0?undefined:result.data.private_messages, - }) + // if (result.data.status === 0) { + + this.setState({ + page: page, + count: result.data.count, + isSpin: false, + data: result.data.private_messages === null ? undefined : result.data.private_messages === undefined ? undefined : result.data.private_messages === [] ? undefined : result.data.private_messages === "[]" ? undefined : result.data.private_messages.length === 0 ? undefined : result.data.private_messages, + }) + // } } }).catch((error) => { console.log(error); @@ -99,8 +99,8 @@ class MessagePrivate extends Component{ }; // 跳转页面 smyJump =(i,item)=>{ - console.log("跳转页面"); - console.log(i); + // console.log("跳转页面"); + // console.log(i); this.props.Modifyur(i,item); }; myCome=(e)=>{ diff --git a/public/react/src/modules/message/js/Messagerouting.js b/public/react/src/modules/message/js/Messagerouting.js index d7348ef85..619e1b838 100644 --- a/public/react/src/modules/message/js/Messagerouting.js +++ b/public/react/src/modules/message/js/Messagerouting.js @@ -37,8 +37,8 @@ class Messagerouting extends Component{ } componentDidMount(){ - console.log("Messagerouting"); - console.log(this.props); + // console.log("Messagerouting"); + // console.log(this.props); // let courstype=this.props.location.search; // // courstype=courstype.splice('/'); // // courstype=courstype[3]; @@ -64,8 +64,8 @@ class Messagerouting extends Component{ if(result===undefined){ return } - console.log("消息未读1"); - console.log(result); + // console.log("消息未读1"); + // console.log(result); this.setState({ unread_message_count:result.data.unread_message_count, unread_tiding_count:result.data.unread_tiding_count, @@ -91,8 +91,8 @@ class Messagerouting extends Component{ Message2=(data)=>{ - console.log("64"); - console.log(data); + // console.log("64"); + // console.log(data); this.setState({ unread_message_count:data.unread_message_count, unread_tiding_count:data.unread_tiding_count, @@ -101,10 +101,10 @@ class Messagerouting extends Component{ //跳转到链接 Modifyur=(i,item)=>{ - console.log("跳转到链接1"); - console.log(i); - console.log(item); - console.log("跳转到链接2"); + // console.log("跳转到链接1"); + // console.log(i); + // console.log(item); + // console.log("跳转到链接2"); if(i<3){ this.setState({ routing:i, diff --git a/public/react/src/modules/message/js/Rightdialogue.js b/public/react/src/modules/message/js/Rightdialogue.js index a28325b3f..d177e7c4f 100644 --- a/public/react/src/modules/message/js/Rightdialogue.js +++ b/public/react/src/modules/message/js/Rightdialogue.js @@ -18,8 +18,8 @@ class Rightdialogue extends Component{ } componentDidMount(){ - console.log("Rightdialogue"); - console.log(this.props); + // console.log("Rightdialogue"); + // console.log(this.props); }; componentDidUpdate(prevProps) {