Merge branch 'dev_vite' of http://18.167.251.121:10003/aidlab/aida_front into dev_vite

src/component/Detail/DesignDetail.vue

@@ -363,6 +363,7 @@ export default defineComponent({
 		}
 		const getSubmitData = async (str:string)=>{
 			// return
+			console.log(detailData.selectDetail)
 			let workspace = store.state.Workspace.probjects
 			if(!detailData?.selectDetail?.path && !detailData?.selectDetail?.newDetail?.sketch?.minIOPath)return
 			let clothes:any

src/component/HomePage/Generate.vue

@@ -1198,6 +1198,7 @@ export default defineComponent({
           level1Type: this.type_.type2,
           level2Type: level2Type,
           gender: this.workspace.sex,
+		  ageGroup: this.workspace.ageGroup,
           timeZone: Intl.DateTimeFormat().resolvedOptions().timeZone
         }
         Https.axiosPost(Https.httpUrls.generateLike, data)

src/component/HomePage/UpgradePlan.vue

@@ -116,7 +116,7 @@ import { Https } from "@/tool/https";
 import { useStore } from "vuex";
 import { useI18n } from "vue-i18n";
 import payMethod from "@/component/Pay/payMethod.vue";
-import { compute } from "three/tsl";
+// import { compute } from "three/tsl";
 // import { forEach } from "jszip";
 export default defineComponent({
 	components: {

src/component/home/design/index.vue

@@ -150,7 +150,10 @@
 											</div>
 										</div>
 									</div>
-									<div v-if="likeDesignCollectionList?.length == 0 && designCollectionList?.length > 0" class="info">{{ $t(t('HomeView.jsContent13')) }}</div>
+									<div v-if="likeDesignCollectionList?.length == 0 && designCollectionList?.length > 0" class="info">
+										<img v-if="locale == 'CHINESE_SIMPLIFIED'" src="@/assets/images/homePage/designTutorial_CN.png" alt="">
+										<img v-else src="@/assets/images/homePage/designTutorial_EN.png" alt="">
+									</div>
 									<div class="right_content_img_block scroll_style active">
 										<div class="right_content_img_item" ref="likeItemDom" designType="like" :index="0">
 											<!-- likeDesignCollectionList -->
@@ -1348,6 +1351,7 @@ export default defineComponent({
 		}
 		return {
 			store,
+			locale,
 			...toRefs(editDesignType),
 			likeDesignCollectionList,
 			deleteDesignCollectionList,
@@ -2251,10 +2255,16 @@ export default defineComponent({
 				}
 			}
 			.info{
-				font-size: 1.2rem;
+				position: absolute;
-				color: #000000;
+				top: 0;
-				margin-left: 2rem;
+				left: 0;
-				font-weight: 900;
+				width: 100%;
+				height: 100%;
+				> img{
+					width: 100%;
+					height: 100%;
+					object-fit: contain;
+				}
 			}
 			.designPage_body {
 				width: 100%;

src/component/home/index.vue

@@ -86,10 +86,21 @@ export default defineComponent({
 					return
 				}
 
+				// 检查是否需要重新初始化
+				const currentPath = route.fullPath
+				const storedPath = store.state.Workspace.projectPath
+				const isSameProject = currentPath === storedPath && data.openType === 'history'
+				
 				if(data.openType == 'history'){
 					store.commit('setProjectPath',route.fullPath)
 				}
 				
+				// 如果是同一个项目且openType为history，跳过重新初始化
+				if(isSameProject){
+					data.dataLoad = false
+					return
+				}
+				
 				nextTick(()=>{
 					if(query.history || query.id){
 						//切换新项目需要清除首次design提示

src/lang/cn.ts

@@ -242,7 +242,6 @@ export default {
 		jsContent10: "二次创作的作品不允许使用'设计'，但是您可以使用'重新设计'",
 		jsContent11: "取消喜欢后相关联的元素会被删除，确认要删除吗",
 		jsContent12: "你确定要删除选中元素和相关元素吗？",
-		jsContent13: "生成的内容需要点击爱心才会储存到自己的库中",
 	},
 	ProductImg: {
 		productInput: "请输入关键词（例如款式、材质）",

src/lang/en.ts

@@ -242,7 +242,6 @@ export default {
 		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?",
-		jsContent13: "The generated content can only be stored in your library by clicking on the heart icon.",
 	},
 	ProductImg: {
 		productInput: "Enter keyword(style,texture)",

src/views/HomeView/library.vue

@@ -1061,6 +1061,7 @@ export default defineComponent({
 					level1Type:this.selectCode,
 					level2Type: designType,
 					gender:this.sex,
+					ageGroup: this.ageGroup,
 					timeZone: Intl.DateTimeFormat().resolvedOptions().timeZone
 				}
 				Https.axiosPost(Https.httpUrls.generateLike, data).then(