merge: 处理合并冲突

apps/mobile/src/composables/attachment-download/component/AttachmentDownload.vue

@@ -375,25 +375,19 @@ export default {
       } else {
         // downUrl: 原始url
         // fileUrl: 下载地址
-<<<<<<< HEAD
-        const { downUrl, fileUrl } = await this.getAttachmentInfo(file)
-
-        let skipRefresh = false
-        // 定制化用户不展示提示和留资
-        if (this.IsCustomTopNet) {
-          skipRefresh = true
-        }
-
-        if (!skipRefresh) {
-          this.refreshResourcePackCount()
-        }
-
-=======
         const result = await this.getAttachmentInfo(file)
         if (result) {
           const { downUrl, fileUrl } = result
-          this.refreshResourcePackCount()
->>>>>>> main
+
+          let skipRefresh = false
+          // 定制化用户不展示提示和留资
+          if (this.IsCustomTopNet) {
+            skipRefresh = true
+          }
+
+          if (!skipRefresh) {
+            this.refreshResourcePackCount()
+          }
 
           if (downUrl && fileUrl) {
             if (platform === 'wx') {