aidlab/aida_front
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复用户指引bug

Browse Source
This commit is contained in:
X1627315083
2023-12-20 17:03:42 +08:00
parent 6297b75d68
commit 5674df060f
18 changed files with 144 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/component/Detail/DesignDetailEnd.vue
View File

@@ -73,7 +73,6 @@
<div class="modal_img">
<div class="modal_img_item" v-for="color,index in colorList" :key="color" >
<div :title="color?.name?color?.name:''" @click="selectColorItem(index,color)" @dblclick="setSelectColorItem(color)" :class="['upload_color',selectIndex === index ? 'select_upload_color' : '',]" :style="{background:`rgba(${color?.r},${color?.g},${color?.b},${color?.a})`}">
<!-- <div class="color_content" :style="{background:`#6c6cac`}"></div> -->
<div class="color_content" :style="{'background-color':`rgba(${color.rgba?.r},${color.rgba?.g},${color.rgba?.b},${color.rgba?.a})`}">
</div>
<div class="color_content_body">
@@ -86,8 +85,7 @@
</div>
<div v-show="type_ == 1 || type_ == 3" @click.stop="setPreview" class="subitOkPreviewBtn">{{ $t('DesignDetailEnd.preview') }}</div>
<div v-if="type_ == 2 && current?.printObject?.prints?.[0]?.path != null" @click.stop="setPrint" class="subitOkPreviewBtn Guide_1_23">{{ $t('DesignDetailEnd.Layout') }}</div>
<div v-else-if="type_ == 2 && current?.printObject?.prints?.[0]?.path == null" @click.stop="setPreview" class="subitOkPreviewBtn">{{ $t('DesignDetailEnd.preview') }}</div>
<div v-else-if="type_ == 2 && designItemDetail?.clothes?.[currentIndex]?.printObject?.prints?.[0]?.path != null && current?.printObject?.prints?.[0]?.path == null" @click.stop="setPreview" class="subitOkPreviewBtn">{{ $t('DesignDetailEnd.preview') }}</div>
<DesignPrintOperation v-if="!moible" ref="DesignPrintOperation"></DesignPrintOperation>
<DesignPrintOperationMobile v-else ref="DesignPrintOperationMobile"></DesignPrintOperationMobile>
</div>
@@ -121,13 +119,16 @@ export default defineComponent({
let sketchImg = ref({})
let driver__ = inject('driver__')//父组件传过来的数据
let moible = inject('moible')//父组件传过来的数据
let designItemDetail = inject('designItemDetail')//父组件传过来的数据
let currentIndex = inject('currentIndex')//父组件传过来的数据
let previewShow = ref(false)
//印花
let overallSingle = ref(false)
let systemDesignerPercentage = ref(30)
//颜色
let colorList = ref([{},{},{},{},{},{},{},{}])
// let colorList = ref([{}])
let colorList = ref([{},{},{},{},{},{},{},{},{}])
//加载中
let loadingShow = ref(false)
@@ -140,6 +141,9 @@ export default defineComponent({
sketchImg,
driver__,
moible,
designItemDetail,
currentIndex,
previewShow,
type_,
overallSingle,
systemDesignerPercentage,
@@ -208,21 +212,24 @@ export default defineComponent({
let parent = this.$parent
this.selectIndex = index
this.$parent.selectIndex = index
if(this.$parent.selectColor.rgba.r == color?.rgba?.r && this.$parent.selectColor.rgba.g == color?.rgba?.g && this.$parent.selectColor.rgba.b == color?.rgba?.b){
if(color.rgba?.r){
hex = parent.rgbaToHex([color.rgba.r,color.rgba.g,color.rgba.b])
}else{
this.$parent.selectColor = {}
return
}
if(color.rgba?.r){
hex = parent.rgbaToHex([color.rgba.r,color.rgba.g,color.rgba.b,color.rgba.a])
}else{
hex = '#FFFFFF'
//判断是否对一个颜色重复点击
if(this.$parent.selectColor?.rgba?.r == color?.rgba?.r && this.$parent.selectColor.rgba.g == color?.rgba?.g && this.$parent.selectColor.rgba.b == color?.rgba?.b){
return
}
this.$parent.selectColor = color?.rgba?.r ? {rgba:{r:color.rgba?.r,g:color.rgba?.g,b:color.rgba?.b,a:color.rgba?.a},hex:hex} : {rgba:{r:255,g:255,b:255,a:1},hex:hex}
this.$parent.selectColor = {rgba:{r:color.rgba?.r,g:color.rgba?.g,b:color.rgba?.b,a:color.rgba?.a},hex:hex}
this.$parent.tcxColor = ''
this.$parent.pantongName = ''
},
setSelectColorItem(color){
let designItemDetail = this.store.state.DesignDetailModule.designItemDetail
let string = `${color.rgba.r},${color.rgba.g},${color.rgba.b},${color.rgba.a}`
let string = `${color.rgba.r},${color.rgba.g},${color.rgba.b}`
this.current.color = string
designItemDetail.clothes.forEach((element,index) => {
if(element.id == this.current.id){
@@ -265,6 +272,10 @@ export default defineComponent({
data.designSingleItemDTOList[index].printObject.ifSingle = false
data.designSingleItemDTOList[index].printObject.prints = []
}else if(this.type_ == 3){
if(this.$parent.selectColor?.rgba?.r == undefined){
message.info(this.t('DesignDetailEnd.jsContent2'))
return
}
let color = `${this.$parent.selectColor.rgba.r} ${this.$parent.selectColor.rgba.g} ${this.$parent.selectColor.rgba.b}`
data.designSingleItemDTOList[index].color = color
}
@@ -474,10 +485,13 @@ export default defineComponent({
.modal_img_item{
margin: 0 1rem 1rem 0;
position: relative;
cursor: pointer;
// cursor: pointer;
border: 0.1rem solid #DCDCEC;
//放8个
height: 8.5rem;
width: 7rem;
// height: 32rem;
// width: 25rem;
overflow: hidden;
@media screen and (max-width: 1440px) {
&.modal_img_item {
@@ -487,11 +501,13 @@ export default defineComponent({
box-sizing: border-box;
.color_content{
width: 100%;
//放8个
height: 4rem;
// height: 25rem;
}
.color_content_body{
.color_des{
font-size: 1.2rem;
// font-size: 1.8rem;
font-weight: 600;
white-space: nowrap;
width: 100%;