Skip to content

Commit

Permalink
change imageSrc
Browse files Browse the repository at this point in the history
  • Loading branch information
unknown committed Jun 20, 2017
2 parents a39378e + de37c6b commit a825093
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 674 deletions.
13 changes: 7 additions & 6 deletions src/frames/conversation/groupchat.vue
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@
imgurl,
userId:'',
allgroups:[], //所有群聊信息
}
},
created(){
Expand All @@ -156,10 +157,11 @@
this.loadStatus=true;
groupChat().then((res) => {
this.gropname=res.petname;
//this.groupconversine=[...res.grouphead];
});
socket.on('chat', (data) => {
//console.log(data);//聊天返回内容
if (!data) {
return
};
this.groupconversine.push(data);
this.$nextTick(()=>{
window.scrollTo(0,this.$refs.groupHeight.offsetHeight-window.innerHeight)
Expand Down Expand Up @@ -211,7 +213,7 @@
}
this.groupconversine = [...groupData.history, ...this.groupconversine]
console.log(this.groupconversine)
this.allgroups=[...this.groupconversine]
Array.prototype.unique = function(){//数组去重
var res = [this[0]];
Expand Down Expand Up @@ -281,11 +283,10 @@
this.clickmore=false;
},
async clickSend(){
this.light=false;
console.log(this.inputmessage)
socket.emit('chat', {user_id: this.userInfo.id, content: this.inputmessage});
this.inputmessage='';
this.light=false;
this.$nextTick(()=>{
window.scrollTo(0,this.$refs.groupHeight.offsetHeight-window.innerHeight)
})
Expand Down
2 changes: 1 addition & 1 deletion src/vuex/action.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export default {
state
}){
const user_id = localStorage.getItem('user_id')
let res = await userInfo()
let res = await userInfo(user_id)
commit(GET_USERINFO,res.user_info)
},
async getDialog({
Expand Down
639 changes: 0 additions & 639 deletions weixin/index.html

This file was deleted.

1 change: 0 additions & 1 deletion weixin/static/css/app.css

This file was deleted.

1 change: 0 additions & 1 deletion weixin/static/js/app.js

This file was deleted.

1 change: 0 additions & 1 deletion weixin/static/js/manifest.js

This file was deleted.

25 changes: 0 additions & 25 deletions weixin/static/js/vendor.js

This file was deleted.

0 comments on commit a825093

Please sign in to comment.