fix

src/component/Detail/DesignDetail.vue

@@ -774,11 +774,11 @@ export default defineComponent({
 				this.store.commit("setDesignItemDetail", designItemDetail);
 			}
 			this.currentIndex = 0
-			let workspace = this.store.state.Workspace.workspace
+			let workspace = this.store.state.Workspace.probjects
 			let data = {
                 designItemId:designItemDetail.designItemId,
 				// designItemId:designItemDetail.designItemId,
-				gender:workspace?.sex,
+				gender:workspace?.sex == 'Male'?1:0,
 				designSingleItemDTOList:clothes,
 				isPreview:false,
 				sketchString:'',

src/component/Detail/DesignDetailAlter.vue

@@ -85,6 +85,7 @@
 
 									:data="{
 										...upload,
+										gender:workspace.sex,
 									}"
 									:headers="{ Authorization: token }"
 									v-model:file-list="uploadList"
@@ -312,7 +313,7 @@ export default defineComponent({
 		})
 		let workspace = ref({})
 		let sketchCatecoryList = computed(()=>{
-			return store.state.Workspace.workspacePosition
+			return store.state.Workspace.probjects.positionList
 		})
 		let designElementsType = computed(()=>{
 			return store.state.UserHabit.designElementsType;
@@ -418,7 +419,6 @@ export default defineComponent({
                 spin: true,
             }),
 			getPantongNameTime:true,
-			workspaceCom:{}
         }
     },
 	directives:{
@@ -523,10 +523,6 @@ export default defineComponent({
 			},
 			immediate: true
 		},
-		workspaceCom(newVal,oldVal){
-			this.workspace = newVal
-			this.upload.gender = newVal?.sexEnum?.value
-		},
     },
 	mounted () {
 		this.token = getCookie("token") || "";
@@ -638,9 +634,6 @@ export default defineComponent({
 			}
 			let DesignDetailEnd = this.$refs.DesignDetailEnd
 			DesignDetailEnd.init(num)
-			this.workspaceCom = computed(()=>{
-				return  this.store?.state?.Workspace?.workspace
-			})
 		},
 		
 		deleteFile(num){
@@ -794,13 +787,13 @@ export default defineComponent({
 			if(this.selectCode == 'Printboard' || this.selectCode == 'DesignElements' || this.selectCode == 'Sketchboard'){
 				level2Type = this.designType
 			}
-			let workspace = this.store.state.Workspace.workspace
+			let workspace = this.store.state.Workspace.probjects
             let data = {
                 // level1Type:'Printboard',
                 level1Type:this.selectCode,
                 // level2Type:'Pattern',
                 level2Type:level2Type,
-				modelSex:workspace?.sex,
+				modelSex:workspace?.sex == 'Male'?1:0,
                 page:this.currentPage,
                 pictureName:this.searchPictureName,
                 size:this.pageSize+this.clothesList.length,
@@ -1222,7 +1215,7 @@ export default defineComponent({
                     // height: 4rem*1.2);
                     // line-height: 3.8rem*1.2);
                     // background: #FFFFFF;
-                    border: calc(0.1rem*1.2) solid #F1F1F1;
+                    border: calc(0.1rem*1.2) solid #000;
                     // font-size: 1.6rem*1.2);
 					font-size: calc(1.2rem*1.2);
                     font-weight: 400;

src/component/Detail/habitSetStyle.vue

@@ -28,7 +28,7 @@
 			<div class="modal_title_text_intro"></div>
 		</div>
 		<div class="habitSetStyle_content_bottom">
-			<div class="content_bottom_item" v-for="item in styleList">
+			<div class="content_bottom_item" v-for="item in mannequinStyle">
 				<div class="content_bottom_item_border" :class="{active:item.name == selectStyle.name}" @click="setItemSelect(item)">
 					{{ item.name}}
 				</div>
@@ -61,7 +61,12 @@ import { downloadIamge } from "@/tool/util";
 import { useI18n } from "vue-i18n";
 export default defineComponent({
 emits:['setParentData','setWorkspaceStyle'],
-
+props:{
+	mannequinStyle:{
+		type:Array,
+		default:()=>[]
+	}
+},
 setup(props,{emit}) {
 	let habitSetStyle: any = ref(false);//弹窗
 	let habitSetStyleMask:any = ref(false)//弹窗遮罩
@@ -94,9 +99,9 @@ setup(props,{emit}) {
 	}
 	let init = (data:any)=>{
 		habitSetStyle.value = true
-		if(habitSetStyleData.styleList.length == 0){
-			getStyleList()
-		}
+		// if(habitSetStyleData.styleList.length == 0){
+		// 	getStyleList()
+		// }
 		oldDataId = data.styleId
 		habitSetStyleData.selectStyle.id = data.styleId 
 		habitSetStyleData.selectStyle.name = data.styleName 
@@ -130,25 +135,27 @@ setup(props,{emit}) {
 		if(oldDataId == data.id){
 			cleardata()
 		}else{
-			let _this = this
-			Modal.confirm({
-				title: t('Habit.jsContent3'),
-				icon: createVNode(ExclamationCircleOutlined),
-				okText: 'Yes',
-				cancelText: 'No',
-				mask:false,
-				centered:true,
-				zIndex:1050,
-				onOk() {
-					data.isRevampModel = true
-					emit('setWorkspaceStyle',data)
-					cleardata()
-				},
-				onCancel() {
-					emit('setWorkspaceStyle',data)
-					cleardata()
-				},
-			});
+			// let _this = this
+			// Modal.confirm({
+			// 	title: t('Habit.jsContent3'),
+			// 	icon: createVNode(ExclamationCircleOutlined),
+			// 	okText: 'Yes',
+			// 	cancelText: 'No',
+			// 	mask:false,
+			// 	centered:true,
+			// 	zIndex:1050,
+			// 	onOk() {
+			// 		data.isRevampModel = true
+			// 		emit('setWorkspaceStyle',data)
+			// 		cleardata()
+			// 	},
+			// 	onCancel() {
+			// 		emit('setWorkspaceStyle',data)
+			// 		cleardata()
+			// 	},
+			// });
+			emit('setWorkspaceStyle',data)
+			cleardata()
 		}
 	}
 	let setClear = ()=>{