-
-
+ Edit the front and back sections
+ {{ $t('Canvas.editFrontBack') }}
+
+
@@ -35,19 +40,14 @@
-->
{{ $t('Canvas.help') }}
-
-
-
Edit the front and back sections
-
-
+
.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/Detail/detailRight/editPrintElement.vue b/src/component/Detail/detailRight/editPrintElement.vue
index 60004aaf..8d445c33 100644
--- a/src/component/Detail/detailRight/editPrintElement.vue
+++ b/src/component/Detail/detailRight/editPrintElement.vue
@@ -1,56 +1,56 @@
+
+ {{ $t('DesignPrintOperation.ModifyPrint') }}
+
-
-
- {{ $t('DesignPrintOperation.Overall') }}
-
-
+
+
+
-
-
+
+
+ {{ $t('DesignPrintOperation.Scale') }}
-
+
-
+
+
+ ![]()
+
+
+
+ ![]()
+
+
+
-
-->
-
+
- ![]()
-
-
-
- ![]()
-
-
-
+
+
{{ $t('DesignPrintOperation.Scale') }}
+
@@ -60,7 +60,7 @@
@@ -317,6 +319,7 @@ export default defineComponent({
const route = useRoute()
const router = useRouter()
const homeMainData = reactive({
+
leftShow:false,
openType:'',
openTypeChild:'',
@@ -342,6 +345,14 @@ export default defineComponent({
bathGenerationList: ["poseTransfer", "SERIES_DESIGN", "toProduct", "relight"],
showHistory:false
})
+ 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
@@ -430,9 +441,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
@@ -807,6 +815,7 @@ export default defineComponent({
t,
...toRefs(homeMainData),
...toRefs(historyData),
+ pastDuePage,
locale,
isMurmur,
credits,
@@ -969,9 +978,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()
// //打开视频
@@ -1804,26 +1813,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;
+ }
}
}
}
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 @@
-->
![]()
![]()
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',
}"
>
-
+
= {
}
},
setDesignColthes(state,data){
- console.log(data)
if(!state.currentDetailType)state.currentDetailType = 'sketch'
//切换选择
// state.currentDetailType = ''
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/tool/listData.js b/src/tool/listData.js
index cb647e5f..7baae450 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 f42166c7..f07de8f4 100644
--- a/src/views/HomeMain.vue
+++ b/src/views/HomeMain.vue
@@ -240,11 +240,13 @@
-
-
-
+
-
@@ -82,8 +82,8 @@
-
+
+
-
@@ -125,7 +125,6 @@ export default defineComponent({
selectDetail:computed(()=>store.state.DesignDetail.selectDetail),
currentDetailType:computed(()=>store.state.DesignDetail.currentDetailType),
currentPrintElement:computed(()=>store.state.DesignDetail.currentPrintElement),
- overallSingle:true,
systemDesignerPercentage:0,
printStyleList:{
print:{
@@ -168,11 +167,6 @@ export default defineComponent({
})
const setOveralSingle = ()=>{
- if(!editPrintElementData.overallSingle){
- editPrintElementData.stateOverallSingle = 'overall'
- }else{
- editPrintElementData.stateOverallSingle = 'single'
- }
setItemPosition()
}
const formatter = (value:any)=>{
@@ -197,7 +191,7 @@ export default defineComponent({
let sketchH = editPrintElementData.sketchWH.height * editPrintElementData.sketchWH.scale
let x = sketchW / 2 - (sketchW * (width / editPrintElementData.sketchWH.width)/2)
let y = sketchH / 2 -(sketchH * height/2)
- if(!editPrintElementData.overallSingle){
+ if(!editPrintElementData.stateOverallSingle == 'single'){
x = sketchW / 2
y = sketchH / 2
}
@@ -212,7 +206,7 @@ export default defineComponent({
let item = {
angle:0,
designType:data.designType,
- ifSingle:editPrintElementData.overallSingle,
+ ifSingle:editPrintElementData.stateOverallSingle == 'single',
level2Type:data.level2Type,
location,
minIOPath:data.minIOPath || data.originalUrl,
@@ -354,9 +348,9 @@ export default defineComponent({
})
setItemPosition()
}
- if(props.type == 'print'){
- editPrintElementData.overallSingle = state
- }
+ // if(props.type == 'print'){
+ // editPrintElementData.overallSingle = state
+ // }
}
// undividedLayer
//计算宽高使用editPrintElementData.selectDetail.path
@@ -392,7 +386,7 @@ export default defineComponent({
editPrintElementData.printStyleList[props.type][editPrintElementData.stateOverallSingle].forEach((v:any)=>{
v.pattern.designOpenrtionBtn = false
})
- if(!editPrintElementData.overallSingle){
+ if(editPrintElementData.stateOverallSingle != 'single'){
editPrintElementDom.imgDom = document.getElementsByClassName('editPrintElement')[0].getElementsByClassName("designOpenrtion_Mouoverall")[0]
}else{
editPrintElementDom.imgDom = document.getElementsByClassName('editPrintElement')[0].getElementsByClassName("modal_imgItem")[editPrintElementData.imgDomIndex]
@@ -462,7 +456,7 @@ export default defineComponent({
let y:any = ( e.clientY - editPrintElementData.printStyleList[props.type][editPrintElementData.stateOverallSingle][editPrintElementData.imgDomIndex].pattern.centers.top)+'px'
editPrintElementData.printStyleList[props.type][editPrintElementData.stateOverallSingle][editPrintElementData.imgDomIndex].pattern.style.left = x
editPrintElementData.printStyleList[props.type][editPrintElementData.stateOverallSingle][editPrintElementData.imgDomIndex].pattern.style.top = y
- if(!editPrintElementData.overallSingle){
+ if(editPrintElementData.stateOverallSingle != 'single'){
if(x.replace(/px/g,'') >= parentNode.width - imgDomWH.width){
editPrintElementData.printStyleList[props.type][editPrintElementData.stateOverallSingle][editPrintElementData.imgDomIndex].pattern.style.left = parentNode.width - imgDomWH.width+'px'
}
@@ -740,7 +734,6 @@ export default defineComponent({
onMounted(()=>{
if(props.type == 'element'){
editPrintElementData.stateOverallSingle = 'single'
- editPrintElementData.overallSingle = true
}
})
onBeforeUnmount(()=>{
@@ -857,74 +850,88 @@ export default defineComponent({
> .overallSlogin{
align-items: center;
display: flex;
+ // margin-top: 1.4rem;
+ margin-bottom: 2.2rem;
+ > label{
+ display: flex;
+ align-items: center;
+ font-size: 1.6rem;
+ margin-right: 2.4rem;
+ &:last-child{
+ margin-right: 0rem;
+ }
+ > input{
+ margin-right: 1rem;
+ }
+ }
}
- .habit_Overal_Single_text {
- font-weight: 600;
- color: rgba(0, 0, 0, 0.5);
+ }
+ .habit_System_Designer {
+ align-items: center;
+ display: flex;
+ justify-content: center;
+ .ant-slider-track,
+ .ant-slider-rail {
+ background-color: #e1e1e1;
+ border-radius: calc(0.5rem*1.2);
+ }
+ :deep(.system_silder){
+ width: 17rem;
+ }
+ .ant-slider .ant-slider-handle:not(.ant-tooltip-open),
+ .ant-slider-handle {
+ background-color: #2d2e76 !important;
+ border: none !important;
+ }
+ .ant-slider-handle:hover{
+ box-shadow: 0 0 0 5px rgba(45, 46, 118, 0.2);
+ }
+ .habit_System_Designer_text{
font-size: 1.8rem;
- margin: 0 1rem;
- &.active {
- color: rgba(0, 0, 0, 0.7);
- // font-weight: 900;
- // transform: scale(1.2);
- }
- }
- .habit_System_Designer {
- align-items: center;
- display: flex;
- .ant-slider-track,
- .ant-slider-rail {
- background-color: #e1e1e1;
- border-radius: calc(0.5rem*1.2);
- }
- :deep(.system_silder){
- width: 20rem;
- }
- .ant-slider .ant-slider-handle:not(.ant-tooltip-open),
- .ant-slider-handle {
- background-color: #2d2e76 !important;
- border: none !important;
- }
- .ant-slider-handle:hover{
- box-shadow: 0 0 0 5px rgba(45, 46, 118, 0.2);
- }
- .habit_System_Designer_text{
- font-size: 1.8rem;
- color: rgba(0, 0, 0, 0.7);
- margin-right: 3rem;
- font-weight: 600;
- }
+ color: rgba(0, 0, 0, 0.7);
+ margin-right: 3rem;
+ font-weight: 600;
}
}
- > .printElementList{
- width: 100%;
- height: 10rem;
- position: relative;
- overflow-x: auto;
- .itemList{
- height: 100%;
+ > .printElementListBorder{
+ &.single{
+ padding: 2rem 4rem;
+ width: 100%;
+ border-radius: 1.5rem;
+ border: .05rem solid #000;
}
- .imgItem{
- width: 8rem;
- height: 8rem;
- position: absolute;
- cursor: pointer;
- border-radius: 1rem;
- overflow: hidden;
- > img{
- width: 100%;
+ > .printElementList{
+ width: 100%;
+ height: 10rem;
+ position: relative;
+ overflow-x: auto;
+
+ .itemList{
height: 100%;
- object-fit: cover;
}
- > i{
+ .imgItem{
+ width: 8rem;
+ height: 8rem;
position: absolute;
- right: 1rem;
- top: 1rem;
- color: #fff;
- text-shadow: 0px 0px 2px black, 0px 0px 2px black, 0px 0px 2px black;
+ cursor: pointer;
+ border-radius: 1rem;
+ overflow: hidden;
+ > img{
+ width: 100%;
+ height: 100%;
+ object-fit: cover;
+ }
+ > i{
+ position: absolute;
+ right: 1rem;
+ top: 1rem;
+ color: #fff;
+ text-shadow: 0px 0px 2px black, 0px 0px 2px black, 0px 0px 2px black;
+ }
}
}
}
+
> .editPrintElementBox{
flex: 1;
overflow: hidden;
diff --git a/src/component/Detail/model/index.vue b/src/component/Detail/model/index.vue
index 37921146..c19c3e50 100644
--- a/src/component/Detail/model/index.vue
+++ b/src/component/Detail/model/index.vue
@@ -4,7 +4,7 @@
@@ -14,7 +14,12 @@
-
+
+
+
+
{{$t('Habit.Brand')}}:
-
{{ $t('Habit.Select') }}
Hidden model
diff --git a/src/lang/cn.ts b/src/lang/cn.ts
index 3f672fad..8665a849 100644
--- a/src/lang/cn.ts
+++ b/src/lang/cn.ts
@@ -239,6 +239,7 @@ export default {
jsContent9: "您确定要清除当前系列并重新开始吗?",
jsContent10: "二次创作的作品不允许使用'设计'，但是您可以使用'重新设计'",
jsContent11: "取消喜欢后相关联的元素会被删除，确认要删除吗",
+ jsContent12: "你确定要删除选中元素和相关元素吗？",
},
ProductImg: {
productInput: "请输入关键词（例如款式、材质）",
@@ -635,6 +636,7 @@ export default {
},
DesignPrintOperation: {
Placement: "调整位置",
+ ModifyPrint: "修改印花",
Overall: "整体",
Single: "单个",
Scale: "大小",
@@ -1277,6 +1279,9 @@ export default {
SelectTextColor:'选择文字颜色',
SelectBGColor:'选择背景颜色',
ok:'确定',
+ editFrontBack:'编辑服装前片后片',
+ help:'帮助',
+ back:'返回',
},
speedList:{
High:'高级',
diff --git a/src/lang/en.ts b/src/lang/en.ts
index aee9a5cd..b6fb9ac8 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)",
@@ -637,6 +638,7 @@ export default {
},
DesignPrintOperation: {
Placement: "Placement",
+ ModifyPrint: "Modify Print",
Overall: "Overall",
Single: "Single",
Scale: "Scale",
@@ -1279,6 +1281,9 @@ export default {
SelectTextColor:'Select Text Color',
SelectBGColor:'Select Background Color',
ok:'OK',
+ editFrontBack:'Edit the front and back sections',
+ help:'Help',
+ back:'Back',
},
speedList:{
High:'High',
diff --git a/src/store/Detail/designDetail.ts b/src/store/Detail/designDetail.ts
index adcd1886..103621c9 100644
--- a/src/store/Detail/designDetail.ts
+++ b/src/store/Detail/designDetail.ts
@@ -138,7 +138,6 @@ const DesignDetail : Module
- {{$t('Header.pastDue')}}
-
-
-
+
+ {{$t('Header.pastDue')}}
+
+
+
NewYear_2025
-