From a94d8362a5b3bcd9b1a28f7efdecf89ebee2d3ea Mon Sep 17 00:00:00 2001 From: 3136352472 <3136352472> Date: Tue, 21 Apr 2020 02:28:15 +0800 Subject: [PATCH 1/2] fix --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index dcc321c..5eb60bf 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ build data task.json username.json +package-lock.json \ No newline at end of file From 0386c7820d3d110918ca23b853bdd70465d066bb Mon Sep 17 00:00:00 2001 From: 3136352472 <3136352472> Date: Tue, 21 Apr 2020 02:46:54 +0800 Subject: [PATCH 2/2] fix mac --- lib/main.js | 1 - main.js | 7 +++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/main.js b/lib/main.js index 5d85ae0..17b36b9 100644 --- a/lib/main.js +++ b/lib/main.js @@ -14,7 +14,6 @@ exports.createMainWindow = function () { preload: path.join(__dirname, 'web/main.js') } }) - // and load the index.html of the app. exports.MainWindow.loadURL('http://oa.ouxuan.net/?d=we&m=login') diff --git a/main.js b/main.js index e2afe8d..ede317d 100644 --- a/main.js +++ b/main.js @@ -15,6 +15,13 @@ app.whenReady().then(function () { main.createMainWindow() const tray = require(path.join(__dirname, "lib/tray.js")) + + + if( app.dock){ + + app.dock.hide(); +} + // tray.createTrayWindow() })