Merge branch 'master' into master

terrence386 · Jun 14, 2017 · 7c8082e · 7c8082e
2 parents 206c2ff + b1aee10
commit 7c8082e
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 29 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
@@ -160,7 +160,10 @@
 			});	
 			socket.on('chat', (data) => {
 				console.log(data);//聊天返回内容
-				this.groupconversine.push(data)
+				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/app.js b/weixin/static/js/app.js
diff --git a/weixin/static/js/manifest.js b/weixin/static/js/manifest.js
@@ -1 +0,0 @@
-!function(e){function c(d){if(a[d])return a[d].exports;var f=a[d]={exports:{},id:d,loaded:!1};return e[d].call(f.exports,f,f.exports,c),f.loaded=!0,f.exports}var d=window.webpackJsonp;window.webpackJsonp=function(t,r){for(var b,n,s=0,o=[];s<t.length;s++)n=t[s],f[n]&&o.push.apply(o,f[n]),f[n]=0;for(b in r)Object.prototype.hasOwnProperty.call(r,b)&&(e[b]=r[b]);for(d&&d(t,r);o.length;)o.shift().call(null,c);if(r[0])return a[0]=0,c(0)};var a={},f={29:0};c.e=function(e,d){if(0===f[e])return d.call(null,c);if(void 0!==f[e])f[e].push(d);else{f[e]=[d];var a=document.getElementsByTagName("head")[0],t=document.createElement("script");t.type="text/javascript",t.charset="utf-8",t.async=!0,t.src=c.p+"static/js/"+({0:"me",1:"find",2:"transfer",3:"dialogue",4:"computer",5:"addressbook",6:"singlechat",7:"friendcircle",8:"personaldetails",9:"chatmessage",10:"more",11:"details",12:"search",13:"wallet",14:"settings",15:"privacy",16:"newmessage",17:"login",18:"help",19:"disturbance",20:"currency",21:"chat",22:"aboutwc",23:"photoalbum",24:"collect",25:"cardbag",26:"miniapps",27:"groupchatmessage",28:"groupchat",30:"vendor",31:"app"}[e]||e)+"."+{0:"d7d77f4b6ff4ff18d5b6",1:"af15925258481cff39cd",2:"0d7e121c4218ca71671c",3:"46089c131657fb2bb74c",4:"ff7cc7233e7b7877a0b8",5:"5d39263890ed3ede07db",6:"1deb64fdd89634f2d380",7:"3fc5f2fcb8c152e6ff6a",8:"95d73ac31488f8465392",9:"3d061c6806f64ccf418d",10:"05001e89cc82b02c4dd8",11:"de1579d98845e98db0b9",12:"253bb1bfd867f42a25a8",13:"3b5b23db142dfa123363",14:"d0e019ad40a3b7339487",15:"da6b253f45c1494ec4c2",16:"c35d953c5e58f59ed8f5",17:"4dc0ef82857be7d2fdaa",18:"921fd815d4429fb33e03",19:"bcb6fb77cf27263d3a67",20:"b03bdd3888dfc2e9ea08",21:"05c953354e291e31166d",22:"9c74d87cc387ee4111f8",23:"689c2ef2ac3d8f6858a1",24:"f3fd33fb32f0844acab2",25:"90318e61cec278527fc7",26:"dd8190300e720cd9d93d",27:"53228650710dbfc45bfc",28:"42537516fc0c70000aeb",30:"20670d498fd32ed58666",31:"9acb2821fa2643a161b7"}[e]+".min.js",a.appendChild(t)}},c.m=e,c.c=a,c.p="/"}([]);

diff --git a/weixin/static/js/vendor.js b/weixin/static/js/vendor.js
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,3 +2,4 @@ @@
     node_modules/
     dist/
     npm-debug.log
+    weixin/
Original file line number	Diff line number	Diff line change
		@@ -1 +0,0 @@
		!function(e){function c(d){if(a[d])return a[d].exports;var f=a[d]={exports:{},id:d,loaded:!1};return e[d].call(f.exports,f,f.exports,c),f.loaded=!0,f.exports}var d=window.webpackJsonp;window.webpackJsonp=function(t,r){for(var b,n,s=0,o=[];s<t.length;s++)n=t[s],f[n]&&o.push.apply(o,f[n]),f[n]=0;for(b in r)Object.prototype.hasOwnProperty.call(r,b)&&(e[b]=r[b]);for(d&&d(t,r);o.length;)o.shift().call(null,c);if(r[0])return a[0]=0,c(0)};var a={},f={29:0};c.e=function(e,d){if(0===f[e])return d.call(null,c);if(void 0!==f[e])f[e].push(d);else{f[e]=[d];var a=document.getElementsByTagName("head")[0],t=document.createElement("script");t.type="text/javascript",t.charset="utf-8",t.async=!0,t.src=c.p+"static/js/"+({0:"me",1:"find",2:"transfer",3:"dialogue",4:"computer",5:"addressbook",6:"singlechat",7:"friendcircle",8:"personaldetails",9:"chatmessage",10:"more",11:"details",12:"search",13:"wallet",14:"settings",15:"privacy",16:"newmessage",17:"login",18:"help",19:"disturbance",20:"currency",21:"chat",22:"aboutwc",23:"photoalbum",24:"collect",25:"cardbag",26:"miniapps",27:"groupchatmessage",28:"groupchat",30:"vendor",31:"app"}[e]\|\|e)+"."+{0:"d7d77f4b6ff4ff18d5b6",1:"af15925258481cff39cd",2:"0d7e121c4218ca71671c",3:"46089c131657fb2bb74c",4:"ff7cc7233e7b7877a0b8",5:"5d39263890ed3ede07db",6:"1deb64fdd89634f2d380",7:"3fc5f2fcb8c152e6ff6a",8:"95d73ac31488f8465392",9:"3d061c6806f64ccf418d",10:"05001e89cc82b02c4dd8",11:"de1579d98845e98db0b9",12:"253bb1bfd867f42a25a8",13:"3b5b23db142dfa123363",14:"d0e019ad40a3b7339487",15:"da6b253f45c1494ec4c2",16:"c35d953c5e58f59ed8f5",17:"4dc0ef82857be7d2fdaa",18:"921fd815d4429fb33e03",19:"bcb6fb77cf27263d3a67",20:"b03bdd3888dfc2e9ea08",21:"05c953354e291e31166d",22:"9c74d87cc387ee4111f8",23:"689c2ef2ac3d8f6858a1",24:"f3fd33fb32f0844acab2",25:"90318e61cec278527fc7",26:"dd8190300e720cd9d93d",27:"53228650710dbfc45bfc",28:"42537516fc0c70000aeb",30:"20670d498fd32ed58666",31:"9acb2821fa2643a161b7"}[e]+".min.js",a.appendChild(t)}},c.m=e,c.c=a,c.p="/"}([]);