From 91d25f107fe5f6b626696020edc747293e86c94a Mon Sep 17 00:00:00 2001 From: zyn Date: Fri, 15 Dec 2023 11:56:48 +0800 Subject: [PATCH] =?UTF-8?q?chore(eslint):=20=E4=BD=BF=E7=94=A8babel-eslint?= =?UTF-8?q?=E8=A7=A3=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .eslintrc.js | 1 + package.json | 1 + src/main.js | 18 ++++++++++-------- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 41f5fb8dd..3ad517a41 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -4,6 +4,7 @@ module.exports = { 'extends': ['eslint:recommended', 'plugin:vue/recommended'], // 解析选项 'parserOptions': { + parser: "babel-eslint", // 解析器 'ecmaVersion': 6, // ES 语法版本 'sourceType': 'module', // ES 模块化 'ecmaFeatures': { // ES 其他特性 diff --git a/package.json b/package.json index f075ee2a9..40e694060 100644 --- a/package.json +++ b/package.json @@ -48,6 +48,7 @@ "@vue/cli-plugin-router": "~4.5.0", "@vue/cli-plugin-vuex": "~4.5.0", "@vue/cli-service": "~4.5.0", + "babel-eslint": "^10.1.0", "babel-plugin-import": "^1.13.3", "eslint": "6.7.2", "eslint-plugin-vue": "6.2.2", diff --git a/src/main.js b/src/main.js index 0d0339511..9f068e3f9 100644 --- a/src/main.js +++ b/src/main.js @@ -1,6 +1,6 @@ import '@babel/polyfill' -require('es6-promise').polyfill(); -require('es6-promise/auto'); +require('es6-promise').polyfill() +require('es6-promise/auto') import Vue from 'vue' import App from './App' import ElementUI from 'element-ui' @@ -34,13 +34,13 @@ import VueI18n from 'vue-i18n' // 国际化 import { simpleUploadPath } from '@/sysConfig' // 时间转换 import moment from 'moment' -moment.suppressDeprecationWarnings = true; +moment.suppressDeprecationWarnings = true // 右键菜单 import Contextmenu from 'vue-contextmenujs' // vant -import vant from 'vant'; -import 'vant/lib/index.css'; +import vant from 'vant' +import 'vant/lib/index.css' //vant import animate from 'animate.css' @@ -53,7 +53,7 @@ import { webLoginType } from '@/sysConfig' import VConsole from 'vuex' -import isMobile from './store/isMobile'; +import isMobile from './store/isMobile' import { getCode, toIdmLoginPage, loginInIdm, loginInPhone, close } from '@/utils/login' router.beforeEach((to, from, next) => { @@ -66,7 +66,8 @@ router.beforeEach((to, from, next) => { path = '/phone' + path next({ path: path }) } - if (!to.name) { // 不存在路由 + if (!to.name) { + // 不存在路由 next('/blankPage') } } @@ -83,7 +84,8 @@ router.beforeEach((to, from, next) => { next() } else { if (to.path === '/login') { - if (webLoginType === 'idm') { // webLoginType === "idm"时不会进入login路由 + if (webLoginType === 'idm') { + // webLoginType === "idm"时不会进入login路由 // let href = window.location.href.replace('code=' + getCode(), '') // toIdmLoginPage(href) }