Merge branch 'live-video-im' into 11/24SAAS

src/views/contentManager/index.vue

@@ -40,9 +40,6 @@
         <el-tab-pane label="系统通知" v-if="permissionList.systemNotify" lazy name="8">
           <systemNotify v-if="activeName == 8" />
         </el-tab-pane>
-        <el-tab-pane label="直播帮助" lazy name="9" v-if="permissionList.liveHelp">
-          <liveHelp v-if="activeName == 9" />
-        </el-tab-pane>
       </tab-router>
     </div>
   </div>
@@ -95,7 +92,6 @@ export default {
         knowledge: permission("/contentManager/knowledge"),
         advert: permission("/contentManager/advert"),
         systemNotify: permission("/contentManager/systemNotify"),
-        liveHelp: permission("/contentManager/liveHelp"),
       },
     };
   },

src/views/contentManager/platformIndex.vue

@@ -5,11 +5,7 @@
       平台内容管理
     </h2>
     <div class="m-core">
-      <tab-router
-        v-model.trim="activeName"
-        type="card"
-        @tab-click="handleClick"
-      >
+      <tab-router v-model.trim="activeName" type="card" @tab-click="handleClick">
         <!-- <el-tab-pane label="精彩活动"
                      v-if="permissionList.activity"
                      lazy
@@ -22,12 +18,7 @@
                      name="1">
           <information v-if="activeName == 1" />
         </el-tab-pane> -->
-        <el-tab-pane
-          label="专项训练"
-          v-if="permissionList.training"
-          lazy
-          name="2"
-        >
+        <el-tab-pane label="专项训练" v-if="permissionList.training" lazy name="2">
           <training v-if="activeName == 2" />
         </el-tab-pane>
         <!-- <el-tab-pane label="闪页管理"
@@ -42,12 +33,7 @@
                      name="4">
           <banner  v-if="activeName == 4" />
         </el-tab-pane> -->
-        <el-tab-pane
-          label="学生端按钮管理"
-          v-if="permissionList.appPage"
-          lazy
-          name="5"
-        >
+        <el-tab-pane label="学生端按钮管理" v-if="permissionList.appPage" lazy name="5">
           <appPage v-if="activeName == 5" />
         </el-tab-pane>
         <el-tab-pane
@@ -84,6 +70,9 @@
                      name="8">
           <systemNotify v-if="activeName == 8" />
         </el-tab-pane> -->
+        <el-tab-pane label="直播帮助" lazy name="9" v-if="permissionList.liveHelp">
+          <liveHelp v-if="activeName == 9" />
+        </el-tab-pane>
       </tab-router>
     </div>
   </div>
@@ -94,6 +83,7 @@ import appPage from "./components/appPage";
 import appBottomPage from "./components/appBottomPage";
 import teacherButton from "./components/teacherButton";
 import { permission } from "@/utils/directivePage";
+import liveHelp from "./components/liveHelp.vue";
 // 精彩活动 1 0
 // 热门资讯 2 1
 // 专项训练 4 2
@@ -110,7 +100,8 @@ export default {
     training,
     appPage,
     appBottomPage,
-    teacherButton
+    teacherButton,
+    liveHelp,
   },
   name: "contentManager",
   data() {
@@ -120,15 +111,16 @@ export default {
         training: permission("/contentManager/training"),
         appPage: permission("/contentManager/appPage"),
         appBottomPage: permission("/contentManager/appBottomPage"),
-        teacherButton: permission("/contentManager/teacherButton")
-      }
+        teacherButton: permission("/contentManager/teacherButton"),
+        liveHelp: permission("/contentManager/liveHelp"),
+      },
     };
   },
   methods: {
     handleClick(val, event) {
       this.activeName = val.name;
-    }
-  }
+    },
+  },
 };
 </script>
 <style lang="scss"></style>