+
+ {/*私信对话框*/}
+
)
}
}
-export default MessagChat;
\ No newline at end of file
+export default MessagChat;
+
+
+// onClick="delete_confirm_box('/users/innov/delete_message?mess_id=25137', '确定要删除该条记录吗？')"
+//
+// {/*左边*/}
+//
\ No newline at end of file
diff --git a/public/react/src/modules/message/js/MessagSub.js b/public/react/src/modules/message/js/MessagSub.js
index a58d059a7..bf61fc3ff 100644
--- a/public/react/src/modules/message/js/MessagSub.js
+++ b/public/react/src/modules/message/js/MessagSub.js
@@ -4,7 +4,8 @@ import {
Pagination,
} from "antd";
import axios from 'axios';
-
+import {getImageUrl} from 'educoder';
+import "../css/messagemy.css"
//消息页面
class MessagSub extends Component{
constructor(props) {
@@ -14,14 +15,15 @@ class MessagSub extends Component{
limit:10,
typeysl:"",
count:0,
- isSpin:true,
+ isSpin:false,
+ data:undefined,
}
}
// 初始化数据
componentDidMount(){
- debugger
console.log("初始化数据了");
this.getdata("",this.state.page);
+ // this.Messageprivatemessageunreadmessage();
}
//塞选页数
@@ -45,18 +47,20 @@ class MessagSub extends Component{
per_page:limit,
}}).then((result) => {
if (result) {
- console.log(types);
- console.log(result);
+ // console.log(types);
+ // console.log(result);
if(result.data.message!==undefined){
- console.log("5151515151");
+ // console.log("5151515151");
return;
}
- console.log("调用了消失的方法");
- console.log("5454545454");
+ // 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,
})
}
}).catch((error) => {
@@ -74,48 +78,93 @@ class MessagSub extends Component{
}
}
render() {
- let{page,limit,typeysl,count,isSpin}=this.state;
- console.log("6868686868");
- console.log(isSpin);
+ let{page,limit,typeysl,count,isSpin,data}=this.state;
+ // console.log("6868686868");
+ // console.log(data);
return (
+ {/*左边*/}
+
+
+ {/*右边*/}
+ + this.smyJump(2)}> + 117llj与你的私信 +
+ {/*聊天页面*/} +
+
+
+ {/*回复*/}
+
+
+
+
+
+
+
+
+
+
+
+ 2019/07/20
+ {/*右边*/} + + +![1?1558048024]({"/images/avatars/User/1?1558048024"})
+
+
+
+
+
+
+
+
+ {/*右边头部*/}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 私信列表
+
+ {/*列表数据*/}
+ {
+ datay===undefined?
+ ""
+ :datay.map((item,key)=>{
+ return(
+
+
+
+ )
+ })}
+
+
+
+
+
+ 
+
+
+
+
+ + + {item.target.name} + {item.unread === true? + + :""} + + {(time)=>this.FormatTime(item.send_time)} +
+ +
{/*头部筛选数据*/}
-
-
- this.getdata("")}>全部消息 +
- this.getdata("",1)}>全部 -
- this.getdata("course")}>课堂提醒 +
- this.getdata("course",1)}>课堂提醒 -
- this.getdata("project")}>项目提醒 +
- this.getdata("project",1)}>项目提醒 -
- this.getdata("project_package")}>众包 +
- this.getdata("project_package",1)}>众包提醒 -
- this.getdata("apply")}>审核 +
- this.getdata("interactive",1)}>互动提醒 -
- this.getdata("system")}>通知 +
- this.getdata("apply",1)}>审核 + +
- this.getdata("system",1)}>通知 -
- this.getdata("interactive")}>互动提醒
+
{/*这里可以进行数据处理*/}
-
-
diff --git a/public/react/src/modules/message/js/MessagePrivate.js b/public/react/src/modules/message/js/MessagePrivate.js
index 7a7c61174..8885d101b 100644
--- a/public/react/src/modules/message/js/MessagePrivate.js
+++ b/public/react/src/modules/message/js/MessagePrivate.js
@@ -1,20 +1,158 @@
import React, { Component } from 'react';
+import {
+ Spin,
+ Pagination,
+} from "antd";
+import axios from 'axios';
+import {getImageUrl} from 'educoder';
+import "../css/messagemy.css"
+import WriteaprivateletterModal from '../messagemodal/WriteaprivateletterModal';
//私信页面
class MessagePrivate extends Component{
constructor(props) {
super(props);
this.state={
-
- }
+ page:1,
+ limit:10,
+ count:0,
+ data:undefined,
+ isSpin:false,
+ modalsType:false,
+ };
+ console.log("MessagePrivate");
+ console.log(this.props);
}
componentDidMount(){
+ this.getdata(1);
+ };
+
+ //获取数据地方
+ getdata=(page)=>{
+ this.setState({
+ isSpin:true,
+ });
+ let{limit}=this.state;
+ let url = `/users/${this.props.current_user.user_id}/private_messages.json`;
+ // let url = `/users/71519/private_messages.json`;
+ axios.get((url),{params:{
+ page:page,
+ 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,
+ 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);
+ this.setState({
+ isSpin:false,
+ })
+ })
+ };
+
+ paginationonChanges=(pageNumber)=>{
+ this.setState({
+ page: pageNumber,
+ })
+ this.getdata(pageNumber);
+ };
+ okmodalsType=()=>{
+ this.setState({
+ modalsType:true,
+ })
+ }
+ cancelmodalsType=()=>{
+ this.setState({
+ modalsType:false,
+ })
+ };
+ // 跳转页面
+ smyJump =(i)=>{
+ console.log("跳转页面");
+ console.log(i);
+ this.props.Modifyur(i);
}
render() {
+ let{page,limit,typeysl,count,isSpin,data,modalsType}=this.state;
+ // console.log( this.props);
+ // console.log("37");
return (
-
-
-
+
+
+
+ {
+ data===undefined?
+
{/*页数*/}
-
+ ![]({getImageUrl("images/educoder/nodata.png")}/)
+
+ :data.map((item,key)=>{
+ return(
+
+ 暂无数据哦~
+
+
+ )
+ })}
+ 
+
+
+
+
+
+
+ + {item.trigger_user.name} + {item.time} + {this.state.typeysl==="apply"?( + item.status===0? + 待处理:"" + ):""} + {this.state.typeysl==="apply"?( + item.status===1? + 已处理:"" + ):""} + +
++ { + item.content + } +
+ +
+ {
+ modalsType===true?
+ this.smyJump(is)} >
+ :""
+ }
+
+
)
}
}
diff --git a/public/react/src/modules/message/js/Messagerouting.js b/public/react/src/modules/message/js/Messagerouting.js
index 6cf717e6d..56eafec7e 100644
--- a/public/react/src/modules/message/js/Messagerouting.js
+++ b/public/react/src/modules/message/js/Messagerouting.js
@@ -16,21 +16,71 @@ class Messagerouting extends Component{
super(props);
this.state={
routing:1,
+ unread_message_count:0,
+ unread_tiding_count:0,
}
}
componentDidMount(){
}
- // 切换路由
+ componentDidUpdate(prevProps) {
+ // console.log("11111111111");
+ // console.log(prevProps);
+ // console.log("22222222222");
+ // console.log(this.props);
+ // console.log("33333333333");
+ if(prevProps.current_user !== this.props.current_user){
+ this.Messageprivatemessageunreadmessage(this.props.current_user.user_id);
+ }
+ }
+ //消息未读
+ Messageprivatemessageunreadmessage=(user_id)=>{
+ const url=`/users/${user_id}/unread_message_info.json`
+ axios.get(url).then((result) => {
+ if(result===undefined){
+ return
+ }
+ console.log("消息未读1");
+ console.log(result);
+ this.setState({
+ unread_message_count:result.data.unread_message_count,
+ unread_tiding_count:result.data.unread_tiding_count,
+ })
+ }).catch((error) => {
+ console.log(error)
+ })
+ };
SwitchonClick=(value)=>{
this.setState({
routing:value,
- })
+ });
+ this.Messageprivatemessageunreadmessage(this.props.current_user.user_id);
+ };
+
+
+
+ Message2=(data)=>{
+ console.log("64");
+ console.log(data);
+ this.setState({
+ unread_message_count:data.unread_message_count,
+ unread_tiding_count:data.unread_tiding_count,
+ })
+ };
+
+ //跳转到链接
+ Modifyur=(i)=>{
+ console.log("跳转到链接");
+ console.log(i);
+ this.setState({
+ routing:i,
+ })
}
render() {
- let{routing} =this.state;
+ let{routing,unread_message_count,unread_tiding_count} =this.state;
+ console.log(this.props);
return (
+
+
+ {
+ data===undefined?
+
+
+
+
+
+ {/*页数*/}
+ { data===undefined?""
+ :
+ (count>10?
+ + 全部私信 + this.okmodalsType()}>写私信 +
+
+
+
+ :data.map((item,key)=>{
+ return(
+
+
+ 暂无数据哦~
+this.smyJump(3)}>
+
+
+
+
+ )
+ })}
+
+
+ {item.unread === true ?:""}
+ + this.smyJump()} className="mr20 private_message_a">{item.target.name} + 与你的私信 + [{item.message_count}{"条"}] + {item.send_time} +
+ + +
+
+ :""
+ )
+
+ }
+
+
@@ -38,34 +88,36 @@ class Messagerouting extends Component{
+
+ )
+ }
+}
+
+export default WriteaprivateletterModal;
\ No newline at end of file
{/*头像*/}
{/*右边*/}
-
- ![]({"/images/avatars/User/71519?1564061748"}/)
+
+ 
-
{/*路由跳转*/}
+
+ 杨树林
-工程师
+{this.props.current_user&&this.props.current_user.username}
+{this.props.current_user&&this.props.current_user.user_identity}
- this.SwitchonClick(1)}>消息 + {unread_tiding_count>0?{unread_message_count}:""} -
- +
- this.SwitchonClick(2)}>私信 + {unread_tiding_count>0?{unread_tiding_count}:""}
-
diff --git a/public/react/src/modules/message/messagemodal/WriteaprivateletterModal.js b/public/react/src/modules/message/messagemodal/WriteaprivateletterModal.js
new file mode 100644
index 000000000..bb23b4f25
--- /dev/null
+++ b/public/react/src/modules/message/messagemodal/WriteaprivateletterModal.js
@@ -0,0 +1,354 @@
+import React, { Component } from 'react';
+import { Modal,Input,Icon,Tooltip,Spin} from 'antd';
+import axios from 'axios';
+// import '../../modules/user/common.css';
+//完善个人资料
+class WriteaprivateletterModal extends Component {
+
+ constructor(props) {
+ super(props)
+ this.state ={
+ modalsType:false,
+ Pleaseselectthesender:false,
+ Pleaseselectthesenders:false,
+ inputvulue:"",
+ inputvulues:"",
+ floatingboxdisplay:false,
+ users:[],
+ Personalid:undefined,
+ isSpin:false,
+ Recentcontacts:false,
+ floatingboxdisplays:false,
+
+ }
+
+ }
+ componentDidMount() {
+ //用户id
+ console.log(this.props.current_user.user_id);
+ this.Recentcontacts();
+
+ }
+ //获取最近联系人
+ Recentcontacts=()=>{
+ this.setState({
+ isSpin:true
+ });
+ const url =`/users/${this.props.current_user.user_id}/recent_contacts.json`
+ axios.get(url).then((result) => {
+ if(result===undefined){
+ return
+ }
+ console.log(result);
+ this.setState({
+ users:result.data.users,
+ Recentcontacts:false,
+ floatingboxdisplay:true,
+ isSpin:false
+ })
+ }).catch((error) => {
+ console.log(error)
+ this.setState({
+ isSpin:false
+ })
+ })
+ };
+
+ //发送私信
+ SendprivatemessageAPI=(idvalue,contentvalue)=>{
+ const url =`/users/${this.props.current_user.user_id}/private_messages.json`
+ let data={
+ target_id:idvalue,
+ content:contentvalue,
+ }
+ axios.post(url, data).then((result) => {
+ if(result===undefined){
+ return
+ }
+ this.setState({
+ floatingboxdisplays:false,
+ Pleaseselectthesender:false,
+ });
+ this.props.smyJump(3);
+ console.log(result);
+ }).catch((error) => {
+ console.log(error)
+ })
+ };
+
+ //搜索私信人
+ Retrieveprivatemessageusers=(value)=>{
+ this.setState({
+ isSpin:true
+ })
+ const url =`/users_for_private_messages.json`
+ axios.get((url),{params:{
+ keyword:value,
+ }}).then((result) => {
+ if(result===undefined){
+ return
+ }
+ this.setState({
+ users:result.data.users,
+ Recentcontacts:true,
+ floatingboxdisplay:true,
+ isSpin:false
+ })
+ console.log(result);
+ }).catch((error) => {
+ console.log(error)
+ this.setState({
+ isSpin:false
+ })
+ })
+ };
+
+ modalCancel=()=>{
+ // var weekArray = JSON.parse(window.sessionStorage.getItem('yslgeturls'));
+ // if(weekArray===undefined){
+ // weekArray="/";
+ // }
+ // if(weekArray===null){
+ // weekArray="/";
+ // }
+ // if(weekArray==="null"){
+ // weekArray="/";
+ // }
+ // window.location.href = weekArray;
+ }
+
+ setDownload=()=>{
+ // window.location.href ='/account/profile';
+ };
+
+ // 搜索
+ search_message_person=()=>{
+ console.log("点击搜索按钮");
+ if(this.state.inputvulue.length===0){
+ this.Recentcontacts();
+ }else {
+ this.Retrieveprivatemessageusers(this.state.inputvulue);
+
+ }
+ };
+
+ //取消事件
+ HideModal=()=>{
+ this.props.cancelmodalsType();
+ };
+
+ //确认事件
+ OKModal=()=>{
+ let{inputvulue,Personalid,inputvulues}=this.state;
+ // console.log("发送私信了");
+ // console.log(inputvulue);
+ // console.log(Personalid);
+ // console.log(inputvulues);
+ if(inputvulue.length===0){
+ this.setState({
+ Pleaseselectthesender:true
+ });
+ return;
+
+ }
+ if(inputvulues.length===0){
+ this.setState({
+ floatingboxdisplays:true
+ })
+ return;
+ }
+ else {
+ if(Personalid===undefined){
+ this.setState({
+ Pleaseselectthesender:true
+ });
+ return
+ }
+
+
+ this.SendprivatemessageAPI(Personalid,inputvulues)
+
+ }
+ };
+
+ // 回车事件
+ Myοnkeydοwn=()=>{
+ console.log("点击了回车事件");
+ if(this.state.inputvulue.length===0){
+ this.Recentcontacts();
+ }else {
+ this.Retrieveprivatemessageusers(this.state.inputvulue);
+
+ }
+ };
+
+ //判断点击的键盘的keyCode是否为13，是就调用上面的搜索函数
+ handleEnterKey = (e) => {
+ console.log("");
+ if(e.nativeEvent.keyCode === 13){ //e.nativeEvent获取原生的事件对像
+ this.Myοnkeydοwn()
+ }
+ };
+ // 查找联系人输入模式
+ setdatafunsval=(e)=>{
+ if(e.target.value.length===0){
+ this.setState({
+ inputvulue:e.target.value,
+ Pleaseselectthesender:false,
+ floatingboxdisplay:true,
+ Personalid:undefined
+ });
+ this.Recentcontacts();
+ }else {
+ this.setState({
+ inputvulue:e.target.value,
+ Pleaseselectthesender:false,
+ floatingboxdisplay:true,
+ });
+ }
+
+ console.log(e.target.value);
+ };
+ // 输入内容
+ setdatafunsvals=(e)=>{
+ console.log(e.target.value);
+ this.setState({
+ inputvulues:e.target.value,
+ Pleaseselectthesenders:false,
+ floatingboxdisplays:false,
+ floatingboxdisplay:false,
+ });
+ }
+ //失去焦点
+ myonBlur=(e)=>{
+ console.log("失去焦点了");
+ e.preventDefault();
+ this.setState({
+ // floatingboxdisplay:false,
+ })
+};
+ //获取焦点
+ myonFocus=(e)=>{
+ console.log("获取到焦点了");
+ this.setState({
+ floatingboxdisplay:true,
+ })
+ };
+
+ //获取用户信息
+ Getuserinformation=(item)=>{
+ console.log("获取到了用户信息");
+ console.log(item.id);
+ this.setState({
+ Personalid:item.id===undefined?undefined:item.id===null?undefined:item.id,
+ inputvulue:item.name,
+ floatingboxdisplay:false,
+ })
+ }
+
+
+ render() {
+ // console.log(this.props)
+ let{Pleaseselectthesender,inputvulue,inputvulues,floatingboxdisplay,users,floatingboxdisplays,Recentcontacts,isSpin}=this.state;
+ return(
+
+
{/*消息自路由*/}
- {routing===1?this.Message2()}> :""}
{/*私信*/}
- {routing===2?this.Message2()} Modifyur={(i)=>this.Modifyur(i)}> :""}
{/*私信聊天页面*/}
- {routing===3?this.Message2()} Modifyur={(i)=>this.Modifyur(i)}> :""}
+
+ {
+ Pleaseselectthesender === true ?
+
+ {/*搜索框*/}
+ {/*
+ {/*私信内容*/}
+ */}
+ {/* */}
+ {/* */}
+ {/* ![]({"/images/educoder/icon/search.svg"})
this.search_message_person()}/>*/}
+ {/*
*/}
+ this.search_message_person()}/>*/}
+ {/*
+ this.search_message_person()}/>
+ }
+ />
+
+ {/*搜索框下面悬浮框*/}
+
+
+
+ {/*
+
+
+ {Recentcontacts===false?"最近联系人":"搜索结果"}
+ + { + users.map((item,key)=>{ + return( +this.Getuserinformation(item)}>
+
+ {item.name}
+
*/}
+ {/* ![1?1558048024]({"/images/avatars/User/1?1558048024"}*/})
*/}
+ {/* ![B?1532489442]({"/images/avatars/User/b?1532489442"}*/})
+
+ 200
+
+ 请选择发送对象
+ :(floatingboxdisplays ===false?:"") + } + { + floatingboxdisplays===true? +请输入发送内容
+ : "" + } + {/*确认事件*/} ++ this.HideModal()} className="pop_close task-btn mr30">取消 + this.OKModal()} id="submit_send_letter">确定 +
+ {/**/}
+ {/* */}
+ {/*
*/}
+ 完善您的资料，将获得更多的使用权限
*/}
+ {/* this.modalCancel()}>取消*/}
+ {/* this.setDownload()}>立即完善*/}
+ {/*
*/}
+ {/*