Merge branch 'dev-yqLive-20200611' into 'dev-yLive-saas-all-0623'

Dev yq live 20200611 to All



See merge request !160

src/utils/filter.js

@@ -492,7 +492,7 @@ const vueFilter = {
             return '预告'
         }else if (value == 2) {
             return '直播中'
-        }else if (value == 3) {
+        }else if (value == 4) {
             return '已结束'
         }else {
             return '-'

src/views/yqrange/yq-range.vue

@@ -134,10 +134,13 @@ export default {
     // 外部用户权限
     getUserAuth(){
 
-      if(localStorage.getItem('mainManager')){
+      let mainManager = localStorage.getItem('mainManager');
+      let manager = localStorage.getItem('manager');
+
+      if(mainManager == "1"){
         this.showNewFlag = true;
       }
-      else if(localStorage.setItem('manager')){
+      else if(manager == "1"){
         this.showNewFlag = false;
       }
       // localStorage.setItem('ordinary', vm.setStoreData(ordinary))