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

# Conflicts:
#	public/react/src/modules/message/js/Messagerouting.js

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

@@ -65,7 +65,8 @@ class MessagChat extends Component{
 	contentViewScrolltop=(e)=>{
 
 		if(e.currentTarget.scrollHeight===0){
-
+			let {pages}=this.state;
+			let newpage=pages+1
 
 		}
 	}
@@ -112,7 +113,7 @@ class MessagChat extends Component{
 			if (result) {
 				// if (result.data.status === 0) {
 					if (result.data !== null) {
-						var datas = []
+						var datas = [];
 						var datay = result.data.messages;
 						datay = datay.reverse();
 						var obj = {};
@@ -121,30 +122,26 @@ class MessagChat extends Component{
 								obj = datay[i];
 								datas.push(datay[i]);
 							} else {
-
 								if (moment(obj.send_day).isSame(datay[i].send_day)) {
 									datay[i].send_day = "";
 								} else {
 									obj = datay[i];
 								}
-
 								datas.push(datay[i]);
 							}
-
 						}
 						//颠倒数组
-
 						this.setState({
 							messages: datas,
 							myuserl: result.data.target,
 						})
 					// }
 
+				}
+			}
 			this.setState({
 				isSpin: false,
 			});
-				}
-			}
 		}).catch((error) => {
 			console.log(error);
 			this.setState({
@@ -193,12 +190,13 @@ class MessagChat extends Component{
 						// this.getdatatwo(this.state.page);
 					// }
 
-					this.setState({
+
-						isSpin: false,
-					});
 
 				}
 			}
+			this.setState({
+				isSpin: false,
+			});
 		}).catch((error) => {
 			console.log(error);
 			this.setState({
@@ -302,6 +300,9 @@ class MessagChat extends Component{
 	}
   //回复
 	setreplyfun=()=>{
+		this.setState({
+			isSpin:true,
+		});
 	  let  contents=this.messageRef.current.getValue().trim();
 		const query = this.props.location.search;
 		let target_ids = query.split('?target_ids=');
@@ -311,6 +312,9 @@ class MessagChat extends Component{
 				content: contents
 			})
 			.then((response) => {
+				this.setState({
+					isSpin:false,
+				});
 				if(response===undefined){
 					return
 				}
@@ -320,31 +324,50 @@ class MessagChat extends Component{
 				var datas=[];
 				var dataso=this.state.messages;
 				var datays=response.data.private_message;
-				var obj={};
+				// var obj={};
-				for (var i=0;i<dataso.length;i++){
+				// for (var i=0;i<dataso.length;i++){
-					if(i===0){
+				// 	if(i===0){
-						obj=dataso[i];
+				// 		obj=dataso[i];
-						datas.push(dataso[i]);
+				// 		datas.push(dataso[i]);
-					}else{
+				// 	}else{
-						if( moment(obj.send_day).isSame(dataso[i].send_day)){
+				// 		if( moment(obj.send_day).isSame(dataso[i].send_day)){
-							dataso[i].send_day="";
+				// 			dataso[i].send_day="";
+				// 		}else {
+				// 			obj=dataso[i];
+				// 		}
+				// 		datas.push(dataso[i]);
+				// 	}
+				// }
+					try {
+						var time =dataso[dataso.length-1].send_time.slice(0,10);
+            console.log(time);
+						var timetwo=datays.send_time.slice(0,10);
+						console.log(timetwo);
+						if( moment(time).isSame(timetwo)){
+							     datays.send_day="";
+						    	dataso.push(datays);
 									}else {
-							obj=dataso[i];
+						    	datays.send_day=timetwo;
-						}
+						    	dataso.push(datays);
-						datas.push(dataso[i]);
 									}
+					}catch (e) {
+           console.log("回去出现错误");
+           console.log(e);
 					}
-				datas.push(datays);
+
 				//颠倒数组
 				this.setState({
-					messages: datas,
+					messages: dataso,
 
-				})
+				});
 					this.messageRef.current.setValue('')
 				}
 			})
 			.catch(function (error) {
 				console.log(error);
+				this.setState({
+					isSpin:false,
+				});
 			});
 	};
    //删除

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

@@ -98,10 +98,10 @@ class MessagePrivate extends Component{
 		})
 	};
 	// 跳转页面
-	smyJump =(i,item)=>{
+	smyJump =(i,id)=>{
 		// console.log("跳转页面");
 		// console.log(i);
-		this.props.Modifyur(i,item);
+		this.props.Modifyur(i,id);
 	};
 	myCome=(e)=>{
 		window.location.href="/users/"+e.target.login;

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

@@ -32,7 +32,6 @@ class Messagerouting extends Component{
 			routing:1,
 			unread_message_count:0,
 			unread_tiding_count:0,
-			myysluser:undefined,
 		}
 	}
 
@@ -100,7 +99,7 @@ class Messagerouting extends Component{
 	};
 
 	//跳转到链接
-	Modifyur=(i,item)=>{
+	Modifyur=(i,id)=>{
 		// console.log("跳转到链接1");
 		// console.log(i);
 		// console.log(item);
@@ -119,10 +118,9 @@ class Messagerouting extends Component{
 		}else {
 			this.setState({
 				routing:i,
-				myysluser:item,
 			});
 			console.log("22222222222");
-			this.props.history.replace(`/message/${this.props.current_user.user_id}/message_detail?target_ids=${item.id}`);
+			this.props.history.replace(`/message/${this.props.current_user.user_id}/message_detail?target_ids=${id}`);
 		}
 
 	};

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

@@ -70,7 +70,7 @@ class WriteaprivateletterModal extends Component {
 				floatingboxdisplays:false,
 				Pleaseselectthesender:false,
 			});
-			this.props.smyJump(3,this.state.users);
+			this.props.smyJump(3,result.data.private_message.receiver_id);
 			//console.log(result);
 		}).catch((error) => {
 			//console.log(error)