From 4f5147911137e741db1bea4e32c9d918dc660d24 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Sat, 30 Dec 2023 10:02:28 +0800
Subject: [PATCH] fix

---
 src/component/Detail/habit.vue               | 9 +++++----
 src/component/HomePage/SketchboardUpload.vue | 4 +++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/component/Detail/habit.vue b/src/component/Detail/habit.vue
index af183ef9..1df92cb6 100644
--- a/src/component/Detail/habit.vue
+++ b/src/component/Detail/habit.vue
@@ -329,9 +329,9 @@ export default defineComponent({
         };
     },
    mounted() {
+		this.getPosition()
 		this.getworkspace()
 		this.getSex()
-		this.getPosition()
 	},
 	directives:{
 		fade:{
@@ -413,17 +413,18 @@ export default defineComponent({
 				this.workspaceItem.positionEnum = this.singleTypeList[0]
 			}
 		},
-		getPosition(){
-			Https.axiosGet(Https.httpUrls.workspaceenumValues,{params:{enumName:'FemalePosition'}}).then((rv: any) => {
+		async getPosition(){
+			await Https.axiosGet(Https.httpUrls.workspaceenumValues,{params:{enumName:'FemalePosition'}}).then((rv: any) => {
 				if (rv) {
 					this.position[0].value = rv
 				}
 			})
-			Https.axiosGet(Https.httpUrls.workspaceenumValues,{params:{enumName:'MalePosition'}}).then((rv: any) => {
+			await Https.axiosGet(Https.httpUrls.workspaceenumValues,{params:{enumName:'MalePosition'}}).then((rv: any) => {
 				if (rv) {
 					this.position[1].value = rv
 				}
 			})
+			// this.setPosition('')
 		},
 		getworkspace(){
 			// Https.axiosGet(Https.httpUrls.workspaceDetail,{params:{id:3}}).then((rv: any) => {
diff --git a/src/component/HomePage/SketchboardUpload.vue b/src/component/HomePage/SketchboardUpload.vue
index 27ce0753..e1d5eb75 100644
--- a/src/component/HomePage/SketchboardUpload.vue
+++ b/src/component/HomePage/SketchboardUpload.vue
@@ -662,6 +662,7 @@ export default defineComponent({
         },
 		//发送请求生成图片
 		getgenerate(){
+			this.sketchCatecoryList = this.store.state.Workspace.workspacePosition
 			if(this.isTest){//试用用户禁止使用
 				message.warning(
 					this.t('isTest.available')
@@ -735,6 +736,7 @@ export default defineComponent({
 					return
 				}
 			}
+
 			this.loadingShow = true
 			Https.axiosPost(Https.httpUrls.sketchAndPrintGenerate, data).then(
                 (rv) => {
@@ -748,7 +750,7 @@ export default defineComponent({
 								category:generage.level2Type?generage.level2Type:this.sketchCatecoryList[0].name,
 								categoryValue:generage.level2Type?generage.level2Type:this.sketchCatecoryList[0].value,
 								id_:GO.id++,
-								like:rv.generatedCollectionItems[index].isLiked
+								like:v.isLiked
 							}
 						this.generateList.push(arr)
 						this.loadingShow = false