diff --git a/public/image/texture/texture0.webp b/public/image/texture/texture0.webp index c9f881fa..19fa7eb6 100644 Binary files a/public/image/texture/texture0.webp and b/public/image/texture/texture0.webp differ diff --git a/public/image/texture/texture1.webp b/public/image/texture/texture1.webp index 8fc0eb4e..0c8da7bf 100644 Binary files a/public/image/texture/texture1.webp and b/public/image/texture/texture1.webp differ diff --git a/public/image/texture/texture10.webp b/public/image/texture/texture10.webp index 052e9d01..a55d80de 100644 Binary files a/public/image/texture/texture10.webp and b/public/image/texture/texture10.webp differ diff --git a/public/image/texture/texture11.webp b/public/image/texture/texture11.webp index 774d8209..d5625ad7 100644 Binary files a/public/image/texture/texture11.webp and b/public/image/texture/texture11.webp differ diff --git a/public/image/texture/texture12.webp b/public/image/texture/texture12.webp index f754a613..3f77d452 100644 Binary files a/public/image/texture/texture12.webp and b/public/image/texture/texture12.webp differ diff --git a/public/image/texture/texture14.webp b/public/image/texture/texture14.webp index 49119387..430f95fe 100644 Binary files a/public/image/texture/texture14.webp and b/public/image/texture/texture14.webp differ diff --git a/public/image/texture/texture15.webp b/public/image/texture/texture15.webp index 9287ef4d..c5705063 100644 Binary files a/public/image/texture/texture15.webp and b/public/image/texture/texture15.webp differ diff --git a/public/image/texture/texture16.webp b/public/image/texture/texture16.webp index ef5e8810..b2aa625e 100644 Binary files a/public/image/texture/texture16.webp and b/public/image/texture/texture16.webp differ diff --git a/public/image/texture/texture17.webp b/public/image/texture/texture17.webp index f1a96eac..0d8c44bf 100644 Binary files a/public/image/texture/texture17.webp and b/public/image/texture/texture17.webp differ diff --git a/public/image/texture/texture18.webp b/public/image/texture/texture18.webp index fe80286a..ddec1d1a 100644 Binary files a/public/image/texture/texture18.webp and b/public/image/texture/texture18.webp differ diff --git a/public/image/texture/texture19.webp b/public/image/texture/texture19.webp index 287b5c3a..6137cc47 100644 Binary files a/public/image/texture/texture19.webp and b/public/image/texture/texture19.webp differ diff --git a/public/image/texture/texture2.webp b/public/image/texture/texture2.webp index f754a613..3f77d452 100644 Binary files a/public/image/texture/texture2.webp and b/public/image/texture/texture2.webp differ diff --git a/public/image/texture/texture20.webp b/public/image/texture/texture20.webp index c9fe5727..bebd5ade 100644 Binary files a/public/image/texture/texture20.webp and b/public/image/texture/texture20.webp differ diff --git a/public/image/texture/texture3.webp b/public/image/texture/texture3.webp index 1485d45b..403dceab 100644 Binary files a/public/image/texture/texture3.webp and b/public/image/texture/texture3.webp differ diff --git a/public/image/texture/texture4.webp b/public/image/texture/texture4.webp index c75e8c06..2da9b66e 100644 Binary files a/public/image/texture/texture4.webp and b/public/image/texture/texture4.webp differ diff --git a/public/image/texture/texture5.webp b/public/image/texture/texture5.webp index bba619c4..3c3f645d 100644 Binary files a/public/image/texture/texture5.webp and b/public/image/texture/texture5.webp differ diff --git a/public/image/texture/texture6.webp b/public/image/texture/texture6.webp index 3129da78..d8160a80 100644 Binary files a/public/image/texture/texture6.webp and b/public/image/texture/texture6.webp differ diff --git a/public/image/texture/texture8.webp b/public/image/texture/texture8.webp index 6642d6db..e99a0b95 100644 Binary files a/public/image/texture/texture8.webp and b/public/image/texture/texture8.webp differ diff --git a/public/image/texture/texture9.webp b/public/image/texture/texture9.webp index 4488341d..942955fd 100644 Binary files a/public/image/texture/texture9.webp and b/public/image/texture/texture9.webp differ diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue index 41570a7b..f1144954 100644 --- a/src/component/Detail/DesignDetail.vue +++ b/src/component/Detail/DesignDetail.vue @@ -268,11 +268,16 @@ export default defineComponent({ } this.current = JSON?.parse(JSON?.stringify(designItemDetail?.clothes?.[this?.currentIndex])) } - if(designItemDetail.others[0].layersObject.length != 0){ - this.body = false - }else{ - this.body = true - } + // if(designItemDetail.others?.[0]?.layersObject?.length != 0){ + // this.body = false + // }else{ + // this.body = true + // } + if(designItemDetail.singleOverall == 'overall'){ + this.body = false + }else{ + this.body = true + } let num = 0 newVal.clothes.forEach((item:any) => { if(item.id){ @@ -419,11 +424,15 @@ export default defineComponent({ } }) this.currentIndex = 0 - this.store.commit('setDesignItemDetail',rv) this.removeRevocation() this.setRevocation(rv,'') - if(rv.others[0].layersObject.length != 0){ + // if(rv.others[0].layersObject.length != 0){ + // this.body = false + // }else{ + // this.body = true + // } + if(rv.singleOverall == 'overall'){ this.body = false }else{ this.body = true @@ -774,6 +783,11 @@ export default defineComponent({ let setDesignItem:any = isMoible() ? this.$refs.setDesignItemMobile : this.$refs.setDesignItem if(this.designShowPrview == 3){ setDesignItem.setImgSize() + }else if(this.designShowPrview == 2){ + let magnifyingGlass:any = this.$refs.magnifyingGlass + // magnifyingGlass.showGlass = true + magnifyingGlass.imageUrl = this.designItemDetailUrl + } // this.others = designItemDetail.others diff --git a/src/component/Detail/magnifyingGlass.vue b/src/component/Detail/magnifyingGlass.vue index 800055b6..6cab6776 100644 --- a/src/component/Detail/magnifyingGlass.vue +++ b/src/component/Detail/magnifyingGlass.vue @@ -2,7 +2,7 @@
- +
@@ -19,8 +19,12 @@ export default defineComponent({ UserOutlined, }, props: ['designItemDetailUrl'], - setup(){ + setup(props){ + let imageUrl = ref() + let showGlass = ref(false) return{ + imageUrl, + showGlass } }, watch:{ diff --git a/src/component/Detail/setDesignItem2.vue b/src/component/Detail/setDesignItem2.vue index b1c1cc96..2a93b55d 100644 --- a/src/component/Detail/setDesignItem2.vue +++ b/src/component/Detail/setDesignItem2.vue @@ -528,6 +528,7 @@ export default defineComponent({ position: relative; height: 100%; overflow: hidden; + margin: 0 auto; >img{ z-index: 2; position: relative; diff --git a/src/component/Detail/setDesignItemMobile.vue b/src/component/Detail/setDesignItemMobile.vue index f4bde99d..ee49c1ef 100644 --- a/src/component/Detail/setDesignItemMobile.vue +++ b/src/component/Detail/setDesignItemMobile.vue @@ -491,6 +491,7 @@ export default defineComponent({ position: relative; height: 100%; overflow: hidden; + margin: 0 auto; >img{ z-index: 2; position: relative; diff --git a/src/component/HomePage/ExportModel.vue b/src/component/HomePage/ExportModel.vue index 98a7be03..3d74e1fe 100644 --- a/src/component/HomePage/ExportModel.vue +++ b/src/component/HomePage/ExportModel.vue @@ -238,7 +238,7 @@ -->
2
4
-
6
+
8
@@ -1355,7 +1355,7 @@ export default defineComponent({ }) } allExportSR.value = arr - allChecked.value = true + allChecked.value = false //多选导出转高清暂时不用 diff --git a/src/component/HomePage/TaskPage.vue b/src/component/HomePage/TaskPage.vue index f2fdd213..729eefd5 100644 --- a/src/component/HomePage/TaskPage.vue +++ b/src/component/HomePage/TaskPage.vue @@ -153,11 +153,15 @@ export default defineComponent({ this.visible = true // this.getTaskList() this.isShowMark = true + let time = 1000 + if(data){ + time = 0 + } setTimeout(() => { this.currentPage = 1 this.getTaskMoreList() this.getTaskTime = null - }, 1000); + }, time); }, sort(arr:any){ arr.sort((a:any, b:any) => { diff --git a/src/router/index.ts b/src/router/index.ts index c04b4c00..07287eb2 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -127,6 +127,7 @@ const router = createRouter({ routes }) router.beforeEach((to, from, next) => { + // 系统维护 // const toName = to.name === 'upgrade'; // if (toName) { diff --git a/src/tool/cookie.js b/src/tool/cookie.js index db160604..230cd4be 100644 --- a/src/tool/cookie.js +++ b/src/tool/cookie.js @@ -3,6 +3,7 @@ const setCookie = (name,value) => { var exp = new Date(); exp.setTime(exp.getTime() + Days*24*60*60*1000); document.cookie = name + "="+ escape (value) + ";expires=" + exp.toGMTString()+ ";Path=/"; + // document.cookie = name + "="+ escape (value) + ";expires=" + exp.toGMTString()+ ";Path=/home"; } const getCookie = (name) => { diff --git a/src/views/HomeMain.vue b/src/views/HomeMain.vue index 1626d870..2b6a955b 100644 --- a/src/views/HomeMain.vue +++ b/src/views/HomeMain.vue @@ -525,7 +525,8 @@ export default defineComponent({ margin-right: .9rem; .credits_item{ transition: .3s all; - height: 4rem; + // height: 4rem; + height: 3.2rem; div{ height: 100%; }