From 34d328bfd7e857786a1673d55af266198d0b109c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Wed, 31 Jul 2019 21:48:35 +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 --- .../react/src/modules/message/js/MessagChat.js | 18 ++---------------- .../src/modules/message/js/MessagePrivate.js | 5 ++++- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/public/react/src/modules/message/js/MessagChat.js b/public/react/src/modules/message/js/MessagChat.js index fbe2b7a0a..484eb785d 100644 --- a/public/react/src/modules/message/js/MessagChat.js +++ b/public/react/src/modules/message/js/MessagChat.js @@ -86,21 +86,7 @@ class MessagChat extends Component{ console.log(i); this.props.Modifyur(i); }; - FormatTime=(timestamp)=> { - var datetime = new Date(timestamp.replace(/-/,"/")) - var mistiming = Math.round(new Date() / 1000) - datetime; - var postfix = mistiming > 0 ? '前' : '后' - mistiming = Math.abs(mistiming) - var arrr = ['年', '个月', '星期', '天', '小时', '分钟', '秒']; - var arrn = [31536000, 2592000, 604800, 86400, 3600, 60, 1]; - - for (var i = 0; i < 7; i++) { - var inm = Math.floor(mistiming / arrn[i]) - if (inm != 0) { - return inm + arrr[i] + postfix - } - } - } + render() { let{isSpins,datay}=this.state; return ( @@ -178,7 +164,7 @@ class MessagChat extends Component{ :""} - {(time)=>this.FormatTime(item.send_time)} + {item.send_time}

diff --git a/public/react/src/modules/message/js/MessagePrivate.js b/public/react/src/modules/message/js/MessagePrivate.js index 8885d101b..6009b4705 100644 --- a/public/react/src/modules/message/js/MessagePrivate.js +++ b/public/react/src/modules/message/js/MessagePrivate.js @@ -84,6 +84,9 @@ class MessagePrivate extends Component{ console.log("跳转页面"); console.log(i); this.props.Modifyur(i); + }; + myCome=(e)=>{ + window.location.href="/users/innov"; } render() { let{page,limit,typeysl,count,isSpin,data,modalsType}=this.state; @@ -118,7 +121,7 @@ class MessagePrivate extends Component{

- this.smyJump()} className="mr20 private_message_a">{item.target.name} + this.myCome(item)} className="mr20 private_message_a">{item.target.name} 与你的私信 [{item.message_count}{"条"}] {item.send_time} From 8cb53af287b2bad7402c5fc319311db84686e29f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Wed, 31 Jul 2019 22:18:24 +0800 Subject: [PATCH 2/2] Merge branch 'dev_Ysl' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl # Conflicts: # public/react/src/modules/message/js/MessagePrivate.js --- .../src/modules/message/js/MessagChat.js | 19 ++++++++++++++----- .../src/modules/message/js/MessagePrivate.js | 8 ++++---- .../src/modules/message/js/Messagerouting.js | 19 ++++++++++++++----- .../messagemodal/WriteaprivateletterModal.js | 2 +- 4 files changed, 33 insertions(+), 15 deletions(-) diff --git a/public/react/src/modules/message/js/MessagChat.js b/public/react/src/modules/message/js/MessagChat.js index 484eb785d..b45288e6e 100644 --- a/public/react/src/modules/message/js/MessagChat.js +++ b/public/react/src/modules/message/js/MessagChat.js @@ -3,6 +3,7 @@ import "../css/messagemy.css" import {getImageUrl} from 'educoder'; import { Modal,Input,Icon,Tooltip,Spin} from 'antd'; import axios from 'axios'; +import moment from 'moment'; //私信聊天页面 class MessagChat extends Component{ constructor(props) { @@ -13,6 +14,7 @@ class MessagChat extends Component{ limit:20, page:1, datay:[], + mess:false, } } @@ -87,8 +89,15 @@ class MessagChat extends Component{ this.props.Modifyur(i); }; + // 点击了用户 + Clickedontheuser=(user)=>{ + this.setState({ + myysluser:user, + mess:true, + }) + } render() { - let{isSpins,datay}=this.state; + let{isSpins,datay,myysluser}=this.state; return (

{/*私信对话框*/} @@ -98,7 +107,7 @@ class MessagChat extends Component{

this.smyJump(2)}> - 117llj与你的私信 + {mess===false?(myysluser!==undefined?myysluser.name:""):(myysluser!==undefined?myysluser.name:"")}与你的私信

{/*聊天页面*/}
@@ -112,7 +121,7 @@ class MessagChat extends Component{
hello
- 删除
@@ -153,7 +162,7 @@ class MessagChat extends Component{ "" :datay.map((item,key)=>{ return( -
+
this.Clickedontheuser(item.target)}>
@@ -164,7 +173,7 @@ class MessagChat extends Component{ :""} - {item.send_time} + {moment(item.send_time).fromNow()}

diff --git a/public/react/src/modules/message/js/MessagePrivate.js b/public/react/src/modules/message/js/MessagePrivate.js index 79be7705c..ffd6a72f5 100644 --- a/public/react/src/modules/message/js/MessagePrivate.js +++ b/public/react/src/modules/message/js/MessagePrivate.js @@ -81,10 +81,10 @@ class MessagePrivate extends Component{ }) }; // 跳转页面 - smyJump =(i)=>{ + smyJump =(i,item)=>{ console.log("跳转页面"); console.log(i); - this.props.Modifyur(i); + this.props.Modifyur(i,item); }; myCome=(e)=>{ window.location.href="/users/innov"; @@ -97,7 +97,7 @@ class MessagePrivate extends Component{
{ modalsType===true? - this.smyJump(is)} > + this.smyJump(is,item)} > :"" }
@@ -116,7 +116,7 @@ class MessagePrivate extends Component{ :data.map((item,key)=>{ return( -
this.smyJump(3)}> +
this.smyJump(3,item.target)}> diff --git a/public/react/src/modules/message/js/Messagerouting.js b/public/react/src/modules/message/js/Messagerouting.js index 56eafec7e..3bad873b0 100644 --- a/public/react/src/modules/message/js/Messagerouting.js +++ b/public/react/src/modules/message/js/Messagerouting.js @@ -18,6 +18,7 @@ class Messagerouting extends Component{ routing:1, unread_message_count:0, unread_tiding_count:0, + myysluser:undefined, } } @@ -71,12 +72,20 @@ class Messagerouting extends Component{ }; //跳转到链接 - Modifyur=(i)=>{ + Modifyur=(i,item)=>{ console.log("跳转到链接"); console.log(i); - this.setState({ - routing:i, - }) + if(i<3){ + this.setState({ + routing:i, + }) + }else { + this.setState({ + routing:i, + myysluser:item, + }) + } + } render() { let{routing,unread_message_count,unread_tiding_count} =this.state; @@ -117,7 +126,7 @@ class Messagerouting extends Component{ {routing===2?this.Message2()} Modifyur={(i)=>this.Modifyur(i)}> :""} {/*私信聊天页面*/} - {routing===3?this.Message2()} Modifyur={(i)=>this.Modifyur(i)}>:""} + {routing===3?this.Message2()} Modifyur={(i)=>this.Modifyur(i)}>:""}
diff --git a/public/react/src/modules/message/messagemodal/WriteaprivateletterModal.js b/public/react/src/modules/message/messagemodal/WriteaprivateletterModal.js index bb23b4f25..3e349ef2c 100644 --- a/public/react/src/modules/message/messagemodal/WriteaprivateletterModal.js +++ b/public/react/src/modules/message/messagemodal/WriteaprivateletterModal.js @@ -69,7 +69,7 @@ class WriteaprivateletterModal extends Component { floatingboxdisplays:false, Pleaseselectthesender:false, }); - this.props.smyJump(3); + this.props.smyJump(3,this.state.users); console.log(result); }).catch((error) => { console.log(error)