Merge remote-tracking branch 'origin/master'

src/views/mobile/live.vue

@@ -161,7 +161,7 @@
               var that = this;
               this.isVisibleTimer = setInterval(function(){
                   that.isShowChange(true);
-              },60000*5);
+              },1000*5);
             },
 
             handleChange(type) {
@@ -441,7 +441,7 @@
                 this.timerPopover = null;
             }
             if(this.isVisibleTimer){
-                clearInterval(that.isVisibleTimerOut);
+                clearInterval(that.isVisibleTimer);
                 this.isVisibleTimer = null;
             }
             globalMsg.$emit("clearTimeout")
@@ -453,7 +453,7 @@
                 this.timerPopover = null;
             }
             if(this.isVisibleTimer){
-                clearInterval(that.isVisibleTimerOut);
+                clearInterval(that.isVisibleTimer);
                 this.isVisibleTimer = null;
             }
             globalMsg.$emit("clearTimeout")