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

Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/370

pages/index/index.vue

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

pages/zhibo/index.nvue

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