From db9d41a7c083f1a1fae57f94b8f14192ae9149c1 Mon Sep 17 00:00:00 2001 From: X1627315083 Date: Fri, 27 Oct 2023 11:13:01 +0800 Subject: [PATCH] 1 --- public/image/femaleBG.png | Bin 0 -> 3764 bytes public/image/maleBG.png | Bin 0 -> 4120 bytes src/assets/iconfont/iconfont.css | 2 +- src/assets/iconfont2/iconfont.css | 12 +- src/assets/iconfont2/iconfont.ttf | Bin 1912 -> 2244 bytes src/assets/style/style.css | 20 +- src/assets/style/style.less | 31 +- src/component/Detail/DesignDetail.vue | 136 +++- src/component/Detail/DesignDetailEnd.vue | 12 +- src/component/Detail/DesignPrintOperation.vue | 13 +- src/component/Detail/habit.vue | 6 + src/component/Detail/setDesignItem.vue | 19 +- src/component/HomePage/Cropper.vue | 3 +- src/component/HomePage/Generate.vue | 31 +- src/component/HomePage/Header.vue | 7 +- src/component/HomePage/MoodboardUpload.vue | 8 +- src/component/HomePage/SketchboardUpload.vue | 2 +- src/component/HomePage/layout.vue | 21 +- src/component/LibraryPage/ModelPlacement.vue | 271 +++++-- .../LibraryPage/ModelPlacementMobile.vue | 83 ++- .../LibraryPage/ModelPlacementNew.vue | 699 ------------------ src/tool/moodb.ts | 2 +- src/views/HistoryPage.vue | 2 +- src/views/LibraryPage.vue | 69 +- 24 files changed, 609 insertions(+), 840 deletions(-) create mode 100644 public/image/femaleBG.png create mode 100644 public/image/maleBG.png delete mode 100644 src/component/LibraryPage/ModelPlacementNew.vue diff --git a/public/image/femaleBG.png b/public/image/femaleBG.png new file mode 100644 index 0000000000000000000000000000000000000000..a9aed9be6615e3063fa23a02ba4f2e3e3fd2f8f3 GIT binary patch literal 3764 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 literal 0 HcmV?d00001 diff --git a/src/assets/iconfont/iconfont.css b/src/assets/iconfont/iconfont.css index f5b39aeb..c19d766f 100644 --- a/src/assets/iconfont/iconfont.css +++ b/src/assets/iconfont/iconfont.css @@ -7,7 +7,7 @@ .iconfont { font-family: "iconfont" !important; - font-size: 16px; + font-size: 1.8rem; font-style: normal; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; diff --git a/src/assets/iconfont2/iconfont.css b/src/assets/iconfont2/iconfont.css index fec3bb25..95123e75 100644 --- a/src/assets/iconfont2/iconfont.css +++ b/src/assets/iconfont2/iconfont.css @@ -1,11 +1,11 @@ @font-face { font-family: "iconfont"; /* Project id */ - src: url('iconfont.ttf?t=1697613542954') format('truetype'); + src: url('iconfont.ttf?t=1698114002056') format('truetype'); } .iconfont { font-family: "iconfont" !important; - font-size: 1.6rem; + font-size: 1.8rem; font-style: normal; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; @@ -15,3 +15,11 @@ content: "\e66c"; } +.icon-fanchehui:before { + content: "\e626"; +} + +.icon-chehui:before { + content: "\e609"; +} + diff --git a/src/assets/iconfont2/iconfont.ttf b/src/assets/iconfont2/iconfont.ttf index 5f9def81591e6776ff4d0d36ddc5ccfcd1ee55ee..f8cc7354eea8d83dca9b5c5f49545cb84cd50916 100644 GIT binary patch delta 711 zcmYLFJ!lhQ7=GWo%QatZFUehqHj&gzH5I8TO^ZEDjD8ovo0ygRKru-J~K#bjg&Vi%>xl-^+HR9*7oGKpJsv2Jmx_Ww)mfSaQr6iByPmX6Ti_=9hPVtu2h4FdyX4+8^3LUL|m!SgBG-U0bvfVdz%r!p>a{m8^kw89B=jIqDenx2- zpb`)OD*-8huz}>d&5M}h88 + +
Submit @@ -115,7 +117,7 @@
- +
@@ -174,6 +176,9 @@ export default defineComponent({ let userInfo:any = {} let ifSubmit = ref(false) let designItemDetailUrl = ref({}) + let setRevocationShow = ref(false)//判断是不是第一次进来和切换下一张 + let oppositeRevocationShow:any = ref() + let revocationShow:any = ref() return{ designItemDetail, store, @@ -187,7 +192,10 @@ export default defineComponent({ designOutfitId, userInfo, ifSubmit, - designItemDetailUrl + designItemDetailUrl, + setRevocationShow, + oppositeRevocationShow, + revocationShow } }, data(){ @@ -213,8 +221,6 @@ export default defineComponent({ } await this.setImgSize() this.designItemDetailUrl = designItemDetail.currentFullBodyView?designItemDetail.currentFullBodyView:designItemDetail.designItemUrl - console.log(this.designItemDetailUrl); - } }, currentIndex:{ @@ -222,7 +228,29 @@ export default defineComponent({ } }, }, + provide() { + return { + setRevocation:this.setRevocation + } + }, mounted(){ + let beforeunload = () => { + this.removeRevocation() + window.removeEventListener('beforeunload',beforeunload) + } + window.addEventListener('beforeunload',beforeunload) + let onresizeTime:any + let this_ = this + window.onresize = () => { + return (() => { + clearTimeout(onresizeTime) + onresizeTime = setTimeout(async ()=>{ + await this_.setImgSize() + },500) + + })() + } + let userInfo:any = getCookie("userInfo") this.userInfo = JSON.parse(userInfo); // let url = Https.httpUrls.getDesignDetail + `?designItemId=34242&designPythonOutfitId=34004` @@ -258,7 +286,6 @@ export default defineComponent({ }, methods:{ openCurrent(num: Number) { - let designItemDetail = JSON.parse(JSON.stringify(this.store.state.DesignDetailModule.designItemDetail)) let DesignDetailAlter:any = this.$refs.DesignDetailAlter DesignDetailAlter.init(num) if(num ==2 ){ @@ -271,8 +298,9 @@ export default defineComponent({ this.designOrder = false let DesignDetailAlter:any = this.$refs.DesignDetailAlter DesignDetailAlter.terminate() - this.designItemDetail = {} + // this.designItemDetail = {} this.frontBack = {} + this.removeRevocation() }else{ this.designShowPrview = 1; this.designItemDetailUrl = {} @@ -300,6 +328,7 @@ export default defineComponent({ }) this.store.commit('setDesignItemDetail',rv) + this.setRevocation(rv,'') if(rv.others[0].layersObject.length != 0){ this.body = false }else{ @@ -336,7 +365,7 @@ export default defineComponent({ } }) }else{ - designItemDetail.others.forEach((item:any) => { + designItemDetail?.others?.forEach((item:any) => { if(item.type == 'Body'){ body = item } @@ -369,7 +398,7 @@ export default defineComponent({ } } }) - let bodyImgWH = document.getElementsByClassName("design_compile_content")[0].getElementsByClassName("perview_img")[0] + let bodyImgWH = document.getElementsByClassName("design_compile_content")?.[0]?.getElementsByClassName("perview_img")?.[0] body.style = { width:body.layersObject[0].imageSize?.[0]*ratio+'px', @@ -402,7 +431,57 @@ export default defineComponent({ this.designShowPrview = 1 // this.showDesignDetailModal(data,str) }, - + removeRevocation(){ + sessionStorage.removeItem('oppositeRevocation') + sessionStorage.removeItem('revocation') + this.setRevocationShow = false + }, + setRevocation(designItemDetail:any,data:any){//设置撤销 + let itemDetail = JSON.parse(JSON.stringify(this.store.state.DesignDetailModule.designItemDetail)) + // let data = JSON.parse(JSON.stringify(this.store.state.DesignDetailModule.designPreviewData)) + let revocation = JSON.parse((sessionStorage.getItem("revocation") as any)) + let oppositeRevocation = JSON.parse((sessionStorage.getItem("oppositeRevocation") as any)) + if(revocation?.[0]?.designItemDetail.designItemId != itemDetail.designItemId || sessionStorage.getItem("revocation") == null){ + // sessionStorage.setItem('revocation', JSON.stringify([])); + // sessionStorage.setItem('oppositeRevocation',JSON.stringify([])); + revocation = [] + } + let detail = { + designItemDetail:designItemDetail, + data:data?data:'' + } + revocation.push(detail) + this.revocationShow = revocation?.length + this.oppositeRevocationShow = 0 + sessionStorage.setItem('revocation', JSON.stringify(revocation)); + sessionStorage.setItem('oppositeRevocation',JSON.stringify([])); + }, + revocation(){//撤回 + let oppositeRevocation = JSON.parse((sessionStorage.getItem("oppositeRevocation") as any)) + let revocation = JSON.parse((sessionStorage.getItem("revocation") as any)) + oppositeRevocation.push(revocation[revocation.length-1]) + this.oppositeRevocationShow = oppositeRevocation.length + revocation.splice(revocation.length-1,1) + this.revocationShow = revocation.length + if(this.revocationShow > 1){ + this.store.commit('setDesignPreviewData',revocation[revocation.length-1].data) + } + this.store.commit("setDesignItemDetail", revocation[revocation.length-1].designItemDetail); + sessionStorage.setItem('oppositeRevocation', JSON.stringify(oppositeRevocation)); + sessionStorage.setItem('revocation', JSON.stringify(revocation)); + }, + oppositeRevocation(){//反撤回 + let oppositeRevocation = JSON.parse((sessionStorage.getItem("oppositeRevocation") as any)) + let revocation = JSON.parse((sessionStorage.getItem("revocation") as any)) + this.store.commit('setDesignPreviewData',oppositeRevocation[oppositeRevocation.length-1].data) + this.store.commit("setDesignItemDetail", oppositeRevocation[oppositeRevocation.length-1].designItemDetail); + revocation.push(oppositeRevocation[oppositeRevocation.length-1]) + this.revocationShow = revocation.length + oppositeRevocation.splice(oppositeRevocation.length-1,1) + this.oppositeRevocationShow = oppositeRevocation.length + sessionStorage.setItem('oppositeRevocation', JSON.stringify(oppositeRevocation)); + sessionStorage.setItem('revocation', JSON.stringify(revocation)); + }, setSubmitItem(str:any){ let designItemDetail = JSON.parse(JSON.stringify(this.store.state.DesignDetailModule.designItemDetail)) let clothes:any = [] @@ -478,7 +557,7 @@ export default defineComponent({ //按比设置单件衣服宽高位置 async setPostition(url:any){ let img:any = await loadImage(url) - let modal_body = document.getElementsByClassName('detail_modal_body')[0] + let modal_body = document.getElementsByClassName('detail_modal_model')[0] const num = modal_body?.offsetWidth / img.width; function loadImage(url:any) { return new Promise((resolve, reject) => { @@ -499,6 +578,7 @@ export default defineComponent({ let newDesign = {} let newIndex = 0 this.designOrder = false + this.removeRevocation() let DesignDetailAlter:any = this.$refs.DesignDetailAlter DesignDetailAlter.terminate() if(type === 'last'){ @@ -692,6 +772,7 @@ export default defineComponent({ // padding: 1.5rem 1rem 2.5rem; box-sizing: border-box; .detail_modal_body_img{ + overflow: hidden; // width: 43.3rem; width: 23%; height: 100%; @@ -700,7 +781,6 @@ export default defineComponent({ justify-content: center; align-items: center; position: relative; - flex-direction: column; // height: 50%; .detail_modal_body{ @@ -714,7 +794,8 @@ export default defineComponent({ top: 0; left: 50%; z-index: 999; - transform: translateX(-50%); + transform: translate(-50%,-120%); + transition: all .3s; >div{ width: 4rem; height: 4rem; @@ -747,6 +828,8 @@ export default defineComponent({ .detail_modal_model{ position: relative; z-index: 1; + max-height: 100%; + width: auto; } .detail_modal_item_front,.detail_modal_item_back{ cursor: pointer; @@ -791,17 +874,46 @@ export default defineComponent({ position: absolute; cursor: pointer; zoom: 1.2; + transition: all .3s; &.fi-bs-expand-arrows-alt{ top: 0; left: 0; + transform: translateX(-120%); } &.fi-rr-edit{ left: 0; top: 3rem; + transform: translateX(-120%); } &.fi-rr-copy{ top: 0; right: 0; + transform: translateX(120%); + } + &.icon-fanchehui{ + top: 6rem; + right: 0; + transform: translateX(120%); + } + &.icon-chehui{ + top: 3rem; + right: 0; + transform: translateX(120%); + } + } + i:hover{ + + } + } + &.detail_modal_body_img:hover{ + .detail_modal_body{ + .detail_modal_body_nav{ + transform: translate(-50%,0%); + } + } + div{ + i{ + transform: translateX(0); } } } diff --git a/src/component/Detail/DesignDetailEnd.vue b/src/component/Detail/DesignDetailEnd.vue index 5026c905..f84ea72f 100644 --- a/src/component/Detail/DesignDetailEnd.vue +++ b/src/component/Detail/DesignDetailEnd.vue @@ -58,7 +58,10 @@
- + +
+ +
@@ -109,6 +112,7 @@ export default defineComponent({ const store = useStore(); let type_ = ref(0); let current = inject('current')//父组件传过来的数据 + let setRevocation = inject('setRevocation')//父组件传过来的数据 let sketchImg = ref({}) //印花 let overallSingle = ref(false) @@ -122,6 +126,7 @@ export default defineComponent({ return{ store, current, + setRevocation, sketchImg, type_, overallSingle, @@ -143,6 +148,7 @@ export default defineComponent({ //点击判断 init(num){ // this.current = JSON.parse(JSON.stringify(this.currentItem)) + console.log(this.current); this.type_ = num this.colorList[this.selectIndex] = this.$parent.selectColor this.overallSingle = this.current?.printObject?.ifSingle == null?false:this.current?.printObject?.ifSingle @@ -271,6 +277,7 @@ export default defineComponent({ this.loadingShow = false this.store.commit("setDesignItemDetail", designItemDetail); this.store.commit("setDesignPreviewData", data); + this.setRevocation(designItemDetail,data) } ).catch(res=>{ this.loadingShow = false @@ -324,6 +331,9 @@ export default defineComponent({ transform: scale(.85); transform-origin: center top; cursor: pointer; + img:nth-child(1){ + position: absolute; + } } } } diff --git a/src/component/Detail/DesignPrintOperation.vue b/src/component/Detail/DesignPrintOperation.vue index 140789e9..6e95a13c 100644 --- a/src/component/Detail/DesignPrintOperation.vue +++ b/src/component/Detail/DesignPrintOperation.vue @@ -113,6 +113,7 @@ export default defineComponent({ let designOpenrtion = ref(false); let designOpenrtionList = ref([]) let current = inject('current')//父组件传过来的数据 + let setRevocation = inject('setRevocation')//父组件传过来的数据 let overallSingle = ref(false) let systemDesignerPercentage = ref(0) let printAmount = ref(1)//印花数量 @@ -165,6 +166,7 @@ export default defineComponent({ print, sketch, loadingShow, + setRevocation }; }, data() { @@ -255,6 +257,13 @@ export default defineComponent({ this.designOpenrtionList.forEach((item,index)=>{ this.setTemplate(item,index) this.printAmount = this.printStyleList.length + if (!this.overallSingle) { + this.printAmount = 1 + this.setprintAmount() + } + if(this.current.printObject.ifSingle != this.overallSingle){ + this.refetchTemplate(0) + } }) }else{ @@ -439,6 +448,7 @@ export default defineComponent({ let num = this.printAmount - this.printStyleList.length for (let index = 0; index < num; index++) { this.printStyleList.push(this.printStyleList[this.printStyleList.length-1]) + this.printStyleList[this.printStyleList.length-1].transform.rotateZ = 0 this.refetchTemplate(this.printStyleList.length-1) this.designOpenrtionList.push(this.current.printObject.prints[this.current.printObject.prints.length-1]) } @@ -601,7 +611,6 @@ export default defineComponent({ prints:this.computeZindex(), } data.timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone - this.store.commit("setDesignPreviewData", data); this.loadingShow = true Https.axiosPost(Https.httpUrls.designSingle, data).then( (rv) => { @@ -623,6 +632,8 @@ export default defineComponent({ item.layersObject[1].id = this.store.state.DesignDetailModule.designItemDetail.clothes[i].layersObject[1].id }) this.store.commit("setDesignItemDetail", designItemDetail); + this.store.commit("setDesignPreviewData", data); + this.setRevocation(designItemDetail,data) this.loadingShow = false this.designOpenrtion = false // this.closeModal() diff --git a/src/component/Detail/habit.vue b/src/component/Detail/habit.vue index dc0e58aa..2d2a7e7b 100644 --- a/src/component/Detail/habit.vue +++ b/src/component/Detail/habit.vue @@ -632,6 +632,7 @@ export default defineComponent({ border-radius: 1rem; padding: 2rem; // zoom: .75; + font-size: 1.6rem; transform-origin: top right; position: absolute; right: -.3rem; @@ -776,6 +777,9 @@ export default defineComponent({ justify-content: space-between; .model_current{ margin-right: 3rem; + .model_text{ + text-align: center; + } } } .habit_model_list{ @@ -831,6 +835,7 @@ export default defineComponent({ flex-direction: column; .model_text{ display: flex; + justify-content: center; :deep(.ant-switch) { margin: 0 1rem; } @@ -922,6 +927,7 @@ export default defineComponent({ display: flex; align-items: center; justify-content: space-between; + font-size: 1.4rem; } \ No newline at end of file diff --git a/src/tool/moodb.ts b/src/tool/moodb.ts index 9bab2560..c531d254 100644 --- a/src/tool/moodb.ts +++ b/src/tool/moodb.ts @@ -1,7 +1,7 @@ export default { moodb_ : [ [['wh4']], - [['wh4','wh4']], + [['wh4','wh4'],['wh8','wh8']], [['wh4','w1h2','w1h2'],['w1h2','w1h2','wh4'],['w2h1','w2h1','wh4'],['wh4','w2h1','w2h1']], [['wh1','wh1','w1h2','wh4'],['w1h2','wh1','wh1','wh4'],['wh4','wh1','wh1','w1h2'],['w1h2','w1h2','w1h2','w1h2']], [['wh1','wh1','wh1','wh1','wh4'],['wh1','wh1','wh4','wh1','wh1'],['wh4','wh1','wh1','wh1','wh1'],['w1h2','w1h2','w1h2','wh1','wh1'],['wh1','wh1','w1h2','w1h2','w1h2'],['w1h2','w1h2','wh1','wh1','w1h2'],['w1h2','wh1','wh1','w1h2','w1h2']], diff --git a/src/views/HistoryPage.vue b/src/views/HistoryPage.vue index 13717434..e2e5c4ac 100644 --- a/src/views/HistoryPage.vue +++ b/src/views/HistoryPage.vue @@ -217,7 +217,7 @@ export default defineComponent({ }, retrieveHome(record:any){ - this.$router.push({name:'home',params: {id:record.id}}) + // this.$router.push({name:'home',params: {id:record.id}}) } } }) diff --git a/src/views/LibraryPage.vue b/src/views/LibraryPage.vue index c117f1a4..3bb5405d 100644 --- a/src/views/LibraryPage.vue +++ b/src/views/LibraryPage.vue @@ -173,10 +173,17 @@
- +
Generate
The entered content exceeds the maximum length.
+
+
{{ printModel.name }}
+
    +
  • Model1
    • +
  • Model2
    • +
+
+
v.type)[0].name let generageImg = this.selectGenerateList.filter((v:any)=>v.checked)[0] @@ -844,7 +875,7 @@ export default defineComponent({ level2Type:this.selectCode == 'Sketchboard'?this.designType:'', text:this.captionGeneration, timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone, - version:2,//为1就是Print + version:this.selectCode == 'Printboard'?this.printModel.num:0,//为1就是Print gender:this.selectCode == 'Sketchboard'?this.sex:'', } if(generateType == 'image'||generateType == 'text-image'){ @@ -1198,9 +1229,40 @@ export default defineComponent({ } } .generage_btn{ - margin-left: 3rem; + margin: 0 3rem; } } + .printModel{ + font-size: 1.4rem; + font-weight: 500; + >div{ + width: 7rem; + display: flex; + justify-content: center; + border-radius: 1rem; + margin: 0; + border: 2px solid; + cursor: pointer; + + } + ul{ + position: absolute; + width: 7rem; + text-align: center; + margin-top: .3rem; + border-radius: 1rem; + overflow: hidden; + z-index: 3; + li{ + background: #c5c4c8; + line-height: 2; + cursor: pointer; + &.printModel_item:hover{ + background: rgba(0,0,0,.4); + } + } + } + } .upload_item{ margin-left: 4rem; .upload_file_item{ @@ -1212,6 +1274,7 @@ export default defineComponent({ .upload_component{ margin: 0; } + } }