调整颜色没有潘通值的情况下展示效果
This commit is contained in:
@@ -119,9 +119,9 @@
|
||||
</div>
|
||||
<div class="img_block_item centent" @click.stop="openCurrent(3)">
|
||||
<div class="color_item">
|
||||
<div v-if="!current?.gradient" class="color_content" :style="{background:`rgba(${current?.color?.r},${current?.color?.g},${current?.color?.b},${current?.color?.a?current?.color.a:1})`}"></div>
|
||||
<div v-if="!current?.gradient" class="color_content" :style="{background:`rgba(${current?.color?.r?current?.color?.r:'255'},${current?.color?.g?current?.color?.g:'255'},${current?.color?.b?current?.color?.b:'255'},${current?.color?.a?current?.color.a:1})`}"></div>
|
||||
<div class="color_content" v-else :style="{height:'10rem','background-image':current?.gradient?`linear-gradient(${current?.gradient.angle}deg,${setGradient(current?.gradient)}`:'none'}"></div>
|
||||
<div v-if="!current?.gradient" class="color_content_body">
|
||||
<div v-if="!current?.gradient" class="color_content_body" :style="{'text-align':current?.color?.name?'left':'center'}">
|
||||
<div class="color_des">{{current?.color?.tcx}}</div>
|
||||
<div class="color_des">{{current?.color?.name}}</div>
|
||||
</div>
|
||||
@@ -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',
|
||||
|
||||
@@ -227,8 +227,9 @@
|
||||
</div>
|
||||
<div class="upload_color">
|
||||
<div v-for="color,index in selectColorList" :key="color" @click="setUplpadColor(color)" class="upload_color_item">
|
||||
<div class="upload_color_item_bg" :style="{'background-color':`rgba(${color.rgba.r},${color.rgba.g},${color.rgba.b},${color.rgba.a})`}">
|
||||
<div v-if="color.rgba?.r" class="upload_color_item_bg" :style="{'background-color':`rgba(${color.rgba.r},${color.rgba.g},${color.rgba.b},${color.rgba.a})`}">
|
||||
</div>
|
||||
<div v-else class="upload_color_item_bg"></div>
|
||||
<!-- <div class="upload_color_item_text">{{ pantongNameList[index] }}</div> -->
|
||||
<img :title="pantongNameList[index]">
|
||||
</div>
|
||||
@@ -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{
|
||||
|
||||
@@ -54,7 +54,7 @@
|
||||
<div v-if="!color?.gradient" class="color_content" :style="{'background-color':`rgba(${color.rgba?.r},${color.rgba?.g},${color.rgba?.b},${color.rgba?.a})`}">
|
||||
</div>
|
||||
<div class="color_content" v-else :style="{height:'100%','background-image':color?.gradient?`linear-gradient(${color?.gradient.angle}deg,${setGradient(color?.gradient)}`:'none'}"></div>
|
||||
<div v-if="!color?.gradient" class="color_content_body">
|
||||
<div v-if="!color?.gradient" class="color_content_body" :style="{'text-align':color?.name?'left':'center'}">
|
||||
<div class="color_des">{{color.tcx}}</div>
|
||||
<div class="color_des">{{ color.name }}</div>
|
||||
</div>
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
<div v-show="exportNav[2].change" class="img_block_item">
|
||||
<div class="color_item" v-for="(color) in allBoardData.colorBoards" :key="color">
|
||||
<div class="color_content" :style="{background:`rgb(${color?.rgbValue?.r},${color?.rgbValue?.g},${color?.rgbValue?.b})`}"></div>
|
||||
<div class="color_content_body">
|
||||
<div class="color_content_body" :style="{'text-align':color?.name?'left':'center'}">
|
||||
<div class="color_des">{{color.tcx}}</div>
|
||||
<div class="color_des">{{color.name}}</div>
|
||||
</div>
|
||||
|
||||
@@ -37,7 +37,7 @@
|
||||
<div class="color_item" v-for="(color) in allBoardData?.colorBoards" :key="color">
|
||||
<div class="color_content" v-if="!color?.gradient" :style="{background:`rgb(${color?.rgbValue?.r},${color?.rgbValue?.g},${color?.rgbValue?.b},${color?.rgbValue?.a})`}"></div>
|
||||
<div class="color_content" v-else :style="{height:'11rem','background-image':color?.gradient?`linear-gradient(${color?.gradient.angle}deg,${setGradient(color?.gradient)}`:'none'}"></div>
|
||||
<div class="color_content_body" v-if="!color?.gradient">
|
||||
<div class="color_content_body" v-if="!color?.gradient" :style="{'text-align':color?.name?'left':'center'}">
|
||||
<div class="color_des">{{color.tcx}}</div>
|
||||
<div class="color_des">{{color.name}}</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user