From 1da0c6ca6b1620a60d36fe4cb1caa5798fb3d9be Mon Sep 17 00:00:00 2001
From: pany <939630029@qq.com>
Date: Thu, 21 Apr 2022 16:04:21 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E4=BC=98=E5=8C=96=20eslint=20?=
 =?UTF-8?q?=E4=B8=8E=20prettier=20=E9=85=8D=E5=90=88=E4=BD=BF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .eslintrc.js | 4 ++--
 package.json | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index df5eaeb..a126598 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -15,12 +15,12 @@ module.exports = {
     ecmaVersion: 2020
   },
   extends: [
-    'plugin:prettier/recommended', // 添加 prettier 插件
     'plugin:vue/vue3-recommended',
     'plugin:vue/vue3-strongly-recommended',
     'plugin:@typescript-eslint/recommended',
     '@vue/standard',
-    '@vue/typescript/recommended'
+    '@vue/typescript/recommended',
+    'plugin:prettier/recommended' // 添加 prettier 插件,必须放在数组最后
   ],
   rules: {
     'vue/multi-word-component-names': 'off',
diff --git a/package.json b/package.json
index 308754f..72f801f 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,9 @@
     "build:prod": "vue-tsc --noEmit && vite build",
     "preview:stage": "pnpm build:stage && vite preview",
     "preview:prod": "pnpm build:prod && vite preview",
-    "lint": "eslint \"{src,mock}/**/*.{vue,ts,tsx}\" --fix"
+    "lint:eslint": "eslint \"{src,mock}/**/*.{vue,ts,tsx}\" --fix",
+    "lint:prettier": "prettier --write  \"src/**/*.{js,json,tsx,css,less,scss,vue,html,md}\"",
+    "lint": "pnpm lint:eslint && pnpm lint:prettier"
   },
   "dependencies": {
     "@element-plus/icons-vue": "^1.1.4",