From 7cd7a0426ca5936a9bca2e348276a31cdc8e3a55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Thu, 1 Aug 2019 15:49:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/modules/message/js/MessagChat.js      | 44 +++++++++++++------
 1 file changed, 31 insertions(+), 13 deletions(-)

diff --git a/public/react/src/modules/message/js/MessagChat.js b/public/react/src/modules/message/js/MessagChat.js
index da4a5a8e9..5caf7069f 100644
--- a/public/react/src/modules/message/js/MessagChat.js
+++ b/public/react/src/modules/message/js/MessagChat.js
@@ -66,7 +66,7 @@ class MessagChat extends Component{
 
 	getChatList=(page,listl,target_ids)=>{
 		this.setState({
-			isSpins:true,
+			isSpin:true,
 		});
 		let url = `/users/${this.props.match.params.userid}/private_message_details.json`;
 		axios.get((url),{params:{
@@ -106,20 +106,20 @@ class MessagChat extends Component{
 				}
 
 				this.setState({
-					isSpins:false,
+					isSpin:false,
 				});
 
 			}
 		}).catch((error) => {
 			console.log(error);
 			this.setState({
-				isSpins:false,
+				isSpin:false,
 			})
 		})
 	};
 	getChatListtwo=(pages,listls,target_ids)=>{
 		this.setState({
-			isSpins:true,
+			isSpin:true,
 		});
 		let url = `/users/${this.props.match.params.userid}/private_message_details.json`;
 		axios.get((url),{params:{
@@ -132,27 +132,43 @@ class MessagChat extends Component{
 				if(result.data.message!==undefined){
 					return;
 				}
+				var datas=[]
+				var datay=result.data.messages;
+				var obj={};
+				for (var i=0;i<datay.length;i++){
+					if(i===0){
+						obj=datay[i];
+						datas.push(datay[i]);
+					}else{
+						obj=datay[i];
+						if(obj.send_day===datay[i].send_day){
+							datay[i].send_day="";
+						}
 
+						datas.push(datay[i]);
+					}
+
+				}
 				if(result.data!==null){
 					console.log(result)
 					this.setState({
-						messages:result.data.messages,
+						messages:datas,
 						myuserl:result.data.target,
 					});
-					this.getdatatwo(this.state.page);
+					// this.getdatatwo(this.state.page);
 				}
 
 				this.setState({
-					isSpins:false,
+					isSpin:false,
 				});
 
 			}
 		}).catch((error) => {
 			console.log(error);
 			this.setState({
-				isSpins:false,
+				isSpin:false,
 			});
-			this.getdatatwo(this.state.page);
+			// this.getdatatwo(this.state.page);
 		})
 	};
 	//获取数据地方
@@ -285,7 +301,7 @@ class MessagChat extends Component{
 
 
 	render() {
-		let{isSpins,datay,myyslusers,mess,limits,myuserl,messages}=this.state;
+		let{isSpins,datay,myyslusers,mess,limits,myuserl,messages,isSpin}=this.state;
 		// console.log(mess);
 		// console.log(myyslusers);
 		// console.log("MessagChat");
@@ -308,14 +324,15 @@ class MessagChat extends Component{
 					{/*聊天页面*/}
 					<div className="dialogPanel">
 						<div >
+							<Spin size="large" className="myw100baifenbi" spinning={isSpin}>
 							<div>
 								{
 									messages===undefined?
 										""
 										:messages.map((item,key)=>{
-											console.log("-----------------================-=-==-==");
-                      console.log(item.sender_id);
-                      console.log(this.props.match.params.userid);
+											// console.log("-----------------================-=-==-==");
+                      // console.log(item.sender_id);
+                      // console.log(this.props.match.params.userid);
 											return(
 												<div key={key}>
 													{
@@ -342,6 +359,7 @@ class MessagChat extends Component{
 								}
 
 							</div>
+						</Spin>
 						</div>
 					</div>