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 51eae368..92af0300 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 054059ad..c6c4ca83 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 04c28ff3..a4fcbb56 100644
--- a/src/views/HomeMain.vue
+++ b/src/views/HomeMain.vue
@@ -240,11 +240,13 @@
-
- {{$t('Header.pastDue')}}
-
-
-
+
+
+ {{$t('Header.pastDue')}}
+
+
+
+