From 1125d3babc35d9c91e6e1c14a717dec7bc9a6158 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 22:36:07 +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      | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/public/react/src/modules/message/js/MessagChat.js b/public/react/src/modules/message/js/MessagChat.js
index d57b4a7a1..8e84dd9fd 100644
--- a/public/react/src/modules/message/js/MessagChat.js
+++ b/public/react/src/modules/message/js/MessagChat.js
@@ -63,7 +63,8 @@ class MessagChat extends Component{
 	contentViewScrolltop=(e)=>{
 
 		if(e.currentTarget.scrollHeight===0){
-
+			let {pages}=this.state;
+			let newpage=pages+1
 
 		}
 	}
@@ -110,7 +111,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 = {};
@@ -119,30 +120,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,
-					});
 				}
 			}
+			this.setState({
+				isSpin: false,
+			});
 		}).catch((error) => {
 			console.log(error);
 			this.setState({
@@ -191,12 +188,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({