xbx #210

Merged
theluyuan merged 6 commits from xbx into master 2020-08-15 07:48:12 +00:00
Showing only changes of commit 27470faee1 - Show all commits

View File

@ -282,6 +282,15 @@ import chatVue from '../../pageD/chat/chat.vue'
// console.log(user) // console.log(user)
this.imService.login(user.member.member_id,user.member.member_nickname,user.member.member_avatar) this.imService.login(user.member.member_id,user.member.member_nickname,user.member.member_avatar)
this.imService.connectIM() this.imService.connectIM()
}else{
this.$u.api.getDefaultAvatar().then((res)=>{
console.log(res)
uni.setStorageSync("morenimg",res.data.avatar)
this.imService.login(new Date().getTime(),"123",res.data.avatar)
this.imService.connectIM()
})
}
let that = this let that = this
setTimeout(function(){ setTimeout(function(){
that.imService.disconnect() that.imService.disconnect()
@ -291,12 +300,6 @@ import chatVue from '../../pageD/chat/chat.vue'
// console.log("lianjie") // console.log("lianjie")
that.imService.connectIM() that.imService.connectIM()
},2000) },2000)
}else{
this.$u.api.getDefaultAvatar().then((res)=>{
console.log(res)
uni.setStorageSync("morenimg",res.data.avatar)
})
}
}, },
onPullDownRefresh() { onPullDownRefresh() {
this.page = 1; this.page = 1;