Merge branch 'master' into seg

package.json

@@ -85,7 +85,7 @@
     "vue": "^2.6.12",
     "vue-i18n": "^8.22.2",
     "vue-loader": "^15.9.5",
-    "vue-meta-info": "^0.1.7",
+    "vue-meta": "^2.4.0",
     "vue-router": "^3.4.9",
     "vue-template-compiler": "^2.6.12",
     "vuex": "^3.6.0"

src/app.vue

@@ -3,3 +3,13 @@
     <router-view></router-view>
   </div>
 </template>
+
+<script>
+export default {
+  metaInfo() {
+    return {
+      title: this.$t('title')
+    }
+  }
+}
+</script>

src/assets/languages/en.json

 {
+  "title": "紫荆教育MBA学习系统",
   "action": {
     "courseAction": {
       "all": "All",

src/assets/languages/zh-CN.json

 {
+  "title": "紫荆教育MBA学习系统",
   "action": {
     "courseAction": {
       "all": "全部",

src/components/beforeEnter/Before.js

@@ -13,7 +13,8 @@ export default class Before {
     if (this.isChrome) {
       this.chromeVersion = parseFloat(UA.match(/Chrome\/([\d.]+)/)[1])
     }
-    this.notSupport = !this.isMobile && (this.isIe || (this.isChrome && this.chromeVersion < 70))
+    // this.notSupport = !this.isMobile && (this.isIe || (this.isChrome && this.chromeVersion < 70))
+    this.notSupport = !this.isMobile && this.isIe
     // https://stackoverflow.com/questions/9847580/how-to-detect-safari-chrome-ie-firefox-and-opera-browser
   }
 

src/index.html

@@ -5,7 +5,7 @@
     <meta name="renderer" content="webkit" />
     <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1" />
     <meta content="origin" name="referrer" />
-    <title>紫荆教育MBA学习系统</title>
+    <title></title>
     <meta
       name="viewport"
       id="viewport"

src/main.js

@@ -9,6 +9,9 @@ import Element from 'element-ui'
 import Modules from '@/modules'
 import createBefore from './components/beforeEnter'
 import _ from 'lodash'
+import VueMeta from 'vue-meta'
+
+Vue.use(VueMeta)
 
 Vue.prototype.$_ = _
 

src/pages/exception/browser.vue

@@ -28,11 +28,21 @@
         </ul>
       </div>
     </div>
+    <p style="font-size: 12px">{{ UA }}</p>
   </div>
 </template>
 
 <script>
-export default {}
+export default {
+  data() {
+    const UA = window.navigator.userAgent
+    const isIe = window.ActiveXObject || 'ActiveXObject' in window
+    return { UA, isIe }
+  },
+  beforeMount() {
+    !this.isIe && this.$router.replace('/')
+  }
+}
 </script>
 
 <style lang="scss" scoped>