diff --git a/electron-builder-test.yml b/electron-builder-test.yml index 61fba8f..ed4e1e2 100644 --- a/electron-builder-test.yml +++ b/electron-builder-test.yml @@ -12,7 +12,7 @@ asarUnpack: - resources/** win: executableName: AIx - icon: resources/logo.ico + icon: resources/logo2.ico nsis: oneClick: false allowToChangeInstallationDirectory: true diff --git a/electron-builder.yml b/electron-builder.yml index cb2cf97..911fb1c 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -12,7 +12,7 @@ asarUnpack: - resources/** win: executableName: AIx - icon: resources/logo.ico + icon: resources/logo2.ico nsis: oneClick: false allowToChangeInstallationDirectory: true diff --git a/resources/logo.ico b/resources/logo.ico index 4c33239..774da95 100644 Binary files a/resources/logo.ico and b/resources/logo.ico differ diff --git a/resources/logo2.ico b/resources/logo2.ico new file mode 100644 index 0000000..9afc9f1 Binary files /dev/null and b/resources/logo2.ico differ diff --git a/src/main/index.js b/src/main/index.js index 0fe8aa0..decc183 100644 --- a/src/main/index.js +++ b/src/main/index.js @@ -19,6 +19,7 @@ function createLoginWindow() { show: false, frame: false, autoHideMenuBar: true, + icon: join(__dirname, '../../resources/logo2.ico'), ...(process.platform === 'linux' ? { icon } : {}), webPreferences: { preload: join(__dirname, '../preload/index.js'), @@ -53,6 +54,7 @@ function createMainWindow() { show: false, frame: false, // 无边框 autoHideMenuBar: true, + icon: join(__dirname, '../../resources/logo2.ico'), ...(process.platform === 'linux' ? { icon } : {}), webPreferences: { preload: join(__dirname, '../preload/index.js'), diff --git a/src/renderer/src/views/resource/index.vue b/src/renderer/src/views/resource/index.vue index 8d11914..1e3647c 100644 --- a/src/renderer/src/views/resource/index.vue +++ b/src/renderer/src/views/resource/index.vue @@ -69,8 +69,8 @@ const submitFile = (data) => { let fileList = toRaw(data) const { textbookId, levelFirstId, levelSecondId, fileSource, fileRoot } = sourceStore.query // 给每个文件添加属性 - let fileData = { textbookId, levelFirstId, levelSecondId, fileSource, fileRoot } fileList.forEach(item => { + let fileData = { textbookId, levelFirstId, levelSecondId, fileSource, fileRoot } fileData.fileShowName = item.fileData.fileShowName fileData.fileFlag = item.fileData.fileFlag item.fileData = fileData