{{ item.label }}
+
.selectList_header{
margin-bottom: 2.5rem;
display: flex;
align-items: center;
+ &.element{
+ margin-bottom: 0rem;
+ }
> .switch_type_list{
display: flex;
> .switch_type_item:last-child{
@@ -173,8 +179,11 @@ export default defineComponent({
> .switch_type_item{
position: relative;
cursor: pointer;
- margin-right: 6.5rem;
+ margin-right: 4rem;
font-size: 1.8rem;
+ > .detailText{
+ font-size: 1.6rem;
+ }
}
> .switch_type_item::before {
position: absolute;
diff --git a/src/component/Detail/detailLeft/module/uploadList.vue b/src/component/Detail/detailLeft/module/uploadList.vue
index da60a543..b11e8bae 100644
--- a/src/component/Detail/detailLeft/module/uploadList.vue
+++ b/src/component/Detail/detailLeft/module/uploadList.vue
@@ -200,9 +200,9 @@ export default defineComponent({
align-content: flex-start;
&::-webkit-scrollbar{display: none;}
> .content_img_item{
+ width: calc((50% - 1rem));
> .content_img_item_block{
- width: calc((34rem - 2rem) / 2);
- height: calc((34rem - 2rem) / 2);
+ aspect-ratio: 1/1;
position: relative;
margin-bottom: 2rem;
@@ -216,11 +216,11 @@ export default defineComponent({
}
> .material_content_list_loding{
width: 100%;
- height: calc((34rem - 2rem) / 2);
+ aspect-ratio: 1/1;
}
> .upload_item{
- width: calc((34rem - 2rem) / 2);
- height: calc((34rem - 2rem) / 2);
+ width: calc((50% - 1rem));
+ aspect-ratio: 1/1;
align-items: center;
justify-content: center;
}
diff --git a/src/component/Detail/detailLeft/module/uploadModel.vue b/src/component/Detail/detailLeft/module/uploadModel.vue
index 4548d4d6..f9334912 100644
--- a/src/component/Detail/detailLeft/module/uploadModel.vue
+++ b/src/component/Detail/detailLeft/module/uploadModel.vue
@@ -262,9 +262,10 @@ import sketchCategory from "@/component/HomePage/sketchCategory.vue";
align-content: flex-start;
&::-webkit-scrollbar{display: none;}
> .content_img_item{
+ width: calc((50% - 1rem));
> .content_img_item_block{
- width: calc((34rem - 2rem) / 2);
- height: calc((34rem - 2rem) / 2);
+ width: 100%;
+ aspect-ratio: 1/1;
position: relative;
margin-bottom: 2rem;
margin: 1rem;
@@ -279,11 +280,11 @@ import sketchCategory from "@/component/HomePage/sketchCategory.vue";
}
> .material_content_list_loding{
width: 100%;
- height: calc((34rem - 2rem) / 2);
+ aspect-ratio: 1/1;
}
> .upload_item{
- width: calc((34rem - 2rem) / 2);
- height: calc((34rem - 2rem) / 2);
+ width: calc((50% - 1rem));
+ aspect-ratio: 1/1;
align-items: center;
justify-content: center;
.upload{
diff --git a/src/component/Detail/detailLeft/module/uploadSegmentation.vue b/src/component/Detail/detailLeft/module/uploadSegmentation.vue
index 3ddce632..0c660ba6 100644
--- a/src/component/Detail/detailLeft/module/uploadSegmentation.vue
+++ b/src/component/Detail/detailLeft/module/uploadSegmentation.vue
@@ -145,9 +145,9 @@ export default defineComponent({
align-content: flex-start;
&::-webkit-scrollbar{display: none;}
> .content_img_item{
+ width: calc((50% - 1rem));
> .content_img_item_block{
- width: calc((34rem - 2rem) / 2);
- height: calc((34rem - 2rem) / 2);
+ aspect-ratio: 1/1;
position: relative;
margin-bottom: 2rem;
@@ -174,11 +174,11 @@ export default defineComponent({
}
> .material_content_list_loding{
width: 100%;
- height: calc((34rem - 2rem) / 2);
+ aspect-ratio: 1/1;
}
> .upload_item{
- width: calc((34rem - 2rem) / 2);
- height: calc((34rem - 2rem) / 2);
+ width: calc((50% - 1rem));
+ aspect-ratio: 1/1;
align-items: center;
justify-content: center;
.upload{
diff --git a/src/component/Detail/detailLeft/print.vue b/src/component/Detail/detailLeft/print.vue
index 2939b0d8..f3a90a53 100644
--- a/src/component/Detail/detailLeft/print.vue
+++ b/src/component/Detail/detailLeft/print.vue
@@ -120,11 +120,11 @@ export default defineComponent({
height: 23.5rem;
padding: 1rem;
text-align: center;
- border-radius: .5rem;
- // border: 1px dashed #202020;
- border: 1px dashed transparent;
+ border: 1px solid #000;
+ // border: 1px dashed transparent;
+ border-radius: 1.5rem;
background: linear-gradient(#fff, #fff) padding-box,repeating-linear-gradient(-45deg,#fff 0,#fff 0.3em, #000 0,#000 0.6em);
- margin-bottom: 3rem;
+ margin-bottom: 1.4rem;
display: flex;
flex-wrap: wrap;
overflow: hidden;
diff --git a/src/component/Detail/detailLeft/sketch.vue b/src/component/Detail/detailLeft/sketch.vue
index 59dcfa14..a637ca17 100644
--- a/src/component/Detail/detailLeft/sketch.vue
+++ b/src/component/Detail/detailLeft/sketch.vue
@@ -126,11 +126,12 @@ export default defineComponent({
padding: 1rem 0;
text-align: center;
border-radius: .5rem;
- // border: 1px dashed #202020;
- border: 1px dashed transparent;
+ border: 1px solid #000;
+ // border: 1px dashed transparent;
+ border-radius: 1.5rem;
position: relative;
background: linear-gradient(#fff, #fff) padding-box,repeating-linear-gradient(-45deg,#fff 0,#fff 0.3em, #000 0,#000 0.6em);
- margin-bottom: 3rem;
+ margin-bottom: 1.4rem;
> img{
width: 100%;
height: 100%;
diff --git a/src/component/Detail/detailRight/editPrintElement.vue b/src/component/Detail/detailRight/editPrintElement.vue
index 38692c5e..12b6effc 100644
--- a/src/component/Detail/detailRight/editPrintElement.vue
+++ b/src/component/Detail/detailRight/editPrintElement.vue
@@ -1,56 +1,56 @@
+
+ {{ $t('DesignPrintOperation.ModifyPrint') }}
+
-
-
- {{ $t('DesignPrintOperation.Overall') }}
-
-
+
+
+
-
-
+
+
+ {{ $t('DesignPrintOperation.Scale') }}
-
+
-
+
+
+ ![]()
+
+
+
+ ![]()
+
+
+
-
-
+
- ![]()
-
-
-
- ![]()
-
-
-
+
+
{{ $t('DesignPrintOperation.Scale') }}
+
@@ -60,7 +60,7 @@
-->
![]()
-
-
+
-
@@ -82,8 +82,8 @@
-
+
+
-
@@ -125,7 +125,6 @@ export default defineComponent({
selectDetail:computed(()=>store.state.DesignDetail.selectDetail),
currentDetailType:computed(()=>store.state.DesignDetail.currentDetailType),
currentPrintElement:computed(()=>store.state.DesignDetail.currentPrintElement),
- overallSingle:true,
systemDesignerPercentage:0,
printStyleList:{
print:{
@@ -144,7 +143,7 @@ export default defineComponent({
sketchWH:{
width:0,
height:0,
- scale:0,
+ scale:[1,1],
},
loadingShow:false,
printElementList:null as any,
@@ -169,11 +168,6 @@ export default defineComponent({
})
const setOveralSingle = ()=>{
- if(!editPrintElementData.overallSingle){
- editPrintElementData.stateOverallSingle = 'overall'
- }else{
- editPrintElementData.stateOverallSingle = 'single'
- }
setItemPosition()
}
const formatter = (value:any)=>{
@@ -194,11 +188,11 @@ export default defineComponent({
let scale = [width / editPrintElementData.sketchWH.width,height]
- let sketchW = editPrintElementData.sketchWH.width * editPrintElementData.sketchWH.scale
- let sketchH = editPrintElementData.sketchWH.height * editPrintElementData.sketchWH.scale
+ let sketchW = editPrintElementData.sketchWH.width * editPrintElementData.sketchWH.scale[0]
+ let sketchH = editPrintElementData.sketchWH.height * editPrintElementData.sketchWH.scale[1]
let x = sketchW / 2 - (sketchW * (width / editPrintElementData.sketchWH.width)/2)
let y = sketchH / 2 -(sketchH * height/2)
- if(!editPrintElementData.overallSingle){
+ if(!editPrintElementData.stateOverallSingle == 'single'){
x = sketchW / 2
y = sketchH / 2
}
@@ -214,7 +208,7 @@ export default defineComponent({
let item = {
angle:0,
designType:data.designType,
- ifSingle:editPrintElementData.overallSingle,
+ ifSingle:editPrintElementData.stateOverallSingle == 'single',
level2Type:data.level2Type,
location,
minIOPath:data.minIOPath || data.originalUrl,
@@ -234,12 +228,12 @@ export default defineComponent({
let style = item.pattern.style
let sketchWH = editPrintElementData.sketchWH.scale
if(item.ifSingle){
- scale = [style.width.replace(/px/g,'')/editPrintElementData.sketchWH.width,(style.height.replace(/px/g,'')/editPrintElementData.sketchWH.height)]
- location = [style.left.replace(/px/g,'')*sketchWH,style.top.replace(/px/g,'')*sketchWH]
+ scale = [style.width.replace(/px/g,'')/(editPrintElementData.sketchWH.width),(style.height.replace(/px/g,'')/(editPrintElementData.sketchWH.height))]
+ location = [style.left.replace(/px/g,'')*sketchWH[0],style.top.replace(/px/g,'')*sketchWH[1]]
}else{
let x = Number(style.left.replace(/px/g,''))
let y = Number(style.top.replace(/px/g,''))
- location = [(x*sketchWH) ,(y*sketchWH)]
+ location = [(x*sketchWH[0]) ,(y*sketchWH[1])]
scale =[ editPrintElementData.systemDesignerPercentage/100, editPrintElementData.systemDesignerPercentage/100]
// scale = [item.pattern.style.width/item.pattern.style.height,item.pattern.style.height/item.pattern.style.width]
// location = [item.pattern.style.left,item.pattern.style.top]
@@ -291,13 +285,13 @@ export default defineComponent({
if(item.ifSingle){
//single
- left = item.location[0] / editPrintElementData.sketchWH.scale
- top = item.location[1] / editPrintElementData.sketchWH.scale
+ left = item.location[0] / editPrintElementData.sketchWH.scale[0]
+ top = item.location[1] / editPrintElementData.sketchWH.scale[1]
}else{
//overall
editPrintElementData.systemDesignerPercentage = item.scale[0]*1000
- left = item.location[0] / editPrintElementData.sketchWH.scale
- top = item.location[1] / editPrintElementData.sketchWH.scale
+ left = item.location[0] / editPrintElementData.sketchWH.scale[0]
+ top = item.location[1] / editPrintElementData.sketchWH.scale[1]
editPrintElementData.systemDesignerPercentage = item.scale?.[0]?item.scale[0]*100:30
}
let pattern = {
@@ -330,15 +324,19 @@ export default defineComponent({
nextTick(()=>{
let img = new Image
img.onload = ()=>{
- let scale = img.width / editPrintElementDom.sketchImg.offsetWidth
+ // let sketchScale = editPrintElementData.selectDetail.layersObject[0].scale
+ let sketchScale = [1,1]
+ let scaleX = img.width * sketchScale[0] / editPrintElementDom.sketchImg.offsetWidth
+ let scaleY = img.height * sketchScale[1] / editPrintElementDom.sketchImg.offsetHeight
+
editPrintElementData.sketchWH = {
width:editPrintElementDom.sketchImg.offsetWidth,
height:editPrintElementDom.sketchImg.offsetHeight,
- scale,
+ scale:[scaleX,scaleY],
}
if(!editPrintElementData.selectDetail.printObject.prints)return
let state = true
- editPrintElementData.stateOverallSingle = 'single'
+ // editPrintElementData.stateOverallSingle = 'single'
let arr:any = editPrintElementData.selectDetail.printObject.prints
if(props.type == 'element'){
arr = editPrintElementData.selectDetail.trims.prints
@@ -348,7 +346,7 @@ export default defineComponent({
}
if(arr && arr.length > 0){
arr.forEach((item:any)=>{
- if(!item.ifSingle){
+ if(!item.ifSingle && arr.length == 1){
editPrintElementData.stateOverallSingle = 'overall',
state = false
}
@@ -356,9 +354,9 @@ export default defineComponent({
})
setItemPosition()
}
- if(props.type == 'print'){
- editPrintElementData.overallSingle = state
- }
+ // if(props.type == 'print'){
+ // editPrintElementData.overallSingle = state
+ // }
}
// undividedLayer
//计算宽高使用editPrintElementData.selectDetail.path
@@ -395,7 +393,7 @@ export default defineComponent({
editPrintElementData.printStyleList[props.type][editPrintElementData.stateOverallSingle].forEach((v:any)=>{
v.pattern.designOpenrtionBtn = false
})
- if(!editPrintElementData.overallSingle){
+ if(editPrintElementData.stateOverallSingle != 'single'){
editPrintElementDom.imgDom = document.getElementsByClassName('editPrintElement')[0].getElementsByClassName("designOpenrtion_Mouoverall")[0]
}else{
editPrintElementDom.imgDom = document.getElementsByClassName('editPrintElement')[0].getElementsByClassName("modal_imgItem")[editPrintElementData.imgDomIndex]
@@ -465,7 +463,7 @@ export default defineComponent({
let y:any = ( e.clientY - editPrintElementData.printStyleList[props.type][editPrintElementData.stateOverallSingle][editPrintElementData.imgDomIndex].pattern.centers.top)+'px'
editPrintElementData.printStyleList[props.type][editPrintElementData.stateOverallSingle][editPrintElementData.imgDomIndex].pattern.style.left = x
editPrintElementData.printStyleList[props.type][editPrintElementData.stateOverallSingle][editPrintElementData.imgDomIndex].pattern.style.top = y
- if(!editPrintElementData.overallSingle){
+ if(editPrintElementData.stateOverallSingle != 'single'){
if(x.replace(/px/g,'') >= parentNode.width - imgDomWH.width){
editPrintElementData.printStyleList[props.type][editPrintElementData.stateOverallSingle][editPrintElementData.imgDomIndex].pattern.style.left = parentNode.width - imgDomWH.width+'px'
}
@@ -743,7 +741,6 @@ export default defineComponent({
onMounted(()=>{
if(props.type == 'element'){
editPrintElementData.stateOverallSingle = 'single'
- editPrintElementData.overallSingle = true
}
})
onBeforeUnmount(()=>{
@@ -860,78 +857,96 @@ export default defineComponent({
> .overallSlogin{
align-items: center;
display: flex;
- }
- .habit_Overal_Single_text {
- font-weight: 600;
- color: rgba(0, 0, 0, 0.5);
- font-size: 1.8rem;
- margin: 0 1rem;
- &.active {
- color: rgba(0, 0, 0, 0.7);
- // font-weight: 900;
- // transform: scale(1.2);
- }
- }
- .habit_System_Designer {
- align-items: center;
- display: flex;
- .ant-slider-track,
- .ant-slider-rail {
- background-color: #e1e1e1;
- border-radius: calc(0.5rem*1.2);
- }
- :deep(.system_silder){
- width: 20rem;
- }
- .ant-slider .ant-slider-handle:not(.ant-tooltip-open),
- .ant-slider-handle {
- background-color: #2d2e76 !important;
- border: none !important;
- }
- .ant-slider-handle:hover{
- box-shadow: 0 0 0 5px rgba(45, 46, 118, 0.2);
- }
- .habit_System_Designer_text{
- font-size: 1.8rem;
- color: rgba(0, 0, 0, 0.7);
- margin-right: 3rem;
- font-weight: 600;
+ // margin-top: 1.4rem;
+ margin-bottom: 2.2rem;
+ > label{
+ display: flex;
+ align-items: center;
+ font-size: 1.6rem;
+ margin-right: 2.4rem;
+ &:last-child{
+ margin-right: 0rem;
+ }
+ > input{
+ margin-right: 1rem;
+ }
}
}
}
- > .printElementList{
- width: 100%;
- height: 10rem;
- position: relative;
- overflow-x: auto;
- .itemList{
- height: 100%;
+ .habit_System_Designer {
+ align-items: center;
+ display: flex;
+ justify-content: center;
+ .ant-slider-track,
+ .ant-slider-rail {
+ background-color: #e1e1e1;
+ border-radius: calc(0.5rem*1.2);
}
- .imgItem{
- width: 8rem;
- height: 8rem;
- position: absolute;
- cursor: pointer;
- border-radius: 1rem;
- overflow: hidden;
- > img{
- width: 100%;
+ :deep(.system_silder){
+ width: 17rem;
+ }
+ .ant-slider .ant-slider-handle:not(.ant-tooltip-open),
+ .ant-slider-handle {
+ background-color: #2d2e76 !important;
+ border: none !important;
+ }
+ .ant-slider-handle:hover{
+ box-shadow: 0 0 0 5px rgba(45, 46, 118, 0.2);
+ }
+ .habit_System_Designer_text{
+ font-size: 1.8rem;
+ color: rgba(0, 0, 0, 0.7);
+ margin-right: 3rem;
+ font-weight: 600;
+ }
+ }
+ > .printElementListBorder{
+ &.single{
+ padding: 2rem 4rem;
+ width: 100%;
+ border-radius: 1.5rem;
+ border: .05rem solid #000;
+ }
+ > .printElementList{
+ width: 100%;
+ height: 10rem;
+ position: relative;
+ overflow-x: auto;
+
+ .itemList{
height: 100%;
object-fit: contain;
}
- > i{
+ .imgItem{
+ width: 8rem;
+ height: 8rem;
position: absolute;
- right: 1rem;
- top: 1rem;
- color: #fff;
- text-shadow: 0px 0px 2px black, 0px 0px 2px black, 0px 0px 2px black;
+ cursor: pointer;
+ border-radius: 1rem;
+ overflow: hidden;
+ > img{
+ width: 100%;
+ height: 100%;
+ object-fit: cover;
+ }
+ > i{
+ position: absolute;
+ right: 1rem;
+ top: 1rem;
+ color: #fff;
+ text-shadow: 0px 0px 2px black, 0px 0px 2px black, 0px 0px 2px black;
+ }
}
}
}
+
> .editPrintElementBox{
flex: 1;
overflow: hidden;
position: relative;
+ margin: 2rem 0;
+ width: 80%;
+ align-self: center;
> .mark_loading{
position: absolute;
}
diff --git a/src/component/Detail/historyDetail/index.vue b/src/component/Detail/historyDetail/index.vue
new file mode 100644
index 00000000..21650cee
--- /dev/null
+++ b/src/component/Detail/historyDetail/index.vue
@@ -0,0 +1,134 @@
+
+
+
+
+ {{ collectionName }}
+
+
+
+
+
+
+
+
+ ![]()
+
+
-
-
+
+
-
+
+
+
+
+
-
+
+
+
-
diff --git a/src/component/HomePage/NewCollectionReview.vue b/src/component/HomePage/NewCollectionReview.vue
index 2b717b6d..9f447ac9 100644
--- a/src/component/HomePage/NewCollectionReview.vue
+++ b/src/component/HomePage/NewCollectionReview.vue
@@ -136,7 +136,7 @@ export default defineComponent({
data(){
return{
imgOpen:true,
-
+ setSketchTime:null as any,
}
},
watch: {
@@ -153,12 +153,18 @@ export default defineComponent({
newArr.push(newVal?.[index]?.id?newVal?.[index]?.id:newVal?.[index]?.sketchBoardIdd)
});
if(JSON.stringify(newArr)!=JSON.stringify(oldArr)){
- this.setSketch()
+ clearTimeout(this.setSketchTime)
+ this.setSketchTime = setTimeout(()=>{
+ this.setSketch()
+ },500)
this.imgOpen = true
}
}else{
nextTick(()=>{
- this.setSketch()
+ clearTimeout(this.setSketchTime)
+ this.setSketchTime = setTimeout(()=>{
+ this.setSketch()
+ },500)
this.imgOpen = true
})
}
@@ -201,6 +207,7 @@ export default defineComponent({
let sketchH = [0,0,0]
nextTick().then(async ()=>{
if(this.sketchList && this.sketchList!=null){
+ console.log(JSON.parse(JSON.stringify(this.sketch)),JSON.parse(JSON.stringify(this.sketchList)))
for (let i = 0; i < this.sketchList?.length; i++) {
let sketch1:any = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item0')[0]?.getBoundingClientRect()
let sketch2:any = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item1')[0]?.getBoundingClientRect()
@@ -232,6 +239,7 @@ export default defineComponent({
}
})
}
+ console.log(JSON.parse(JSON.stringify(this.sketch)))
this.imgOpen = true
this.store.commit('setshowSketchList', this.sketch)
}
diff --git a/src/component/HomePage/collectionModal.vue b/src/component/HomePage/collectionModal.vue
index 1da86b34..e85da19b 100644
--- a/src/component/HomePage/collectionModal.vue
+++ b/src/component/HomePage/collectionModal.vue
@@ -468,6 +468,7 @@ export default defineComponent({
cursor: pointer;
display: flex;
height: 100%;
+ font-size: 1.8rem;
}
.fi::before{
padding: 5px;
diff --git a/src/component/HomePage/generalMenu.vue b/src/component/HomePage/generalMenu.vue
index 61c26a43..eda6986f 100644
--- a/src/component/HomePage/generalMenu.vue
+++ b/src/component/HomePage/generalMenu.vue
@@ -213,7 +213,6 @@ import { message, Upload, Modal } from "ant-design-vue";
onMounted(() => {
instance.appContext.config.globalProperties.$dropdownEvents.onClose(removePrintModel)
window.addEventListener('scroll', handleScroll, true)
- console.log(instance,)
})
onUnmounted(() => {
diff --git a/src/component/HomePage/productImg.vue b/src/component/HomePage/productImg.vue
deleted file mode 100644
index 232b43b3..00000000
--- a/src/component/HomePage/productImg.vue
+++ /dev/null
@@ -1,1145 +0,0 @@
-
-
- +
+
@@ -32,10 +32,6 @@ export default defineComponent({
},
emits:['canvasReload','addSketch','deleteItem'],
props:{
- isEditPattern:{
- type:Boolean,
- default:false,
- },
},
setup(props,{emit}) {
const store = useStore();
@@ -49,6 +45,7 @@ export default defineComponent({
singleOveral:inject('singleOveral') as any,
getCanvasIfEdit:inject('getCanvasIfEdit')as any,
modelNav:null as any,
+ modelNavBox:null as any,
})
const collItemSize = reactive({
collValue:18,
@@ -241,12 +238,18 @@ export default defineComponent({
collItemSize.prentHeight = (collItemSize.padding + remValue) * elArr.length + 'px'
moveItem()
}
+ let observers = null as any
onMounted(()=>{
-
+ observers = new ResizeObserver(entries => {
+ for (let entry of entries) {
+ setItemPosition()
+ }
+ });
+ observers.observe(detailData.modelNavBox);
+ })
+ onBeforeUnmount(()=>{
+ observers.disconnect();
})
- // onBeforeUnmount(()=>{
- // detailData.selectIndex = -1
- // })
return{
...toRefs(detailData),
...toRefs(collItemSize),
@@ -281,12 +284,7 @@ export default defineComponent({
position: absolute;
background: #fff;
transition: top .3s;
- &:hover{
- > i{
- display: block;
- }
- }
- > i{
+ > i:not(.fi-bs-plus){
display: none;
position: absolute;
right: 1rem;
@@ -294,6 +292,11 @@ export default defineComponent({
cursor: pointer;
font-size: 2rem;
}
+ &:hover{
+ > i{
+ display: block;
+ }
+ }
&:last-child{
margin-bottom: 0;
}
@@ -305,12 +308,25 @@ export default defineComponent({
height: 100%;
object-fit: contain;
}
- &.add{
- font-size: 8rem;
+ }
+ .add{
+ width: 12rem;
+ height: 12rem;
+ text-align: center;
+ line-height: 12rem;
+ padding: 1rem;
+ border-radius: 2rem;
+ border: 2px solid #B4B4B4;
+ font-size: 8rem;
+ border-radius: 2rem;
+ border: 2px solid #B4B4B4;
+ cursor: pointer;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ i{
+ font-size: 4rem;
display: flex;
- align-items: center;
- position: absolute;
- justify-content: center;
}
}
}
diff --git a/src/component/Detail/model/modelPosition.vue b/src/component/Detail/model/modelPosition.vue
index 8242a2cb..fa016168 100644
--- a/src/component/Detail/model/modelPosition.vue
+++ b/src/component/Detail/model/modelPosition.vue
@@ -25,13 +25,15 @@
+
- ![]()
+ ![]()
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/component/HomePage/scaleImage.vue b/src/component/HomePage/scaleImage.vue
index e001e990..1436ef71 100644
--- a/src/component/HomePage/scaleImage.vue
+++ b/src/component/HomePage/scaleImage.vue
@@ -296,6 +296,8 @@ export default defineComponent({
elementId:scaleImageList.value[scaleImageIndex.value].elementId,
elementType:scaleImageList.value[scaleImageIndex.value].elementType,
}
+ obj.elementType = obj.elementType == 'Relight'?'ToProductImage':obj.elementType
+
// let imageStrength = productimg.productimgSimilarity == 100? 95 :productimg.productimgSimilarity
let imageStrength = 70 / 100 * productimg.productimgSimilarity
let data:any ={
diff --git a/src/component/LibraryPage/brandDetail.vue b/src/component/LibraryPage/brandDetail.vue
index 54486269..47c97c2e 100644
--- a/src/component/LibraryPage/brandDetail.vue
+++ b/src/component/LibraryPage/brandDetail.vue
@@ -88,12 +88,12 @@
-
-
-
-
-
-
-
-
-
-
- {{$t('ProductImg.Finalize')}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{$t('ProductImg.Similarity')}}
-
-
-
-
-
-
-
- {{$t('ProductImg.RelightDirection')}}
-
-
-
-
-
- {{$t('ProductImg.Highlight')}}
-
-
-
-
-
-
- {{$t('ProductImg.SelectCollection')}}
-
-
-
-
- ![]()
-
-
-
-
-
-
- ![]()
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ $t('Generate.Generate') }}
-
-
-
-
-
-
-
-
- {{$t('ProductImg.GenerateProduct')}}
-
-
-
-
-
- 
-
-
-
- ![]()
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{$t('ProductImg.SelectedProduct')}}
-
-
-
-
-
- ![]()
-
-
-
-
-
-
-
-
-
-
-
-
- {{$t('brandDNA.Delete')}}
- 
@@ -175,6 +175,7 @@ export default defineComponent({
isNoData:false,//如果数据为空就不加载
isNull:true,
finishTime:'',
+ uploadCount:0,//上传的图片数量
})
const dataDom = reactive({
Cropper:null as any,
@@ -183,6 +184,7 @@ export default defineComponent({
loadingDom:null as any,
})
const customRequest = (event:any)=>{
+ data.uploadCount++;
let new_data = {
file:event.file,
brandId:data.detail.id,
@@ -190,14 +192,19 @@ export default defineComponent({
data.isShowMark = true
Https.axiosPost(Https.httpUrls.brandDNAUpload, new_data,{headers:{'Content-Type': 'multipart/form-data'}}).then(
(rv: any) => {
- // getLibraryList()
- rv.canvasUrl = rv.minIOPath
- dataDom.fall.push([rv]);
- data.isNull = false
+ data.uploadCount --;
+ dataDom.fall.clearData()
+ if(data.uploadCount) return;
data.isShowMark = false
+ data.isNoData = false
+ data.currentPage = 1
+ getLibraryList()
+ // rv.canvasUrl = rv.minIOPath
+ // dataDom.fall.push([rv]);
}
).catch((res)=>{
// getLibraryList()
+ data.uploadCount --;
data.isShowMark = false
});
}
@@ -304,6 +311,7 @@ export default defineComponent({
uploadBrand()
}
const getBranDetailData = (value:any)=>{
+ console.log(value)
data.detail = value
data.brandName = value.brandName;
data.brandSlogan = value.brandSlogan;
@@ -330,7 +338,15 @@ export default defineComponent({
}
const back = ()=>{
clearInterval(data.getProgressTime)
- emit("handleBack")
+ console.log(data)
+ let value = {
+ brandName:data.brandName,
+ brandSlogan:data.brandSlogan,
+ logoUrl:data.logoUrl,
+ minioUrl:data.minioUrl,
+ id:data.detail.id,
+ }
+ emit("handleBack",value)
}
const uploadBrand = ()=>{
let value = {
@@ -412,9 +428,7 @@ export default defineComponent({
}
const confirmDeletePic = (value:any,index:any,nData:any)=>{
data.currentPage = 0
- data.isNoData = false
- data.isNull = false
- data.isShowMark = false
+
let libraryIds = value ? [value.id] : data.selectImgList
let newData = {
libraryIds:libraryIds,
@@ -426,6 +440,9 @@ export default defineComponent({
(rv: any) => {
dataDom.fall.clearData()
data.selectImgList = []
+ data.isNoData = false
+ data.isShowMark = false
+ // data.upLoadList++
// getLibraryList()
}
).catch((res)=>{
diff --git a/src/component/LibraryPage/createBrand.vue b/src/component/LibraryPage/createBrand.vue
index fa81fdc1..fdd7ad58 100644
--- a/src/component/LibraryPage/createBrand.vue
+++ b/src/component/LibraryPage/createBrand.vue
@@ -126,6 +126,10 @@ export default defineComponent({
})
const cancelDsign = ()=>{
data.showLoadsBrandDNA = false;
+ data.brandName = ''
+ data.brandSlogan = ''
+ data.generateText = ''
+ data.uploadList = []
}
const upFileUploadChange = (value:any)=>{
let file = value.file;
diff --git a/src/component/LibraryPage/searchLabel.vue b/src/component/LibraryPage/searchLabel.vue
index f5a13542..2f4d54cc 100644
--- a/src/component/LibraryPage/searchLabel.vue
+++ b/src/component/LibraryPage/searchLabel.vue
@@ -14,27 +14,29 @@
-
-
-
+
+
+
+
+
-
+
@@ -175,6 +175,7 @@ export default defineComponent({
isNoData:false,//如果数据为空就不加载
isNull:true,
finishTime:'',
+ uploadCount:0,//上传的图片数量
})
const dataDom = reactive({
Cropper:null as any,
@@ -183,6 +184,7 @@ export default defineComponent({
loadingDom:null as any,
})
const customRequest = (event:any)=>{
+ data.uploadCount++;
let new_data = {
file:event.file,
brandId:data.detail.id,
@@ -190,14 +192,19 @@ export default defineComponent({
data.isShowMark = true
Https.axiosPost(Https.httpUrls.brandDNAUpload, new_data,{headers:{'Content-Type': 'multipart/form-data'}}).then(
(rv: any) => {
- // getLibraryList()
- rv.canvasUrl = rv.minIOPath
- dataDom.fall.push([rv]);
- data.isNull = false
+ data.uploadCount --;
+ dataDom.fall.clearData()
+ if(data.uploadCount) return;
data.isShowMark = false
+ data.isNoData = false
+ data.currentPage = 1
+ getLibraryList()
+ // rv.canvasUrl = rv.minIOPath
+ // dataDom.fall.push([rv]);
}
).catch((res)=>{
// getLibraryList()
+ data.uploadCount --;
data.isShowMark = false
});
}
@@ -304,6 +311,7 @@ export default defineComponent({
uploadBrand()
}
const getBranDetailData = (value:any)=>{
+ console.log(value)
data.detail = value
data.brandName = value.brandName;
data.brandSlogan = value.brandSlogan;
@@ -330,7 +338,15 @@ export default defineComponent({
}
const back = ()=>{
clearInterval(data.getProgressTime)
- emit("handleBack")
+ console.log(data)
+ let value = {
+ brandName:data.brandName,
+ brandSlogan:data.brandSlogan,
+ logoUrl:data.logoUrl,
+ minioUrl:data.minioUrl,
+ id:data.detail.id,
+ }
+ emit("handleBack",value)
}
const uploadBrand = ()=>{
let value = {
@@ -412,9 +428,7 @@ export default defineComponent({
}
const confirmDeletePic = (value:any,index:any,nData:any)=>{
data.currentPage = 0
- data.isNoData = false
- data.isNull = false
- data.isShowMark = false
+
let libraryIds = value ? [value.id] : data.selectImgList
let newData = {
libraryIds:libraryIds,
@@ -426,6 +440,9 @@ export default defineComponent({
(rv: any) => {
dataDom.fall.clearData()
data.selectImgList = []
+ data.isNoData = false
+ data.isShowMark = false
+ // data.upLoadList++
// getLibraryList()
}
).catch((res)=>{
diff --git a/src/component/LibraryPage/createBrand.vue b/src/component/LibraryPage/createBrand.vue
index fa81fdc1..fdd7ad58 100644
--- a/src/component/LibraryPage/createBrand.vue
+++ b/src/component/LibraryPage/createBrand.vue
@@ -126,6 +126,10 @@ export default defineComponent({
})
const cancelDsign = ()=>{
data.showLoadsBrandDNA = false;
+ data.brandName = ''
+ data.brandSlogan = ''
+ data.generateText = ''
+ data.uploadList = []
}
const upFileUploadChange = (value:any)=>{
let file = value.file;
diff --git a/src/component/LibraryPage/searchLabel.vue b/src/component/LibraryPage/searchLabel.vue
index f5a13542..2f4d54cc 100644
--- a/src/component/LibraryPage/searchLabel.vue
+++ b/src/component/LibraryPage/searchLabel.vue
@@ -14,27 +14,29 @@
{{$t('LibraryPage.Tag')}}
-
- {{$t('LibraryPage.Select')}}
-
-
- {{$t('LibraryPage.Tag')}}
+
+ {{$t('LibraryPage.Select')}}
+
+
+ {{$t('LibraryPage.Category')}}
@@ -44,6 +46,7 @@
ref="select"
v-model:value="sex"
:options="sexList"
+ :fieldNames="{ label: 'name', value: 'value' }"
@change="getPosition"
>
@@ -90,6 +93,12 @@ import { Modal,message,Upload,CascaderProps } from 'ant-design-vue';
import { ElCascader } from 'element-plus'
export default defineComponent({
+ props:{
+ isHistory:{
+ type:Boolean,
+ default:false
+ },
+ },
components:{
VueCropper,
ElCascader,
diff --git a/src/component/LibraryPage/setLabel.vue b/src/component/LibraryPage/setLabel.vue
index 7d0805c2..6b6826ba 100644
--- a/src/component/LibraryPage/setLabel.vue
+++ b/src/component/LibraryPage/setLabel.vue
@@ -12,7 +12,7 @@
-
+
-
+
+ Forgot your password
+
+ {{$t('newScaleImage.SecondaryCreation')}}
+ {{$t('newScaleImage.SecondaryCreation')}}
@@ -279,7 +279,7 @@ import fullScreenImg from '@/component/HomePage/fullScreenImg.vue'
export default defineComponent({
components:{fullScreenImg},
- emits:['deletePorfolio'],
+ emits:['deletePorfolio','uploadLikeAndLook'],
setup(props:any,{emit}) {
let {t} = useI18n()
//首先在setup中定义
@@ -332,6 +332,7 @@ export default defineComponent({
}
scaleImage.value = false
imgData.scaleImageIndex = 0
+ emit('uploadLikeAndLook',imgData.scaleImageData)
imgData.scaleImageData = {}
imgData.commentText = ''
imgData.scaleImageList = []
diff --git a/src/component/WorksPage/newScaleImageMobile.vue b/src/component/WorksPage/newScaleImageMobile.vue
index 7057d8d0..4fca1d46 100644
--- a/src/component/WorksPage/newScaleImageMobile.vue
+++ b/src/component/WorksPage/newScaleImageMobile.vue
@@ -251,7 +251,7 @@ import 'swiper/css';
import { Pagination } from 'swiper/modules';
export default defineComponent({
components:{fullScreenImg,Swiper,SwiperSlide},
- emits:['deletePorfolio','bbb'],
+ emits:['deletePorfolio','uploadLikeAndLook'],
setup(props:any,{emit}) {
let {t} = useI18n()
//首先在setup中定义
@@ -304,6 +304,7 @@ export default defineComponent({
}
scaleImage.value = false
imgData.scaleImageIndex = 0
+ emit('uploadLikeAndLook',imgData.scaleImageData)
imgData.scaleImageData = {}
imgData.commentText = ''
imgData.scaleImageList = []
diff --git a/src/component/common/SelectImages.vue b/src/component/common/SelectImages.vue
new file mode 100644
index 00000000..90258d7e
--- /dev/null
+++ b/src/component/common/SelectImages.vue
@@ -0,0 +1,773 @@
+
+
-
+
+
+
+
+
+
diff --git a/src/component/common/TableSearchBar.vue b/src/component/common/TableSearchBar.vue
new file mode 100644
index 00000000..8e17d8d6
--- /dev/null
+++ b/src/component/common/TableSearchBar.vue
@@ -0,0 +1,126 @@
+
+
+
+
+
+
+
diff --git a/src/component/home/design/collection.vue b/src/component/home/design/collection.vue
index bff86664..282fa7c1 100644
--- a/src/component/home/design/collection.vue
+++ b/src/component/home/design/collection.vue
@@ -285,6 +285,7 @@ export default defineComponent({
cursor: pointer;
display: flex;
height: 100%;
+ font-size: 1.8rem;
}
.fi::before{
padding: 5px;
diff --git a/src/component/home/design/collection/ColorboardUpload.vue b/src/component/home/design/collection/ColorboardUpload.vue
index 821157a6..0d7da54f 100644
--- a/src/component/home/design/collection/ColorboardUpload.vue
+++ b/src/component/home/design/collection/ColorboardUpload.vue
@@ -450,7 +450,7 @@ export default defineComponent({
//清除当前的颜色
clearCurrentColor(index){
- this.selectColor = {}
+ // this.selectColor = {}
// this.fileList = []
this.reviewColor={}
this.colorList[index] = {}
@@ -673,6 +673,7 @@ export default defineComponent({
openSetData(){
let colorList = this.store.state.UploadFilesModule.allBoardData.colorBoards
+ this.colorList = [{},{},{},{},{},{},{},{}]
let hex
colorList.forEach((ele, index) => {
this.colorList[index] = ele
@@ -681,10 +682,11 @@ export default defineComponent({
this.colorList[index].gradient = ele.gradient
this.colorList[index].name = ele.name
});
- if(this.colorList[0]?.gradient && this.colorList[0]?.gradient?.selectIndex>-1 && this.colorList[0]?.gradient?.gradientShow){
- this.selectColor = {rgba:this.colorList[0].gradient.gradientList[0].rgba,hex:hex} //顔色选择器默认颜色
+ this.selectIndex = colorList.length - 1
+ if(this.colorList[colorList.length - 1]?.gradient && this.colorList[colorList.length - 1]?.gradient?.selectIndex>-1 && this.colorList[colorList.length - 1]?.gradient?.gradientShow){
+ this.selectColor = {rgba:this.colorList[colorList.length - 1].gradient.gradientList[colorList.length - 1].rgba,hex:hex} //顔色选择器默认颜色
}else{
- this.selectColor = {rgba:this.colorList[0].rgba,hex:hex} //顔色选择器默认颜色
+ this.selectColor = {rgba:this.colorList[colorList.length - 1].rgba,hex:hex} //顔色选择器默认颜色
}
this.store.commit('setColorboardList',colorList)
},
diff --git a/src/component/home/design/collection/MoodboardUpload.vue b/src/component/home/design/collection/MoodboardUpload.vue
index 4fbaef2b..93d3ad27 100644
--- a/src/component/home/design/collection/MoodboardUpload.vue
+++ b/src/component/home/design/collection/MoodboardUpload.vue
@@ -355,11 +355,11 @@ export default defineComponent({
this.fileList.splice(moodboard,1)
this.store.commit("setMoodboardFile", this.fileList);
}
- if(this.store.state.UploadFilesModule.moodboard.length == 0){
+ // if(this.store.state.UploadFilesModule.moodboard.length == 0){
this.store.commit("clearMoodTemplateId");
this.layoutList = []
this.edieShow = false
- }
+ // }
},
openSetData() {
let arr = JSON.parse(
diff --git a/src/component/home/design/collection/PrintboardUpload.vue b/src/component/home/design/collection/PrintboardUpload.vue
index d1d37d96..56ab8e8d 100644
--- a/src/component/home/design/collection/PrintboardUpload.vue
+++ b/src/component/home/design/collection/PrintboardUpload.vue
@@ -27,20 +27,6 @@
{{ $t('PrintboardUpload.Generate') }}
+
+
+
+
+ {{ $t(navTypeList(t).library.label) }}
+ +
+
+
+
+
+
+
+
+
+
+ {{ category }}
+
+
+
+
+
+
+ 
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
+ 加载中...
+
+
+
+ {{ $t('Canvas.NoPicture') }}
+
-
@@ -218,7 +204,6 @@ export default defineComponent({
name:'Pattern',
value:'Pattern'
})
- let openMenu = ref(false)
let printCatecoryList:any = computed(()=>{
return store.state.UserHabit.printType
})
@@ -237,7 +222,6 @@ export default defineComponent({
useGenerate,
workspace,
scene,
- openMenu,
printCatecoryList,
printboardList,
}
@@ -618,23 +602,6 @@ export default defineComponent({
scaleImage.isLike = false
scaleImage.init(this.printboardList,index)
},
- setSceneList(data:any){
- if(this.scene.value === data.value) return
- this.scene = data
- let generate:any = this.$refs.Generate
- generate.sketchboardList = []
- generate.searchPictureName = ''
- this.openMenu = false
- },
- openPrintModel(){
- if(this.openMenu)return
- document.addEventListener('click',this.removePrintModel)
- this.openMenu = true
- },
- removePrintModel(){
- this.openMenu = false
- document.removeEventListener('click',this.removePrintModel)
- }
}
})
diff --git a/src/component/home/design/collection/SketchboardUpload.vue b/src/component/home/design/collection/SketchboardUpload.vue
index 96756f9d..1640a159 100644
--- a/src/component/home/design/collection/SketchboardUpload.vue
+++ b/src/component/home/design/collection/SketchboardUpload.vue
@@ -23,20 +23,6 @@
>
{{ $t('SketchboardUpload.Generate') }}
-
-
{{ scene.name }}
-
- -
-
- {{ item.name }} -
@@ -129,7 +115,6 @@
v-show="openClick == 3"
ref="Generate"
msg="Sketchboard"
- :scene="scene"
:gender="workspace.sex"
:sketchCatecoryList="sketchCatecoryList"
>
@@ -236,14 +221,6 @@ export default defineComponent({
designType:'',
})
- let openMenu = ref(false)
- let sketchStyleList:any = computed(()=>{
- return store.state.UserHabit.SketchGenerateType
- })
- let scene = ref({
- name: t('SketchboardUpload.GenerateSketch'),
- value:'generate'
- })
return {
fileList,
openClick,
@@ -256,9 +233,6 @@ export default defineComponent({
driver__,
isTest,
useGenerate,
- scene,
- openMenu,
- sketchStyleList,
};
},
data() {
@@ -572,23 +546,6 @@ export default defineComponent({
}
this.store.commit("setSketchboardFile", this.fileList);
},
- setSceneList(data:any){
- if(this.scene.value === data.value) return
- this.scene = data
- let generate:any = this.$refs.Generate
- generate.sketchboardList = []
- generate.searchPictureName = ''
- this.openMenu = false
- },
- openPrintModel(){
- if(this.openMenu)return
- document.addEventListener('click',this.removePrintModel)
- this.openMenu = true
- },
- removePrintModel(){
- this.openMenu = false
- document.removeEventListener('click',this.removePrintModel)
- }
},
});
diff --git a/src/component/home/design/collection/more.vue b/src/component/home/design/collection/more.vue
index 1c77c9ce..153b64e9 100644
--- a/src/component/home/design/collection/more.vue
+++ b/src/component/home/design/collection/more.vue
@@ -121,7 +121,7 @@ export default defineComponent({
props.list[props.index].imgUrl = rv.url
props.list[props.index].resData = {
id:rv.id,
- designType:props.item.resData.designType,
+ designType:props.item.resData.designType || props.item.designType,
}
}else{
rv.imgUrl = rv.url
@@ -130,7 +130,7 @@ export default defineComponent({
rv.resData = {
id:rv.id,
url:rv.url,
- designType:props.item.resData.designType,
+ designType:props.item.resData.designType || props.item.designType,
}
props.list.unshift(rv)
}
diff --git a/src/component/home/design/editDesignType/index.vue b/src/component/home/design/editDesignType/index.vue
index 51d34141..0a9deccd 100644
--- a/src/component/home/design/editDesignType/index.vue
+++ b/src/component/home/design/editDesignType/index.vue
@@ -37,10 +37,10 @@
+
{{$t('ProductImg.Similarity')}}
-
+
-
+
{{$t('ProductImg.RelightDirection')}}
-
+
+
{{$t('ProductImg.Highlight')}}
-
+
-
+
{{ $t('poseTransfer.hint') }}
@@ -263,7 +263,7 @@ setup(props:any,{emit}) {
title:'',
label:t('speedList.toproductFlus'),
relightLabel:t('speedList.relightEdit'),
- value:'flux',
+ value:'advanced',
},{
title:'',
label:t('speedList.toproductBasic'),
@@ -277,7 +277,7 @@ setup(props:any,{emit}) {
title:'',
label:t('speedList.toproductFlus'),
relightLabel:t('speedList.relightEdit'),
- value:'flux',
+ value:'advanced',
},
})
const openSpeed = ()=>{
@@ -338,7 +338,6 @@ setup(props:any,{emit}) {
projectId:productimg.selectObject.id,
productImage:getMinioUrl(productimg.scaleImageList[productimg.scaleImageIndex].sourceUrl),
modelName:speed.speedData.value,
-
parentId:productimg.selectGenerate.parentId || productimg.selectGenerate.userLikeSortId,
userLikeSortId:productimg.openType == 'add'?(productimg.selectGenerate.userLikeSortId || null):null,
isDefaultLike:true,//表示是否生成就like
@@ -352,7 +351,7 @@ setup(props:any,{emit}) {
direction:productimg.productimgRelightDirection,
prompt:productimg.productimgSearchName,
toProductImageVOList:[obj],
- modelName:speed.speedData.value,
+ modelName:'flux',
brightenValue:productimg.productimgBrightenValue,
projectId:productimg.selectObject.id,
imageStrength:(100 - imageStrength)/100,
@@ -367,6 +366,7 @@ setup(props:any,{emit}) {
// },10000)
let url = Https.httpUrls.relight
if(productimg.scaleImageList[productimg.scaleImageIndex]?.resultType == 'ToProductImage'){
+ data.modelName = speed.speedData.value
url = Https.httpUrls.toProduct
}else if(productimg.scaleImageList[productimg.scaleImageIndex]?.resultType == 'PoseTransfer'){
url = Https.httpUrls.poseTransform
@@ -426,7 +426,8 @@ setup(props:any,{emit}) {
...rv[0],
prompt:productimg.productimgSearchName,
parentId:productimg.selectGenerate?.parentId || productimg.selectGenerate.userLikeGroupId,
- modelName:speed.speedData.value,
+ // modelName:speed.speedData.value,
+ modelName:data.modelName,
poseId:productimg.selectPose,
userLikeSortId:productimg.selectGenerate.userLikeSortId || productimg.selectGenerate?.parentId,
sourceUrl:productimg.selectGenerate?.sourceUrl || productimg.selectGenerate?.productImage,
@@ -497,7 +498,7 @@ setup(props:any,{emit}) {
clearInterval(remPrductimgTime)
store.dispatch('getCredits')
}else if(rv[0].status == 'Fail'){
- message.info(t('ProductImg.jsContent3'))
+ message.info(rv[0]?.errorMessage || t('ProductImg.jsContent3'))
isEnd = true
productimg.generateCourse = null
}
@@ -670,47 +671,29 @@ setup(props:any,{emit}) {
return message.info(t('Generate.generateLoading'))
}
}
- if(productimg.isGenerate){
- if(productimg.productimgIsProductimg){
- clearInterval(prductimgTime)
- clearInterval(remPrductimgTime)
- productimg.productimgRemProductimg = false
- productimg.productimgIsProductimg = false
+ if(productimg.generateCourse){
+ if(productimg.isGenerate){
+ if(productimg.productimgIsProductimg){
+ clearInterval(prductimgTime)
+ clearInterval(remPrductimgTime)
+ productimg.productimgRemProductimg = false
+ productimg.productimgIsProductimg = false
+ }
+ productimg.generateCourse.oldData = {}
+ if(productimg.selectGenerate.resultType == "Design"){
+ productimg.generateCourse.oldData.resultType = productimg.selectGenerate.resultType
+ }
}
- productimg.generateCourse.oldData = {
- // id:productimg.selectGenerate.id,
-
+ let emitData = {
+ status:'add',
+ // status:productimg.openType,
+ addList:[{
+ ...productimg.generateCourse,
+ }]
}
- if(productimg.selectGenerate.resultType == "Design"){
- productimg.generateCourse.oldData.resultType = productimg.selectGenerate.resultType
- // productimg.generateCourse.parentId = productimg.selectGenerate.userLikeSortId
- // let index = productimg.likeDesignCollectionList.findIndex((item:any)=>(item.userLikeSortId == productimg.selectGenerate.userLikeSortId && item.resultType == "Design"))
- // if(!productimg.likeDesignCollectionList[index]?.childList)productimg.likeDesignCollectionList[index].childList = []
- // if(productimg.openType == 'add')productimg.likeDesignCollectionList[index]?.childList.push(productimg.generateCourse)
- }else{
- // productimg.generateCourse.parentId = productimg.selectGenerate.parentId
- // let index = productimg.likeDesignCollectionList.findIndex((item:any)=>(item.userLikeSortId == productimg.selectGenerate.parentId && item.resultType == "Design"))
- // if(!productimg.likeDesignCollectionList[index]?.childList){
- // productimg.likeDesignCollectionList[index].childList = []
- // }
- // if(productimg.openType == 'add'){
- // productimg.likeDesignCollectionList[index]?.childList.push(productimg.generateCourse)
- // }else{
- // let childIndex = productimg.likeDesignCollectionList[index].childList.findIndex((item:any)=>(item.id == productimg.selectGenerate.id))
- // productimg.likeDesignCollectionList[index].childList[childIndex] = productimg.generateCourse
- // }
- }
-
+ emit('upDataDesignLikeList',emitData,'noBatch')
+ productimg.generateCourse = null
}
- let emitData = {
- status:'add',
- // status:productimg.openType,
- addList:[{
- ...productimg.generateCourse,
- }]
- }
- emit('upDataDesignLikeList',emitData)
- productimg.generateCourse = null
productimg.openType = ''
scaleImage.value = false
clearInterval(prductimgTime)
diff --git a/src/component/home/design/index.vue b/src/component/home/design/index.vue
index d2cc27da..f4b073d0 100644
--- a/src/component/home/design/index.vue
+++ b/src/component/home/design/index.vue
@@ -38,7 +38,7 @@
-
-
+
@@ -76,6 +77,12 @@
+
{{ $t('Header.Tools') }}
@@ -670,9 +670,8 @@ export default defineComponent({
posiitonData.value.generateElList = posiitonData.value.generateElList.filter((item:any)=>item.userLikeSortId != value.designItemId)
posiitonData.value.generateElList.forEach((item:any)=>{
- if(item.sort > collItem.sort){
- item.sort-=1
- }
+ if(item.sort > collItem.sort) item.sort --
+ if(item.index > collItem.index) item.index --
})
moveItem('')
}
@@ -685,11 +684,8 @@ export default defineComponent({
if(str != 'like' && showDesignMark.value) return
}
let Id = design.userLikeSortId || design.id || design.designItemId
- console.log(design)
let arr = str == 'like'? posiitonData.value.likeElList:posiitonData.value.generateElList
- console.log(arr)
let item:any = arr.filter((item:any)=>item.userLikeSortId == Id)[0]
- console.log(item)
item.el.style.zIndex = 2;
item.el.style.transition = 'all 0s';
let startX = e.clientX,
@@ -905,7 +901,6 @@ export default defineComponent({
clearInterval(prductimgTime.PoseTransfer)
clearInterval(prductimgTime.Relight)
arr[index].sort = arr[index].oldSort || arr[index].sort
- console.log(JSON.parse(JSON.stringify(arr[index])))
dataDom.editDesignType.init(arr,index,null,status,listType)
if(item != 'Design'){
designData.selectDesign = designData.selectLikeDesign.filter((item:any)=>(item.resultType == 'Design' && item.userLikeSortId == designData.selectLikeDesign[index].parentId))[0]
@@ -918,7 +913,6 @@ export default defineComponent({
}
const addGenerateImg = async (data:any)=>{
if(!data.id)return
- console.log(data)
await nextTick().then(()=>{
designData.isUnfold = true
uploadLikeDom()
@@ -928,7 +922,6 @@ export default defineComponent({
const setNoDesignLike = (design:any,index:any,type:any,str:string) => {
let url
let designItem = design || designData.selectEditBtn
- console.log(designItem,designData?.selectDesign)
let data = {
toProductImageResultId:[(designItem.designItemId || designItem.id)],
projectId: store.state.Workspace.probjects.id,
@@ -1041,15 +1034,16 @@ export default defineComponent({
if(designData.isUnfold){
designData.selectLikeDesign.forEach((item:any,index:any) => {
if(element.taskId == item.taskId){
- designData.selectLikeDesign[index].url = element.url
- designData.selectLikeDesign[index].status = element.status
- designData.selectLikeDesign[index].elementType = element.elementType
- designData.selectLikeDesign[index].elementId = element.elementId
- designData.selectLikeDesign[index].id = element.id
+ designData.selectLikeDesign[index].status = element?.status
+ designData.selectLikeDesign[index].id = element?.id
if(element?.videoUrl){
designData.selectLikeDesign[index].firstFrameUrl = element.firstFrameUrl
designData.selectLikeDesign[index].videoUrl = element.videoUrl
designData.selectLikeDesign[index].gifUrl = element.gifUrl
+ }else{
+ designData.selectLikeDesign[index].url = element?.url
+ designData.selectLikeDesign[index].elementType = element?.elementType
+ designData.selectLikeDesign[index].elementId = element?.elementId
}
}
});
@@ -1058,15 +1052,16 @@ export default defineComponent({
if(likeItem?.childList?.length > 0){
likeItem.childList.forEach((childItem:any,index:any)=>{
if(childItem.taskId == element.taskId){
- likeItem.childList[index].url = element.url
- likeItem.childList[index].status = element.status
- likeItem.childList[index].elementType = element.elementType
- likeItem.childList[index].elementId = element.elementId
- likeItem.childList[index].id = element.id
+ childItem.status = element?.status
+ childItem.id = element?.id
if(element?.videoUrl){
- likeItem.childList[index].id.firstFrameUrl = element.firstFrameUrl
- likeItem.childList[index].id.videoUrl = element.videoUrl
- likeItem.childList[index].id.gifUrl = element.gifUrl
+ childItem.firstFrameUrl = element.firstFrameUrl
+ childItem.videoUrl = element.videoUrl
+ childItem.gifUrl = element.gifUrl
+ }else{
+ childItem.url = element?.url
+ childItem.elementId = element?.elementId
+ childItem.elementType = element?.elementType
}
}
})
@@ -1077,15 +1072,20 @@ export default defineComponent({
})
}
const upDataSort = (generateCourseItem:any,likeIndex:number)=>{
+ console.log(generateCourseItem.sort)
let list = likeDesignCollectionList.value
if(list[likeIndex].childList.length == 0)return
list[likeIndex].childList.forEach((likeItem:any,index:any)=>{
if(likeItem.sort >= generateCourseItem.sort){
likeItem.sort += 1
}
+ // if(generateCourseItem.sort >= likeItem.sort && str == 'batch'){
+ // likeItem.sort += 1
+ // console.log(likeItem.sort)
+ // }
})
}
- const generateLoad = async (data:any)=>{
+ const generateLoad = async (data:any,str:string)=>{
// return
let list = likeDesignCollectionList.value
//添加元素
@@ -1098,7 +1098,7 @@ export default defineComponent({
generateCourseItem.oldSort = generateCourseItem.sort
generateCourseItem.sort = list[index]?.childList.length + 1
if(data.status == 'add'){
- upDataSort(generateCourseItem,index)
+ if(str == 'noBatch')upDataSort(generateCourseItem,index,str)
list[index]?.childList.push(generateCourseItem)
}
}else{
@@ -1108,7 +1108,7 @@ export default defineComponent({
list[index].childList = []
}
if(data.status == 'add'){
- upDataSort(generateCourseItem,index)
+ if(str == 'noBatch')upDataSort(generateCourseItem,index,str)
list[index]?.childList.push(generateCourseItem)
}else{
upDataSuccess(generateCourseItem)
@@ -1171,8 +1171,6 @@ export default defineComponent({
toProductImage.push(childItem.taskId)
}
}else if(childItem.resultType == 'Relight'){
- console.log(JSON.parse(JSON.stringify(childItem)))
- console.log((!childItem.status || childItem.status != "Success"), (!childItem?.url))
if((!childItem.status || childItem.status != "Success") && (!childItem?.url)){
relight.push(childItem.taskId)
}
@@ -1220,30 +1218,24 @@ export default defineComponent({
prductimgTime[type] = setInterval(()=>{
if(!state)return
state = false
- Https.axiosPost(url, data).then(
- (rv) => {
- // if(type == 'PoseTransfer'){
- // rv = [rv]
- // }
+ Https.axiosPost(url, data).then((rv) => {
state = true
rv.forEach((element:any) => {
if(element?.status == 'Success'){
- // setFail([element.taskId])
upDataSuccess(element)
data = data.filter((item:any) => item !== element.taskId);
store.dispatch('getCredits')
}else if(element?.status == 'Fail' || element?.status == 'Invalid'){
data = data.filter((item:any) => item !== element.taskId);
setFail([element.taskId])
- message.info(t('Generate.everyTimeEffectPoor'));
+ message.info(element?.errorMessage || t('Generate.everyTimeEffectPoor'));
}
});
if(data.length == 0){
- store.state.store.dispatch('getCredits')
+ store.dispatch('getCredits')
clearInterval(prductimgTime[type])
}
- }
- ).catch(res=>{
+ }).catch(res=>{
clearInterval(prductimgTime[type])
setFail(data)
});
@@ -1275,7 +1267,6 @@ export default defineComponent({
item.oldSort = item.sort
if(item?.childList?.length > 0){
item.childList.forEach((childItem:any,childIndex:number)=>{
-
childItem.oldSort = childItem.sort
childItem.oldSort = childItem.sort
childItem.sort = childItem.sort + childLength + index
@@ -1817,6 +1808,16 @@ export default defineComponent({
getSkecthBoard(boardData: any) {
boardData = boardData || []
+ const mapB = new Map();
+ boardData.forEach(item => {
+ if (item.categoryValue !== undefined) {
+ mapB.set(item.categoryValue, true);
+ }
+ });
+
+ boardData.filter(item =>
+ item.categoryValue !== undefined && mapB.has(item.categoryValue)
+ );
let sketchBoards = boardData.map((v: any) => {
let data = {
designType: v.resData.designType,
@@ -2174,6 +2175,7 @@ export default defineComponent({
// padding-right:5rem;
overflow: initial !important;
position: relative;
+ padding: .5rem 0;
.page_content {
position: relative;
diff --git a/src/component/home/design/mannequin/index.vue b/src/component/home/design/mannequin/index.vue
index c4380c01..726e8676 100644
--- a/src/component/home/design/mannequin/index.vue
+++ b/src/component/home/design/mannequin/index.vue
@@ -151,18 +151,24 @@ export default defineComponent({
index = listIndex
}
})
+ let num = data.selectObject.model.filter((item:any)=>item.level3Type == data.selectObject.sex).length
if(index != -1){
+ if(num <= 1 && data.selectObject.model[index].level3Type == data.selectObject.sex){
+ message.info(t('LibraryPage.jsContent14'))//最多选择四个
+ return
+ }
if(list.length > 1){
list.splice(index,1)
}else{
message.info(t('LibraryPage.jsContent13'))//至少选择一个
}
}else if(index == -1){
- if(list.length <= 3){
+ if(num <= 3){
let model = {
id:item.id,
url:item.presignedUrl || item.url,
type:item.type?item.type:data.systemUser?'System':'Library',
+ level3Type:data.selectObject.sex,
}
list.push(model)
}else{
@@ -170,7 +176,13 @@ export default defineComponent({
}
}
}
+
const deleteSelectModel = (index:number)=>{
+ let num = data.selectObject.model.filter((item:any)=>item.level3Type == data.selectObject.sex).length
+ if(num <= 1 && data.selectObject.model[index].level3Type == data.selectObject.sex){
+ message.info(t('LibraryPage.jsContent14'))//最多选择四个
+ return
+ }
let list = store.state.Workspace.probjects.model
if(list.length > 1){
list.splice(index,1)
diff --git a/src/component/home/design/tools.vue b/src/component/home/design/tools.vue
index 331926b1..8bc116ed 100644
--- a/src/component/home/design/tools.vue
+++ b/src/component/home/design/tools.vue
@@ -54,6 +54,7 @@
@@ -435,9 +435,9 @@
@@ -720,10 +720,10 @@ export default defineComponent({
let printModelList:any = ref([])
let speed = reactive({
speedList:[
- {
+ {
title:'',
label:t('speedList.generateWx'),
- value:'wx',
+ value:'advanced',
},{
title:'',
label:t('speedList.toproductFlus'),
@@ -731,26 +731,21 @@ export default defineComponent({
},{
title:'',
label:t('speedList.generateNormal'),
- value:'fast',
-
- },{
- title:'',
- label:t('speedList.generateFlux'),
- value:'flux',
+ value:'normal',
},
],
extractList:[
{
title:'',
- label:t('speedList.generateFlux'),
- value:'flux',
+ label:t('speedList.generateWx'),
+ value:'advanced',
},
],
speedState:false,
speedData:{
title:'',
label:t('speedList.generateWx'),
- value:'wx',
+ value:'advanced',
},
})
const openSpeed = ()=>{
@@ -892,6 +887,19 @@ export default defineComponent({
).catch(res=>{
});
}
+ const handleBack = (value)=>{
+ console.log(value,pageData.brandDNAList)
+ pageData.brandDNAList.forEach((item:any)=>{
+ if(item.id == value.id){
+ item.brandName = value.brandName
+ item.brandSlogan = value.brandSlogan
+ item.minioUrl = value.logoUrl
+ item.brandLogo = value.minioUrl
+ }
+ })
+ pageData.isBrandDetail = false
+
+ }
return {
...toRefs(dataDom),
...toRefs(pageData),
@@ -955,6 +963,7 @@ export default defineComponent({
addBrand,
editImg,
saveBase64Img,
+ handleBack,
}
},
data(this_) {
@@ -987,17 +996,22 @@ export default defineComponent({
this.isSloganHint = ''
}
if(newVal.value == 'extract'){
- this.speedData = this.extractList[0]
+ this.speedData = {
+ ...this.extractList[0]
+ }
}else if(newVal.value == 'Logo' || newVal.value == 'Slogan'){
this.speedData = {
value:'',
label:''
}
}else{
- if(newVal.value == "Pattern" || this.selectCode == 'Sketchboard'){
- this.speedData = this.speedList[1]
- }else{
- this.speedData = this.speedList[0]
+ // if(newVal.value == "Pattern" || this.selectCode == 'Sketchboard'){
+ // this.speedData = this.speedList[1]
+ // }else{
+ // this.speedData = this.speedList[0]
+ // }
+ this.speedData = {
+ ...this.speedList[0]
}
}
this.speedState = false
@@ -1771,6 +1785,7 @@ export default defineComponent({
this.isGenerate[selectCodeStr] = false
clearInterval(this.remGenerateTime[selectCodeStr])
this.remGenerate[selectCodeStr] = false
+ this.generateList[selectCodeStr] = this.generateList[selectCodeStr].filter((item: any) => item.status !== '')
if(res.errCode === 2){
let this_ = this
Modal.confirm({
@@ -1839,6 +1854,7 @@ export default defineComponent({
}
}
).catch(res=>{
+ this.generateList[selectCodeStr] = this.generateList[selectCodeStr].filter((item: any) => item.status !== '')
clearInterval(this.generateTime[str])
clearInterval(this.remGenerateTime[str])
// this.isShowMark = false
diff --git a/src/views/Login.vue b/src/views/Login.vue
index 061e5b4c..2efedabb 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -171,7 +171,6 @@ export default defineComponent({
}
onMounted(()=>{
const data = route.query;
- console.log(data)
if (data?.state == "weiXin") {
wechatLogin(data);
}