From 08b4275c8b04e8dbb7053e8fcb406980550ffb11 Mon Sep 17 00:00:00 2001 From: zm2000 <18386612143@163.com> Date: Thu, 23 Apr 2026 15:45:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=95=86=E5=93=81=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E9=A1=B5=E8=BF=94=E5=9B=9E=E9=94=AE=E5=9B=9E=E9=80=80?= =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=8C=E9=98=B2=E6=AD=A2=E5=A4=9A=E9=80=80?= =?UTF-8?q?=E4=B8=80=E5=B1=82=EF=BC=8C=E4=BF=9D=E8=AF=81=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E5=9B=9E=E6=BB=9A=E4=B8=80=E8=87=B4=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/page-nav/page-nav.vue | 4 + components/uploadImgCos/uploadImgCos.vue | 151 ++++++++- core/request/apis.js | 6 + pages/work/product/detail.vue | 33 +- pages/work/product/edit.vue | 389 ++++++++++++++++++++++- pages/work/product/query.vue | 33 +- 6 files changed, 589 insertions(+), 27 deletions(-) diff --git a/components/page-nav/page-nav.vue b/components/page-nav/page-nav.vue index b1b6590..30d6619 100644 --- a/components/page-nav/page-nav.vue +++ b/components/page-nav/page-nav.vue @@ -35,6 +35,10 @@ }, back() { console.log("返回"); + if (this.$listeners && this.$listeners.back) { + this.$emit('back'); + return; + } if (this.showBack) { // 有上一页,正常返回 diff --git a/components/uploadImgCos/uploadImgCos.vue b/components/uploadImgCos/uploadImgCos.vue index ecec1b0..3c8d8b9 100644 --- a/components/uploadImgCos/uploadImgCos.vue +++ b/components/uploadImgCos/uploadImgCos.vue @@ -66,6 +66,93 @@ export default { } }, methods: { + getFileId(file) { + if (!file || typeof file !== 'object') { + return ''; + } + + return file.id || file.fileId || file.file_id || (file.file && (file.file.id || file.file.fileId || file.file.file_id)) || ''; + }, + extractImageListFromGetImagesResponse(response) { + if (!response || typeof response !== 'object') { + return []; + } + + const candidates = [ + response.data, + response.data && response.data.data, + response.data && response.data.images, + response.data && response.data.list, + response.data && response.data.rows, + response.data && response.data.records, + response.data && response.data.result, + response.data && response.data.result && response.data.result.images, + response.data && response.data.result && response.data.result.list, + response.images, + response.list, + response.rows, + response.records + ]; + + for (let i = 0; i < candidates.length; i++) { + const current = candidates[i]; + if (!current) { + continue; + } + + if (Array.isArray(current)) { + return current; + } + + if (typeof current === 'object') { + const objectCandidates = [current.images, current.list, current.rows, current.records, current.data]; + for (let j = 0; j < objectCandidates.length; j++) { + if (Array.isArray(objectCandidates[j])) { + return objectCandidates[j]; + } + } + } + } + + return []; + }, + getRemoteFileId(file) { + if (!file || typeof file !== 'object') { + return ''; + } + + return file.file_id + || file.fileId + || file.id + || file.image_id + || (file.file && (file.file.file_id || file.file.fileId || file.file.id)) + || ''; + }, + async getRemoteFileIds() { + if (!this.business_id) { + return []; + } + + try { + const response = await this.$http('common.getImages', { + id: Number(this.business_id), + business_id: Number(this.business_id), + stock_id: Number(this.business_id), + type: this.business_type, + business_type: this.business_type + }); + + return this.extractImageListFromGetImagesResponse(response) + .map(item => this.getRemoteFileId(item)) + .filter(Boolean); + } catch (error) { + if (process.env.NODE_ENV !== 'production') { + console.warn('[UploadImgCos] getRemoteFileIds failed', error); + } + return []; + } + }, + /** * 格式化文件列表 */ @@ -77,7 +164,10 @@ export default { this.internalFileList = externalList.map(item => { if (item.status) { - return item; + return { + ...item, + id: this.getFileId(item) + }; } return { @@ -85,7 +175,7 @@ export default { name: item.name || this.extractFileName(item.url) || '', status: 'success', message: '', - id: item.id || item.fileId || '' + id: this.getFileId(item) }; }); }, @@ -135,7 +225,7 @@ export default { const filesToUpload = files.slice(0, remainingSlots); - // 添加文件到列表(初始状态为pending) + // 添加文件到列表(初始状态为pending) const startIndex = this.fileList.length; filesToUpload.forEach((file) => { this.fileList.push({ @@ -193,13 +283,26 @@ export default { if (!configData) { throw new Error("获取上传配置失败"); } - // 4. 执行COS上传(这里不会返回响应数据) + console.log(configData); + if(configData.fileId){ + // 如果后端已经返回了fileId,说明文件已存在,无需上传,直接通知后端关联即可 + this.fileList[fileIndex] = { + ...this.fileList[fileIndex], + status: "success", + message: "", + url: configData.fileUrl, + id: configData.fileId, + successUrl: configData.fileUrl // 保存成功后的URL + }; + await this.referenceFiles(); + return ; + } + // 4. 执行COS上传(这里不会返回响应数据) await this.uploadToCOS(file.url, configData, fileIndex); - // 5. 通知后端上传完成 const notifyResult = await this.notifyUploadComplete(configData.fileInfo, fileIndex); - + console.log("后端上传成功返回",JSON.stringify(notifyResult)); // 6. 更新状态为成功 if (notifyResult.data?.data) { const { fileUrl, fileId } = notifyResult.data.data; @@ -236,7 +339,7 @@ export default { }, /** - * 上传文件到COS(关键修改:不需要处理响应) + * 上传文件到COS(关键修改:不需要处理响应) */ uploadToCOS(filePath, config, fileIndex) { return new Promise((resolve, reject) => { @@ -248,7 +351,7 @@ export default { formData: config.data, // COS上传成功不会有响应体,只会有状态码 success: (res) => { - // 注意:COS返回的HTTP状态码成功通常是204或200,但没有响应体 + // 注意:COS返回的HTTP状态码成功通常是204或200,但没有响应体 if (res.statusCode === 200 || res.statusCode === 204) { resolve(); } else { @@ -304,13 +407,35 @@ export default { /** * 关联文件 */ - async referenceFiles() { + async referenceFiles(options = {}) { + const { mergeRemote = true } = options; console.log("this.fileList",this.fileList); try { // 获取所有成功的文件(包括之前已经关联的) - const validFiles = this.fileList - .filter(item => item.status === "success" && item.id) - .map(item => ({ file_id: item.id })); + const localFileIds = this.fileList + .filter(item => item.status === "success" && this.getFileId(item)) + .map(item => this.getFileId(item)); + + const remoteFileIds = mergeRemote ? await this.getRemoteFileIds() : []; + const mergedFileIds = Array.from(new Set([...(remoteFileIds || []), ...(localFileIds || [])])); + const validFiles = mergedFileIds.map(fileId => ({ file_id: fileId })); + + if (process.env.NODE_ENV !== 'production') { + console.log('[UploadImgCos] ReferenceFile payload debug', { + business_id: this.business_id, + type: this.business_type, + merge_remote: mergeRemote, + remote_file_ids: remoteFileIds, + local_file_ids: localFileIds, + file_ids: validFiles.map(item => item.file_id), + file_list: this.fileList.map(item => ({ + url: item.url || item.path || item.successUrl || '', + status: item.status, + id: this.getFileId(item) + })) + }); + } + if (validFiles.length === 0) { // 如果没有成功文件,也要通知后端清空关联 @@ -364,7 +489,7 @@ export default { // 异步更新文件关联 try { - await this.referenceFiles(); + await this.referenceFiles({ mergeRemote: false }); } catch (error) { console.error("删除后重新关联失败:", error); // 这里可以选择给用户提示,但不阻塞UI diff --git a/core/request/apis.js b/core/request/apis.js index 2aaa134..9d47120 100644 --- a/core/request/apis.js +++ b/core/request/apis.js @@ -28,6 +28,12 @@ export default { method: "POST", isSystemApi: true }, + getImages: { + path: "index.getImages", + auth: true, + method: "POST", + isSystemApi: true + }, ReferenceFile: { path: "index.ReferenceFile", auth: true, diff --git a/pages/work/product/detail.vue b/pages/work/product/detail.vue index 077d93b..8175d3c 100644 --- a/pages/work/product/detail.vue +++ b/pages/work/product/detail.vue @@ -259,7 +259,20 @@ export default { } if (Array.isArray(item.images) && item.images.length > 0) { - return String(item.images[0]); + const firstImage = item.images[0]; + if (!firstImage) { + return ''; + } + + if (typeof firstImage === 'string') { + return firstImage; + } + + if (typeof firstImage === 'object') { + return String(firstImage.url || firstImage.path || firstImage.successUrl || firstImage.fileUrl || firstImage.image_url || ''); + } + + return ''; } if (Array.isArray(item.pics) && item.pics.length > 0) { @@ -274,7 +287,23 @@ export default { } if (Array.isArray(item.images) && item.images.length > 0) { - return item.images.map(url => String(url)).filter(Boolean); + return item.images + .map(image => { + if (!image) { + return ''; + } + + if (typeof image === 'string') { + return image; + } + + if (typeof image === 'object') { + return image.url || image.path || image.successUrl || image.fileUrl || image.image_url || ''; + } + + return ''; + }) + .filter(Boolean); } if (Array.isArray(item.pics) && item.pics.length > 0) { diff --git a/pages/work/product/edit.vue b/pages/work/product/edit.vue index 470c931..24a84fd 100644 --- a/pages/work/product/edit.vue +++ b/pages/work/product/edit.vue @@ -1,7 +1,7 @@