Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg

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

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

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'),

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