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)