From e3dae9e640e70160d08f8de82d5a7b1320480914 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Mon, 15 Sep 2025 13:33:27 +0800 Subject: [PATCH 01/54] =?UTF-8?q?=E9=9D=9E=E6=AD=A3=E5=BC=8F=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E7=9A=84=E9=81=AE=E7=BD=A9=E4=BD=8D=E7=BD=AE=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/style/style.css | 4 -- src/assets/style/style.less | 7 +- .../Canvas/ExistsImageList/index.vue | 14 ++-- src/component/HomePage/generalMenu.vue | 2 +- src/component/home/design/index.vue | 2 +- src/component/home/newProject/workspace.vue | 1 - src/lang/cn.ts | 1 + src/lang/en.ts | 1 + src/tool/listData.js | 3 +- src/views/HomeMain.vue | 70 +++++++++++-------- 10 files changed, 58 insertions(+), 47 deletions(-) diff --git a/src/assets/style/style.css b/src/assets/style/style.css index 4818ee3c..b1077c2d 100644 --- a/src/assets/style/style.css +++ b/src/assets/style/style.css @@ -1816,13 +1816,11 @@ textarea:focus { .accountEdit_page .input_border, .generalMenu_printModel_upload .input_border, .generate .input_border { - z-index: 2; display: flex; align-items: center; padding-bottom: calc(2rem*1.2); top: 0; flex-wrap: wrap; - z-index: 6; --width: 65%; } .collection_modal_body .input_border .input_box, @@ -1836,7 +1834,6 @@ textarea:focus { .generalMenu_printModel_upload .input_border .input_box, .generate .input_border .input_box { position: relative; - z-index: 6; flex: 1; display: flex; align-items: center; @@ -2210,7 +2207,6 @@ textarea:focus { cursor: pointer; transition: all 0.3s; position: relative; - z-index: 4; width: 4rem; display: flex; min-height: 3rem; diff --git a/src/assets/style/style.less b/src/assets/style/style.less index 6df16490..ce1c3905 100644 --- a/src/assets/style/style.less +++ b/src/assets/style/style.less @@ -1974,17 +1974,17 @@ textarea:focus{ //设计input和上传按钮样式 .collection_modal_body,.design_detail_modal_component,.library_page,.productImg_content,.poseTransfer,.scaleImage_modal,.editDesignType_modal,.accountEdit_page,.generalMenu_printModel_upload,.generate{ .input_border{ - z-index: 2; + // z-index: 2; display: flex; align-items: center; padding-bottom: calc(2rem*1.2); top: 0; flex-wrap: wrap; - z-index: 6; + // z-index: 6; --width:65%; .input_box{ position: relative; - z-index: 6; + // z-index: 6; flex: 1; display: flex; align-items: center; @@ -2150,7 +2150,6 @@ textarea:focus{ cursor: pointer; transition: all .3s; position: relative; - z-index: 4; width: 4rem; align-items: center; justify-content: center; diff --git a/src/component/Canvas/ExistsImageList/index.vue b/src/component/Canvas/ExistsImageList/index.vue index 154fff27..5730cbfe 100644 --- a/src/component/Canvas/ExistsImageList/index.vue +++ b/src/component/Canvas/ExistsImageList/index.vue @@ -349,18 +349,18 @@ const handleImageError = (event) => { /* 图片网格 */ .image-grid { display: grid; - grid-template-columns: repeat(auto-fill, minmax(200px, 1fr)); + grid-template-columns: repeat(auto-fill, minmax(20rem, 1fr)); gap: 16px; - min-height: 200px; - max-height: 500px; + min-height: 20rem; + max-height: 50rem; @media screen and (max-width: 768px) { - grid-template-columns: repeat(auto-fill, minmax(150px, 1fr)); + grid-template-columns: repeat(auto-fill, minmax(15rem, 1fr)); gap: 12px; } - @media screen and (max-width: 480px) { - grid-template-columns: repeat(auto-fill, minmax(120px, 1fr)); + @media screen and (max-width: 48rem) { + grid-template-columns: repeat(auto-fill, minmax(12rem, 1fr)); gap: 10px; } } @@ -387,7 +387,7 @@ const handleImageError = (event) => { .image-wrapper { position: relative; width: 100%; - height: 220px; + height: 22rem; overflow: hidden; img { diff --git a/src/component/HomePage/generalMenu.vue b/src/component/HomePage/generalMenu.vue index 43d7525c..61c26a43 100644 --- a/src/component/HomePage/generalMenu.vue +++ b/src/component/HomePage/generalMenu.vue @@ -71,7 +71,7 @@ import { message, Upload, Modal } from "ant-design-vue"; }, isFontType:{ type:Boolean, - default:true, + default:false, }, selectSize:{ type:String, diff --git a/src/component/home/design/index.vue b/src/component/home/design/index.vue index eb568b5c..e33f809e 100644 --- a/src/component/home/design/index.vue +++ b/src/component/home/design/index.vue @@ -1911,7 +1911,7 @@ export default defineComponent({ if(design?.childList?.length > 0){ await new Promise((resolve, reject) => { Modal.confirm({ - title: this.t('LibraryPage.jsContent11'), + title: this.t('HomeView.jsContent12'), icon: createVNode(ExclamationCircleOutlined), okText: 'Yes', cancelText: 'No', diff --git a/src/component/home/newProject/workspace.vue b/src/component/home/newProject/workspace.vue index 8e613c1c..2e19c50b 100644 --- a/src/component/home/newProject/workspace.vue +++ b/src/component/home/newProject/workspace.vue @@ -43,7 +43,6 @@
{{$t('Habit.Brand')}}:
-
{{ $t('Habit.Select') }}
diff --git a/src/lang/cn.ts b/src/lang/cn.ts index d093f37d..ded270bc 100644 --- a/src/lang/cn.ts +++ b/src/lang/cn.ts @@ -239,6 +239,7 @@ export default { jsContent9: "您确定要清除当前系列并重新开始吗?", jsContent10: "二次创作的作品不允许使用'设计'，但是您可以使用'重新设计'", jsContent11: "取消喜欢后相关联的元素会被删除，确认要删除吗", + jsContent12: "你确定要删除选中元素和相关元素吗？", }, ProductImg: { productInput: "请输入关键词（例如款式、材质）", diff --git a/src/lang/en.ts b/src/lang/en.ts index 88e55012..0928c6d4 100644 --- a/src/lang/en.ts +++ b/src/lang/en.ts @@ -241,6 +241,7 @@ export default { jsContent9: "Are you sure to erase current collection and start over?", jsContent10: "Re-created works are not allowed to use 'design', but you can use 'redesign'", jsContent11: "By unliking this, all connected posts will be deleted. Are you sure you want to continue?", + jsContent12: "Are you sure about deleting the current brand DNA?", }, ProductImg: { productInput: "Enter keyword(style,texture)", diff --git a/src/tool/listData.js b/src/tool/listData.js index 258bcc6a..31c0bcde 100644 --- a/src/tool/listData.js +++ b/src/tool/listData.js @@ -339,7 +339,8 @@ const openTypeList = (t)=>{ label:t('LibraryPage.Mannequins'), value:'Models', router:'library=Models' - },{ + }, + { icon:'fi-ss-gem', label:t('LibraryPage.brandDNA'), value:'MyBrand', diff --git a/src/views/HomeMain.vue b/src/views/HomeMain.vue index d5c3aa97..25c5c6fe 100644 --- a/src/views/HomeMain.vue +++ b/src/views/HomeMain.vue @@ -240,11 +240,13 @@ -
- {{$t('Header.pastDue')}} -
-
- +
+
+ {{$t('Header.pastDue')}} +
+
+ +
@@ -341,6 +343,14 @@ export default defineComponent({ }, bathGenerationList:["poseTransfer","SERIES_DESIGN","toProduct","relight"] }) + let userDetail= computed(()=>{ + return store.state.UserHabit.userDetail + }) + const pastDuePage = computed(()=>{ + const isAllowedRoute = route.path === '/home/events' || route.path === '/home/works'; + const hasNoSystemAccess = userDetail.value.systemList.indexOf(1) === -1; + return !hasNoSystemAccess && !isAllowedRoute; + }) watch(()=>homeMainData.userDetailLanguage,(newVal)=>{ if(locale.value == newVal || !newVal)return locale.value = newVal @@ -413,9 +423,6 @@ export default defineComponent({ // homeMainData.historyData.page = 1 // }) - let userDetail= computed(()=>{ - return store.state.UserHabit.userDetail - }) let isMurmur = ref() let credits = computed(()=>{ return store.state.UserHabit.credits.value @@ -791,6 +798,7 @@ export default defineComponent({ t, ...toRefs(homeMainData), ...toRefs(historyData), + pastDuePage, locale, isMurmur, credits, @@ -953,9 +961,9 @@ export default defineComponent({ let url = 'https://aida-user-manual-chinese.super.site/' if(this.locale == 'ENGLISH'){ url = 'https://code-create.com.hk/wp-content/uploads/2025/02/aida_3.0-Manual-2_5-EN.pdf' - showViewVideo({url:'https://aida.com.hk/video/user_manual_3_1_0.mp4'}) + showViewVideo({url:'https://aida.com.hk/video/user_manual_3_1_0.mov'}) }else{ - showViewVideo({url:'https://aida.com.hk/video/user_manual_3_1_0.mp4'}) + showViewVideo({url:'https://aida.com.hk/video/user_manual_3_1_0_cn.mov'}) } this.toUserManual() // //打开视频 @@ -1778,26 +1786,32 @@ export default defineComponent({ } } - > .router{ - flex: 1; + > .routerView{ + position: relative; overflow: hidden; - padding: 0 6rem; - padding-bottom: 2rem; - } - > .userSystem{ - top: 0; - left: 0; - position: absolute; - width: 100%; - height: 100%; - background: rgba(0, 0, 0, 0.4); - z-index:2; + flex: 1; display: flex; - justify-content: center; - align-items: center; - color: #fff; - font-weight: 600; - font-size: 4rem; + > .router{ + flex: 1; + overflow: hidden; + padding: 0 6rem; + padding-bottom: 2rem; + } + > .userSystem{ + top: 0; + left: 0; + position: absolute; + width: 100%; + height: 100%; + background: rgba(0, 0, 0, 0.4); + display: flex; + justify-content: center; + align-items: center; + color: #fff; + font-weight: 600; + font-size: 4rem; + z-index: 100; + } } } } From 64a96a0cff7d731ce26d039b1f80db389ffd0802 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Mon, 15 Sep 2025 13:35:03 +0800 Subject: [PATCH 02/54] fix --- src/views/HomeMain.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/HomeMain.vue b/src/views/HomeMain.vue index 25c5c6fe..69f3782e 100644 --- a/src/views/HomeMain.vue +++ b/src/views/HomeMain.vue @@ -349,7 +349,7 @@ export default defineComponent({ const pastDuePage = computed(()=>{ const isAllowedRoute = route.path === '/home/events' || route.path === '/home/works'; const hasNoSystemAccess = userDetail.value.systemList.indexOf(1) === -1; - return !hasNoSystemAccess && !isAllowedRoute; + return hasNoSystemAccess && !isAllowedRoute; }) watch(()=>homeMainData.userDetailLanguage,(newVal)=>{ if(locale.value == newVal || !newVal)return From 06a313c216f6730d5a95ab42bce17070b72703cf Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Tue, 16 Sep 2025 11:39:45 +0800 Subject: [PATCH 03/54] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BA=A2=E7=BB=BF?= =?UTF-8?q?=E5=9B=BE=E6=9B=B4=E6=96=B0=E5=89=8D=E5=90=8E=E7=89=87=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/Detail/canvas/index.vue | 2 +- src/component/Detail/detailLeft/module/currentList.vue | 2 ++ src/component/Detail/model/modelPosition.vue | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/component/Detail/canvas/index.vue b/src/component/Detail/canvas/index.vue index 485fb8dd..875d8d6b 100644 --- a/src/component/Detail/canvas/index.vue +++ b/src/component/Detail/canvas/index.vue @@ -185,7 +185,7 @@ export default defineComponent({ }) } const frontBackChange = (value:any)=>{ - let full = detailData.frontBack.front[detailData.imgDomIndex].undividedLayer || detailData.frontBack.front[detailData.imgDomIndex].imageUrl + let full = detailData.frontBack.front[detailData.imgDomIndex].undividedLayer || detailData.selectDetail.path let size = { ...detailData.canvasConfig, } diff --git a/src/component/Detail/detailLeft/module/currentList.vue b/src/component/Detail/detailLeft/module/currentList.vue index 66c719d5..16c5eed2 100644 --- a/src/component/Detail/detailLeft/module/currentList.vue +++ b/src/component/Detail/detailLeft/module/currentList.vue @@ -58,6 +58,8 @@ export default defineComponent({ if(props.type != 'models'){ if(!file.resData.minIOPath){ file.minIOPath = getMinioUrl(file.imgUrl || file.resData.url) + }else{ + file.minIOPath = file.resData.minIOPath } if(!file.designType){ file.designType = file.resData.designType diff --git a/src/component/Detail/model/modelPosition.vue b/src/component/Detail/model/modelPosition.vue index deb47ba9..c7edf80a 100644 --- a/src/component/Detail/model/modelPosition.vue +++ b/src/component/Detail/model/modelPosition.vue @@ -481,7 +481,7 @@ export default defineComponent({ align-items: center; justify-content: center; img{ - height: auto; + // height: auto; } } } From 26bb4f2d6b620a1f173ff5d48cd07fffc1bc3506 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Tue, 16 Sep 2025 12:31:09 +0800 Subject: [PATCH 04/54] fix --- src/component/Detail/detailLeft/module/currentList.vue | 6 +++--- src/component/Detail/detailLeft/sketch.vue | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/component/Detail/detailLeft/module/currentList.vue b/src/component/Detail/detailLeft/module/currentList.vue index 16c5eed2..36094527 100644 --- a/src/component/Detail/detailLeft/module/currentList.vue +++ b/src/component/Detail/detailLeft/module/currentList.vue @@ -56,13 +56,13 @@ export default defineComponent({ }) const selectImgItem = (file:any)=>{ if(props.type != 'models'){ - if(!file.resData.minIOPath){ - file.minIOPath = getMinioUrl(file.imgUrl || file.resData.url) + if(!file.resData?.minIOPath){ + file.minIOPath = getMinioUrl(file?.imgUrl || file?.resData?.url) }else{ file.minIOPath = file.resData.minIOPath } if(!file.designType){ - file.designType = file.resData.designType + file.designType = file?.resData?.designType } } // store.commit('DesignDetail/setNewDetail',file.resData) diff --git a/src/component/Detail/detailLeft/sketch.vue b/src/component/Detail/detailLeft/sketch.vue index b5895d3a..59dcfa14 100644 --- a/src/component/Detail/detailLeft/sketch.vue +++ b/src/component/Detail/detailLeft/sketch.vue @@ -76,10 +76,10 @@ export default defineComponent({ selectImgItem(data) return } - data.id = id if(data?.imgUrl)data.url = data.imgUrl let value = { data, + id, } if(detailData.currentDetailType == 'sketch'){ detailData.selectDetail.sketchString = '' From ffa60e26b8b19a0082751359e7f4ec38ac7f81fc Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Tue, 16 Sep 2025 13:14:20 +0800 Subject: [PATCH 05/54] =?UTF-8?q?=E4=BF=AE=E5=A4=8Ddetail=E5=88=87?= =?UTF-8?q?=E6=8D=A2sketch=E5=89=8D=E5=90=8E=E7=89=87=E6=9C=89=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/Detail/DesignDetail.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue index 5f9bcc6e..e81ff67e 100644 --- a/src/component/Detail/DesignDetail.vue +++ b/src/component/Detail/DesignDetail.vue @@ -302,14 +302,15 @@ export default defineComponent({ if(detailData.currentDetailType == 'sketch' && newData){ color = detailData.designDetail.clothes[0].color?.rgba?.r?`${detailData.designDetail.clothes[0].color.rgba.r} ${detailData.designDetail.clothes[0].color.rgba.g} ${detailData.designDetail.clothes[0].color.rgba.b}`:'' } + console.log(list[i]) let data:any = { changed:false, color, designType:(newData && detailData.currentDetailType == 'sketch' && isCurrent)?newData.designType:list[i].designType, id:(newData && detailData.currentDetailType == 'sketch' && isCurrent)?newData.id:list[i].id, - maskMinioUrl:list[i]?.maskMinioUrl, + maskMinioUrl:(newData && detailData.currentDetailType == 'sketch')?'':list[i]?.maskMinioUrl, // maskUrl:'', - maskUrl:list[i].maskUrl, + maskUrl:(newData && detailData.currentDetailType == 'sketch')?'':list[i]?.maskUrl, // offset:[ // -233.13985, // 406.90964 From ad9399292ace5bcef81cafb1a5b2b5d2960f69b2 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Tue, 16 Sep 2025 14:02:50 +0800 Subject: [PATCH 06/54] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E9=A1=B5=E7=89=88=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Login.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/Login.vue b/src/views/Login.vue index 4bd55be3..061e5b4c 100644 --- a/src/views/Login.vue +++ b/src/views/Login.vue @@ -40,7 +40,7 @@
- Log on to AiDA + Log on to AiDA 3.1
Please fill your information below
From 467d816bcdec7f15de982717a45b69669dec40ad Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Tue, 16 Sep 2025 18:36:52 +0800 Subject: [PATCH 07/54] =?UTF-8?q?detail=E7=BC=96=E8=BE=91=E7=BA=A2?= =?UTF-8?q?=E7=BB=BF=E5=9B=BE=E7=9A=84=E5=BA=95=E5=9B=BE=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E4=B8=BA=E7=BA=BF=E7=A8=BF=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/Detail/canvas/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/component/Detail/canvas/index.vue b/src/component/Detail/canvas/index.vue index 875d8d6b..8ac6b936 100644 --- a/src/component/Detail/canvas/index.vue +++ b/src/component/Detail/canvas/index.vue @@ -35,7 +35,7 @@ --> -