diff --git a/electron.vite.config.mjs b/electron.vite.config.mjs index 9b9c503..c48cc00 100644 --- a/electron.vite.config.mjs +++ b/electron.vite.config.mjs @@ -24,8 +24,8 @@ export default defineConfig({ server: { proxy: { '/dev-api': { - // target: 'http://27.128.240.72:7865', - target: 'http://192.168.2.52:7863', + target: 'http://27.128.240.72:7865', + // target: 'http://192.168.2.52:7863', changeOrigin: true, rewrite: (p) => p.replace(/^\/dev-api/, '') } diff --git a/package.json b/package.json index 5cf82e3..5c5797a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "aix-win", - "version": "1.0.6", + "version": "1.0.7", "description": "An Electron application with Vue", "main": "./out/main/index.js", "author": "example.com", diff --git a/src/main/update.js b/src/main/update.js index d59d155..e2f7332 100644 --- a/src/main/update.js +++ b/src/main/update.js @@ -42,6 +42,11 @@ const updateInit = (win) => { logger.error('检查更新失败') }) + // 监听下载进度 + autoUpdater.on('download-progress', (progressObj) => { + win.webContents.send('update-app-progress', progressObj.percent); + }); + // 跟新下载完毕 autoUpdater.on('update-downloaded', () => { dialog @@ -58,4 +63,4 @@ const updateInit = (win) => { }) } -export default updateInit \ No newline at end of file +export default updateInit diff --git a/src/renderer/src/views/login/index.vue b/src/renderer/src/views/login/index.vue index 5d98726..2828429 100644 --- a/src/renderer/src/views/login/index.vue +++ b/src/renderer/src/views/login/index.vue @@ -7,24 +7,47 @@
- +
+ + + - +