From ca9a92cfc2f2bd8c724020ee5e46094633eb80a5 Mon Sep 17 00:00:00 2001
From: 黄何裕 <1053952480@qq.com>
Date: 星期五, 12 七月 2024 17:39:45 +0800
Subject: [PATCH] 处理冲突
---
package.json | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/package.json b/package.json
index 4e85247..a4ee116 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
"dev": "vite",
"build": "vite build",
"preview": "vite preview",
- "electron:dev": "vite && electron"
+ "electron:dev": "chcp 65001 && vite --config vite.config.electron.js"
},
"dependencies": {
"@jitsi/electron-sdk": "^6.0.40",
@@ -15,9 +15,13 @@
"dayjs": "^1.11.11",
"element-plus": "^2.7.3",
"lodash": "^4.17.21",
+ "mockjs": "^1.1.0",
"pinia": "^2.1.7",
+ "pinia-plugin-persistedstate": "^3.2.1",
"vue": "^3.4.21",
- "vue-router": "^4.3.2"
+ "vue-router": "^4.3.2",
+ "vue-ueditor-wrap": "^3.0.8",
+ "xgplayer": "^3.0.18"
},
"devDependencies": {
"@vitejs/plugin-vue": "^5.0.4",
@@ -25,13 +29,13 @@
"electron": "^30.0.9",
"electron-builder": "^24.13.3",
"electron-devtools-installer": "^3.2.0",
- "mockjs": "^1.1.0",
"postcss": "^8.4.38",
"sass": "^1.77.4",
"tailwindcss": "^3.4.3",
"unplugin-auto-import": "^0.17.6",
"unplugin-vue-components": "^0.27.0",
"vite": "^5.2.0",
- "vite-plugin-electron": "^0.28.7"
+ "vite-plugin-electron": "^0.28.7",
+ "vite-plugin-mock": "^3.0.2"
}
}
--
Gitblit v1.8.0