diff --git a/src/component/Canvas/CanvasEditor/components/ToolsSidebar.vue b/src/component/Canvas/CanvasEditor/components/ToolsSidebar.vue index 2198665a..2c687311 100644 --- a/src/component/Canvas/CanvasEditor/components/ToolsSidebar.vue +++ b/src/component/Canvas/CanvasEditor/components/ToolsSidebar.vue @@ -328,6 +328,9 @@ const handleToolClick = (tool) => { style="width: 0; height: 0; opacity: 0" /> + + + { /> - + diff --git a/src/component/Canvas/CanvasEditor/index.vue b/src/component/Canvas/CanvasEditor/index.vue index 7247885a..f72cee5a 100644 --- a/src/component/Canvas/CanvasEditor/index.vue +++ b/src/component/Canvas/CanvasEditor/index.vue @@ -1043,9 +1043,12 @@ defineExpose({ @zoom-out="zoomOut" @undo-redo-status-changed="changeCanvas" > + + + - - + + diff --git a/src/component/Canvas/canvasExample.vue b/src/component/Canvas/canvasExample.vue index 58f8843a..567fdd5a 100644 --- a/src/component/Canvas/canvasExample.vue +++ b/src/component/Canvas/canvasExample.vue @@ -218,7 +218,7 @@ const isShowLeft = ref(true); - + diff --git a/src/component/Detail/canvas/index.vue b/src/component/Detail/canvas/index.vue index 6354aa15..712eb5df 100644 --- a/src/component/Detail/canvas/index.vue +++ b/src/component/Detail/canvas/index.vue @@ -16,11 +16,12 @@ imageMode:'contains', }" ref="editCanvas"> - + + - Edit the front and back sections + {{ $t('Canvas.editFrontBack') }} @@ -42,6 +43,13 @@ imageMode:'contains', }" ref="editCanvasBackFront"> + + + currentView = 'canvasEditor'"> + + {{ $t('Canvas.back') }} + + @@ -117,6 +125,7 @@ export default defineComponent({ },{immediate: true}) provide('isShowMark',detailData.isShowMark) provide('canvasType',detailData.canvasType) + const editFront = (str:any)=>{//编辑前后片 let canvasJSON = '' as any diff --git a/src/component/Detail/detailLeft/element.vue b/src/component/Detail/detailLeft/element.vue index 0096e41d..04bc6a2a 100644 --- a/src/component/Detail/detailLeft/element.vue +++ b/src/component/Detail/detailLeft/element.vue @@ -122,10 +122,11 @@ export default defineComponent({ padding: 1rem; text-align: center; border-radius: .5rem; - // border: 1px dashed #202020; - border: 1px dashed transparent; + border: 1px solid #000; + // border: 1px dashed transparent; + border-radius: 1.5rem; background: linear-gradient(#fff, #fff) padding-box,repeating-linear-gradient(-45deg,#fff 0,#fff 0.3em, #000 0,#000 0.6em); - margin-bottom: 3rem; + margin-bottom: 1.4rem; display: flex; flex-wrap: wrap; overflow: hidden; diff --git a/src/component/Detail/detailLeft/models.vue b/src/component/Detail/detailLeft/models.vue index 403240bc..c239fa94 100644 --- a/src/component/Detail/detailLeft/models.vue +++ b/src/component/Detail/detailLeft/models.vue @@ -100,11 +100,12 @@ export default defineComponent({ padding: 1rem 0; text-align: center; border-radius: .5rem; - // border: 1px dashed #202020; - border: 1px dashed transparent; + border: 1px solid #000; + // border: 1px dashed transparent; + border-radius: 1.5rem; position: relative; background: linear-gradient(#fff, #fff) padding-box,repeating-linear-gradient(-45deg,#fff 0,#fff 0.3em, #000 0,#000 0.6em); - margin-bottom: 3rem; + margin-bottom: 1.4rem; > img{ width: 100%; height: 100%; diff --git a/src/component/Detail/detailLeft/module/currentList.vue b/src/component/Detail/detailLeft/module/currentList.vue index 66c719d5..4684d870 100644 --- a/src/component/Detail/detailLeft/module/currentList.vue +++ b/src/component/Detail/detailLeft/module/currentList.vue @@ -105,9 +105,9 @@ export default defineComponent({ align-content: flex-start; &::-webkit-scrollbar{display: none;} > .content_img_item{ + width: calc((50% - 1rem)); > .content_img_item_block{ - width: calc((34rem - 2rem) / 2); - height: calc((34rem - 2rem) / 2); + aspect-ratio: 1/1; position: relative; margin-bottom: 2rem; @@ -119,16 +119,6 @@ export default defineComponent({ } } } - > .material_content_list_loding{ - width: 100%; - height: calc((34rem - 2rem) / 2); - } - > .upload_item{ - width: calc((34rem - 2rem) / 2); - height: calc((34rem - 2rem) / 2); - align-items: center; - justify-content: center; - } } } diff --git a/src/component/Detail/detailLeft/module/libraryList.vue b/src/component/Detail/detailLeft/module/libraryList.vue index 5b40f497..284999c8 100644 --- a/src/component/Detail/detailLeft/module/libraryList.vue +++ b/src/component/Detail/detailLeft/module/libraryList.vue @@ -349,9 +349,9 @@ export default defineComponent({ align-content: flex-start; &::-webkit-scrollbar{display: none;} > .content_img_item{ + width: calc((50% - 1rem)); > .content_img_item_block{ - width: calc((34rem - 2rem) / 2); - height: calc((34rem - 2rem) / 2); + aspect-ratio: 1/1; position: relative; margin-bottom: 2rem; cursor: pointer; @@ -364,7 +364,7 @@ export default defineComponent({ } > .material_content_list_loding{ width: 100%; - height: calc((34rem - 2rem) / 2); + aspect-ratio: 1/1; overflow: hidden; > img{ width: 100%; diff --git a/src/component/Detail/detailLeft/module/selectList.vue b/src/component/Detail/detailLeft/module/selectList.vue index 0bf32560..0729390d 100644 --- a/src/component/Detail/detailLeft/module/selectList.vue +++ b/src/component/Detail/detailLeft/module/selectList.vue @@ -1,6 +1,6 @@ - + .selectList_header{ margin-bottom: 2.5rem; display: flex; align-items: center; + &.element{ + margin-bottom: 0rem; + } > .switch_type_list{ display: flex; > .switch_type_item:last-child{ diff --git a/src/component/Detail/detailLeft/module/uploadList.vue b/src/component/Detail/detailLeft/module/uploadList.vue index 8a4764e5..851ae3af 100644 --- a/src/component/Detail/detailLeft/module/uploadList.vue +++ b/src/component/Detail/detailLeft/module/uploadList.vue @@ -199,9 +199,9 @@ export default defineComponent({ align-content: flex-start; &::-webkit-scrollbar{display: none;} > .content_img_item{ + width: calc((50% - 1rem)); > .content_img_item_block{ - width: calc((34rem - 2rem) / 2); - height: calc((34rem - 2rem) / 2); + aspect-ratio: 1/1; position: relative; margin-bottom: 2rem; @@ -215,11 +215,11 @@ export default defineComponent({ } > .material_content_list_loding{ width: 100%; - height: calc((34rem - 2rem) / 2); + aspect-ratio: 1/1; } > .upload_item{ - width: calc((34rem - 2rem) / 2); - height: calc((34rem - 2rem) / 2); + width: calc((50% - 1rem)); + aspect-ratio: 1/1; align-items: center; justify-content: center; } diff --git a/src/component/Detail/detailLeft/module/uploadModel.vue b/src/component/Detail/detailLeft/module/uploadModel.vue index 4548d4d6..f9334912 100644 --- a/src/component/Detail/detailLeft/module/uploadModel.vue +++ b/src/component/Detail/detailLeft/module/uploadModel.vue @@ -262,9 +262,10 @@ import sketchCategory from "@/component/HomePage/sketchCategory.vue"; align-content: flex-start; &::-webkit-scrollbar{display: none;} > .content_img_item{ + width: calc((50% - 1rem)); > .content_img_item_block{ - width: calc((34rem - 2rem) / 2); - height: calc((34rem - 2rem) / 2); + width: 100%; + aspect-ratio: 1/1; position: relative; margin-bottom: 2rem; margin: 1rem; @@ -279,11 +280,11 @@ import sketchCategory from "@/component/HomePage/sketchCategory.vue"; } > .material_content_list_loding{ width: 100%; - height: calc((34rem - 2rem) / 2); + aspect-ratio: 1/1; } > .upload_item{ - width: calc((34rem - 2rem) / 2); - height: calc((34rem - 2rem) / 2); + width: calc((50% - 1rem)); + aspect-ratio: 1/1; align-items: center; justify-content: center; .upload{ diff --git a/src/component/Detail/detailLeft/module/uploadSegmentation.vue b/src/component/Detail/detailLeft/module/uploadSegmentation.vue index 3ddce632..0c660ba6 100644 --- a/src/component/Detail/detailLeft/module/uploadSegmentation.vue +++ b/src/component/Detail/detailLeft/module/uploadSegmentation.vue @@ -145,9 +145,9 @@ export default defineComponent({ align-content: flex-start; &::-webkit-scrollbar{display: none;} > .content_img_item{ + width: calc((50% - 1rem)); > .content_img_item_block{ - width: calc((34rem - 2rem) / 2); - height: calc((34rem - 2rem) / 2); + aspect-ratio: 1/1; position: relative; margin-bottom: 2rem; @@ -174,11 +174,11 @@ export default defineComponent({ } > .material_content_list_loding{ width: 100%; - height: calc((34rem - 2rem) / 2); + aspect-ratio: 1/1; } > .upload_item{ - width: calc((34rem - 2rem) / 2); - height: calc((34rem - 2rem) / 2); + width: calc((50% - 1rem)); + aspect-ratio: 1/1; align-items: center; justify-content: center; .upload{ diff --git a/src/component/Detail/detailLeft/print.vue b/src/component/Detail/detailLeft/print.vue index 2939b0d8..f3a90a53 100644 --- a/src/component/Detail/detailLeft/print.vue +++ b/src/component/Detail/detailLeft/print.vue @@ -120,11 +120,11 @@ export default defineComponent({ height: 23.5rem; padding: 1rem; text-align: center; - border-radius: .5rem; - // border: 1px dashed #202020; - border: 1px dashed transparent; + border: 1px solid #000; + // border: 1px dashed transparent; + border-radius: 1.5rem; background: linear-gradient(#fff, #fff) padding-box,repeating-linear-gradient(-45deg,#fff 0,#fff 0.3em, #000 0,#000 0.6em); - margin-bottom: 3rem; + margin-bottom: 1.4rem; display: flex; flex-wrap: wrap; overflow: hidden; diff --git a/src/component/Detail/detailLeft/sketch.vue b/src/component/Detail/detailLeft/sketch.vue index b5895d3a..8ecd33e9 100644 --- a/src/component/Detail/detailLeft/sketch.vue +++ b/src/component/Detail/detailLeft/sketch.vue @@ -126,11 +126,12 @@ export default defineComponent({ padding: 1rem 0; text-align: center; border-radius: .5rem; - // border: 1px dashed #202020; - border: 1px dashed transparent; + border: 1px solid #000; + // border: 1px dashed transparent; + border-radius: 1.5rem; position: relative; background: linear-gradient(#fff, #fff) padding-box,repeating-linear-gradient(-45deg,#fff 0,#fff 0.3em, #000 0,#000 0.6em); - margin-bottom: 3rem; + margin-bottom: 1.4rem; > img{ width: 100%; height: 100%; diff --git a/src/component/home/tools/deReconstruction/canvas/index.vue b/src/component/home/tools/deReconstruction/canvas/index.vue index 0c6b8277..6b8e698d 100644 --- a/src/component/home/tools/deReconstruction/canvas/index.vue +++ b/src/component/home/tools/deReconstruction/canvas/index.vue @@ -9,7 +9,7 @@ imageMode:'contains', }" > - + Hidden model diff --git a/src/lang/cn.ts b/src/lang/cn.ts index d093f37d..f587818a 100644 --- a/src/lang/cn.ts +++ b/src/lang/cn.ts @@ -1277,6 +1277,8 @@ export default { SelectTextColor:'选择文字颜色', SelectBGColor:'选择背景颜色', ok:'确定', + editFrontBack:'编辑服装前片后片', + back:'返回', }, speedList:{ High:'高级', diff --git a/src/lang/en.ts b/src/lang/en.ts index 88e55012..4512db6d 100644 --- a/src/lang/en.ts +++ b/src/lang/en.ts @@ -1279,6 +1279,8 @@ export default { SelectTextColor:'Select Text Color', SelectBGColor:'Select Background Color', ok:'OK', + editFrontBack:'Edit the front and back sections', + back:'Back', }, speedList:{ High:'High', diff --git a/src/store/userHabit/userHabit.ts b/src/store/userHabit/userHabit.ts index d76ad75a..010a8057 100644 --- a/src/store/userHabit/userHabit.ts +++ b/src/store/userHabit/userHabit.ts @@ -263,9 +263,10 @@ const userHabit : Module = { * 7 : 学校管理员 * 8 : 学校子账号 */ + // data.systemUser = 0 state.userDetail.affiliate = data.affiliate state.userDetail.systemUser = data.systemUser - // state.userDetail.systemUser = 3 + // state.userDetail.systemUser = 1 // 身份列表1:可以使用aida系统,2:可以使用affiliate页面,3:系统管理员用户 state.userDetail.systemList = [] if(data.systemUser != 0)state.userDetail.systemList.push(1) diff --git a/src/views/HomeMain.vue b/src/views/HomeMain.vue index d5c3aa97..84d4def4 100644 --- a/src/views/HomeMain.vue +++ b/src/views/HomeMain.vue @@ -240,7 +240,7 @@ - + {{$t('Header.pastDue')}} @@ -317,6 +317,7 @@ export default defineComponent({ const route = useRoute() const router = useRouter() const homeMainData = reactive({ + leftShow:false, openType:'', openTypeChild:'', @@ -341,6 +342,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 +422,7 @@ 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, diff --git a/src/views/HomeView/Works.vue b/src/views/HomeView/Works.vue index 4f2c88ad..363c75cd 100644 --- a/src/views/HomeView/Works.vue +++ b/src/views/HomeView/Works.vue @@ -10,7 +10,7 @@ NewYear_2025 --> - +