diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue
index 40bd7ee3..685b1d21 100644
--- a/src/component/Detail/DesignDetail.vue
+++ b/src/component/Detail/DesignDetail.vue
@@ -33,7 +33,7 @@
-
@@ -172,7 +172,7 @@ export default defineComponent({
// return store.state.DesignDetailModule.designItemDetail
// })
let designItemDetail :any = computed(()=>{
- console.log(123);
+ console.log(store.state.DesignDetailModule.designItemDetail,'-=-=--==--==-');
return store.state.DesignDetailModule.designItemDetail
})
@@ -211,6 +211,8 @@ export default defineComponent({
let setClothes:any = ref()
//点击删除按钮
let deleteShow:any = ref(false)
+ let designItemDetailNum:any = ref(0)
+
return{
designItemDetail,
store,
@@ -233,6 +235,7 @@ export default defineComponent({
t,
setClothes,
deleteShow,
+ designItemDetailNum,
}
},
data(){
@@ -248,7 +251,6 @@ export default defineComponent({
watch:{
designItemDetail:{
handler: async function(newVal,oldVal) {
- console.log(1123);
let designItemDetail = JSON.parse(JSON.stringify(this.store.state.DesignDetailModule.designItemDetail))
this.ifSubmit = designItemDetail.ifSubmit?designItemDetail.ifSubmit:false
this.current = JSON?.parse(JSON?.stringify(designItemDetail?.clothes?.[this?.currentIndex]))
@@ -257,12 +259,23 @@ export default defineComponent({
}else{
this.body = true
}
+ let num = 0
+ newVal.clothes.forEach((item:any) => {
+ if(item.id){
+ num++
+ }
+ });
+ this.designItemDetailNum = num
await this.setImgSize()
- this.designItemDetailUrl = designItemDetail.currentFullBodyView?designItemDetail.currentFullBodyView:designItemDetail.designItemUrl
- }
- },
- currentIndex:{
- handler: function(newval) {
+ let url = ''
+ if(designItemDetail.currentFullBodyView){
+ url = designItemDetail.currentFullBodyView
+ }else{
+ url = designItemDetail.designItemUrl
+ }
+ this.designItemDetailUrl = url
+ // console.log(designItemDetail.currentFullBodyView,designItemDetail.designItemUrl);
+
}
},
designDetailShow:{
@@ -346,7 +359,8 @@ export default defineComponent({
this.moible = isMoible()
this.designItemId = data.design.designItemId
this.designOutfitId = data.design.designOutfitId
- let url = Https.httpUrls.getDesignDetail + `?designItemId=${data.design.designItemId}&designPythonOutfitId=${data.design.designOutfitId}`
+ // let url = Https.httpUrls.getDesignDetail + `?designItemId=${data.design.designItemId}&designPythonOutfitId=${data.design.designOutfitId}`
+ let url = Https.httpUrls.getDesignDetail + `?designItemId=45192&designPythonOutfitId=44898`
this.parentData = data
this.loadingShow = true
Https.axiosGet(url).then(
@@ -362,6 +376,7 @@ export default defineComponent({
item.printObject.prints = [{}]
}
})
+ this.currentIndex = 0
this.store.commit('setDesignItemDetail',rv)
this.removeRevocation()
this.setRevocation(rv,'')
@@ -418,7 +433,6 @@ export default defineComponent({
let frontIndex = 6
let backIndex = 3
designItemDetail.clothes.forEach((v:any,index:any)=>{
-
for (let i = v.layersObject.length-1; i >= 0; i--) {
v.layersObject[i].style = {
top:v.layersObject[i].position?.[0]*ratio+'px',
@@ -434,10 +448,10 @@ export default defineComponent({
v.layersObject[i].designOpenrtionBtn = false
if(v.layersObject[i].imageCategory.indexOf("back") == -1){
front[index] = v.layersObject[i]
- front[index].style.zIndex = frontIndex-=1
+ front[index].style.zIndex = v.priority
}else{
back[index] = v.layersObject[i]
- back[index].style.zIndex = backIndex-=1
+ back[index].style.zIndex = v.priority
// back[index].style.zIndex = backIndex==0?v.layersObject[i]:backIndex++
}
}
@@ -537,11 +551,14 @@ export default defineComponent({
sessionStorage.setItem('oppositeRevocation', JSON.stringify(oppositeRevocation));
sessionStorage.setItem('revocation', JSON.stringify(revocation));
},
- setSubmitItem(str:any){
+ setSubmitItem(str:any,sub:any){
+ //sub判断是不是点击新增图层又直接点击删除
let designItemDetail = JSON.parse(JSON.stringify(this.store.state.DesignDetailModule.designItemDetail))
let clothes:any = []
-
- designItemDetail.clothes.forEach((item:any) => {
+ let num = -1
+ // let zIndex = 10
+ designItemDetail.clothes.forEach((item:any,index:number) => {
+
let clothesItem = {
color: `${item.color.r} ${item.color.g} ${item.color.b}`,
id:item.id,
@@ -553,11 +570,20 @@ export default defineComponent({
// path:item.printObject.path?item.printObject.path :'',
prints:item?.printObject?.prints[0]?.minIOPath?item?.printObject?.prints:[]
},
+ priority:item.priority,
type:item.type,
}
- clothes.push(clothesItem)
-
+ if(!item.id && sub){
+ num = index
+ }else{
+ clothes.push(clothesItem)
+ }
});
+ if(num != -1){
+ designItemDetail.clothes.splice(num,1)
+ this.store.commit("setDesignItemDetail", designItemDetail);
+ }
+ this.currentIndex = 0
let data = {
designItemId:designItemDetail.designItemId,
// designItemId:designItemDetail.designItemId,
@@ -573,17 +599,17 @@ export default defineComponent({
data.isPreview = false
delete data.ifSubmit
}
- this.store.commit('setDesignPreviewData',data)
+ // this.store.commit('setDesignPreviewData',data)
return data
},
async setSubmit(str:any){
let setDesignItem:any = isMoible() ? this.$refs.setDesignItemMobile : this.$refs.setDesignItem
- let data = this.setSubmitItem(str)
+ let data = this.setSubmitItem(str,true)
this.loadingShow = true
await setDesignItem.setPreview(data)
},
async submit(){
- let data = this.setSubmitItem('')
+ let data = this.setSubmitItem('',true)
this.loadingShow = true
Https.axiosPost(Https.httpUrls.designSingle, data).then(
(rv: any) => {
@@ -625,6 +651,9 @@ export default defineComponent({
// nextTick().then(()=>{
// })
console.log(modal_body);
+ if(modal_body == undefined){
+ this.setPostition(url)
+ }
function loadImage(url:any) {
return new Promise((resolve, reject) => {
const img = new Image();
@@ -695,12 +724,13 @@ export default defineComponent({
DesignDetailAlter.changePlace()
}else{
this.deleteShow = false
- let data = this.setSubmitItem('preview')
+ this.loadingShow = true
+ let data = this.setSubmitItem('preview',true)
Https.axiosPost(Https.httpUrls.designSingle, data).then(
(rv) => {
let designItemDetail = JSON.parse(JSON.stringify(this.designItemDetail))
+ designItemDetail.ifSubmit = true
this.loadingShow = false
- console.log(rv);
this.store.commit("setDesignItemDetail", designItemDetail);
this.store.commit("setDesignPreviewData", data);
this.setRevocation(designItemDetail,data)
@@ -757,6 +787,7 @@ export default defineComponent({
// this.designOrder = true
// let DesignDetailAlter:any = this.$refs.DesignDetailAlter
// DesignDetailAlter.changePlace()
+ this.designOrder = true
if(this.designItemDetail.clothes[this.designItemDetail.clothes.length-1].id){
this.designItemDetail.clothes.push(aa)
this.clothesDetail(aa,this.designItemDetail.clothes.length-1)
@@ -772,15 +803,21 @@ export default defineComponent({
clothesDetail(clothes:any, index:number){
let designItemDetail = JSON.parse(JSON.stringify(this.store.state.DesignDetailModule.designItemDetail))
- this.currentIndex = index?index:0
this.designOrder = true
- this.current = designItemDetail.clothes[this.currentIndex]
- let data:any = this.setSubmitItem('preview')
+ this.current = designItemDetail.clothes[index]
+ if(this.current.id && !designItemDetail.clothes[designItemDetail.clothes.length-1].id){
+ designItemDetail.clothes.splice(designItemDetail.clothes.length-1,1)
+ this.store.commit('setDesignItemDetail',designItemDetail)
+ }
+ let data:any = this.setSubmitItem('preview',false)
+ this.currentIndex = index?index:0
+
data.designSingleItemDTOList[this.currentIndex] = {
color:`${this.current.color.r} ${this.current.color.g} ${this.current.color.b}`,
id:this.current.id?this.current.id:'',
path:this.current.minIOPath?this.current.minIOPath:'',
offset:this.current.layersObject?.[1]?.offset?this.current.layersObject[1].offset:[0,0],
+ priority:this.current.priority,
scale:this.current.layersObject?.[1]?.scale?this.current.layersObject[1].scale:1,
printObject:{
ifSingle:this.current?.printObject?.ifSingle == null ? false : this.current?.printObject?.ifSingle,
@@ -945,6 +982,7 @@ export default defineComponent({
height: 4rem;
cursor: pointer;
text-align: center;
+ margin-left: .3rem;
img{
// width: 100%;
height: 100%;
@@ -960,11 +998,11 @@ export default defineComponent({
}
}
>div:nth-child(1){
- margin-right: 1rem;
+ margin-left: 0rem;
}
}
.detail_modal_item_front:last-child{
- z-index: 1 !important;
+ // z-index: 1 !important;
}
>img{
width: 100%;
diff --git a/src/component/Detail/DesignDetailAlter.vue b/src/component/Detail/DesignDetailAlter.vue
index c6cef618..f3c01472 100644
--- a/src/component/Detail/DesignDetailAlter.vue
+++ b/src/component/Detail/DesignDetailAlter.vue
@@ -535,31 +535,40 @@ export default defineComponent({
},
upFileUploadChange(data) {
let file = data.file;
+ let bor = true
+
if (file.status === "done") {
let res = JSON.parse(file.xhr.response);
- file.id = res.data.id;
- file.url = res.data.url;
- file.resData = res.data;
- file.designType = res.data.designType
- file.category = this.current;
- file.minIOPath = file.resData.minIOPath
- let fileList = this.uploadList.filter(
- (v) => v.status === "done"
- );
- if (this.uploadList.length >= 8) {
- message.info(this.t('DesignDetailAlter.jsContent2'));
- } else {
- // this.store.commit("setSketchboardFile", fileList);
- this.uploadList = fileList
- // this.store.commit("clearMoodTemplateId");
- if(this.selectCode == 'Sketchboard'){
- this.apparelList = this.uploadList
- }else{
- this.printList = this.uploadList
+ if(res.errCode == 0){
+ file.id = res.data.id;
+ file.url = res.data.url;
+ file.resData = res.data;
+ file.designType = res.data.designType
+ file.category = this.current;
+ file.minIOPath = file.resData.minIOPath
+ let fileList = this.uploadList.filter(
+ (v) => v.status === "done"
+ );
+ if (this.uploadList.length >= 8) {
+ message.info(this.t('DesignDetailAlter.jsContent2'));
+ } else {
+ // this.store.commit("setSketchboardFile", fileList);
+ this.uploadList = fileList
+ // this.store.commit("clearMoodTemplateId");
+ if(this.selectCode == 'Sketchboard'){
+ this.apparelList = this.uploadList
+ }else{
+ this.printList = this.uploadList
+ }
}
- }
+ }else{
+ bor = false
+ }
} else if (file.status === "error") {
- let index = -1;
+ bor = false
+ }
+ if(!bor){
+ let index = -1;
this.uploadList.forEach((ele, index1) => {
if (file.uid === ele.uid) {
index = index1;
@@ -568,8 +577,9 @@ export default defineComponent({
if (index > -1) {
this.uploadList.splice(index, 1);
}
- message.warning(file.name + this.t('DesignDetailAlter.jsContent3'));
- }
+ // message.warning(file.name + this.t('DesignDetailAlter.jsContent3'));
+ message.warning(res.errMsg);
+ }
},
diff --git a/src/component/Detail/DesignDetailEnd.vue b/src/component/Detail/DesignDetailEnd.vue
index 8fe55f42..bf511c53 100644
--- a/src/component/Detail/DesignDetailEnd.vue
+++ b/src/component/Detail/DesignDetailEnd.vue
@@ -236,16 +236,23 @@ export default defineComponent({
let designItemDetail = JSON.parse(JSON.stringify(this.store.state.DesignDetailModule.designItemDetail))
let index
let data = JSON.parse(JSON.stringify(this.store.state.DesignDetailModule.designPreviewData))
- let bor = false
+ // let bor = false
+ let zIndex = 10
designItemDetail.clothes.forEach((v,ind)=>{
if(v.id == this.current.id){
index = ind
- bor = true
+ // bor = true
+ }
+ if(v.priority){
+ if(zIndex < v.priority){
+ zIndex = v.priority
+ }
}
})
- console.log(this.current);
-
- if(this.type_ == 1 && bor){
+ if(!this.current.id){
+ data.designSingleItemDTOList[index].priority = zIndex+=1
+ }
+ if(this.type_ == 1){
if(data.designSingleItemDTOList[index].path != this.sketchImg.minIOPath && this.sketchImg.id_){
data.designSingleItemDTOList[index].offset = [0,0]
data.designSingleItemDTOList[index].scale = 1
@@ -253,50 +260,53 @@ export default defineComponent({
data.designSingleItemDTOList[index].id = this.sketchImg.id_? this.sketchImg.id_:this.current.id_
data.designSingleItemDTOList[index].path =this.sketchImg.minIOPath? this.sketchImg.minIOPath: this.current.minIOPath
data.designSingleItemDTOList[index].type =this.sketchImg.type? this.sketchImg.type: this.current.type
- }else if(this.type_ == 2 && bor){
+ }else if(this.type_ == 2){
data.designSingleItemDTOList[index].printObject.ifSingle = false
data.designSingleItemDTOList[index].printObject.prints = []
- }else if(this.type_ == 3 && bor){
+ }else if(this.type_ == 3){
let color = `${this.$parent.selectColor.rgba.r} ${this.$parent.selectColor.rgba.g} ${this.$parent.selectColor.rgba.b}`
data.designSingleItemDTOList[index].color = color
}
- if(!bor){
- index = designItemDetail.clothes.length
- let color = `${this.$parent.selectColor.rgba.r} ${this.$parent.selectColor.rgba.g} ${this.$parent.selectColor.rgba.b}`
- let obj = {
- "color": color,
- "id": this.sketchImg.id_? this.sketchImg.id_:this.current.id_,
- "path": this.sketchImg.minIOPath? this.sketchImg.minIOPath: this.current.minIOPath,
- "offset": [
- 0,
- 0
- ],
- "scale": 1,
- "printObject": {
- "ifSingle": false,
- "prints": [
- ]
- },
- "type": this.sketchImg.type
- }
- return
- // data.designSingleItemDTOList.push(obj)
- // designItemDetail.clothes.push(obj)
- }
+ // if(!bor){
+ // index = designItemDetail.clothes.length
+ // let color = `${this.$parent.selectColor.rgba.r} ${this.$parent.selectColor.rgba.g} ${this.$parent.selectColor.rgba.b}`
+ // let obj = {
+ // "color": color,
+ // "id": this.sketchImg.id_? this.sketchImg.id_:this.current.id_,
+ // "path": this.sketchImg.minIOPath? this.sketchImg.minIOPath: this.current.minIOPath,
+ // "offset": [
+ // 0,
+ // 0
+ // ],
+ // "scale": 1,
+ // "printObject": {
+ // "ifSingle": false,
+ // "prints": [
+ // ]
+ // },
+ // priority:zIndex,
+ // "type": this.sketchImg.type
+ // }
+ // // data.designSingleItemDTOList.push(obj)
+ // // designItemDetail.clothes.push(obj)
+ // }
// return
data.timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone
this.loadingShow = true
Https.axiosPost(Https.httpUrls.designSingle, data).then(
(rv) => {
rv.clothes.forEach((item)=>{
- console.log(item.id , designItemDetail.clothes[index].id);
if(item.id == this.sketchImg.id_){
+ console.log(item, designItemDetail.clothes[index]);
console.log(item,item.id , designItemDetail.clothes[index].id);
designItemDetail.clothes[index].color = item.color
designItemDetail.clothes[index].printObject = item.printObject
designItemDetail.clothes[index].layersObject = item.layersObject
designItemDetail.clothes[index].minIOPath = item.minIOPath
designItemDetail.clothes[index].path = item.path
+ designItemDetail.clothes[index].id = item.id
+ designItemDetail.clothes[index].type = item.type
+ designItemDetail.clothes[index].priority = zIndex
}
})
designItemDetail.currentFullBodyView = rv.currentFullBodyView
diff --git a/src/component/Detail/magnifyingGlass.vue b/src/component/Detail/magnifyingGlass.vue
index b13625d4..39056b75 100644
--- a/src/component/Detail/magnifyingGlass.vue
+++ b/src/component/Detail/magnifyingGlass.vue
@@ -30,7 +30,6 @@ export default defineComponent({
};
},
mounted() {
-
},
directives:{
mousemove:{
diff --git a/src/component/Detail/setDesignItem.vue b/src/component/Detail/setDesignItem.vue
index 68349c99..bd5fd63e 100644
--- a/src/component/Detail/setDesignItem.vue
+++ b/src/component/Detail/setDesignItem.vue
@@ -1,6 +1,11 @@
+
+
+
![]()
+
+