Merge remote-tracking branch 'origin/dev_Ysl' into dev_Ysl

public/react/src/modules/message/js/MessagePrivate.js

@@ -25,16 +25,25 @@ class MessagePrivate extends Component{
 	}
 
 	componentDidMount(){
-      this.getdata(1);
+      // this.getdata(1);
 	};
-
+	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.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/${this.props.current_user&&this.props.current_user.user_id}/private_messages.json`;
 		// let url = `/users/71519/private_messages.json`;
 		axios.get((url),{params:{
 				page:page,

public/react/src/modules/message/messagemodal/WriteaprivateletterModal.js

@@ -2,6 +2,7 @@ import React, { Component } from 'react';
 import { Modal,Input,Icon,Tooltip,Spin} from 'antd';
 import axios from 'axios';
 // import '../../modules/user/common.css';
+import {getImageUrl} from 'educoder';
 //完善个人资料
 class WriteaprivateletterModal extends Component {
 
@@ -282,7 +283,7 @@ class WriteaprivateletterModal extends Component {
 								onFocus={this.myonFocus}
 								onChange={this.setdatafunsval}
 								suffix={
-									<img src={"/images/educoder/icon/search.svg"}  onClick={()=>this.search_message_person()}/>
+									<img src={getImageUrl("/images/"+"educoder/icon/search.svg")}  onClick={()=>this.search_message_person()}/>
 								}
 							/>
 						</div>
@@ -295,7 +296,7 @@ class WriteaprivateletterModal extends Component {
 								users.map((item,key)=>{
 									return(
 										<p className="clearfix recently_item"  onMouseDown={(c)=>this.Getuserinformation(item)}>
-											<img alt="1?1558048024" className="radius fl mr10 myimgw48 myimgh48"  src={item.image_url}
+											<img alt="1?1558048024" className="radius fl mr10 myimgw48 myimgh48"  src={getImageUrl("/images/"+item.image_url)}
 											/>
 											<span className="recently_name">{item.name}</span>
 										</p>
@@ -337,8 +338,8 @@ class WriteaprivateletterModal extends Component {
 				}
 				{/*确认事件*/}
 				<p className="clearfix edu-txt-center">
-					<a href="javascript:void(0);" onClick={()=>this.HideModal()} className="pop_close task-btn mr30">取消</a>
-					<a href="javascript:void(0);" className="task-btn task-btn-orange" onClick={()=>this.OKModal()} id="submit_send_letter">确定</a>
+					<a onClick={()=>this.HideModal()} className="pop_close task-btn mr30">取消</a>
+					<a className="task-btn task-btn-orange" onClick={()=>this.OKModal()} id="submit_send_letter">确定</a>
 				</p>
 				{/*<div className="educouddiv">*/}
 				{/*	<div className={"tabeltext-alignleft"}><p style={{fontSize: "16px"}}>完善您的资料，将获得更多的使用权限</p></div>*/}