From 18463d1bbd818a2639ed27f0e34df14f7dc9df3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Thu, 1 Aug 2019 22:32:08 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/message/js/MessagChat.js | 57 +++++++++++++------ .../src/modules/message/js/MessagePrivate.js | 4 +- .../src/modules/message/js/Messagerouting.js | 6 +- .../messagemodal/WriteaprivateletterModal.js | 2 +- 4 files changed, 46 insertions(+), 23 deletions(-) diff --git a/public/react/src/modules/message/js/MessagChat.js b/public/react/src/modules/message/js/MessagChat.js index c412a88ff..d57b4a7a1 100644 --- a/public/react/src/modules/message/js/MessagChat.js +++ b/public/react/src/modules/message/js/MessagChat.js @@ -300,6 +300,9 @@ class MessagChat extends Component{ } //回复 setreplyfun=()=>{ + this.setState({ + isSpin:true, + }); let contents=this.messageRef.current.getValue().trim(); let target_ids=this.props.match.params.private let url = `/users/${this.props.match.params.userid}/private_messages.json`; @@ -308,6 +311,9 @@ class MessagChat extends Component{ content: contents }) .then((response) => { + this.setState({ + isSpin:false, + }); if(response===undefined){ return } @@ -317,31 +323,50 @@ class MessagChat extends Component{ var datas=[]; var dataso=this.state.messages; var datays=response.data.private_message; - var obj={}; - for (var i=0;i{ + smyJump =(i,id)=>{ // console.log("跳转页面"); // console.log(i); - this.props.Modifyur(i,item); + this.props.Modifyur(i,id); }; myCome=(e)=>{ window.location.href="/users/"+e.target.login; diff --git a/public/react/src/modules/message/js/Messagerouting.js b/public/react/src/modules/message/js/Messagerouting.js index 619e1b838..ee0034a4f 100644 --- a/public/react/src/modules/message/js/Messagerouting.js +++ b/public/react/src/modules/message/js/Messagerouting.js @@ -32,7 +32,6 @@ class Messagerouting extends Component{ routing:1, unread_message_count:0, unread_tiding_count:0, - myysluser:undefined, } } @@ -100,7 +99,7 @@ class Messagerouting extends Component{ }; //跳转到链接 - Modifyur=(i,item)=>{ + Modifyur=(i,id)=>{ // console.log("跳转到链接1"); // console.log(i); // console.log(item); @@ -119,10 +118,9 @@ class Messagerouting extends Component{ }else { this.setState({ routing:i, - myysluser:item, }); console.log("22222222222"); - this.props.history.replace(`/message/${this.props.current_user.user_id}/${item.id}/message_detail`); + this.props.history.replace(`/message/${this.props.current_user.user_id}/${id}/message_detail`); } }; diff --git a/public/react/src/modules/message/messagemodal/WriteaprivateletterModal.js b/public/react/src/modules/message/messagemodal/WriteaprivateletterModal.js index 1234b1fe1..a89614745 100644 --- a/public/react/src/modules/message/messagemodal/WriteaprivateletterModal.js +++ b/public/react/src/modules/message/messagemodal/WriteaprivateletterModal.js @@ -70,7 +70,7 @@ class WriteaprivateletterModal extends Component { floatingboxdisplays:false, Pleaseselectthesender:false, }); - this.props.smyJump(3,this.state.users); + this.props.smyJump(3,result.data.private_message.receiver_id); //console.log(result); }).catch((error) => { //console.log(error) From 1125d3babc35d9c91e6e1c14a717dec7bc9a6158 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Thu, 1 Aug 2019 22:36:07 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/message/js/MessagChat.js | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/public/react/src/modules/message/js/MessagChat.js b/public/react/src/modules/message/js/MessagChat.js index d57b4a7a1..8e84dd9fd 100644 --- a/public/react/src/modules/message/js/MessagChat.js +++ b/public/react/src/modules/message/js/MessagChat.js @@ -63,7 +63,8 @@ class MessagChat extends Component{ contentViewScrolltop=(e)=>{ if(e.currentTarget.scrollHeight===0){ - + let {pages}=this.state; + let newpage=pages+1 } } @@ -110,7 +111,7 @@ class MessagChat extends Component{ if (result) { // if (result.data.status === 0) { if (result.data !== null) { - var datas = [] + var datas = []; var datay = result.data.messages; datay = datay.reverse(); var obj = {}; @@ -119,30 +120,26 @@ class MessagChat extends Component{ 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]; } - datas.push(datay[i]); } - } //颠倒数组 - this.setState({ messages: datas, myuserl: result.data.target, }) // } - this.setState({ - isSpin: false, - }); } } + this.setState({ + isSpin: false, + }); }).catch((error) => { console.log(error); this.setState({ @@ -191,12 +188,13 @@ class MessagChat extends Component{ // this.getdatatwo(this.state.page); // } - this.setState({ - isSpin: false, - }); + } } + this.setState({ + isSpin: false, + }); }).catch((error) => { console.log(error); this.setState({