theluyuan/deming
2
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request 'gdpao' (#370) from gyh into master

Browse Source 
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/370
This commit is contained in:
gyh 2020-09-15 17:40:00 +08:00
commit d805b6f0bf
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pages/index/index.vue
View File

@ -273,7 +273,7 @@
darenItem darenItem
}, },
onShow() { onShow() {
console.log(this.imService.status) console.log(this.imService.status,this.$store.state.hasLogin)
if(!this.imService.status && this.$store.state.hasLogin){ if(!this.imService.status && this.$store.state.hasLogin){
const user = uni.getStorageSync('user_info'); const user = uni.getStorageSync('user_info');
// console.log(user) // console.log(user)

9
pages/zhibo/index.nvue
View File

@ -418,6 +418,7 @@ export default {
"Authorization" : 'Bearer' + " " + token "Authorization" : 'Bearer' + " " + token
}, },
success(res){ success(res){
console.log(res) console.log(res)
that.info = res.data.data that.info = res.data.data
// that.list= res.data.data // that.list= res.data.data
@ -461,7 +462,7 @@ export default {
}); });
}, },
errors(a){ errors(a){
console.log(a) console.log(a)
}, },
newpeople(list){ newpeople(list){
this.room.onlineUsers = list this.room.onlineUsers = list
@ -497,6 +498,12 @@ export default {
// this.contentPosition = 'message-box'+(this.room.messages.length-1); // this.contentPosition = 'message-box'+(this.room.messages.length-1);
// }, 300) // }, 300)
console.log(message) console.log(message)
if(message.type == 1){
this.videoContext.stop();
this.videoContext.play()
console.log('stop')
return ;
}
this.danmulist.push(message) this.danmulist.push(message)
if(this.danmulist.length > 7){ if(this.danmulist.length > 7){