diff --git a/src/component/Detail/detailLeft/colorBox/index.vue b/src/component/Detail/detailLeft/colorBox/index.vue index 6581ce7b..667d4b1c 100644 --- a/src/component/Detail/detailLeft/colorBox/index.vue +++ b/src/component/Detail/detailLeft/colorBox/index.vue @@ -100,7 +100,6 @@ export default defineComponent({ tcxToColor:'', }) watch(()=>colorData.selectColor,async (newVal,oldVal)=>{ - console.log(newVal) if(newVal.rgba && newVal.rgba?.r){ let data:any = await getColorName(newVal.rgba) newVal.name = data.name @@ -138,13 +137,12 @@ export default defineComponent({ item = colorData.allBoardData.colorBoards[index] let color = colorData.allBoardData.colorBoards?.[index] if(!color?.rgba && color?.rgbValue)color.rgba = color.rgbValue - if( colorData.allBoardData.colorBoards?.[index] && colorData.selectDetail.color.rgba?.r == color?.rgba?.r && colorData.selectDetail.color.rgba?.g == color?.rgba?.g && - colorData.selectDetail.color.rgba?.b == color?.rgba?.b && - JSON.stringify(colorData.selectDetail.color.gradient) == JSON.stringify(color?.gradient) + colorData.selectDetail.color.rgba?.b == color?.rgba?.b || + (JSON.stringify(colorData.selectDetail.color.gradient) == JSON.stringify(color?.gradient) && JSON.stringify(colorData.selectDetail.color.gradient)) && colorData.selectDetail.color.rgba?.r ){ isNoSelect = true