diff --git a/electron/main.js b/electron/main.js index fde39e2..e66c1dd 100644 --- a/electron/main.js +++ b/electron/main.js @@ -1,7 +1,12 @@ const { app, BrowserWindow } = require('electron') const path = require('path') -const devServerUrl = process.env.ELECTRON_RENDERER_URL || 'http://localhost:5173' +const devServerUrl = process.env.ELECTRON_RENDERER_URL +const rendererEntry = path.join(__dirname, '..', 'dist', 'build', 'h5', 'index.html') + +if (devServerUrl) { + app.commandLine.appendSwitch('disable-http-cache') +} function createWindow() { const win = new BrowserWindow({ @@ -14,8 +19,14 @@ function createWindow() { }, }) - win.loadURL(devServerUrl) - win.webContents.openDevTools({ mode: 'detach' }) + if (devServerUrl) { + win.webContents.session.clearCache().catch(() => {}) + win.loadURL(devServerUrl) + win.webContents.openDevTools({ mode: 'detach' }) + return + } + + win.loadFile(rendererEntry) } app.whenReady().then(() => { diff --git a/scripts/dev-electron.js b/scripts/dev-electron.js index d46b877..2335724 100644 --- a/scripts/dev-electron.js +++ b/scripts/dev-electron.js @@ -2,7 +2,8 @@ const { spawn } = require('child_process') const http = require('http') const path = require('path') -const devServerUrl = process.env.ELECTRON_RENDERER_URL || 'http://localhost:5173' +const rendererPort = process.env.ELECTRON_RENDERER_PORT || '5188' +const devServerUrl = process.env.ELECTRON_RENDERER_URL || `http://localhost:${rendererPort}` function waitForServer(url, timeout = 90000) { const startedAt = Date.now() @@ -35,7 +36,7 @@ const npmCmd = process.platform === 'win32' ? 'npm.cmd' : 'npm' const npxCmd = process.platform === 'win32' ? 'npx.cmd' : 'npx' const useShell = process.platform === 'win32' -const devProcess = spawn(npmCmd, ['run', 'dev:h5:electron'], { +const devProcess = spawn(npmCmd, ['run', 'dev:h5:electron', '--', '--port', rendererPort, '--strictPort'], { stdio: 'inherit', shell: useShell, }) diff --git a/src/components/order-review-one/index.vue b/src/components/order-review-one/index.vue new file mode 100644 index 0000000..808f645 --- /dev/null +++ b/src/components/order-review-one/index.vue @@ -0,0 +1,446 @@ + + + + + diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index caa186b..0cd1632 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -37,26 +37,10 @@ - - - - - - - - - 暂无匹配订单 - - 订单号:{{ order.orderNo }} - 客户:{{ order.customer }} - - + + + + {{ getActiveMenuTitle() || '请选择功能菜单' }} @@ -64,8 +48,13 @@ @@ -64,73 +18,9 @@ export default {