diff --git a/.env.dev b/.env.dev index d5d9d7c0..7d4cc729 100644 --- a/.env.dev +++ b/.env.dev @@ -9,4 +9,4 @@ VUE_APP_BASE_URL = 'https://develop.api.aida.com.hk' # 佩佩 # VUE_APP_BASE_URL = 'http://192.168.1.7:5567' # 海波 -# VUE_APP_BASE_URL = 'http://192.168.1.9:5567' +VUE_APP_BASE_URL = 'http://192.168.1.9:5567' diff --git a/public/image/mainImg/img1.png b/public/image/mainImg/img1.png new file mode 100644 index 00000000..37a436a7 Binary files /dev/null and b/public/image/mainImg/img1.png differ diff --git a/public/image/mainImg/img10.png b/public/image/mainImg/img10.png new file mode 100644 index 00000000..ee511ac7 Binary files /dev/null and b/public/image/mainImg/img10.png differ diff --git a/public/image/mainImg/img2.png b/public/image/mainImg/img2.png new file mode 100644 index 00000000..000457a2 Binary files /dev/null and b/public/image/mainImg/img2.png differ diff --git a/public/image/mainImg/img3.png b/public/image/mainImg/img3.png new file mode 100644 index 00000000..dc160d6f Binary files /dev/null and b/public/image/mainImg/img3.png differ diff --git a/public/image/mainImg/img4.png b/public/image/mainImg/img4.png new file mode 100644 index 00000000..1b52ac31 Binary files /dev/null and b/public/image/mainImg/img4.png differ diff --git a/public/image/mainImg/img5.png b/public/image/mainImg/img5.png new file mode 100644 index 00000000..58ccb204 Binary files /dev/null and b/public/image/mainImg/img5.png differ diff --git a/public/image/mainImg/img6.png b/public/image/mainImg/img6.png new file mode 100644 index 00000000..e210bbe6 Binary files /dev/null and b/public/image/mainImg/img6.png differ diff --git a/public/image/mainImg/img7.png b/public/image/mainImg/img7.png new file mode 100644 index 00000000..bb329b97 Binary files /dev/null and b/public/image/mainImg/img7.png differ diff --git a/public/image/mainImg/img8.png b/public/image/mainImg/img8.png new file mode 100644 index 00000000..fa81b846 Binary files /dev/null and b/public/image/mainImg/img8.png differ diff --git a/public/image/mainImg/img9.png b/public/image/mainImg/img9.png new file mode 100644 index 00000000..2a20dc59 Binary files /dev/null and b/public/image/mainImg/img9.png differ diff --git a/src/assets/style/style.css b/src/assets/style/style.css index 27365a00..28be6b4d 100644 --- a/src/assets/style/style.css +++ b/src/assets/style/style.css @@ -163,6 +163,7 @@ li { height: 3.3rem; line-height: 3.3rem; zoom: 1; + white-space: nowrap; } .started_btn .fi-br-loading::before { transition: all 0.5s; diff --git a/src/assets/style/style.less b/src/assets/style/style.less index 0ec8c4e4..3ccc00af 100644 --- a/src/assets/style/style.less +++ b/src/assets/style/style.less @@ -173,6 +173,7 @@ input:focus{ height: 3.3rem; line-height: 3.3rem; zoom: 1; + white-space: nowrap; .fi-br-loading::before{ transition: all .5s; display: inline-block; diff --git a/src/component/Detail/DesignDetailAlter.vue b/src/component/Detail/DesignDetailAlter.vue index 3783fcf6..ebf8ebf2 100644 --- a/src/component/Detail/DesignDetailAlter.vue +++ b/src/component/Detail/DesignDetailAlter.vue @@ -2,7 +2,8 @@
-
+
{{ $t('LibraryPage.generated') }}
+
-
+
@@ -1130,19 +1131,19 @@ export default defineComponent({ ) }); this.selectColorList = selectColorList - // this.getHsvColor(selectColorList) - // this.selectColor = {rgba:{r:color[0],g:color[1],b:color[2],a:1},hex:colorHex} - let colorListIndex = [] - this.colorList.forEach((item,index)=>{ - if(!item.rgba){ - colorListIndex.push(index) - } - }) - for (let index = 0; index < selectColorList.length; index++) { - this.colorList[colorListIndex[0]] = selectColorList[index] - this.getPantongName(selectColorList[index].rgba,colorListIndex[0]) - colorListIndex.splice(0,1) - } + this.getHsvColor(selectColorList) + this.selectColor = {rgba:{r:color[0],g:color[1],b:color[2],a:1},hex:colorHex} + // let colorListIndex = [] + // this.colorList.forEach((item,index)=>{ + // if(!item.rgba){ + // colorListIndex.push(index) + // } + // }) + // for (let index = 0; index < selectColorList.length; index++) { + // this.colorList[colorListIndex[0]] = selectColorList[index] + // this.getPantongName(selectColorList[index].rgba,colorListIndex[0]) + // colorListIndex.splice(0,1) + // } img.remove() }; diff --git a/src/component/Detail/DesignPrintOperation.vue b/src/component/Detail/DesignPrintOperation.vue index 794f84f3..c3ad3bf2 100644 --- a/src/component/Detail/DesignPrintOperation.vue +++ b/src/component/Detail/DesignPrintOperation.vue @@ -39,10 +39,10 @@
-
+
-
+
@@ -257,7 +258,9 @@ export default defineComponent({ let x = e.clientX - X let y = Y - e.clientY angle = Math.atan2(x,y)*(180 / Math.PI) - elParent.firstElementChild.style.transform = "rotateZ("+ angle + "deg)" + if(elParent){ + elParent.firstElementChild.style.transform = "rotateZ("+ angle + "deg)" + } el.style.transform = "translate(-50%, -50%)rotateZ("+ angle + "deg)" } } @@ -652,7 +655,8 @@ export default defineComponent({ location = [arr[index].style.left.replace(/px/g,'')*sketchNum,arr[index].style.top.replace(/px/g,'')*sketchNum] } let obj = { - angle : !this.overallSingle ? 0:arr[index].transform.rotateZ, + angle : arr[index].transform.rotateZ, + // angle : !this.overallSingle ? 0:arr[index].transform.rotateZ, location : location, priority:arr[index].style.zIndex, scale: scale, @@ -1038,6 +1042,7 @@ export default defineComponent({ i{ display: flex; color: #14bcff; + justify-content: center; } .animtion1{ animation: anim 4s 2s linear infinite; diff --git a/src/component/Detail/DesignPrintOperationMobile.vue b/src/component/Detail/DesignPrintOperationMobile.vue index d13cef0b..90cc7689 100644 --- a/src/component/Detail/DesignPrintOperationMobile.vue +++ b/src/component/Detail/DesignPrintOperationMobile.vue @@ -42,10 +42,10 @@ -
+
-
+
@@ -257,7 +258,9 @@ export default defineComponent({ let x = e.targetTouches[0].clientX - X let y = Y - e.targetTouches[0].clientY angle = Math.atan2(x,y)*(180 / Math.PI) - elParent.firstElementChild.style.transform = "rotateZ("+ angle + "deg)" + if(elParent){ + elParent.firstElementChild.style.transform = "rotateZ("+ angle + "deg)" + } el.style.transform = "translate(-50%, -50%)rotateZ("+ angle + "deg)" } } @@ -652,7 +655,8 @@ export default defineComponent({ location = [arr[index].style.left.replace(/px/g,'')*sketchNum,arr[index].style.top.replace(/px/g,'')*sketchNum] } let obj = { - angle : !this.overallSingle ? 0:arr[index].transform.rotateZ, + angle : arr[index].transform.rotateZ, + // angle : !this.overallSingle ? 0:arr[index].transform.rotateZ, location : location, priority:arr[index].style.zIndex, scale: scale, @@ -1074,6 +1078,7 @@ export default defineComponent({ i{ display: flex; color: #14bcff; + justify-content: center; } .animtion1{ animation: anim 4s 2s linear infinite; diff --git a/src/component/Detail/habit.vue b/src/component/Detail/habit.vue index 739f759d..ec6f6fc2 100644 --- a/src/component/Detail/habit.vue +++ b/src/component/Detail/habit.vue @@ -521,24 +521,37 @@ export default defineComponent({ this.setPosition('') // this.getworkspace() } - }) + }).catch((res)=>{ + this.isShowMark = false + // this.getworkspace() + }); }, - getMannequins(){//获取模特 - Https.axiosGet(Https.httpUrls.getMannequins,{params:{sex:this.workspaceItem.sex}}).then((rv: any) => { - if (rv) { - // rv.forEach((item:any)=>{ - // item.type == - // }) - if(rv[0].type == 'System'){ - let a = rv[0] - rv[0] = rv[1] - rv[1] = a + getMannequins(isSetmannequins:any){//获取模特 + let styleData = this.workspaceItem.style?this.workspaceItem.style:'' + return new Promise((resolve,reject)=>{ + Https.axiosGet(Https.httpUrls.getMannequins,{params:{sex:this.workspaceItem.sex,style:styleData}}).then(async (rv: any) => { + if (rv) { + if(rv[0].type == 'System'){ + let a = rv[0] + rv[0] = rv[1] + rv[1] = a + } + this.mannequins = rv + if(this.mannequins?.[0]==null){ + this.systemSeleves = false + } + if(isSetmannequins){ + // this.workspaceItem.femalePresignedUrl = this.mannequins?.[1]?.modelList[0].presignedUrl + // this.workspaceItem.mannequinFemaleType = 'System' + // this.workspaceItem.mannequinFemaleId = this.mannequins?.[1]?.modelList[0].id + await this.setMannequins(this.mannequins?.[1]?.modelList[0],'System') + // this.workspaceItem.mannequinUrl = this.mannequins?.[1]?.modelList[0].presignedUrl + // this.workspaceItem.mannequinType = 'System' + // this.workspaceItem.mannequinId = this.mannequins?.[1]?.modelList[0].id + } + resolve('') } - this.mannequins = rv - if(this.mannequins?.[0]==null){ - this.systemSeleves = false - } - } + }) }) }, putWorkspace(data:any,index:any){//修改workspace @@ -678,7 +691,7 @@ export default defineComponent({ this.workspaceItem.sexEnum = v this.openType.sex = false this.workspaceItem.sex = v.value - this.getMannequins() + this.getMannequins(false) this.setMannequinsSex() this.setPosition('sex') @@ -694,33 +707,37 @@ export default defineComponent({ // this.workspaceItem.mannequinId = item.id // this.workspaceItem.mannequinType = str // this.workspaceItem.mannequinUrl = item.presignedUrl - let id - if(this.workspaceItem.sexEnum.value == 'Female'){ - id = this.workspaceItem.mannequinFemaleId - this.workspaceItem.femalePresignedUrl = item.presignedUrl - this.workspaceItem.mannequinFemaleType = str - this.workspaceItem.mannequinFemaleId = item.id - }else if(this.workspaceItem.sexEnum.value == 'Male'){ - id = this.workspaceItem.mannequinMaleId - this.workspaceItem.malePresignedUrl = item.presignedUrl - this.workspaceItem.mannequinMaleType = str - this.workspaceItem.mannequinMaleId = item.id - } - // if(id != item.id){ - if(this.driver__.driver){ - // this.openType.habit = false - nextTick().then(()=>{ - // driverObj__.moveTo(2); - driverObj__.moveNext(); - this.openType.model = false + return new Promise((resolve, reject) => { + let id + if(this.workspaceItem.sexEnum.value == 'Female'){ + id = this.workspaceItem.mannequinFemaleId + this.workspaceItem.femalePresignedUrl = item.presignedUrl + this.workspaceItem.mannequinFemaleType = str + this.workspaceItem.mannequinFemaleId = item.id + }else if(this.workspaceItem.sexEnum.value == 'Male'){ + id = this.workspaceItem.mannequinMaleId + this.workspaceItem.malePresignedUrl = item.presignedUrl + this.workspaceItem.mannequinMaleType = str + this.workspaceItem.mannequinMaleId = item.id + } + // if(id != item.id){ + if(this.driver__.driver){ + // this.openType.habit = false + nextTick().then(()=>{ + // driverObj__.moveTo(2); + driverObj__.moveNext(); + this.openType.model = false - // driverObj__.moveNext(); - }) - } - // } - this.workspaceItem.mannequinUrl = item.presignedUrl - this.workspaceItem.mannequinType = str - this.workspaceItem.mannequinId = item.id + // driverObj__.moveNext(); + }) + } + // } + this.workspaceItem.mannequinUrl = item.presignedUrl + this.workspaceItem.mannequinType = str + this.workspaceItem.mannequinId = item.id + resolve('') + }) + }, // FEMALE MALE setMannequinsSex(){ @@ -755,7 +772,7 @@ export default defineComponent({ this.openType.workspace = false this.openType.sex = false this.openType.model = !this.openType.model - this.getMannequins() + this.getMannequins(false) if(this.driver__.driver && this.openType.model){ nextTick().then(()=>{ driverObj__.moveTo(4); @@ -794,9 +811,14 @@ export default defineComponent({ // sureSelectModel(event: any) { // this.store.commit("setTemplateData", event); // }, - setWorkspaceStyle(data: any){ - this.workspaceItem.styleId = data.id + async setWorkspaceStyle(data: any){ + // this.workspaceItem.styleId = data.id this.workspaceItem.styleName = data.name + this.workspaceItem.style = data.value + this.workspaceItem.styleId = data.id + if(data.isRevampModel){ + await this.getMannequins(true) + } this.putWorkspace(this.workspaceItem,this.workspaceItem.id) }, setStyle(){ @@ -1025,6 +1047,8 @@ export default defineComponent({ justify-content: space-between; .model_current{ margin-right: calc(3rem*1.2); + display: flex; + flex-direction: column; .model_text{ text-align: center; } diff --git a/src/component/Detail/habitSetStyle.vue b/src/component/Detail/habitSetStyle.vue index efe0c7f8..141abe32 100644 --- a/src/component/Detail/habitSetStyle.vue +++ b/src/component/Detail/habitSetStyle.vue @@ -121,6 +121,7 @@ setup(props,{emit}) { let data = { id:habitSetStyleData.selectStyle.id, name:habitSetStyleData.selectStyle.name, + value:habitSetStyleData.selectStyle.value, isRevampModel:false, } if(oldDataId == data.id){ @@ -150,10 +151,10 @@ setup(props,{emit}) { let setClear = ()=>{ habitSetStyleData.selectStyle.id = '' habitSetStyleData.selectStyle.name = '' + habitSetStyleData.selectStyle.value = '' } let setItemSelect = (item:any)=>{ - habitSetStyleData.selectStyle.name = item.name - habitSetStyleData.selectStyle.id = item.id + habitSetStyleData.selectStyle = Object.assign({},item) } return { habitSetStyle, diff --git a/src/component/HomePage/ColorboardUpload.vue b/src/component/HomePage/ColorboardUpload.vue index 3d16475e..e0554955 100644 --- a/src/component/HomePage/ColorboardUpload.vue +++ b/src/component/HomePage/ColorboardUpload.vue @@ -123,9 +123,8 @@
+
{{isSelectSuccessively?$t('ColorboardUpload.SelectSuccessively'):$t('ColorboardUpload.SelectSeparately')}}
- -
@@ -201,6 +200,7 @@ export default defineComponent({ selectIndex:-1, gradientShow:false, }) + let isSelectSuccessively = ref(false) return { fileList, colorList, @@ -209,6 +209,7 @@ export default defineComponent({ driver__, t, gradient, + isSelectSuccessively, } }, watch:{ @@ -487,16 +488,16 @@ export default defineComponent({ this.selectColor = {rgba:{r:color[0],g:color[1],b:color[2],a:1},hex:colorHex} // console.log(this.colorList); // console.log(selectColorList); - let colorListIndex = [] - this.colorList.forEach((item,index)=>{ - if(!item.rgba){ - colorListIndex.push(index) - } - }) - for (let index = 0; index < selectColorList.length; index++) { - this.colorList[colorListIndex[0]] = selectColorList[index] - colorListIndex.splice(0,1) - } + // let colorListIndex = [] + // this.colorList.forEach((item,index)=>{ + // if(!item.rgba){ + // colorListIndex.push(index) + // } + // }) + // for (let index = 0; index < selectColorList.length; index++) { + // this.colorList[colorListIndex[0]] = selectColorList[index] + // colorListIndex.splice(0,1) + // } nextTick().then(()=>{ if(this.driver__.driver){ driverObj__.moveNext() @@ -524,10 +525,21 @@ export default defineComponent({ }, setUplpadColor(color){ nextTick().then(()=>{ - this.selectColor = color - if(this.driver__.driver){ - driverObj__.moveNext() + if(this.isSelectSuccessively){ + for (let index = 0; index < this.colorList.length; index++) { + if(!this.colorList[index].rgba){ + this.selectIndex = index + this.selectColor = color + break + } + } + }else{ + this.selectColor = color + if(this.driver__.driver){ + driverObj__.moveNext() + } } + }) }, @@ -746,7 +758,7 @@ export default defineComponent({ } let colorList =this.colorList.filter((v) => v && Object.keys(v).length) this.setColorboardList(colorList) - } + }, } }) @@ -834,10 +846,12 @@ export default defineComponent({ .right_content_line{ padding-left: calc(3rem*1.2); position: relative; - padding-right: calc(5rem*1.2); + padding-right: calc(3rem*1.2); + margin-right: 2.4rem; .upload_centetn{ overflow-x: hidden; height: calc(100% - 4.4rem*1.2); + padding-bottom: 4rem; } .upload_centetn::-webkit-scrollbar { display: none; @@ -923,6 +937,13 @@ export default defineComponent({ } } } + .upload_color_btn{ + position: absolute; + left: 50%; + transform: translateX(-50%); + bottom: 0; + white-space: nowrap; + } .color_setting_block{ margin: auto; background: linear-gradient(70deg, #eee4f3, #f3f4e6); diff --git a/src/component/HomePage/ExportModel.vue b/src/component/HomePage/ExportModel.vue index b0055b86..b47b022a 100644 --- a/src/component/HomePage/ExportModel.vue +++ b/src/component/HomePage/ExportModel.vue @@ -205,7 +205,7 @@
{{ $t('exportModel.insufficient') }}
-
{{ $t('exportModel.HDExport') }}
+
{{ $t('exportModel.Save') }}
{{ $t('exportModel.Share') }}
{{ $t('exportModel.Export') }}
@@ -289,7 +289,7 @@
OK
- + + \ No newline at end of file diff --git a/src/component/HomePage/productImg.vue b/src/component/HomePage/productImg.vue index 2f9bf7ae..a6b02308 100644 --- a/src/component/HomePage/productImg.vue +++ b/src/component/HomePage/productImg.vue @@ -112,7 +112,7 @@ {{$t('Generate.Close')}}
-
清空
+
@@ -123,11 +123,14 @@
-
+
- + +
    +
  • {{ menuItem.label }}
    • +
@@ -136,15 +139,15 @@
{{$t('ProductImg.Export')}}
-
+
-
+
- +
-
+
  • {{ menuItem.label }}
    • @@ -202,15 +205,15 @@ export default defineComponent({ isProductimg:false,//开始生成 selectProductimgList:[], generateList:{}, - likeList:{}, + likeList:[], }) let productimgMenuList = ref([ { value:'ProductImage', label:useI18n().t('ProductImg.ProductImage') },{ - value:'ProductImage1', - label:'123123' + value:'Relight', + label:useI18n().t('ProductImg.Relight') } ]) let productimgMenu:any = ref(productimgMenuList.value[0]) @@ -242,7 +245,7 @@ export default defineComponent({ rv.forEach((item:any) => { item.imgUrl = item.url }); - productImgData.likeList[productimgMenu.value.value] = rv + productImgData.likeList = rv } ).catch(res=>{ }); @@ -263,7 +266,7 @@ export default defineComponent({ let cleardata = ()=>{ productImg.value = false productImgData.isShowMark = false - productImgData.likeList = {} + productImgData.likeList = [] productImgData.generateList = {} productimgMenu.value = productimgMenuList.value[0] } @@ -278,6 +281,9 @@ export default defineComponent({ file.id = res.data.id file.isChecked = true file.type = 'ProductElement' + if(productimgMenu.value.value == 'Relight'){ + file.type = "ToProductImage" + } productImgData.fileList[productimgMenu.value.value].filter((v: any) => v.status === "done"); }else{ bor = false @@ -322,17 +328,14 @@ export default defineComponent({ Https.axiosPost(url, data).then( (rv) => { if(str == 'like'){ - if(!productImgData.likeList[productimgMenu.value.value]){ - productImgData.likeList[productimgMenu.value.value] = [] - } - productImgData.likeList[productimgMenu.value.value].push(item) + productImgData.likeList.push(item) productImgData.generateList[productimgMenu.value.value].splice(index,1) }else{ if(!productImgData.generateList[productimgMenu.value.value]){ productImgData.generateList[productimgMenu.value.value] = [] } productImgData.generateList[productimgMenu.value.value].push(item) - productImgData.likeList[productimgMenu.value.value].splice(index,1) + productImgData.likeList.splice(index,1) } } @@ -341,11 +344,7 @@ export default defineComponent({ } let setExport = ()=>{ let imgList:any = [] - productimgMenuList.value.forEach((item:any)=>{ - if(productImgData.likeList[item.value]){ - imgList.push(...productImgData.likeList[item.value]) - } - }) + imgList = productImgData.likeList let data = { key:'FinalizeImage', imgList:imgList, @@ -386,6 +385,10 @@ export default defineComponent({ if(item.isChecked){ obj.elementId = item.designOutfitId obj.elementType = 'DesignOutfit' + if(productimgMenu.value.value == 'Relight'){ + obj.elementId = item.id + obj.elementType = 'ToProductImage' + } selectArr.push(JSON.parse(JSON.stringify(obj))) } }) @@ -404,7 +407,11 @@ export default defineComponent({ remPrductimgTime = setTimeout(()=>{ productImgData.remProductimg = true },10000) - Https.axiosPost(Https.httpUrls.toProduct, data).then( + let url = Https.httpUrls.toProduct + if(productimgMenu.value.value == 'Relight'){ + url = Https.httpUrls.relight + } + Https.axiosPost(url, data).then( (rv) => { let arr:any = [] rv.forEach((item:any)=>{ @@ -424,10 +431,15 @@ export default defineComponent({ let data = dataList let dataNum = dataList.length let state = true + let url = Https.httpUrls.toProductImageResult + if(productimgMenu.value.value == 'Relight'){ + url = Https.httpUrls.relightResult + } + prductimgTime = setInterval(()=>{ if(!state)return state = false - Https.axiosPost(Https.httpUrls.toProductImageResult, data).then( + Https.axiosPost(url, data).then( (rv) => { state = true if(productImgData.isProductimg){//防止取消后有正在执行的获取状态 @@ -499,6 +511,7 @@ export default defineComponent({ selectList.value[productimgMenu.value.value] = [] } if(selectList.value[menuItem.value].indexOf(item) == -1){ + item.isChecked = true selectList.value[menuItem.value].push(item) } generalIsMenuShow.menuShow = false @@ -507,6 +520,9 @@ export default defineComponent({ generalIsMenuShow.menuShow = false generalIsMenuShow = {} document.removeEventListener('click',removeMenuShow) + } + let clearPrductimg = ()=>{ + } //超分 let setTask = (data:any)=>{ @@ -538,6 +554,7 @@ export default defineComponent({ setScaleImage, setMenu, setMenuShow, + clearPrductimg, setTask, }; }, @@ -725,7 +742,7 @@ export default defineComponent({ justify-content: space-around; .input_box{ flex: 0; - + margin-left: auto; } .started_btn{ // width: 13rem; @@ -760,9 +777,16 @@ export default defineComponent({ .productImg_right_item_like,.productImg_right_item_scale,.productImg_right_item_menu{ display: none; position: absolute; - top: 1rem; + top: 2rem; right: 2rem; cursor: pointer; + width: 3rem; + height: 3rem; + background: #fff; + align-items: center; + justify-content: center; + border-radius: .5rem; + border: .1rem solid #ccc; .fi-sr-heart{ color: red; } @@ -771,12 +795,15 @@ export default defineComponent({ ul{ top: 100%; position: absolute; - width: 10rem; + width: 13rem; + left: 0; text-align: center; border-radius: calc(1rem*1.2); overflow: hidden; + z-index: 3; li{ background: #cccccc; + padding: .5rem 1rem; } li:hover{ // background: rgba(0,0,0,.4); @@ -790,12 +817,12 @@ export default defineComponent({ right: auto; } .productImg_right_item_scale{ - top: 4rem; + top: 6rem; } } .productImg_right_item:hover{ .productImg_right_item_like,.productImg_right_item_scale,.productImg_right_item_menu{ - display: block; + display: flex; } } .productImg_right_item:last-child{ diff --git a/src/component/HomePage/scaleImage.vue b/src/component/HomePage/scaleImage.vue index 036d3580..a7d308bb 100644 --- a/src/component/HomePage/scaleImage.vue +++ b/src/component/HomePage/scaleImage.vue @@ -20,8 +20,8 @@
+ -
diff --git a/src/component/LibraryPage/ModelPlacement.vue b/src/component/LibraryPage/ModelPlacement.vue index 5cd0a858..bf79b86a 100644 --- a/src/component/LibraryPage/ModelPlacement.vue +++ b/src/component/LibraryPage/ModelPlacement.vue @@ -602,7 +602,7 @@ export default defineComponent({ }, - confrimSubmit(){ + async confrimSubmit(){ let param = { libraryId:this.printObject.id, templateId:this.printObject.templateId || null, @@ -610,7 +610,7 @@ export default defineComponent({ modelSex:this.sex, checkMd5:1, timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone, - ...this.getPrintLocation() + ...await this.getPrintLocation() } if(this.userInfo.userId == 88 || this.userInfo.userId == 83){ param.modelType = this.modelType @@ -686,8 +686,19 @@ export default defineComponent({ }); }) }, - getPrintLocation(){ + async getPrintLocation(){ let {width , height} = this.imgBox + if(this.modelType == 'System'){ + await new Promise((resolve, reject) => { + let img = new Image() + img.src = this.option.img + img.onload = () => { + width = img.width + height = img.height + resolve(true) + } + }) + } let locationData:any = {} let returnData:any = {} let newLocationList = JSON.parse(JSON.stringify(this.locationList)) @@ -720,7 +731,7 @@ export default defineComponent({ libraryId:this.printObject.relationId || null, templateId:this.printObject.templateId || null, timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone, - ...this.getPrintLocation() + ...await this.getPrintLocation() } let cropper:any = this.$refs.cropper await cropper.getCropData((value:any)=>{ diff --git a/src/component/LibraryPage/ModelPlacementUpdata.vue b/src/component/LibraryPage/ModelPlacementUpdata.vue new file mode 100644 index 00000000..74570a02 --- /dev/null +++ b/src/component/LibraryPage/ModelPlacementUpdata.vue @@ -0,0 +1,850 @@ + + + \ No newline at end of file diff --git a/src/component/WorksPage/Falls.vue b/src/component/WorksPage/Falls.vue index 30268899..7eb8c920 100644 --- a/src/component/WorksPage/Falls.vue +++ b/src/component/WorksPage/Falls.vue @@ -161,6 +161,16 @@ export default defineComponent({ this.loadImg(); } }, + deleteItem(id){ + console.log(this.list,id); + for (let index = 0; index < this.list.length; index++) { + if(this.list[index].id == id){ + this.list.splice(index,1) + this.resize() + break; + } + } + }, loadImg() { if (this.wait_list.length <= 0) { this.loading = false; diff --git a/src/component/WorksPage/newScaleImage.vue b/src/component/WorksPage/newScaleImage.vue index 06eb746a..935d2167 100644 --- a/src/component/WorksPage/newScaleImage.vue +++ b/src/component/WorksPage/newScaleImage.vue @@ -12,7 +12,7 @@ :destroyOnClose="true" >
-
+
@@ -44,16 +47,58 @@
Overall
--> -
{{scaleImageData.portfolioName}}
-
{{scaleImageData.portfolioDes}}
+ +
+ +
+
@{{scaleImageData.userName}}
+ +
+
+
+ {{$t('newScaleImage.Title')}}: + {{scaleImageData.portfolioName}} +
+
+ {{$t('newScaleImage.Describe')}}: {{scaleImageData.portfolioDes}} +
+
{{scaleImageData.createDate}}
+
+ +
+ + + {{scaleImageData.likeNum}} +
+
+ + {{scaleImageData.viewNums}} +
+
+ + {{commentList.length}} +
+
+ + +
+
-
+
{{scaleImageData.Collection}}
-
{{$t('newScaleImage.SecondaryCreation')}}
+
{{$t('newScaleImage.SecondaryCreation')}}
@@ -75,18 +120,9 @@
-
+
-
- -
-
{{scaleImageData.userName}}
- -
-
+
@@ -101,27 +137,7 @@ {{ scaleImageData.updateDate }}
-
- -
- - - {{scaleImageData.likeNum}} -
-
- - {{scaleImageData.viewNums}} -
-
- - {{commentList.length}} -
-
+ +
+ +
+ +
+
-
+
@@ -170,13 +192,12 @@ 123
-->
- {{userInfo.userName }}{{item.userName}} -
删除
+
{{$t('newScaleImage.Delete')}}
{{item.detailUnfold?$t('newScaleImage.Collapse'):$t('newScaleImage.unfold')}}
-
+
@@ -196,7 +217,7 @@ 123
-->
-
删除
+
{{$t('newScaleImage.Delete')}}
{{children.detailUnfold?$t('newScaleImage.Collapse'):$t('newScaleImage.unfold')}}
@@ -216,12 +237,7 @@
-
- -
- -
-
+
@@ -230,18 +246,22 @@