调整部分bug

src/store/Detail/designDetailCopy.ts

@@ -114,6 +114,8 @@ const DesignDetailCopy : Module<DesignDetailCopy,RootState> = {
 				state.selectDetail.newDetail[str] = data
 			}else if(str == 'element'){
 				state.selectDetail.newDetail[str] = data
+			}else if(str == 'models'){
+				state.selectDetail.newDetail[str] = data
 			}else{
 				if(!state.selectDetail.newDetail[str])state.selectDetail.newDetail[str] = []
 				const foundObjects = state.selectDetail.newDetail[str].filter((item:any) => item.id === data.id);

src/store/uploadFile/uploadFile.ts

@@ -404,7 +404,7 @@ const UploadFilesModule : Module<UploadFiles,RootState> = {
 		getProjectData({ state,commit },str){
 			return new Promise((resolve,reject) => {
 				let data:any = {}
-				let allBoardData = ['sketchBoard','moodBoard','printBoard','colorBoard']
+				let allBoardData = ['sketchBoard','moodBoard','printBoard','colorBoard','mannequin']
 				if(allBoardData.indexOf(str) != -1){
 					if(str == 'colorBoard'){
 						let boardData = state.colorBoards || []
@@ -456,6 +456,18 @@ const UploadFilesModule : Module<UploadFiles,RootState> = {
 							return data;
 						});
 						data[str] = sketchBoards
+					}else if(str == 'mannequin'){
+						let list:any = []
+						let workspaceState:any = workspace.state
+						workspaceState.probjects.model.forEach((item:any)=>{
+							let obj = {
+								id:item.id,
+								type:item.type,
+								collectionElementId:item.collectionElementId
+							}
+							list.push(obj)
+						})
+						data[str] = list
 					}
 				}else{
 					data[str] = state.modularData[str]

src/store/userHabit/userHabit.ts

@@ -260,7 +260,7 @@ const userHabit : Module<UserHabit,RootState> = {
 			 */
 			state.userDetail.affiliate = data.affiliate
 			state.userDetail.systemUser = data.systemUser
-			state.userDetail.systemUser = 3
+			// state.userDetail.systemUser = 3
 			// 身份列表1：可以使用aida系统，2:可以使用affiliate页面，3：系统管理员用户
 			state.userDetail.systemList = []
 			if(data.systemUser != 0)state.userDetail.systemList.push(1)
@@ -380,6 +380,25 @@ const userHabit : Module<UserHabit,RootState> = {
 					})
 			    })
 			}
+			const getmannequinStyle = ()=>{
+				return new Promise((resolve,reject) => {
+					Https.axiosPost(Https.httpUrls.getStyleList, {}).then(
+						(rv) => {
+							rv.forEach((item:any) => {
+								let name = item.value
+								item.value = item.name
+								item.name = name
+							});
+							rv.unshift({name:'All',value:'',id:''})
+							store.commit('setMannequinStyle',rv)
+							resolve('')
+						}
+					).catch(res=>{
+						reject('')
+					});
+				})	
+			}
+			
 			context.commit('setWorkspaceAllPosition',workspaceAllPosition)
 			let getUserDetail = ()=>{
 				return new Promise((resolve,reject) => {
@@ -394,7 +413,7 @@ const userHabit : Module<UserHabit,RootState> = {
 					})
 				})
 			}
-			return await Promise.all([...getList.map(item => axiosGet(item)),getUserDetail()])
+			return await Promise.all([...getList.map(item => axiosGet(item)),getUserDetail(),getmannequinStyle()])
 		}
     }
 }

src/store/workspace/workspace.ts

@@ -28,6 +28,10 @@ const Workspace : Module<DesignDetail,RootState> = {
 			ageGroup:'Adult',//年龄组
 			positionList:[],//衣服位置
 			position:{},//衣服位置
+			brandPercentage:30,//品牌分成
+			userBrandDna:'',//用户品牌
+			userBrandDnaImg:'',//用户品牌图片
+			userBrandDnaName:'',//用户品牌名字
 			publishData:{
 				id:'',
 				portfolioDes:'',
@@ -35,11 +39,7 @@ const Workspace : Module<DesignDetail,RootState> = {
 				tagsDTO:[],
 			},//发布的作品数据
 			systemDesignerPercentage:30,//设计师分成
-			model:{
-				id:null,
-				url:'',
-				type:'',
-			},//模特
+			model:[],//模特
 		},
 		projectList:[],//项目列表参数
     },
@@ -83,6 +83,9 @@ const Workspace : Module<DesignDetail,RootState> = {
 				ageGroup:'Adult',//年龄组
 				positionList:[],
 				position:{},//衣服位置
+				userBrandDna:'',//用户品牌
+				userBrandDnaImg:'',//用户品牌图片
+				userBrandDnaName:'',//用户品牌名字
 				publishData:{
 					id:'',
 					portfolioDes:'',
@@ -90,11 +93,7 @@ const Workspace : Module<DesignDetail,RootState> = {
 					tagsDTO:[],
 				},//发布的作品数据
 				systemDesignerPercentage:30,
-				model:{
-					id:-1,
-					url:'',
-					type:'',
-				},//模特
+				model:[],//模特
 			}
 		}
     },