From df6add881422755c7c01a8fa55ee2b97bfb6f26b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=BF=97=E9=B9=8F?= <2916022834@qq.com> Date: Tue, 14 Oct 2025 11:42:07 +0800 Subject: [PATCH 1/5] =?UTF-8?q?brand=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/LibraryPage/brandDetail.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/component/LibraryPage/brandDetail.vue b/src/component/LibraryPage/brandDetail.vue index a85e776a..8da391b9 100644 --- a/src/component/LibraryPage/brandDetail.vue +++ b/src/component/LibraryPage/brandDetail.vue @@ -192,12 +192,12 @@ export default defineComponent({ Https.axiosPost(Https.httpUrls.brandDNAUpload, new_data,{headers:{'Content-Type': 'multipart/form-data'}}).then( (rv: any) => { dataDom.fall.clearData() + data.isShowMark = false + data.isNoData = false data.currentPage = 1 getLibraryList() // rv.canvasUrl = rv.minIOPath // dataDom.fall.push([rv]); - data.isNull = false - data.isShowMark = false } ).catch((res)=>{ // getLibraryList() From 0240b50a73dd7c63df106d7ceb7b96e3c1820189 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=BF=97=E9=B9=8F?= <2916022834@qq.com> Date: Tue, 14 Oct 2025 13:32:07 +0800 Subject: [PATCH 2/5] =?UTF-8?q?brand=E4=B8=8A=E4=BC=A0=E5=A4=9A=E4=B8=AA?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=87=BA=E7=8E=B0bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/LibraryPage/brandDetail.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/component/LibraryPage/brandDetail.vue b/src/component/LibraryPage/brandDetail.vue index 8da391b9..47c97c2e 100644 --- a/src/component/LibraryPage/brandDetail.vue +++ b/src/component/LibraryPage/brandDetail.vue @@ -175,7 +175,7 @@ export default defineComponent({ isNoData:false,//如果数据为空就不加载 isNull:true, finishTime:'', - upLoadList:0, + uploadCount:0,//上传的图片数量 }) const dataDom = reactive({ Cropper:null as any, @@ -184,6 +184,7 @@ export default defineComponent({ loadingDom:null as any, }) const customRequest = (event:any)=>{ + data.uploadCount++; let new_data = { file:event.file, brandId:data.detail.id, @@ -191,7 +192,9 @@ export default defineComponent({ data.isShowMark = true Https.axiosPost(Https.httpUrls.brandDNAUpload, new_data,{headers:{'Content-Type': 'multipart/form-data'}}).then( (rv: any) => { + data.uploadCount --; dataDom.fall.clearData() + if(data.uploadCount) return; data.isShowMark = false data.isNoData = false data.currentPage = 1 @@ -201,6 +204,7 @@ export default defineComponent({ } ).catch((res)=>{ // getLibraryList() + data.uploadCount --; data.isShowMark = false }); } From 19d37a5d2b0cd452a9200d11023b9467abe438c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=BF=97=E9=B9=8F?= <2916022834@qq.com> Date: Tue, 14 Oct 2025 14:22:06 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/LibraryPage/setLabel.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/component/LibraryPage/setLabel.vue b/src/component/LibraryPage/setLabel.vue index 830c7ddb..f7cde38e 100644 --- a/src/component/LibraryPage/setLabel.vue +++ b/src/component/LibraryPage/setLabel.vue @@ -163,6 +163,7 @@ export default defineComponent({ this.deleteShow(this.options) }, clearOpenType(){ + this.labelBor = false this.openType = false this.options.forEach((optionsItem:any) => { optionsItem.openType = false @@ -257,7 +258,8 @@ export default defineComponent({ } }); data.classificationIdList = classificationIdList - this.deleteClass(data) + if(classificationIdList.length > 0) this.deleteClass(data) + this.labelBor = false }, addLabel(val:any){ let data = this.setLabelData() From 64d9b0e9c7a1e30b2b00ad61bbab5d8352bdf724 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=BF=97=E9=B9=8F?= <2916022834@qq.com> Date: Tue, 14 Oct 2025 14:33:16 +0800 Subject: [PATCH 4/5] 1 --- src/component/LibraryPage/setLabel.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/component/LibraryPage/setLabel.vue b/src/component/LibraryPage/setLabel.vue index f7cde38e..597748fa 100644 --- a/src/component/LibraryPage/setLabel.vue +++ b/src/component/LibraryPage/setLabel.vue @@ -234,7 +234,7 @@ export default defineComponent({ this.openType = true } nextTick().then(()=>{ - input.focus() + input?.focus() }) }, removeLabel(val:any){ From c1aad172fd57984f3643cf32c85281d03a4f3274 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=BF=97=E9=B9=8F?= <2916022834@qq.com> Date: Tue, 14 Oct 2025 14:46:39 +0800 Subject: [PATCH 5/5] 111 --- src/component/LibraryPage/setLabel.vue | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/component/LibraryPage/setLabel.vue b/src/component/LibraryPage/setLabel.vue index 597748fa..6b6826ba 100644 --- a/src/component/LibraryPage/setLabel.vue +++ b/src/component/LibraryPage/setLabel.vue @@ -12,7 +12,7 @@