chore(eslint): 使用babel-eslint解析
This commit is contained in:
@@ -4,6 +4,7 @@ module.exports = {
|
|||||||
'extends': ['eslint:recommended', 'plugin:vue/recommended'],
|
'extends': ['eslint:recommended', 'plugin:vue/recommended'],
|
||||||
// 解析选项
|
// 解析选项
|
||||||
'parserOptions': {
|
'parserOptions': {
|
||||||
|
parser: "babel-eslint", // 解析器
|
||||||
'ecmaVersion': 6, // ES 语法版本
|
'ecmaVersion': 6, // ES 语法版本
|
||||||
'sourceType': 'module', // ES 模块化
|
'sourceType': 'module', // ES 模块化
|
||||||
'ecmaFeatures': { // ES 其他特性
|
'ecmaFeatures': { // ES 其他特性
|
||||||
|
|||||||
@@ -48,6 +48,7 @@
|
|||||||
"@vue/cli-plugin-router": "~4.5.0",
|
"@vue/cli-plugin-router": "~4.5.0",
|
||||||
"@vue/cli-plugin-vuex": "~4.5.0",
|
"@vue/cli-plugin-vuex": "~4.5.0",
|
||||||
"@vue/cli-service": "~4.5.0",
|
"@vue/cli-service": "~4.5.0",
|
||||||
|
"babel-eslint": "^10.1.0",
|
||||||
"babel-plugin-import": "^1.13.3",
|
"babel-plugin-import": "^1.13.3",
|
||||||
"eslint": "6.7.2",
|
"eslint": "6.7.2",
|
||||||
"eslint-plugin-vue": "6.2.2",
|
"eslint-plugin-vue": "6.2.2",
|
||||||
|
|||||||
+10
-8
@@ -1,6 +1,6 @@
|
|||||||
import '@babel/polyfill'
|
import '@babel/polyfill'
|
||||||
require('es6-promise').polyfill();
|
require('es6-promise').polyfill()
|
||||||
require('es6-promise/auto');
|
require('es6-promise/auto')
|
||||||
import Vue from 'vue'
|
import Vue from 'vue'
|
||||||
import App from './App'
|
import App from './App'
|
||||||
import ElementUI from 'element-ui'
|
import ElementUI from 'element-ui'
|
||||||
@@ -34,13 +34,13 @@ import VueI18n from 'vue-i18n' // 国际化
|
|||||||
import { simpleUploadPath } from '@/sysConfig'
|
import { simpleUploadPath } from '@/sysConfig'
|
||||||
// 时间转换
|
// 时间转换
|
||||||
import moment from 'moment'
|
import moment from 'moment'
|
||||||
moment.suppressDeprecationWarnings = true;
|
moment.suppressDeprecationWarnings = true
|
||||||
// 右键菜单
|
// 右键菜单
|
||||||
import Contextmenu from 'vue-contextmenujs'
|
import Contextmenu from 'vue-contextmenujs'
|
||||||
|
|
||||||
// vant
|
// vant
|
||||||
import vant from 'vant';
|
import vant from 'vant'
|
||||||
import 'vant/lib/index.css';
|
import 'vant/lib/index.css'
|
||||||
//vant
|
//vant
|
||||||
|
|
||||||
import animate from 'animate.css'
|
import animate from 'animate.css'
|
||||||
@@ -53,7 +53,7 @@ import { webLoginType } from '@/sysConfig'
|
|||||||
|
|
||||||
import VConsole from 'vuex'
|
import VConsole from 'vuex'
|
||||||
|
|
||||||
import isMobile from './store/isMobile';
|
import isMobile from './store/isMobile'
|
||||||
import { getCode, toIdmLoginPage, loginInIdm, loginInPhone, close } from '@/utils/login'
|
import { getCode, toIdmLoginPage, loginInIdm, loginInPhone, close } from '@/utils/login'
|
||||||
|
|
||||||
router.beforeEach((to, from, next) => {
|
router.beforeEach((to, from, next) => {
|
||||||
@@ -66,7 +66,8 @@ router.beforeEach((to, from, next) => {
|
|||||||
path = '/phone' + path
|
path = '/phone' + path
|
||||||
next({ path: path })
|
next({ path: path })
|
||||||
}
|
}
|
||||||
if (!to.name) { // 不存在路由
|
if (!to.name) {
|
||||||
|
// 不存在路由
|
||||||
next('/blankPage')
|
next('/blankPage')
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -83,7 +84,8 @@ router.beforeEach((to, from, next) => {
|
|||||||
next()
|
next()
|
||||||
} else {
|
} else {
|
||||||
if (to.path === '/login') {
|
if (to.path === '/login') {
|
||||||
if (webLoginType === 'idm') { // webLoginType === "idm"时不会进入login路由
|
if (webLoginType === 'idm') {
|
||||||
|
// webLoginType === "idm"时不会进入login路由
|
||||||
// let href = window.location.href.replace('code=' + getCode(), '')
|
// let href = window.location.href.replace('code=' + getCode(), '')
|
||||||
// toIdmLoginPage(href)
|
// toIdmLoginPage(href)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user