From ca9a92cfc2f2bd8c724020ee5e46094633eb80a5 Mon Sep 17 00:00:00 2001
From: 黄何裕 <1053952480@qq.com>
Date: 星期五, 12 七月 2024 17:39:45 +0800
Subject: [PATCH] 处理冲突
---
src/background.js | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/background.js b/src/background.js
index 1cc5e7a..823bb8d 100644
--- a/src/background.js
+++ b/src/background.js
@@ -1,4 +1,3 @@
-// src-electron/main.js
const { app, BrowserWindow, screen, globalShortcut, ipcMain } = require('electron');
const { join } = require('path');
@@ -38,7 +37,8 @@
});
// 鐩戝惉鎵撳紑鏂扮獥鍙�
- ipcMain.on('open-new-window', () => {
+ ipcMain.on('open-new-window', (event, meet) => {
+ const { meetName, id } = JSON.parse(meet);
const childWin = new BrowserWindow({
width: width,
height: height,
@@ -51,10 +51,14 @@
childWin.maximize();
// development妯″紡
if (process.env.VITE_DEV_SERVER_URL) {
- childWin.loadURL(process.env.VITE_DEV_SERVER_URL + '#/meet');
+ childWin.loadURL(process.env.VITE_DEV_SERVER_URL + '#/meet?' + `meetName=${meetName}&id=${id}`);
} else {
childWin.loadFile(join(__dirname, '../dist/index.html'), {
- hash: '/meet'
+ hash: '/meet',
+ query: {
+ meetName,
+ id
+ }
});
}
});
--
Gitblit v1.8.0