From 609a1931953b2298016bd2b0d6b410666b5ad7b9 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 02 七月 2026 09:19:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/3.0.1' into 3.0.1
---
admin/package.json | 33 +++++++++++----------------------
1 files changed, 11 insertions(+), 22 deletions(-)
diff --git a/admin/package.json b/admin/package.json
index 44c7272..e60224b 100644
--- a/admin/package.json
+++ b/admin/package.json
@@ -4,8 +4,10 @@
"private": true,
"scripts": {
"serve": "vue-cli-service serve",
+ "servePro": "vue-cli-service serve --mode production",
+ "dev": "vue-cli-service serve",
"build:pro": "vue-cli-service build",
- "build:staging": "vue-cli-service build --mode staging",
+ "build:dev": "vue-cli-service build --mode staging",
"lint": "vue-cli-service lint",
"fix": "eslint --ext .js,.vue src --fix"
},
@@ -20,14 +22,18 @@
"@wangeditor/editor-for-vue": "^1.0.2",
"axios": "^0.21.1",
"core-js": "^3.6.5",
+ "dayjs": "^1.11.13",
"echarts": "^5.4.2",
"ele-calendar": "^2.0.0",
"element-ui": "^2.15.13",
"js-cookie": "^2.2.1",
"js-file-download": "^0.4.12",
+ "qrcodejs2": "0.0.2",
"sass-loader": "^8.0.2",
"vue": "^2.6.11",
"vue-clipboard2": "^0.3.3",
+ "vue-print-nb": "^1.7.5",
+ "vue-qr": "^4.0.9",
"vue-router": "^3.5.1",
"vuescroll": "^4.17.3",
"vuex": "^3.4.0"
@@ -56,34 +62,17 @@
"env": {
"node": true
},
- "extends": [
- "plugin:vue/essential",
- "@vue/standard"
- ],
+ "extends": [],
"parserOptions": {
"parser": "babel-eslint"
},
- "rules": {
- "indent": [
- "error",
- 2
- ],
- "generator-star-spacing": "off",
- "no-debugger": "error"
- }
+ "rules": {}
},
"browserslist": [
"> 1%",
"last 2 versions",
"not dead"
],
- "gitHooks": {
- "pre-commit": "lint-staged"
- },
- "lint-staged": {
- "*.{js,jsx,vue}": [
- "vue-cli-service lint",
- "git add"
- ]
- }
+ "gitHooks": {},
+ "lint-staged": {}
}
--
Gitblit v1.9.3