Merge remote-tracking branch 'origin/StableVersion' into dev_vite

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;

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;

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 {

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,

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',

src/component/home/newProject/workspace.vue

@@ -43,7 +43,6 @@
 			</div>
 			<div class="style brand marginBottom">
 				<div class="text">{{$t('Habit.Brand')}}:</div>
-				<!-- <div class="text"><img v-show="selectObject.userBrandDna" :src="selectObject.userBrandDnaImg">{{ selectObject.userBrandDnaName }}</div> -->
 				<div class="gallery_btn" @click="setBrandDNA">{{ $t('Habit.Select') }}</div>
 			</div>
 			<div class="brandImg" v-if="selectObject.userBrandDna"><img :src="selectObject.userBrandDnaImg"></div>

src/lang/cn.ts

@@ -239,6 +239,7 @@ export default {
     jsContent9: "您确定要清除当前系列并重新开始吗?",
     jsContent10: "二次创作的作品不允许使用'设计'，但是您可以使用'重新设计'",
     jsContent11: "取消喜欢后相关联的元素会被删除，确认要删除吗",
+    jsContent12: "你确定要删除选中元素和相关元素吗？",
   },
   ProductImg: {
     productInput: "请输入关键词（例如款式、材质）",

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)",

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',

src/views/HomeMain.vue

@@ -240,11 +240,13 @@
 						</div>
 					</div>
 				</div>
-				<div class="userSystem" v-if="!pastDuePage">
-					{{$t('Header.pastDue')}}
-				</div>
-				<div class="router" v-else-if="!getLangIsShowMark">
-					<home ref="home" @setNewProject="()=>leftShow=true" @setTask="setTask"></home>
+				<div class="routerView">
+					<div class="userSystem" v-show="pastDuePage">
+						{{$t('Header.pastDue')}}
+					</div>
+					<div class="router" v-if="!getLangIsShowMark">
+						<home ref="home" @setNewProject="()=>leftShow=true" @setTask="setTask"></home>
+					</div>
 				</div>
 			</div>
 		</div>
@@ -348,7 +350,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
@@ -422,7 +424,6 @@ export default defineComponent({
 		// 	homeMainData.historyData.page = 1
 		// })
 		
-		
 		let isMurmur = ref()
 		let credits = computed(()=>{
 			return store.state.UserHabit.credits.value
@@ -961,9 +962,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()
 			// //打开视频
@@ -1786,26 +1787,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;
+				}
 			}
 		}
 	}