解决滚动

startsuper · Jun 14, 2017 · b1aee10 · b1aee10
1 parent 77ce757
commit b1aee10
Show file tree

Hide file tree

Showing 35 changed files with 21 additions and 90 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@
 node_modules/
 dist/
 npm-debug.log
+weixin/
diff --git a/src/frames/conversation/groupchat.vue b/src/frames/conversation/groupchat.vue
@@ -158,14 +158,12 @@
 				this.gropname=res.petname;
 				//this.groupconversine=[...res.grouphead];
 			});	
-<<<<<<< HEAD
-			socket.on('chat', function (data) {
-				console.log(data);//聊天返回内容
-=======
 			socket.on('chat', (data) => {
 				console.log(data);//聊天返回内容
-				this.groupconversine.push(data)
->>>>>>> fcb41450fc1df1587f1bc4e289ffae3bb2df400a
+				this.groupconversine.push(data);
+				this.$nextTick(()=>{
+					window.scrollTo(0,this.$refs.groupHeight.offsetHeight-window.innerHeight)
+				})
 			});
 			chatData().then((res) => {
 				this.chatData=res;

diff --git a/weixin/static/css/app.css b/weixin/static/css/app.css
diff --git a/weixin/static/js/aboutwc.4c769f907da0ebe045de.min.js b/weixin/static/js/aboutwc.4c769f907da0ebe045de.min.js
diff --git a/weixin/static/js/addressbook.b5bc84badd17a06b5894.min.js b/weixin/static/js/addressbook.b5bc84badd17a06b5894.min.js
diff --git a/weixin/static/js/app.js b/weixin/static/js/app.js
diff --git a/weixin/static/js/cardbag.41111d417a907608db80.min.js b/weixin/static/js/cardbag.41111d417a907608db80.min.js
diff --git a/weixin/static/js/chat.4949fd6fa9889335d4ca.min.js b/weixin/static/js/chat.4949fd6fa9889335d4ca.min.js
diff --git a/weixin/static/js/chatmessage.b58415092ac09b806498.min.js b/weixin/static/js/chatmessage.b58415092ac09b806498.min.js
diff --git a/weixin/static/js/collect.44638360d18408b335ed.min.js b/weixin/static/js/collect.44638360d18408b335ed.min.js
diff --git a/weixin/static/js/computer.31eded42d1b107b870f3.min.js b/weixin/static/js/computer.31eded42d1b107b870f3.min.js
diff --git a/weixin/static/js/currency.a8d5e65da4f8f075dc68.min.js b/weixin/static/js/currency.a8d5e65da4f8f075dc68.min.js
diff --git a/weixin/static/js/details.74c5d6eb0ce5bb56c19e.min.js b/weixin/static/js/details.74c5d6eb0ce5bb56c19e.min.js
diff --git a/weixin/static/js/dialogue.475b0cf24edc52436134.min.js b/weixin/static/js/dialogue.475b0cf24edc52436134.min.js
diff --git a/weixin/static/js/disturbance.e907968e0a3873b01e65.min.js b/weixin/static/js/disturbance.e907968e0a3873b01e65.min.js
diff --git a/weixin/static/js/find.43dbf9f423b86c48386c.min.js b/weixin/static/js/find.43dbf9f423b86c48386c.min.js
diff --git a/weixin/static/js/friendcircle.6af1cdfab057fd3b4ceb.min.js b/weixin/static/js/friendcircle.6af1cdfab057fd3b4ceb.min.js
diff --git a/weixin/static/js/groupchat.4fdfc970a06742c4e0ad.min.js b/weixin/static/js/groupchat.4fdfc970a06742c4e0ad.min.js
diff --git a/weixin/static/js/groupchatmessage.5a4f5a7f1468a8559bab.min.js b/weixin/static/js/groupchatmessage.5a4f5a7f1468a8559bab.min.js
diff --git a/weixin/static/js/help.e743c35707ad636be767.min.js b/weixin/static/js/help.e743c35707ad636be767.min.js
diff --git a/weixin/static/js/login.af085b0a9a92f645d9cb.min.js b/weixin/static/js/login.af085b0a9a92f645d9cb.min.js
diff --git a/weixin/static/js/manifest.js b/weixin/static/js/manifest.js
diff --git a/weixin/static/js/me.33e1fb0c7fae680b8c16.min.js b/weixin/static/js/me.33e1fb0c7fae680b8c16.min.js
diff --git a/weixin/static/js/miniapps.e57c0077cebd29e2cd24.min.js b/weixin/static/js/miniapps.e57c0077cebd29e2cd24.min.js
diff --git a/weixin/static/js/more.665ed89984fd8976ffdb.min.js b/weixin/static/js/more.665ed89984fd8976ffdb.min.js
diff --git a/weixin/static/js/newmessage.c34b1386b5db608e45a0.min.js b/weixin/static/js/newmessage.c34b1386b5db608e45a0.min.js
diff --git a/weixin/static/js/personaldetails.8d3017d7e43b1626455c.min.js b/weixin/static/js/personaldetails.8d3017d7e43b1626455c.min.js
diff --git a/weixin/static/js/photoalbum.2820731419523eddc424.min.js b/weixin/static/js/photoalbum.2820731419523eddc424.min.js
diff --git a/weixin/static/js/privacy.519f2e3381d9908087ef.min.js b/weixin/static/js/privacy.519f2e3381d9908087ef.min.js
diff --git a/weixin/static/js/search.6b2a5dd5a71bcd39b5c3.min.js b/weixin/static/js/search.6b2a5dd5a71bcd39b5c3.min.js
diff --git a/weixin/static/js/settings.08d9fcfb1c2d827d7825.min.js b/weixin/static/js/settings.08d9fcfb1c2d827d7825.min.js
diff --git a/weixin/static/js/singlechat.f04c11601bd029c042bb.min.js b/weixin/static/js/singlechat.f04c11601bd029c042bb.min.js
diff --git a/weixin/static/js/transfer.5b94c330a7146b508c32.min.js b/weixin/static/js/transfer.5b94c330a7146b508c32.min.js
diff --git a/weixin/static/js/vendor.js b/weixin/static/js/vendor.js
diff --git a/weixin/static/js/wallet.d8aea85bff3aa2196fbf.min.js b/weixin/static/js/wallet.d8aea85bff3aa2196fbf.min.js
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,3 +2,4 @@ @@
     node_modules/
     dist/
     npm-debug.log
+    weixin/