From 10844bc820be80054d983d166c402de802545108 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Wed, 12 Nov 2025 10:05:00 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E5=9B=BE=E7=89=87404=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/LoginPage/login/personal.vue | 2 -- src/component/home/index.vue | 4 ++-- src/component/toolsPage/index.vue | 2 +- src/router/index.ts | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/component/LoginPage/login/personal.vue b/src/component/LoginPage/login/personal.vue index 33e569ff..09debfc6 100644 --- a/src/component/LoginPage/login/personal.vue +++ b/src/component/LoginPage/login/personal.vue @@ -373,8 +373,6 @@ export default defineComponent({ email: this.forgetPasswordEmail, operationType: "FORGET_PWD", }; - this.frogetPasswordStep = 2; - (this.forgetEmailCode = ["", "", "", "", "", ""]), this.createTimer(); Https.axiosPost(Https.httpUrls.accountSendEmail, data).then((rv: any) => { if (rv) { this.frogetPasswordStep = 2; diff --git a/src/component/home/index.vue b/src/component/home/index.vue index 43fcf4fe..45a0b998 100644 --- a/src/component/home/index.vue +++ b/src/component/home/index.vue @@ -85,7 +85,7 @@ export default defineComponent({ const routeName = newRoute.name as string const shouldCache = newRoute.meta?.cache === true if (shouldCache && routeName && !data.cachedRoutes.includes(routeName)) { - if(routeName == 'toolsPage' && !route.query?.id)return + if(routeName == 'tools' && !route.query?.id)return data.cachedRoutes.push(routeName)// 保证缓存只有一个项目 } else if ((!route.query?.id && shouldCache) || (!shouldCache && routeName && data.cachedRoutes.includes(routeName))) { // } else if (!shouldCache && routeName && data.cachedRoutes.includes(routeName)) { @@ -226,7 +226,7 @@ export default defineComponent({ storeData.positionList = position store.commit('setProbject',storeData) // setChatData() - if(route.name == 'toolsPage'){ + if(route.name == 'tools'){ getCollection('tools',null) }else{ getCollection('design',null) diff --git a/src/component/toolsPage/index.vue b/src/component/toolsPage/index.vue index ef04f5f6..26e80b6d 100644 --- a/src/component/toolsPage/index.vue +++ b/src/component/toolsPage/index.vue @@ -92,7 +92,7 @@ export default defineComponent({ (query:any, oldQuery:any) => { if(oldQuery && query == oldQuery)return const key = Object.keys(query)?.[0] - if(route.name == 'toolsPage' && key){ + if(route.name == 'tools' && key){ data.openType = query[key] nextTick(()=>{ open(query[key]) diff --git a/src/router/index.ts b/src/router/index.ts index a28a7f9d..1fe4d6b1 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -67,7 +67,7 @@ const routes: Array = [ children: [ { path: "tools", - name: "toolsPage", + name: "tools", meta: { enter: "all",cache:true }, component: () => import("@/views/HomeView/Tools.vue"), }, From 841416f2d0fdd45f01bcb63f2756277242a07353 Mon Sep 17 00:00:00 2001 From: zhangyh Date: Wed, 12 Nov 2025 10:12:43 +0800 Subject: [PATCH 2/2] =?UTF-8?q?style:=20=E4=B8=8A=E4=BC=A0trigger=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/home/tools/toProduct/index.vue | 118 ++++++++++--------- 1 file changed, 65 insertions(+), 53 deletions(-) diff --git a/src/component/home/tools/toProduct/index.vue b/src/component/home/tools/toProduct/index.vue index 8de3187d..5fb58c33 100644 --- a/src/component/home/tools/toProduct/index.vue +++ b/src/component/home/tools/toProduct/index.vue @@ -384,10 +384,10 @@ export default defineComponent({ type: Boolean, default: false }, - isState:{ - type:Boolean, - default:false, - }, + isState: { + type: Boolean, + default: false + } }, emit: ['unLike'], setup(props, { emit }) { @@ -406,8 +406,7 @@ export default defineComponent({ const createProbject: any = inject('createProbject', () => {}) let productImgData: any = reactive({ isShowMark: false, - fileList:{ - }, + fileList: {}, searchName: { ToProductImage: '', Relight: '' @@ -416,37 +415,37 @@ export default defineComponent({ isProductimg: false, //开始生成 selectProductimgList: [], generateList: { - ToProductImage:computed(()=>{ - if(!route.query?.id && route.query.tools == 'toProduct'){ - return [] - }else{ - return store.state.HomeStoreModule.toProductImageList.list - } - }), - Relight:computed(()=>{ - if(!route.query?.id && route.query.tools == 'relight'){ - return [] - }else{ - return store.state.HomeStoreModule.relightList.list - } - }), + ToProductImage: computed(() => { + if (!route.query?.id && route.query.tools == 'toProduct') { + return [] + } else { + return store.state.HomeStoreModule.toProductImageList.list + } + }), + Relight: computed(() => { + if (!route.query?.id && route.query.tools == 'relight') { + return [] + } else { + return store.state.HomeStoreModule.relightList.list + } + }) }, selectObject: computed(() => store.state.Workspace.probjects), //选择的项目 likeList: { - ToProductImage:computed(()=>{ - if(!route.query?.id && route.query.tools == 'toProduct'){ - return [] - }else{ - return store.state.HomeStoreModule.toProductImageList.likedList - } - }), - Relight:computed(()=>{ - if(!route.query?.id && route.query.tools == 'relight'){ - return [] - }else{ - return store.state.HomeStoreModule.relightList.likedList - } - }), + ToProductImage: computed(() => { + if (!route.query?.id && route.query.tools == 'toProduct') { + return [] + } else { + return store.state.HomeStoreModule.toProductImageList.likedList + } + }), + Relight: computed(() => { + if (!route.query?.id && route.query.tools == 'relight') { + return [] + } else { + return store.state.HomeStoreModule.relightList.likedList + } + }) } as any, similarity: 30, brightenValue: 1, @@ -520,19 +519,23 @@ export default defineComponent({ return store.state.UploadFilesModule.modularData }) let userlikeGroupId = 0 - watch(()=>store.state.HomeStoreModule.uploadElement.length,(newVal,oldVal)=>{ - setFileList() - }) - const setFileList = () => { - if(props.isDesignPage)return - if(!route.query?.id && route.query.tools){ - productImgData.fileList[props.productimgMenu.value] = [] - }else{ - productImgData.fileList[props.productimgMenu.value] = store.state.HomeStoreModule.uploadElement - if(productImgData.fileList[props.productimgMenu.value][0]){ - productImgData.fileList[props.productimgMenu.value][0].isChecked = true - } - } + watch( + () => store.state.HomeStoreModule.uploadElement.length, + (newVal, oldVal) => { + setFileList() + } + ) + const setFileList = () => { + if (props.isDesignPage) return + if (!route.query?.id && route.query.tools) { + productImgData.fileList[props.productimgMenu.value] = [] + } else { + productImgData.fileList[props.productimgMenu.value] = + store.state.HomeStoreModule.uploadElement + if (productImgData.fileList[props.productimgMenu.value][0]) { + productImgData.fileList[props.productimgMenu.value][0].isChecked = true + } + } } const openSetData = (designList: any) => { // cleardata() @@ -545,7 +548,7 @@ export default defineComponent({ productImgData.fileList[props.productimgMenu.value] = designList return } - setFileList() + setFileList() userlikeGroupId = selectDesignList.value.userlikeGroupId // getLikeProductImage(selectDesignList.value.userlikeGroupId) productImgDom.generalDragLeft.setItemPosition() @@ -1260,15 +1263,14 @@ export default defineComponent({ // &.active > .item { - // margin-right: 1rem; - // width: calc(100% / 2 - 0.5rem); - width: 9.6rem; + margin-right: 1rem; + width: calc(100% / 2 - 0.5rem); cursor: pointer; overflow: hidden; display: flex; justify-content: center; flex-shrink: 0; - height: 13.4rem; + height: 25rem; position: relative; // &.active{ // border: 2px solid; @@ -1539,6 +1541,16 @@ export default defineComponent({ } +.upload_file_item { + :deep(.ant-upload-picture-card-wrapper) { + .ant-upload-list-picture-card { + .ant-upload-select-picture-card { + width: 9.6rem; + height: 13.4rem; + } + } + } +} .prompt-container { margin-top: 4rem; margin-bottom: 3rem; @@ -1556,7 +1568,7 @@ export default defineComponent({ } } } - .input_box_btnBox{ + .input_box_btnBox { padding-bottom: 4rem; } .asistant-btn {