diff --git a/src/assets/images/homePage/designTutorial_CN.png b/src/assets/images/homePage/designTutorial_CN.png
new file mode 100644
index 00000000..7d0c1bc3
Binary files /dev/null and b/src/assets/images/homePage/designTutorial_CN.png differ
diff --git a/src/assets/images/homePage/designTutorial_EN.png b/src/assets/images/homePage/designTutorial_EN.png
new file mode 100644
index 00000000..10191929
Binary files /dev/null and b/src/assets/images/homePage/designTutorial_EN.png differ
diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue
index f3391727..2f719645 100644
--- a/src/component/Detail/DesignDetail.vue
+++ b/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
diff --git a/src/component/HomePage/Generate.vue b/src/component/HomePage/Generate.vue
index 88b3e3aa..71bbc612 100644
--- a/src/component/HomePage/Generate.vue
+++ b/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)
diff --git a/src/component/HomePage/UpgradePlan.vue b/src/component/HomePage/UpgradePlan.vue
index 952984a0..75e9ec37 100644
--- a/src/component/HomePage/UpgradePlan.vue
+++ b/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: {
diff --git a/src/component/home/design/index.vue b/src/component/home/design/index.vue
index ac9b67f7..f5a4137d 100644
--- a/src/component/home/design/index.vue
+++ b/src/component/home/design/index.vue
@@ -150,7 +150,10 @@
-
@@ -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;
- color: #000000;
- margin-left: 2rem;
- font-weight: 900;
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ > img{
+ width: 100%;
+ height: 100%;
+ object-fit: contain;
+ }
}
.designPage_body {
width: 100%;
diff --git a/src/component/home/index.vue b/src/component/home/index.vue
index e4d90a0d..e4d17a05 100644
--- a/src/component/home/index.vue
+++ b/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提示
diff --git a/src/lang/cn.ts b/src/lang/cn.ts
index 7258c13a..e0b5bc98 100644
--- a/src/lang/cn.ts
+++ b/src/lang/cn.ts
@@ -242,7 +242,6 @@ export default {
jsContent10: "二次创作的作品不允许使用'设计',但是您可以使用'重新设计'",
jsContent11: "取消喜欢后相关联的元素会被删除,确认要删除吗",
jsContent12: "你确定要删除选中元素和相关元素吗?",
- jsContent13: "生成的内容需要点击爱心才会储存到自己的库中",
},
ProductImg: {
productInput: "请输入关键词(例如款式、材质)",
diff --git a/src/lang/en.ts b/src/lang/en.ts
index 245c0747..97ed82ac 100644
--- a/src/lang/en.ts
+++ b/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)",
diff --git a/src/views/HomeView/library.vue b/src/views/HomeView/library.vue
index 9e9695e9..ea8e13bf 100644
--- a/src/views/HomeView/library.vue
+++ b/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(