Merge branch 'dev_Ysl' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl

public/react/public/css/edu-all.css

@@ -577,7 +577,7 @@ p .activity-item:first-child{border-top: 1px solid #eee;}
 .recently_name{float: left;line-height: 48px;display: block}
 .recently_item:hover{background-color: #F9F9F9;}
 /*私信对话框*/
-.private-list{min-height: 660px;max-height: 810px;overflow-y: auto}
+.private-list{min-height: 660px;max-height: 835px;overflow-y: auto}
 .private-list .private-part{padding-left:20px;cursor: pointer}
 .private-part:hover{background-color: #F5F5F5;}
 .private-part.active{background-color: #F5F5F5;}

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

@@ -108,8 +108,27 @@ class MessagChat extends Component{
 	}
 
 	setreplyfun=()=>{
-		console.log(this.messageRef.current.getValue().trim())
+	  let  contents=this.messageRef.current.getValue().trim();
+	  let  target_ids="";
+		let url = `/users/${this.props.current_user.user_id}/private_messages.json`;
+
+		axios.post(url, {
+				target_id: target_ids,
+				content: contents
+			})
+			.then((response) => {
+				if (response.data.status == '0') {
+					this.setState({ modulationModalVisible: false })
+					this.props.showNotification('调分成功')
+					this.fetchList()
+				}
+			})
+			.catch(function (error) {
+				console.log(error);
+			});
 	}
+
+
 	render() {
 		let{isSpins,datay,myyslusers,mess}=this.state;
 		// console.log(mess);
@@ -135,7 +154,7 @@ class MessagChat extends Component{
 								<p className="mt30 edu-txt-center"><span className="letter-time">2019/07/20</span></p>
 								{/*右边*/}
 								<div className="ThisSide clearfix" id="message_content_25137">
-									<a href="/users/innov"><img alt="1?1558048024" className="ml10 radius fr myimgw48 myimgh48" src={"/images/avatars/User/1?1558048024"} /></a>
+									<a href="/users/innov"><img alt="头像" className="ml10 radius fr myimgw48 myimgh48" src={"/images/avatars/User/1?1558048024"} /></a>
 									<div className="fr pr ThisSide-info">
 										<span className="trangle"></span>
 										<div className="sms break_word" id="message_content_show_25137">hello</div>
@@ -160,7 +179,13 @@ class MessagChat extends Component{
 
 					{/*回复*/}
 					<div className="bor-top-greyE padding20">
-
+						<style>
+							{`
+							.rememberTip{
+								display:none;
+								}
+							`}
+						</style>
 						<TPMMDEditor ref={this.messageRef}
 												 placeholder={'请输入您的回复'}
 												 watch={false}

public/stylesheets/educoder/edu-all.css

@@ -580,7 +580,7 @@ p .activity-item:first-child{border-top: 1px solid #eee;}
 .recently_name{float: left;line-height: 48px;display: block}
 .recently_item:hover{background-color: #F9F9F9;}
 /*私信对话框*/
-.private-list{min-height: 660px;max-height: 810px;overflow-y: auto}
+.private-list{min-height: 660px;max-height: 835px;overflow-y: auto}
 .private-list .private-part{padding-left:20px;cursor: pointer}
 .private-part:hover{background-color: #F5F5F5;}
 .private-part.active{background-color: #F5F5F5;}