diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue index 77e87975..760b2bc2 100644 --- a/src/component/Detail/DesignDetail.vue +++ b/src/component/Detail/DesignDetail.vue @@ -119,9 +119,9 @@
-
+
-
+
{{current?.color?.tcx}}
{{current?.color?.name}}
@@ -735,7 +735,7 @@ export default defineComponent({ // let zIndex = 10 designItemDetail.clothes.forEach((item:any,index:number) => { let clothesItem:any = { - color: `${item.color.r} ${item.color.g} ${item.color.b}`, + color: item?.color?.r?`${item.color.r} ${item.color.g} ${item.color.b}`:null , id:item.id, path:item.minIOPath, gradient:{}, @@ -1094,7 +1094,7 @@ export default defineComponent({ this.current.sketchString = '' this.currentIndex = this.currentIndex>0?this.currentIndex:0 data.designSingleItemDTOList[this.currentIndex] = { - color:`${this.current.color.r} ${this.current.color.g} ${this.current.color.b}`, + color:this.current?.color?.r?`${this.current.color.r} ${this.current.color.g} ${this.current.color.b}`:null, id:this.current.id?this.current.id:'', changed:this.current.changed?this.current.changed:false, designType:this.current.designType?this.current.designType:'Library', diff --git a/src/component/Detail/DesignDetailAlter.vue b/src/component/Detail/DesignDetailAlter.vue index 08742c77..f12f8568 100644 --- a/src/component/Detail/DesignDetailAlter.vue +++ b/src/component/Detail/DesignDetailAlter.vue @@ -227,8 +227,9 @@
-
+
+
@@ -610,14 +611,13 @@ export default defineComponent({ this.getLibraryList() }else{ let rgba = { - r:this.current.color.r+"", - g:this.current.color.g+"", - b:this.current.color.b+"", + r:this.current.color?.r+"", + g:this.current.color?.g+"", + b:this.current.color?.b+"", a:1 } let ind = 0 this.store.state.UploadFilesModule.allBoardData?.colorBoards?.forEach((item,index) => { - console.log(JSON.stringify(rgba) , JSON.stringify(item.rgbValue)); if(JSON.stringify(rgba) == JSON.stringify(item.rgbValue)){ ind+=1 }else{ diff --git a/src/component/Detail/DesignDetailEnd.vue b/src/component/Detail/DesignDetailEnd.vue index 140bbe41..e8170a73 100644 --- a/src/component/Detail/DesignDetailEnd.vue +++ b/src/component/Detail/DesignDetailEnd.vue @@ -54,7 +54,7 @@
-
+
{{color.tcx}}
{{ color.name }}
diff --git a/src/component/HomePage/ExportNewCoolection.vue b/src/component/HomePage/ExportNewCoolection.vue index 15057e4a..57d22d86 100644 --- a/src/component/HomePage/ExportNewCoolection.vue +++ b/src/component/HomePage/ExportNewCoolection.vue @@ -35,7 +35,7 @@
-
+
{{color.tcx}}
{{color.name}}
diff --git a/src/component/HomePage/NewCollectionReview.vue b/src/component/HomePage/NewCollectionReview.vue index 0292836d..0319a1df 100644 --- a/src/component/HomePage/NewCollectionReview.vue +++ b/src/component/HomePage/NewCollectionReview.vue @@ -37,7 +37,7 @@
-
+
{{color.tcx}}
{{color.name}}