diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue index 3eca497d..424d607d 100644 --- a/src/component/Detail/DesignDetail.vue +++ b/src/component/Detail/DesignDetail.vue @@ -642,7 +642,7 @@ export default defineComponent({ designItemDetail.clothes.forEach((item:any,index:number) => { if(item?.printObject?.prints[0]?.minIOPath){ item?.printObject?.prints?.forEach((element:any) => { - item.designType = "Library" + element.designType = "Library" }); } let clothesItem = { @@ -937,6 +937,7 @@ export default defineComponent({ let designItemDetail = JSON.parse(JSON.stringify(this.store.state.DesignDetailModule.designItemDetail)) this.designOrder = true + console.log( designItemDetail.clothes[index]); this.current = designItemDetail.clothes[index] if(this.current.id && !designItemDetail.clothes[designItemDetail.clothes.length-1].id){ designItemDetail.clothes.splice(designItemDetail.clothes.length-1,1) @@ -944,7 +945,11 @@ export default defineComponent({ } let data:any = this.setSubmitItem('preview',false) this.currentIndex = index?index:0 - + if(this.current?.printObject?.prints[0]?.minIOPath){ + this.current?.printObject?.prints.forEach((element:any) => { + element.designType = 'Library' + }); + } data.designSingleItemDTOList[this.currentIndex] = { color:`${this.current.color.r} ${this.current.color.g} ${this.current.color.b}`, id:this.current.id?this.current.id:'', diff --git a/src/tool/flexible.js b/src/tool/flexible.js index 34aa2d53..cf060c0c 100644 --- a/src/tool/flexible.js +++ b/src/tool/flexible.js @@ -5,12 +5,14 @@ let flexible = (designWidth, maxWidth,minWidth) =>{ minWidth = minWidth || 1024; function refreshRem() { var width = docEl.getBoundingClientRect().width; + var height = docEl.getBoundingClientRect().height; maxWidth = maxWidth || 1920; width > maxWidth && (width = maxWidth); width > maxWidth && (width = maxWidth); width < minWidth && (width = minWidth); var rem = width * 10 / designWidth; docEl.style.fontSize = rem+'px' + // if(height / width > .5)return remStyle.innerHTML = 'html{font-size:' + rem + 'px;}'; } // if (docEl.firstElementChild) {