diff --git a/src/renderer/src/utils/talkFile/index.js b/src/renderer/src/utils/talkFile/index.js index 6d4e746..08c9990 100644 --- a/src/renderer/src/utils/talkFile/index.js +++ b/src/renderer/src/utils/talkFile/index.js @@ -9,6 +9,7 @@ export const asyncLocalFile = (item) => { if (isAsync === true) { item.async = 'on' if (type === 'down') { + console.log(item) ipcRenderer.send('download-file-default', { url: item.fileFullPath, fileName: item.fileNewName diff --git a/src/renderer/src/views/prepare/index.vue b/src/renderer/src/views/prepare/index.vue index 23e0c33..8d6dbe5 100644 --- a/src/renderer/src/views/prepare/index.vue +++ b/src/renderer/src/views/prepare/index.vue @@ -232,7 +232,7 @@ export default { }, asyncAllFile() { this.isLoading = true - getSmarttalkPage({ + return getSmarttalkPage({ ...this.uploadData, orderByColumn: 'uploadTime', isAsc: 'desc', @@ -249,9 +249,11 @@ export default { await asyncLocalFile(item) } this.asyncAllFileVisiable = false + return Promise.resolve() }) .catch(() => { this.isLoading = false + return Promise.resolve() }) }, async nodeClick(data) { @@ -264,7 +266,7 @@ export default { this.uploadData.levelSecondId = cata[1] this.uploadData.levelThirdId = cata[2] this.uploadData.textbookId = data.textBook.curBookId - this.asyncAllFile() + await this.asyncAllFile() if (this.uploadData.levelSecondId) { // 获取作业列表所需ID const res = await this.getChapterId() @@ -292,7 +294,7 @@ export default { getChapterId() { return listEntpcourse({ evalid: this.uploadData.levelSecondId, edituserid: this.userStore.userId, pageSize: 500 }) }, - // + // createTimer() { this.timerId = setInterval(() => { this.getHomeWorkList() diff --git a/src/renderer/src/views/profile/cropperImage.vue b/src/renderer/src/views/profile/cropperImage.vue index 99df315..5745127 100644 --- a/src/renderer/src/views/profile/cropperImage.vue +++ b/src/renderer/src/views/profile/cropperImage.vue @@ -213,6 +213,7 @@ export default { > .btn { position: relative; display: flex; + margin-top: 30px; > .upload { display: block; width: 60px; @@ -222,7 +223,6 @@ export default { left: 0; opacity: 0; } - margin-top: 30px; } } .personal-authentica {