Merge remote-tracking branch 'origin/main' into main

cds-fontend-2025.V1/src/hooks/business/download.ts

@@ -120,11 +120,12 @@ export function useDownload() {
 
       const finalFilename = filename || response.headers.get('Download-Filename') || `download-${timestamp}`;
 
-      if (response.body) {
+      /*老旧浏览器还是存在流式传输兼容问题,暂时屏蔽,只使用普通传输*/
+      /*if (response.body) {
         const contentLength = Number(response.headers.get('Content-Length'));
         await downloadByStream(response.body, finalFilename, contentLength);
         return;
-      }
+      }*/
 
       const responseContentType = response.headers.get('Content-Type');
       const mainType = responseContentType?.split(';')[0]?.trim() || 'application/octet-stream';

cds-fontend-2025.V1/src/views/home/index.vue

@@ -58,11 +58,11 @@ const setDateRange = (type: 'today' | 'week' | 'month') => {
 };
 
 //测试登录用户信息
-onMounted(() => {
+/*onMounted(() => {
   console.log(JSON.stringify(userInfo));
   console.log("是否营销:" + userInfo.user.userCategory);
   console.log("营销编号:" + userInfo.user.mktNo);
-});
+});*/
 </script>
 
 <template>