diff --git a/html/loading.html b/html/loading.html
deleted file mode 100644
index 1bd5926..0000000
--- a/html/loading.html
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
- NIANXX
-
-
-
-
-
-
-
-
diff --git a/public/loading.html b/public/loading.html
new file mode 100644
index 0000000..c8a3222
--- /dev/null
+++ b/public/loading.html
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/public/logo.ico b/public/logo.ico
new file mode 100644
index 0000000..df36fcf
Binary files /dev/null and b/public/logo.ico differ
diff --git a/src/main/service/window-service/index.ts b/src/main/service/window-service/index.ts
index 3c29344..50ce867 100644
--- a/src/main/service/window-service/index.ts
+++ b/src/main/service/window-service/index.ts
@@ -172,7 +172,12 @@ class WindowService {
width: size.width,
height: size.height,
});
- loadingView.webContents.loadFile(path.join(__dirname, 'loading.html'));
+
+ if (MAIN_WINDOW_VITE_DEV_SERVER_URL) {
+ loadingView.webContents.loadURL(`${MAIN_WINDOW_VITE_DEV_SERVER_URL}/loading.html`);
+ } else {
+ loadingView.webContents.loadFile(path.join(__dirname, `../renderer/${MAIN_WINDOW_VITE_NAME}/loading.html`));
+ }
const onRendererIsReady = (e: IpcMainEvent) => {
if ((e.sender !== window?.webContents) || rendererIsReady) return;
@@ -208,7 +213,7 @@ class WindowService {
if (MAIN_WINDOW_VITE_DEV_SERVER_URL) {
return window.loadURL(`${MAIN_WINDOW_VITE_DEV_SERVER_URL}${'/html/' + (name === 'main' ? '' : name)}`);
}
- window.loadFile(path.join(__dirname, `../renderer/${MAIN_WINDOW_VITE_NAME}/html/${name === 'main' ? 'index' : name}.html`));
+ window.loadFile(path.join(__dirname, `../renderer/${MAIN_WINDOW_VITE_NAME}/html/${name === 'main' ? 'login' : name}.html`));
}
diff --git a/src/renderer/main.ts b/src/renderer/main.ts
index a9ec512..39e10ba 100644
--- a/src/renderer/main.ts
+++ b/src/renderer/main.ts
@@ -22,12 +22,10 @@ const components: Plugin = (app) => {
// 创建 Vue 应用实例
const app = createApp(App);
+const pinia = createPinia();
// 使用 Pinia 状态管理
-app.use(createPinia());
-
-
-// 使用 Vue Router
+app.use(pinia);
app.use(router);
app.use(ElementPlus, { locale })
app.use(components)
diff --git a/src/renderer/router/index.ts b/src/renderer/router/index.ts
index 978dc13..42cddcf 100644
--- a/src/renderer/router/index.ts
+++ b/src/renderer/router/index.ts
@@ -19,7 +19,7 @@ const routes = [
const router = createRouter({
history: createMemoryHistory(),
routes,
- scrollBehavior(to: any, from: any, savedPosition: any) {
+ scrollBehavior(_to: any, _from: any, savedPosition: any) {
if (savedPosition) {
return savedPosition
}
diff --git a/src/renderer/views/loading/index.ts b/src/renderer/views/loading/index.ts
deleted file mode 100644
index 5147c9a..0000000
--- a/src/renderer/views/loading/index.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import '@renderer/styles/index.css'
-
-import errorHandler from '@utils/errorHandler'
-import i18n from '@renderer/i18n'
-import HeaderBar from '@renderer/components/HeaderBar/index.vue'
-import DragRegion from '@renderer/components/DragRegion/index.vue'
-
-import Loading from './index.vue'
-
-createApp(Loading)
- .use(i18n)
- .use(createPinia())
- .use(errorHandler)
- .component('HeaderBar', HeaderBar)
- .component('DragRegion', DragRegion)
- .mount('#app')
diff --git a/src/renderer/views/loading/index.vue b/src/renderer/views/loading/index.vue
deleted file mode 100644
index 6f0fa1b..0000000
--- a/src/renderer/views/loading/index.vue
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/vite.main.config.ts b/vite.main.config.ts
index 5094b1c..e80b8ab 100644
--- a/vite.main.config.ts
+++ b/vite.main.config.ts
@@ -1,5 +1,5 @@
-import { defineConfig } from "vite";
-import { resolve } from "path";
+import { defineConfig } from "vite"
+import { resolve } from 'node:path'
// https://vitejs.dev/config
export default defineConfig( async () => {
diff --git a/vite.preload.config.ts b/vite.preload.config.ts
index 29175f3..723285e 100644
--- a/vite.preload.config.ts
+++ b/vite.preload.config.ts
@@ -1,5 +1,5 @@
-import { defineConfig } from 'vite';
-import { resolve } from "path";
+import { defineConfig } from 'vite'
+import { resolve } from 'node:path'
// https://vitejs.dev/config
export default defineConfig({
diff --git a/vite.renderer.config.ts b/vite.renderer.config.ts
index 6c4d287..99ff5b4 100644
--- a/vite.renderer.config.ts
+++ b/vite.renderer.config.ts
@@ -1,4 +1,4 @@
-import { resolve } from "path";
+import { resolve } from "node:path";
import { defineConfig, type CSSOptions } from "vite";
// https://vitejs.dev/config
@@ -25,13 +25,11 @@ export default defineConfig(async () => {
resolve(__dirname, 'html/index.html'),
resolve(__dirname, 'html/dialog.html'),
resolve(__dirname, 'html/setting.html'),
- resolve(__dirname, 'html/loading.html'),
]
}
},
resolve: {
- preserveSymlinks: true,
alias: {
"@renderer": resolve(__dirname, "./src/renderer"),
"@api": resolve(__dirname, "./src/renderer/api"),