Merge branch 'dev' into 'master'

Dev

See merge request !54

src/views/order/podUs/index.vue

@@ -1921,23 +1921,28 @@ const handleDownload = async (row: PodUsOrderListData, type: string) => {
     background: 'rgba(0, 0, 0, 0.3)',
     background: 'rgba(0, 0, 0, 0.3)',
   })
   })
   try {
   try {
-    const url = filePath + (type === 'png' ? row.url : row.tiffUrl)
+    const url =
+      type === 'png'
+        ? filePath + row.url
+        : `https://ps.jomalls.com/tiff/` + row.tiffUrl
 
 
-    fetch(url)
-      .then((res) => res.blob())
-      .then((blob) => {
+    const response = await fetch(url)
+    if (!response.ok) {
+      throw new Error('网络响应错误')
+    }
+
+    const blob = await response.blob()
     const link = document.createElement('a')
     const link = document.createElement('a')
     link.href = URL.createObjectURL(blob)
     link.href = URL.createObjectURL(blob)
     link.download = url ? url.split('/').pop() || 'download' : 'download'
     link.download = url ? url.split('/').pop() || 'download' : 'download'
     link.click()
     link.click()
-      })
-      .then(() => {
-        batchDownloadDownloadApi({ id: row.id, type })
+
+    await batchDownloadDownloadApi({ id: row.id, type })
     ElMessage.success('操作成功')
     ElMessage.success('操作成功')
     search()
     search()
     loadTabData()
     loadTabData()
-      })
   } catch (e) {
   } catch (e) {
+    ElMessage.error('下载失败')
     console.error(e)
     console.error(e)
   } finally {
   } finally {
     loading.close()
     loading.close()