From fbf441f2c74594286a17274e665825a727440442 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Tue, 2 Jan 2024 16:22:33 +0800
Subject: [PATCH] fix

---
 src/component/Detail/habit.vue         | 6 ++++--
 src/component/HomePage/Generate.vue    | 5 +++--
 src/component/HomePage/RobotAssist.vue | 2 +-
 src/lang/en.ts                         | 1 +
 src/views/HomeView.vue                 | 1 +
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/component/Detail/habit.vue b/src/component/Detail/habit.vue
index 1df92cb6..c2449abc 100644
--- a/src/component/Detail/habit.vue
+++ b/src/component/Detail/habit.vue
@@ -328,8 +328,8 @@ export default defineComponent({
             store: useStore(),
         };
     },
-   mounted() {
-		this.getPosition()
+   async mounted() {
+		await this.getPosition()
 		this.getworkspace()
 		this.getSex()
 	},
@@ -406,6 +406,8 @@ export default defineComponent({
 				num = 1
 			}
 			this.singleTypeList = this.position[num].value
+			console.log(this.position[num],this.singleTypeList);
+
 			this.store.commit("setWorkspacePosition", this.position[num].value);
 
 			if(str == 'sex'){
diff --git a/src/component/HomePage/Generate.vue b/src/component/HomePage/Generate.vue
index 5baf3f6d..0470ede9 100644
--- a/src/component/HomePage/Generate.vue
+++ b/src/component/HomePage/Generate.vue
@@ -39,7 +39,7 @@
 					<li class="printModel_item" @click="setprintModel(1)">{{ $t('Generate.Model1') }}</li>
 					<li class="printModel_item" @click="setprintModel(2)">{{ $t('Generate.Model2') }}</li>
 					<li class="printModel_item" @click="setprintModel(3)">{{ $t('Generate.Model3') }}</li>
-					<li v-show="printBoards.length >= 1" class="printModel_item" @click="setprintModel(4)">{{ $t('Generate.Generate') }}</li>
+					<li v-show="printBoards.length >= 1" class="printModel_item" @click="setprintModel(4)">{{ $t('Generate.Merge') }}</li>
 				</ul>
 			</div>
         </div>
@@ -436,7 +436,7 @@ export default defineComponent({
 					num : 'Generate',
 					optype:false,
 					value:'',
-					name:this.t('Generate.Generate')
+					name:this.t('Generate.Merge')
 				}
 			}else{
 				this.printModel = {
@@ -603,6 +603,7 @@ export default defineComponent({
             document.addEventListener("click", this.hiddenFileCategory);
         },
         selectFileCategory(file: any, cate: any) {
+			file.categoryValue = cate?.value;
             file.category = cate.name;
 			file.categoryShow = false
             // this.store.commit("setSketchboardFile", this.sketchboardList);
diff --git a/src/component/HomePage/RobotAssist.vue b/src/component/HomePage/RobotAssist.vue
index f9c18737..9c0b4dd8 100644
--- a/src/component/HomePage/RobotAssist.vue
+++ b/src/component/HomePage/RobotAssist.vue
@@ -28,7 +28,7 @@
 								<i v-else class="fi fi-sr-heart" @click.stop="likeFile(imgItem,imgIndex,index)"></i>
 							</div>
 							<div class="delete_like_file_block left"  :class="[driver__.driver?'hideEvents':'']">
-								<i class="fi fi-bs-expand-arrows-alt" @click.stop="scaleImage(item.img,index)"></i>
+								<i class="fi fi-bs-expand-arrows-alt" @click.stop="scaleImage(item.img,imgIndex)"></i>
 							</div>
 						</div>
 					</div>
diff --git a/src/lang/en.ts b/src/lang/en.ts
index 4b651d8c..db2fa769 100644
--- a/src/lang/en.ts
+++ b/src/lang/en.ts
@@ -255,6 +255,7 @@ export default {
 		Model3:'Real Style',
 		inputContent1:'Input prompt',
 		Generate:'Generate',
+		Merge:'Merge',
 		maximumLength:'The entered content exceeds the maximum length.',
 		Model:'Model',
 		jsContent1:"You can only upload Image file!",
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index 86163048..6db88678 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -449,6 +449,7 @@ export default defineComponent({
 						// console.log(num,this.allBoardData?.sketchboardFiles.length);
 					}
 				});
+				
 			});
 			if(this.allBoardData?.sketchboardFiles?.length && this.allBoardData?.sketchboardFiles?.length>0){
 				if(num != this.allBoardData?.sketchboardFiles?.length){