diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue index 41890c9c..92f10a31 100644 --- a/src/component/Detail/DesignDetail.vue +++ b/src/component/Detail/DesignDetail.vue @@ -87,7 +87,7 @@
- {{ current.id }} +
{{ $t('DesignDetail.CurrentPrint') }}
@@ -265,6 +265,7 @@ export default defineComponent({ num++ } }); + this.designItemDetailNum = num await this.setImgSize() let url = '' diff --git a/src/component/Detail/DesignDetailAlter.vue b/src/component/Detail/DesignDetailAlter.vue index f3c01472..466885b9 100644 --- a/src/component/Detail/DesignDetailAlter.vue +++ b/src/component/Detail/DesignDetailAlter.vue @@ -591,6 +591,7 @@ export default defineComponent({ DesignDetailEnd.type_ = 0 this.colorFileList = [] this.selectColorList = [] + DesignDetailEnd.sketchImg = {} }, //切换整体衣服 diff --git a/src/component/Detail/DesignDetailEnd.vue b/src/component/Detail/DesignDetailEnd.vue index 4643934b..81692acf 100644 --- a/src/component/Detail/DesignDetailEnd.vue +++ b/src/component/Detail/DesignDetailEnd.vue @@ -295,18 +295,27 @@ export default defineComponent({ this.loadingShow = true Https.axiosPost(Https.httpUrls.designSingle, data).then( (rv) => { + let bor = false rv.clothes.forEach((item)=>{ - if(item.id == this.sketchImg.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 + if(item.type != 'body'){ + if(item.id == designItemDetail.clothes[index].id || item.id == this.sketchImg.id_){ + designItemDetail.clothes[index].color = item.color + 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].printObject = item.printObject + bor = true + }else{ + + } + if(!designItemDetail.clothes[index].id){ + designItemDetail.clothes[index].priority = zIndex + } } }) + designItemDetail.currentFullBodyView = rv.currentFullBodyView designItemDetail.ifSubmit = true designItemDetail.clothes.forEach((item,index)=>{ diff --git a/src/component/Detail/setDesignItem.vue b/src/component/Detail/setDesignItem.vue index 218b9f5d..18486b16 100644 --- a/src/component/Detail/setDesignItem.vue +++ b/src/component/Detail/setDesignItem.vue @@ -419,7 +419,6 @@ export default defineComponent({ if(item.id === i.id){ i.layersObject = item.layersObject i.priority = item.layersObject[0].priority - console.log(item,i); } }) }) diff --git a/src/component/HomePage/RobotAssist.vue b/src/component/HomePage/RobotAssist.vue index 0ecd326b..6bb44616 100644 --- a/src/component/HomePage/RobotAssist.vue +++ b/src/component/HomePage/RobotAssist.vue @@ -339,7 +339,6 @@ export default defineComponent({ }, removeDriver(index:number){ if(this.driver__.driver){ - driverObj__.destroy(); let data = { index : 0, driver : false, @@ -349,6 +348,10 @@ export default defineComponent({ // this.robotInput = false this.createTimer() } + console.log('销毁'); + + driverObj__.destroy(); + // setCookie("isBeginner", false); this.record[index].driver = false sessionStorage.setItem('record', JSON.stringify(this.record)); this.textScroll() diff --git a/src/router/index.ts b/src/router/index.ts index e7f33546..0ad945ec 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -33,6 +33,11 @@ const routes: Array = [ name: 'library', component: _import('LibraryPage') }, + { + path: '/trialApproval', + name: 'trialApproval', + component: _import('trialApproval') + }, ] const router = createRouter({ diff --git a/src/tool/guide.js b/src/tool/guide.js index 67f9d01f..e3a9ee73 100644 --- a/src/tool/guide.js +++ b/src/tool/guide.js @@ -155,6 +155,7 @@ const driverObj__ = driver({ index : driverIndex__, driver : false, } + console.log('销毁'); store?.commit("setGuide", data); setCookie("isBeginner", false); driverObj__.destroy();//销毁方法 @@ -204,6 +205,7 @@ function removeDiv(element){ const openGuide = () =>{ let isBeginner = JSON.parse(getCookie('isBeginner')) + console.log(isBeginner); // console.log(isBeginner); let isBeginnerNum = JSON.parse(getCookie('isBeginnerNum')?getCookie('isBeginnerNum'):'0') let data diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue index bec7e8d4..4e5b4596 100644 --- a/src/views/HomeView.vue +++ b/src/views/HomeView.vue @@ -299,6 +299,7 @@ export default defineComponent({ let driver__:any = computed(()=>{ return store.state.Guide.guide }) + let likeDesignItemIdList = ref([]) return { store, likeDesignCollectionList, @@ -312,7 +313,8 @@ export default defineComponent({ isShowOperate, userInfo, t, - driver__ + driver__, + likeDesignItemIdList }; }, data() { @@ -818,6 +820,7 @@ export default defineComponent({ ...v, groupDetailId: v.id, designItemUrl: v.designOutfitUrl, + designItemId: v.designItemId, }; return data; } @@ -904,8 +907,9 @@ export default defineComponent({ driverObj__.moveNext(); }) } + let a = document.createElement("a"); - this.isShowMark = true; + // this.isShowMark = true; let img:any = [] await html2canvas(collectionReview, { useCORS: true, scale: 3 }).then( (canvas) => { @@ -943,6 +947,7 @@ export default defineComponent({ num++ } } + let dataList:any = [] this.likeDesignCollectionList.forEach((item:any)=>{ let nameTail = item?.designOutfitUrl?.split(".").pop().split("?").shift(); let data = { @@ -953,11 +958,33 @@ export default defineComponent({ "." + nameTail, }; + dataList.push(item.designItemId) img.push(data); index++; }) + let mannequinList:any = [] + // Https.axiosPost(Https.httpUrls.designLike, dataList) + // .then((rv: any) => { + // }) + // .catch((rv) => { + // }); + mannequinList.forEach((item:any) => { + let nameTail = item?.imgUrl?.split(".").pop().split("?").shift(); + let data = { + imgUrl: item.imgUrl, + name: + 'mannequin' + + index + + "." + + nameTail, + }; + img.push(data); + index++; + }); + + // a.setAttribute('href', URL.createObjectURL(blob)); // a.setAttribute('download', `collection.png`); // a.click(); @@ -985,9 +1012,6 @@ export default defineComponent({ // }); // } // ); - // console.log(img); - - return this.downImg(img); }, diff --git a/src/views/LoginPage.vue b/src/views/LoginPage.vue index 169ccbff..7a236fce 100644 --- a/src/views/LoginPage.vue +++ b/src/views/LoginPage.vue @@ -454,7 +454,7 @@ export default defineComponent({ let token = rv.token; setCookie("token", token); setCookie("isTest", isTest); - setCookie("isBeginner", isBeginner); + setCookie("isBeginner", true); setCookie("isBeginnerNum", 0); setCookie("userInfo", JSON.stringify(rv)); this.turnToHomePage(); diff --git a/src/views/trialApproval.vue b/src/views/trialApproval.vue new file mode 100644 index 00000000..acc18638 --- /dev/null +++ b/src/views/trialApproval.vue @@ -0,0 +1,431 @@ + + + \ No newline at end of file