Commit b73b8ad8 by linjinhong

fix:修改问题

parent f03769d1
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
"name": "JomallProductionAssistant", "name": "JomallProductionAssistant",
"productName": "JomallProductionAssistant", "productName": "JomallProductionAssistant",
"description": "", "description": "",
"version": "1.0.27", "version": "1.0.29",
"private": true, "private": true,
"scripts": { "scripts": {
"serve": "vue-cli-service serve", "serve": "vue-cli-service serve",
......
...@@ -177,7 +177,7 @@ export default { ...@@ -177,7 +177,7 @@ export default {
console.log("data", data); console.log("data", data);
let path, processDesignA, processDesignB; let path, processDesignA, processDesignB;
if (data.data) { if (data.data) {
path = data.data.path; path = data.data.path || data.data[0];
processDesignA = data.data.processDesignA; processDesignA = data.data.processDesignA;
processDesignB = data.data.processDesignB; processDesignB = data.data.processDesignB;
} else { } else {
......
...@@ -84,6 +84,8 @@ export const downloadImage = (list, isForcedProduction) => { ...@@ -84,6 +84,8 @@ export const downloadImage = (list, isForcedProduction) => {
if (downloadItems.length === 0) { if (downloadItems.length === 0) {
return resolve(list); return resolve(list);
} }
console.log("list1111", list);
console.log("downloadItems", downloadItems);
// 并行处理所有下载 // 并行处理所有下载
const downloadPromises = downloadItems.map((item) => { const downloadPromises = downloadItems.map((item) => {
...@@ -104,6 +106,7 @@ export const downloadImage = (list, isForcedProduction) => { ...@@ -104,6 +106,7 @@ export const downloadImage = (list, isForcedProduction) => {
const isArchive = archiveExtensions.some((ext) => const isArchive = archiveExtensions.some((ext) =>
item.url.toLowerCase().includes(ext), item.url.toLowerCase().includes(ext),
); );
console.log("item.url", item.url);
const fileName = isArchive const fileName = isArchive
? item.url.split("/").pop() ? item.url.split("/").pop()
...@@ -137,10 +140,10 @@ export const downloadImage = (list, isForcedProduction) => { ...@@ -137,10 +140,10 @@ export const downloadImage = (list, isForcedProduction) => {
resolveStream(); resolveStream();
}); });
}); });
if (isArchive) { if (isArchive) {
// 处理压缩文件 // 处理压缩文件
item.list = await zip(filePath, dirPath); item.list = await zip(filePath, dirPath);
console.log("list111111111", item.list);
if (Object.keys(isForcedProduction).length > 0) { if (Object.keys(isForcedProduction).length > 0) {
item.list = item.list.map((el) => { item.list = item.list.map((el) => {
if (el.designId.includes("A")) { if (el.designId.includes("A")) {
...@@ -151,7 +154,7 @@ export const downloadImage = (list, isForcedProduction) => { ...@@ -151,7 +154,7 @@ export const downloadImage = (list, isForcedProduction) => {
return { ...el }; return { ...el };
}); });
} }
console.log("list", item.list); console.log("list222222222", item.list);
} else { } else {
// 处理普通图片文件 // 处理普通图片文件
if (!item.list) item.list = []; if (!item.list) item.list = [];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment