Merge branch 'main' into zhuhao_dev

Reviewed-on: #88

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

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()

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 {