Merge branch 'master' of http://121.4.203.192:9000/mingxue/front

package.json

@@ -61,6 +61,7 @@
     "quill": "1.3.7",
     "screenfull": "5.0.2",
     "sortablejs": "^1.10.2",
+    "vconsole": "^3.14.6",
     "videojs-contrib-hls": "^5.15.0",
     "vue": "2.6.12",
     "vue-aliplayer": "^1.0.0",

src/main.js

@@ -1,5 +1,8 @@
 import Vue from 'vue'
 
+import vConsole from 'vconsole'
+new vConsole()
+
 import Cookies from 'js-cookie'
 import Element from 'element-ui'
 import './assets/styles/element-variables.scss'

src/permission.js

@@ -56,7 +56,7 @@ router.beforeEach((to, from, next) => {
     // 没有token
     if (whiteList.indexOf(to.path) !== -1) {
       // 在免登录白名单，直接进入
-      if (!uaWhiteList.includes(to.path)) uaredirect()
+      // if (!uaWhiteList.includes(to.path)) uaredirect() // TODO: hht 22.7.4 临时注释测试班牌打不开的问题
       next()
     } else {
       // next()