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

fix

Browse Source
This commit is contained in:
X1627315083
2024-04-29 17:00:33 +08:00
parent b5b13751b8
commit 9160ed3c09
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/component/Detail/DesignDetail.vue
View File

@@ -642,7 +642,7 @@ export default defineComponent({
designItemDetail.clothes.forEach((item:any,index:number) => { designItemDetail.clothes.forEach((item:any,index:number) => {
if(item?.printObject?.prints[0]?.minIOPath){ if(item?.printObject?.prints[0]?.minIOPath){
item?.printObject?.prints?.forEach((element:any) => { item?.printObject?.prints?.forEach((element:any) => {
item.designType = "Library" element.designType = "Library"
}); });
} }
let clothesItem = { let clothesItem = {
@@ -937,6 +937,7 @@ export default defineComponent({
let designItemDetail = JSON.parse(JSON.stringify(this.store.state.DesignDetailModule.designItemDetail)) let designItemDetail = JSON.parse(JSON.stringify(this.store.state.DesignDetailModule.designItemDetail))
this.designOrder = true this.designOrder = true
console.log( designItemDetail.clothes[index]);
this.current = designItemDetail.clothes[index] this.current = designItemDetail.clothes[index]
if(this.current.id && !designItemDetail.clothes[designItemDetail.clothes.length-1].id){ if(this.current.id && !designItemDetail.clothes[designItemDetail.clothes.length-1].id){
designItemDetail.clothes.splice(designItemDetail.clothes.length-1,1) designItemDetail.clothes.splice(designItemDetail.clothes.length-1,1)
@@ -944,7 +945,11 @@ export default defineComponent({
} }
let data:any = this.setSubmitItem('preview',false) let data:any = this.setSubmitItem('preview',false)
this.currentIndex = index?index:0 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] = { 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.g} ${this.current.color.b}`,
id:this.current.id?this.current.id:'', id:this.current.id?this.current.id:'',

2
src/tool/flexible.js
View File

@@ -5,12 +5,14 @@ let flexible = (designWidth, maxWidth,minWidth) =>{
minWidth = minWidth || 1024; minWidth = minWidth || 1024;
function refreshRem() { function refreshRem() {
var width = docEl.getBoundingClientRect().width; var width = docEl.getBoundingClientRect().width;
var height = docEl.getBoundingClientRect().height;
maxWidth = maxWidth || 1920; maxWidth = maxWidth || 1920;
width > maxWidth && (width = maxWidth); width > maxWidth && (width = maxWidth);
width > maxWidth && (width = maxWidth); width > maxWidth && (width = maxWidth);
width < minWidth && (width = minWidth); width < minWidth && (width = minWidth);
var rem = width * 10 / designWidth; var rem = width * 10 / designWidth;
docEl.style.fontSize = rem+'px' docEl.style.fontSize = rem+'px'
// if(height / width > .5)return
remStyle.innerHTML = 'html{font-size:' + rem + 'px;}'; remStyle.innerHTML = 'html{font-size:' + rem + 'px;}';
} }
// if (docEl.firstElementChild) { // if (docEl.firstElementChild) {