diff --git a/src/assets/style/style.css b/src/assets/style/style.css index f92844d2..428c12b0 100644 --- a/src/assets/style/style.css +++ b/src/assets/style/style.css @@ -256,28 +256,35 @@ li { } .delete_like_file_block { display: none; - width: 2.5rem; - height: 2.5rem; + width: 3rem; + height: 3rem; background: rgba(0, 0, 0, 0.6); - border-radius: 0.4rem; + border-radius: calc(0.4rem*1.2); position: absolute; - top: 0rem; - right: 0rem; + top: calc(0.9rem*1.2); + right: calc(0.9rem*1.2); text-align: center; - line-height: 2.5rem; + line-height: 3rem; left: auto; - cursor: pointer; +} +.delete_like_file_block.left { + left: calc(0.9rem*1.2); +} +.delete_like_file_block.left1 { + left: calc(0.9rem*1.2); + top: 5rem; +} +.delete_like_file_block .icon-shanchu { + font-size: calc(1.6rem*1.2); + color: #fff; } .delete_like_file_block i { - font-size: 1.6rem; + font-size: calc(1.4rem); color: #fff; } .delete_like_file_block i.fi-sr-heart { color: red; } -.delete_like_file_block.left { - left: 0rem; -} .progress_mark .mark_content .ant-progress .ant-progress-text .anticon-check { color: #7a61dc; } diff --git a/src/assets/style/style.less b/src/assets/style/style.less index b068a827..a600628d 100644 --- a/src/assets/style/style.less +++ b/src/assets/style/style.less @@ -285,19 +285,29 @@ input:focus{ //爱心 .delete_like_file_block{ display: none; - width: 2.5rem; - height: 2.5rem; + width: 3rem; + height: 3rem; background: rgba(0,0,0,0.6); - border-radius: 0.4rem; + border-radius: calc(0.4rem*1.2); position: absolute; - top: 0rem; - right: 0rem; + top: calc(0.9rem*1.2); + right: calc(0.9rem*1.2); text-align: center; - line-height: 2.5rem; + line-height: 3rem; left: auto; - cursor: pointer; + &.left{ + left: calc(.9rem*1.2); + } + &.left1{ + left: calc(.9rem*1.2); + top: 5rem; + } + .icon-shanchu{ + font-size: calc(1.6rem*1.2); + color: #fff; + } i{ - font-size: 1.6rem; + font-size: calc(1.4rem); color: #fff; &.fi-rr-heart{ @@ -306,9 +316,6 @@ input:focus{ color: red; } } - &.left{ - left: 0rem; - } } //design进度100 diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue index c279852f..8a9f82ca 100644 --- a/src/component/Detail/DesignDetail.vue +++ b/src/component/Detail/DesignDetail.vue @@ -414,6 +414,7 @@ export default defineComponent({ async (rv: any) => { rv.clothes.forEach((item:any)=>{ let a + item.designType='Library' if(item.layersObject[0].imageCategory.indexOf("back") == -1){ a = item.layersObject[0] item.layersObject[0] = item.layersObject[1] @@ -421,6 +422,12 @@ export default defineComponent({ } if(item.printObject.prints == null){ item.printObject.prints = [{}] + }else{ + item.printObject.prints.forEach((element:any) => { + if(!element.designType){ + element.designType = 'Library' + } + }); } }) this.currentIndex = 0 @@ -931,6 +938,8 @@ export default defineComponent({ clothesDetail(clothes:any, index:number){ let designItemDetail = JSON.parse(JSON.stringify(this.store.state.DesignDetailModule.designItemDetail)) + console.log(designItemDetail); + this.designOrder = true this.current = designItemDetail.clothes[index] if(this.current.id && !designItemDetail.clothes[designItemDetail.clothes.length-1].id){ @@ -950,7 +959,7 @@ export default defineComponent({ color:`${this.current.color.r} ${this.current.color.g} ${this.current.color.b}`, id:this.current.id?this.current.id:'', changed:this.current.changed?this.current.changed:false, - + designType:this.current.designType?this.current.designType:'Library', path:this.current.minIOPath?this.current.minIOPath:'', offset:this.current.layersObject?.[1]?.offset?this.current.layersObject[1].offset:[0,0], priority:this.current.priority, diff --git a/src/component/Detail/DesignDetailEnd.vue b/src/component/Detail/DesignDetailEnd.vue index 37cc634d..5674a4a8 100644 --- a/src/component/Detail/DesignDetailEnd.vue +++ b/src/component/Detail/DesignDetailEnd.vue @@ -311,7 +311,7 @@ export default defineComponent({ let color = `${this.$parent.selectColor.rgba.r} ${this.$parent.selectColor.rgba.g} ${this.$parent.selectColor.rgba.b}` data.designSingleItemDTOList[index].color = color } - data.designSingleItemDTOList[index].designType = this.sketchImg.designType?this.sketchImg.designType:"Library" + data.designSingleItemDTOList[index].designType = this.sketchImg.designType?this.sketchImg.designType:this.current.designType data.timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone this.loadingShow = true Https.axiosPost(Https.httpUrls.designSingle, data).then( @@ -321,7 +321,7 @@ export default defineComponent({ if(item.type != 'body'){ if(item.id == designItemDetail.clothes[index].id || item.id == this.sketchImg.id_){ designItemDetail.clothes[index].color = item.color - designItemDetail.clothes[index].designType = this.sketchImg.designType?this.sketchImg.designType:'Library' + designItemDetail.clothes[index].designType = item.designType designItemDetail.clothes[index].layersObject = item.layersObject designItemDetail.clothes[index].minIOPath = item.minIOPath designItemDetail.clothes[index].path = item.path diff --git a/src/component/Detail/setDesignItem.vue b/src/component/Detail/setDesignItem.vue index 22646bdd..ac739b56 100644 --- a/src/component/Detail/setDesignItem.vue +++ b/src/component/Detail/setDesignItem.vue @@ -299,7 +299,7 @@ export default defineComponent({ w = (e.x - this.frontBack.front[this.imgDomIndex].centers.left) h = (e.x - this.frontBack.front[this.imgDomIndex].centers.left)*num width = w+'px' - height = w*num+'px' + // height = w*num+'px' }else if(this.direction == 'top'){ num = width/height this.frontBack.front[this.imgDomIndex].style.top = 'auto' @@ -309,19 +309,19 @@ export default defineComponent({ h = (this.frontBack.front[this.imgDomIndex].centers.top - e.y) height = h+'px' - width = h*num+'px' + // width = h*num+'px' }else if(this.direction == 'bottom'){ num = width/height h = (e.y - this.frontBack.front[this.imgDomIndex].centers.top) height = h+'px' - width = h*num+'px' + // width = h*num+'px' }else if(this.direction == 'left'){ this.frontBack.front[this.imgDomIndex].style.left = 'auto' this.frontBack.front[this.imgDomIndex].style.right = parentNode.offsetWidth -imgDomWH.width - this.imgDom.offsetLeft+'px' w = (this.frontBack.front[this.imgDomIndex].centers.left - e.x) width = w+'px' - height = w*num+'px' + // height = w*num+'px' } //判断尺寸是否到边 this.frontBack.front[this.imgDomIndex].style.width = width diff --git a/src/component/HomePage/Generate.vue b/src/component/HomePage/Generate.vue index 5cfc5a2d..0fe8d987 100644 --- a/src/component/HomePage/Generate.vue +++ b/src/component/HomePage/Generate.vue @@ -137,7 +137,7 @@
@@ -146,7 +146,9 @@
- +
+ +
@@ -160,8 +162,8 @@