提交 0a3717ee authored 作者: 王鹏飞's avatar 王鹏飞

merge...

module.exports = {
domain: 'dev.ezijing.com',
url: 'https://ciis-learning2.ezijing.com/api',
url: 'https://ciis-learning.ezijing.com/api',
apiBaseURL: '/',
others: {
url: '/app/learn/course',
loginUrl: 'https://login2.ezijing.com/ciis/login/index'
loginUrl: 'https://login.ezijing.com/ciis/login/index'
},
webpack: {
externals: {
......
差异被折叠。
......@@ -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"
......
......@@ -34,6 +34,11 @@
import cAction from '@/action'
export default {
metaInfo() {
return {
title: this.$t('title')
}
},
data() {
const UA = navigator.userAgent
return {
......
{
"title": "Zijing - CIIS MAP Learning Platform",
"action": {
"courseAction": {
"all": "All",
......
{
"title": "紫荆教育-加州整合大学应用心理学硕士学习系统",
"action": {
"courseAction": {
"all": "全部",
......
......@@ -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
}
......
......@@ -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>紫荆教育MAP学习系统</title>
<title></title>
<meta
name="viewport"
id="viewport"
......
......@@ -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.$_ = _
......
......@@ -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>
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论