diff --git a/public/react/src/modules/message/js/MessagChat.js b/public/react/src/modules/message/js/MessagChat.js index 8e84dd9fd..61ba5b33c 100644 --- a/public/react/src/modules/message/js/MessagChat.js +++ b/public/react/src/modules/message/js/MessagChat.js @@ -61,11 +61,12 @@ class MessagChat extends Component{ contentViewScrolltop=(e)=>{ - - if(e.currentTarget.scrollHeight===0){ + if(e.currentTarget.scrollTop===0){ + console.log("调用了方法1111111") let {pages}=this.state; let newpage=pages+1 - + let target_ids=this.props.match.params.private; + this.getChatList(newpage,this.state.limits,target_ids); } } // 滑动刷新 @@ -120,10 +121,17 @@ 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]; + try { + var timeone=obj.send_time.slice(0,10); + var timetwo=datay[i].send_time.slice(0,10); + if (moment(timeone).isSame(timetwo)) { + datay[i].send_day = ""; + } else { + datay[i].send_day = timetwo; + obj = datay[i]; + } + }catch (e) { + } datas.push(datay[i]); } @@ -169,13 +177,18 @@ class MessagChat extends Component{ obj = datay[i]; datas.push(datay[i]); } else { + try { + var timeone=obj.send_time.slice(0,10); + var timetwo=datay[i].send_time.slice(0,10); + if (moment(timeone).isSame(timetwo)) { + datay[i].send_day = ""; + } else { + datay[i].send_day = timetwo; + obj = datay[i]; + } + }catch (e) { - if (moment(obj.send_day).isSame(datay[i].send_day)) { - datay[i].send_day = ""; - } else { - obj = datay[i]; } - datas.push(datay[i]); }