-
{{ $t('frontPage.BindNow') }}
+
{{ $t('frontPage.BindNow') }}
{{ $t('frontPage.Unbind') }}
@@ -276,7 +276,7 @@ export default defineComponent({
> .gallery_btn{
position: relative;
z-index: 2;
- pointer-events: none;
+
}
#g_id_bind{
position: absolute;
diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue
index 0e4dcde1..f10847a4 100644
--- a/src/component/Detail/DesignDetail.vue
+++ b/src/component/Detail/DesignDetail.vue
@@ -167,60 +167,64 @@ export default defineComponent({
}
const showDesignDetailModal = (data:any,str:any)=>{
- // let url = Https.httpUrls.getDesignDetail + `?designItemId=${77770}&designPythonOutfitId=${77423}`
- let url = Https.httpUrls.getDesignDetail + `?designItemId=${data.design.designItemId}&designPythonOutfitId=${data.design.designOutfitId}`
- detailData.loadingShow = true
- Https.axiosGet(url).then(
- async (rv: any) => {
- store.commit('DesignDetail/setDesignDetail',rv)
- rv.clothes.forEach((item:any)=>{
- let a
- item.designType='Library'
- if(item.layersObject[0].imageCategory.indexOf("back") == -1){
- a = item.layersObject[0]
- item.layersObject[0] = item.layersObject[1]
- item.layersObject[1] = a
- }
- if(item.color){
- item.color.rgba = {
- r:item.color.r,
- g:item.color.g,
- b:item.color.b,
+ return new Promise
((resolve, reject) => {
+ store.commit('DesignDetail/clearDetailData')
+ // let url = Https.httpUrls.getDesignDetail + `?designItemId=${77770}&designPythonOutfitId=${77423}`
+ let url = Https.httpUrls.getDesignDetail + `?designItemId=${data.design.designItemId}&designPythonOutfitId=${data.design.designOutfitId}`
+ detailData.loadingShow = true
+ Https.axiosGet(url).then(
+ async (rv: any) => {
+ store.commit('DesignDetail/setDesignDetail',rv)
+ rv.clothes.forEach((item:any)=>{
+ let a
+ item.designType='Library'
+ if(item.layersObject[0].imageCategory.indexOf("back") == -1){
+ a = item.layersObject[0]
+ item.layersObject[0] = item.layersObject[1]
+ item.layersObject[1] = a
}
- }else{
- item.color = {
- // rgba:{
- // r:undefined,
- // g:undefined,
- // b:undefined,
- // }
+ if(item.color){
+ item.color.rgba = {
+ r:item.color.r,
+ g:item.color.g,
+ b:item.color.b,
+ }
+ }else{
+ item.color = {
+ // rgba:{
+ // r:undefined,
+ // g:undefined,
+ // b:undefined,
+ // }
+ }
}
- }
- if(item.gradient){
- item.color.gradient = item.gradient
- }
- if(item.printObject.prints == null)item.printObject.prints = []
- item.printObject.prints.forEach((element:any) => {
- if(!element.designType){
- element.designType = 'Library'
+ if(item.gradient){
+ item.color.gradient = item.gradient
}
- });
- })
- detailData.singleOveral.value = rv.singleOverall
- detailData.designDetailShow = true
- // this.deleteShow = false
- initialize()
- setRevocation()
- detailData.loadingShow = false
- if(rv.singleOverall == "single"){
- store.commit('DesignDetail/setDesignColthes',rv.clothes[0].id)
+ if(item.printObject.prints == null)item.printObject.prints = []
+ item.printObject.prints.forEach((element:any) => {
+ if(!element.designType){
+ element.designType = 'Library'
+ }
+ });
+ })
+ detailData.singleOveral.value = rv.singleOverall
+ detailData.designDetailShow = true
+ // this.deleteShow = false
+ initialize()
+ setRevocation()
+ detailData.loadingShow = false
+ if(rv.singleOverall == "single"){
+ store.commit('DesignDetail/setDesignColthes',rv.clothes[0].id)
+ }
+ resolve(rv)
}
-
- }
-
- ).catch(rv=>{
- detailData.loadingShow = false
- })
+ ).catch(rv=>{
+ detailData.loadingShow = false
+ resolve(rv)
+ })
+ })
+
}
const initialize = ()=>{//design后初始化
diff --git a/src/component/Detail/model/modelPosition.vue b/src/component/Detail/model/modelPosition.vue
index ffee0398..925bd244 100644
--- a/src/component/Detail/model/modelPosition.vue
+++ b/src/component/Detail/model/modelPosition.vue
@@ -4,7 +4,7 @@
- ![]()
+ ![]()
diff --git a/src/component/home/design/collection/MoodboardUpload.vue b/src/component/home/design/collection/MoodboardUpload.vue
index 9cafb8d4..4fbaef2b 100644
--- a/src/component/home/design/collection/MoodboardUpload.vue
+++ b/src/component/home/design/collection/MoodboardUpload.vue
@@ -339,7 +339,7 @@ export default defineComponent({
},
deleteFile(item: any) {
- if(item.type_.type1 == 'generate' || item.type_.type1 == 'material'){
+ if(item?.type_?.type1 == 'generate' || item?.type_?.type1 == 'material'){
item.jsContent1 = this.t('uploadFile.jsContent1',{maxImg:8})
item.state = 'delete'
this.store.commit("addGenerateMaterialFils", item);
diff --git a/src/component/home/design/collection/PrintboardUpload.vue b/src/component/home/design/collection/PrintboardUpload.vue
index e92add64..d1d37d96 100644
--- a/src/component/home/design/collection/PrintboardUpload.vue
+++ b/src/component/home/design/collection/PrintboardUpload.vue
@@ -385,7 +385,7 @@ export default defineComponent({
deleteFile(item:any){
// this.fileList.splice(item, 1)
// this.store.commit('setPrintboardFile',this.fileList)
- if(item.type_.type1 == 'generate' || item.type_.type1 == 'material'){
+ if(item?.type_?.type1 == 'generate' || item?.type_?.type1 == 'material'){
item.jsContent1 = this.t('uploadFile.jsContent1',{maxImg:16})
item.state = 'delete'
this.store.commit("addGenerateMaterialFils", item);
@@ -610,7 +610,6 @@ export default defineComponent({
}
this.fileList.push(data)
}
- console.log(this.fileList)
this.store.commit('setPrintboardFile',this.fileList)
},
diff --git a/src/component/home/design/collection/more.vue b/src/component/home/design/collection/more.vue
index a912c326..1c77c9ce 100644
--- a/src/component/home/design/collection/more.vue
+++ b/src/component/home/design/collection/more.vue
@@ -124,6 +124,14 @@ export default defineComponent({
designType:props.item.resData.designType,
}
}else{
+ rv.imgUrl = rv.url
+ rv.category = props.item.category
+ rv.categoryValue = props.item.categoryValue
+ rv.resData = {
+ id:rv.id,
+ url:rv.url,
+ designType:props.item.resData.designType,
+ }
props.list.unshift(rv)
}
}
diff --git a/src/component/home/design/index.vue b/src/component/home/design/index.vue
index e33f809e..688ba236 100644
--- a/src/component/home/design/index.vue
+++ b/src/component/home/design/index.vue
@@ -2117,13 +2117,14 @@ export default defineComponent({
type: string
) {
// if()
- if(this.isMove)return
+ if(this.isMove || this.isShowMark)return
this.store.commit('setOpenChatStatus',false)
if(design.resultType != "Design"){
this.selectEditBtn = design
this.setEditDesignType(collectionList,index,design.resultType,'edit',type)
return
}
+ this.isShowMark = true
design.designOutfitId = design.designPythonOutfitId?design.designPythonOutfitId:design.designOutfitId
let data = {
design: design,
@@ -2134,7 +2135,9 @@ export default defineComponent({
this.detailDestroy = true
nextTick(()=>{
let designDetail: any = this.$refs.designDetail;
- designDetail.showDesignDetailModal(data);
+ designDetail.showDesignDetailModal(data).then(()=>{
+ this.isShowMark = false
+ })
})
},
diff --git a/src/store/Detail/designDetail.ts b/src/store/Detail/designDetail.ts
index dbae1ece..f6277607 100644
--- a/src/store/Detail/designDetail.ts
+++ b/src/store/Detail/designDetail.ts
@@ -28,7 +28,21 @@ const DesignDetail : Module = {
currentPrintElement:null,
},
mutations:{
+ clearDetailData(state){
+ state.designDetail = null
+ state.designPreviewData = {}
+ state.frontBack = {
+ front:[],
+ back:[],
+ body:{},
+ }
+ state.selectDetail = null
+ state.printZIndex = -1
+ state.currentDetailType = ''
+ state.currentPrintElement = null
+ },
setDesignDetail(state,data){
+ console.log(data)
if(data.others.length > 0 && data.others[0].type == "Body"){
state.frontBack.body = data.others[0]
}
@@ -74,7 +88,6 @@ const DesignDetail : Module = {
state.frontBack.back = back
},
updataDetailItem(state,data){
- console.log(data)
state.designDetail.clothes.forEach((item:any) => {
if(item.id == state.selectDetail.id){
for (const key in data) {