feats

src/utils/request.js

@@ -18,9 +18,9 @@ instance.interceptors.request.use(function (config) {
     successTip,
     headers: {
       ...headers,
-      responseType: download ? 'blob' : responseType,
       Authorization: token,
-    }
+    },    
+    responseType: download ? 'blob' : responseType,
   };
 }, function (error) {
   // 对请求错误做些什么
@@ -33,8 +33,8 @@ instance.interceptors.response.use(function (response) {
   // 对响应数据做点什么
 
   const { data, config } = response;
-  if (config.download) {
-    return downloadBlob(response.data, '下载文件');
+  if (config.download && !data.code) {
+    return downloadBlob(response, '下载文件');
   }
   
   if (data.code === 1000) {
@@ -128,15 +128,16 @@ export function restful(url) {
 
 function downloadBlob(response) {
   let fileName = '未知文件';
+  const contentType = response.headers['content-type'];
   const contentDisposition = response.headers['content-disposition'];
   if (contentDisposition) {
     const parts = contentDisposition.split(';filename=');
     if (parts[1]) {
-      fileName = parts[1];
+      fileName = decodeURIComponent(parts[1]);
     }
   }
-
-  const url = window.URL.createObjectURL(response.data);
+console.log(response);
+  const url = window.URL.createObjectURL(new Blob([response.data], { type: contentType }));
   const link = document.createElement('a');
   link.href = url;
   link.setAttribute('download', fileName);