Skip to content

Commit

Permalink
user_id
Browse files Browse the repository at this point in the history
  • Loading branch information
Your Name committed Jun 19, 2017
1 parent 65bb476 commit 0c8adfa
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 5 deletions.
2 changes: 0 additions & 2 deletions src/frames/conversation/groupchat.vue
Original file line number Diff line number Diff line change
Expand Up @@ -156,10 +156,8 @@
this.loadStatus=true;
groupChat().then((res) => {
this.gropname=res.petname;
//this.groupconversine=[...res.grouphead];
});
socket.on('chat', (data) => {
//console.log(data);//聊天返回内容
this.groupconversine.push(data);
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
Loading

0 comments on commit 0c8adfa

Please sign in to comment.