除了颜色选择图片，注册页面

2024-06-26 17:26:31 +08:00
parent 15077d37ea
commit c661454590
43 changed files with 1494 additions and 271 deletions
--- a/src/component/Detail/DesignDetailAlter.vue
+++ b/src/component/Detail/DesignDetailAlter.vue
@@ -2,7 +2,8 @@
 	<div class="detail_modal_body_select">
 		<div v-show="(type_ == 1 || type_ == 2 || type_ == 4) && select == true">
 			<div class="detail_uploadLibrary">
-				<div class="switch_type_list">
+				<div v-show="type_ == 4" style="font-size:1.5rem; margin:1rem 0">{{ $t('LibraryPage.generated') }}</div>
+				<div class="switch_type_list" v-show="type_ != 4">
 					<div
 						@click.stop="open(1)"
 						class="switch_type_item"
@@ -35,7 +36,7 @@
 							></template>
 						</a-select>
 					</div>
-					<div class="content_search_block">
+					<div class="content_search_block" v-show="type_ != 4">
 						<input class="search_input" :placeholder="$t('DesignDetailAlter.inputContent1')" v-model="searchPictureName"  @keydown.enter="getLibraryList()">
 						<div class="search_icon_block" @click.stop="getLibraryList()"><span class="icon iconfont icon-sousuo"></span></div>
 					</div>
@@ -1130,19 +1131,19 @@ export default defineComponent({
 							)
 						});
 						this.selectColorList = selectColorList
-						// this.getHsvColor(selectColorList)
-						// this.selectColor = {rgba:{r:color[0],g:color[1],b:color[2],a:1},hex:colorHex}
-						let colorListIndex = []
-						this.colorList.forEach((item,index)=>{
-							if(!item.rgba){
-								colorListIndex.push(index)
-							}
-						})
-						for (let index = 0; index < selectColorList.length; index++) {
-							this.colorList[colorListIndex[0]] = selectColorList[index]
-							this.getPantongName(selectColorList[index].rgba,colorListIndex[0])
-							colorListIndex.splice(0,1)										
-						}
+						this.getHsvColor(selectColorList)
+						this.selectColor = {rgba:{r:color[0],g:color[1],b:color[2],a:1},hex:colorHex}
+						// let colorListIndex = []
+						// this.colorList.forEach((item,index)=>{
+						// 	if(!item.rgba){
+						// 		colorListIndex.push(index)
+						// 	}
+						// })
+						// for (let index = 0; index < selectColorList.length; index++) {
+						// 	this.colorList[colorListIndex[0]] = selectColorList[index]
+						// 	this.getPantongName(selectColorList[index].rgba,colorListIndex[0])
+						// 	colorListIndex.splice(0,1)										
+						// }
 						img.remove()
 					};
                    
--- a/src/component/Detail/DesignPrintOperation.vue
+++ b/src/component/Detail/DesignPrintOperation.vue
@@ -39,10 +39,10 @@
 						</div>
 						<div class="print_right show_print_right Guide_1_25" :class="[driver__.driver?'showEvents':'']">
 							<div class="designOpenrtion_nav">
-								<div class="designOpenrtion_single" v-for="item,index in designOpenrtionList" :key="item" v-show="(stateOverallSingle == 'overall' && item.level2Type == 'Pattern') || stateOverallSingle == 'single'">
+								<div class="designOpenrtion_single" v-for="item,index in designOpenrtionList" :key="item" v-show="(stateOverallSingle == 'single' && item.level2Type != 'Pattern') || stateOverallSingle == 'overall'">
 									<img :class="[(item.checked == true && overallSingle == false)?'active':'']" :src="item.path" @click="setpitch(item,index)">
 								</div>
-								<div class="designOpenrtion_single" v-for="item,index in designList" :key="item" v-show="(stateOverallSingle == 'overall' && item.level2Type == 'Pattern') || stateOverallSingle == 'single'">
+								<div class="designOpenrtion_single" v-for="item,index in designList" :key="item" v-show="(stateOverallSingle == 'single' && item.level2Type != 'Pattern') || stateOverallSingle == 'overall'">
 									<img :class="[(item.checked == true && overallSingle == false)?'active':'']" :src="item.path" @click="setpitch(item,index)">
 								</div>
 								<!-- <div class="designOpenrtion_overall" v-show="!overallSingle">
@@ -102,9 +102,10 @@
 								</li>
 							</ul>
 							<div v-show="!overallSingle"></div>
-							<ul v-if="!overallSingle && printStyleList[stateOverallSingle][0]" :class="{active:printStyleList[stateOverallSingle][0]?.designOpenrtionBtn}" class="designOpenrtion_Mouoverall" :style="'left:'+printStyleList[stateOverallSingle][0]?.style?.left+';top:'+printStyleList[stateOverallSingle][0]?.style?.top+';'" @mousedown.stop="itemMoveMousedown(0,$event)">
+							<ul v-if="!overallSingle && printStyleList[stateOverallSingle][0]" class="designOpenrtion_Mouoverall active" :style="'left:'+printStyleList[stateOverallSingle][0]?.style?.left+';top:'+printStyleList[stateOverallSingle][0]?.style?.top+';'" @mousedown.stop="itemMoveMousedown(0,$event)">
 								<i class="fi fi-rr-arrows animtion1"></i>
 								<i class="fi fi-rr-arrows animtion2"></i>
+								<li class="designOpenrtion_rotote" v-rotote.stop="[0,printStyleList[stateOverallSingle][0].transform]"></li>
 								<!-- <li class="designOpenrtion_delete" @click="deletePrint">
 									<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAACXBIWXMAAACxAAAAsQHGLUmNAAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAAdBJREFUSImt1r1uU0EQBeDPFh1pgBQEEwFVAg9BROhCAh1FAg1gkMA8DA0oKOEB3IEIRQgF4SEQBIUC6ENSGgPFXaPx+udeSxxppPXOzJnZ8e7MrRmPWdzANZxPv+EbvmILL/G9hGcADayjgz8l0kUb56qSX8dhBeJcDrFSRv44ZRQdt3EPczieZB5NvB1ymta4zCP5J1yucOIFfM6CDJykob8s73GiAnkPJ7Eb/H9iJhpsZJlPQh6D7AWe9Z5iFr+CIpalhjWspnXZ/pXA01FURkv/HxpxK+g2UE+yGfZXM5+doHt4DEtB2R5dAXdD9nfG2LVxNa2XKGreiziXGefZ5rKZbCLmg/4jHIWNqSEZ1fC0IrnE0bM5qqdFGWoV92RBf/P/S3RRVqI3YaOZGd8eQpgHXMt8HgTd67qi5fZwMzOO5XuREmim9ShEji04q78tLwSDSR/aYuD599DgeVDsY3pMhqOQt4pnUXlGf7PbTQ5VcQofgv8BTudGK/rb9Z6it5RhEV+CX1cxYoeiZXDg7OC+4vpNJbmkuC3vMtsuHpVltKzo55OOzINxmeeYxhPVhn5H0ftnhhGNeu49NBSjdBkX9H+27Cvu+Sv8GEXwF9+O3b1zwZqdAAAAAElFTkSuQmCC" alt="">
 								</li> -->
@@ -257,7 +258,9 @@ export default defineComponent({
 							let x = e.clientX - X
 							let y = Y - e.clientY
 							angle = Math.atan2(x,y)*(180 / Math.PI)
-							elParent.firstElementChild.style.transform = "rotateZ("+ angle + "deg)"
+							if(elParent){
+								elParent.firstElementChild.style.transform = "rotateZ("+ angle + "deg)"
+							}
 							el.style.transform = "translate(-50%, -50%)rotateZ("+ angle + "deg)"
 						}
 					}
@@ -652,7 +655,8 @@ export default defineComponent({
 						location = [arr[index].style.left.replace(/px/g,'')*sketchNum,arr[index].style.top.replace(/px/g,'')*sketchNum]
 					}
 					let obj = {
-						angle : !this.overallSingle ? 0:arr[index].transform.rotateZ,
+						angle : arr[index].transform.rotateZ,
+						// angle : !this.overallSingle ? 0:arr[index].transform.rotateZ,
 						location : location,
 						priority:arr[index].style.zIndex,
 						scale: scale,
@@ -1038,6 +1042,7 @@ export default defineComponent({
 						i{
 							display: flex;
 							color: #14bcff;
+							justify-content: center;
 						}
 						.animtion1{
 							animation: anim 4s 2s linear infinite;
--- a/src/component/Detail/DesignPrintOperationMobile.vue
+++ b/src/component/Detail/DesignPrintOperationMobile.vue
@@ -42,10 +42,10 @@
 								<!-- <div class="designOpenrtionMobile_single" v-show="overallSingle" v-for="item,index in designOpenrtionList" :key="item" :class="{active:printStyleList[index]?.designOpenrtionBtn?printStyleList[index]?.designOpenrtionBtn:false}">
 									<img :src="item.path" @click="setpitch(item,index)">
 								</div> -->
-								<div class="designOpenrtionMobile_single" v-for="item,index in designOpenrtionList" :key="item" v-show="(stateOverallSingle == 'overall' && item.level2Type == 'Pattern') || stateOverallSingle == 'single'">
+								<div class="designOpenrtionMobile_single" v-for="item,index in designOpenrtionList" :key="item" v-show="(stateOverallSingle == 'single' && item.level2Type != 'Pattern') || stateOverallSingle == 'overall'">
 									<img :class="[(item.checked == true && overallSingle == false)?'active':'']" :src="item.path" @click="setpitch(item,index)">
 								</div>
-								<div class="designOpenrtionMobile_single" v-for="item,index in designList" :key="item" v-show="(stateOverallSingle == 'overall' && item.level2Type == 'Pattern') || stateOverallSingle == 'single'">
+								<div class="designOpenrtionMobile_single" v-for="item,index in designList" :key="item" v-show="(stateOverallSingle == 'single' && item.level2Type != 'Pattern') || stateOverallSingle == 'overall'">
 									<img :class="[(item.checked == true && overallSingle == false)?'active':'']" :src="item.path" @click="setpitch(item,index)">
 								</div>
 								<!-- <div class="designOpenrtionMobile_overall" v-show="!overallSingle">
@@ -103,9 +103,10 @@
 								</li>
 							</ul>
 							<div v-show="!overallSingle"></div>
-							<ul v-if="!overallSingle && printStyleList[stateOverallSingle][0]" :class="{active:printStyleList[stateOverallSingle][0]?.designOpenrtionBtn}" class="designOpenrtionMobile_Mouoverall" :style="'left:'+printStyleList[stateOverallSingle][0]?.style?.left+';top:'+printStyleList[stateOverallSingle][0]?.style?.top+';'" @touchstart.stop="itemMoveMousedown(0,$event)">
+							<ul v-if="!overallSingle && printStyleList[stateOverallSingle][0]" class="designOpenrtionMobile_Mouoverall active" :style="'left:'+printStyleList[stateOverallSingle][0]?.style?.left+';top:'+printStyleList[stateOverallSingle][0]?.style?.top+';'" @touchstart.stop="itemMoveMousedown(0,$event)">
 								<i class="fi fi-rr-arrows animtion1"></i>
 								<i class="fi fi-rr-arrows animtion2"></i>
+								<li class="designOpenrtionMobile_rotote" v-rotote.stop="[0,printStyleList[stateOverallSingle][0].transform]"></li>
 								<!-- <li class="designOpenrtionMobile__delete" @click="deletePrint">
 									<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAACXBIWXMAAACxAAAAsQHGLUmNAAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAAdBJREFUSImt1r1uU0EQBeDPFh1pgBQEEwFVAg9BROhCAh1FAg1gkMA8DA0oKOEB3IEIRQgF4SEQBIUC6ENSGgPFXaPx+udeSxxppPXOzJnZ8e7MrRmPWdzANZxPv+EbvmILL/G9hGcADayjgz8l0kUb56qSX8dhBeJcDrFSRv44ZRQdt3EPczieZB5NvB1ymta4zCP5J1yucOIFfM6CDJykob8s73GiAnkPJ7Eb/H9iJhpsZJlPQh6D7AWe9Z5iFr+CIpalhjWspnXZ/pXA01FURkv/HxpxK+g2UE+yGfZXM5+doHt4DEtB2R5dAXdD9nfG2LVxNa2XKGreiziXGefZ5rKZbCLmg/4jHIWNqSEZ1fC0IrnE0bM5qqdFGWoV92RBf/P/S3RRVqI3YaOZGd8eQpgHXMt8HgTd67qi5fZwMzOO5XuREmim9ShEji04q78tLwSDSR/aYuD599DgeVDsY3pMhqOQt4pnUXlGf7PbTQ5VcQofgv8BTudGK/rb9Z6it5RhEV+CX1cxYoeiZXDg7OC+4vpNJbmkuC3vMtsuHpVltKzo55OOzINxmeeYxhPVhn5H0ftnhhGNeu49NBSjdBkX9H+27Cvu+Sv8GEXwF9+O3b1zwZqdAAAAAElFTkSuQmCC" alt="">
 								</li> -->
@@ -257,7 +258,9 @@ export default defineComponent({
 							let x = e.targetTouches[0].clientX - X
 							let y = Y - e.targetTouches[0].clientY
 							angle = Math.atan2(x,y)*(180 / Math.PI)
-							elParent.firstElementChild.style.transform = "rotateZ("+ angle + "deg)"
+							if(elParent){
+								elParent.firstElementChild.style.transform = "rotateZ("+ angle + "deg)"
+							}
 							el.style.transform = "translate(-50%, -50%)rotateZ("+ angle + "deg)"
 						}
 					}
@@ -652,7 +655,8 @@ export default defineComponent({
 						location = [arr[index].style.left.replace(/px/g,'')*sketchNum,arr[index].style.top.replace(/px/g,'')*sketchNum]
 					}
 					let obj = {
-						angle : !this.overallSingle ? 0:arr[index].transform.rotateZ,
+						angle : arr[index].transform.rotateZ,
+						// angle : !this.overallSingle ? 0:arr[index].transform.rotateZ,
 						location : location,
 						priority:arr[index].style.zIndex,
 						scale: scale,
@@ -1074,6 +1078,7 @@ export default defineComponent({
 						i{
 							display: flex;
 							color: #14bcff;
+							justify-content: center;
 						}
 						.animtion1{
 							animation: anim 4s 2s linear infinite;
--- a/src/component/Detail/habit.vue
+++ b/src/component/Detail/habit.vue
@@ -521,24 +521,37 @@ export default defineComponent({
 					this.setPosition('')
 					// this.getworkspace()
 				}
-			})
+			}).catch((res)=>{
+				this.isShowMark = false
+				// this.getworkspace()
+            });
 		},
-		getMannequins(){//获取模特
-			Https.axiosGet(Https.httpUrls.getMannequins,{params:{sex:this.workspaceItem.sex}}).then((rv: any) => {
-				if (rv) {
-					// rv.forEach((item:any)=>{
-					// 	item.type ==
-					// })
-					if(rv[0].type == 'System'){
-						let a = rv[0]
-						rv[0] = rv[1]
-						rv[1] = a
+		getMannequins(isSetmannequins:any){//获取模特
+			let styleData = this.workspaceItem.style?this.workspaceItem.style:''
+			return new Promise((resolve,reject)=>{
+				Https.axiosGet(Https.httpUrls.getMannequins,{params:{sex:this.workspaceItem.sex,style:styleData}}).then(async (rv: any) => {
+					if (rv) {
+						if(rv[0].type == 'System'){
+							let a = rv[0]
+							rv[0] = rv[1]
+							rv[1] = a
+						}
+						this.mannequins = rv
+						if(this.mannequins?.[0]==null){
+							this.systemSeleves = false
+						}
+						if(isSetmannequins){
+							// this.workspaceItem.femalePresignedUrl = this.mannequins?.[1]?.modelList[0].presignedUrl
+							// this.workspaceItem.mannequinFemaleType  = 'System'
+							// this.workspaceItem.mannequinFemaleId = this.mannequins?.[1]?.modelList[0].id
+							await this.setMannequins(this.mannequins?.[1]?.modelList[0],'System')
+							// this.workspaceItem.mannequinUrl = this.mannequins?.[1]?.modelList[0].presignedUrl
+							// this.workspaceItem.mannequinType = 'System'
+							// this.workspaceItem.mannequinId = this.mannequins?.[1]?.modelList[0].id
+						}
+						resolve('')
 					}
-					this.mannequins = rv
-					if(this.mannequins?.[0]==null){
-						this.systemSeleves = false
-					}
-				}
+				})
 			})
 		},
 		putWorkspace(data:any,index:any){//修改workspace
@@ -678,7 +691,7 @@ export default defineComponent({
 			this.workspaceItem.sexEnum = v
 			this.openType.sex = false
 			this.workspaceItem.sex = v.value
-			this.getMannequins()
+			this.getMannequins(false)
 			this.setMannequinsSex()
 			this.setPosition('sex')
 			
@@ -694,33 +707,37 @@ export default defineComponent({
 			// this.workspaceItem.mannequinId = item.id
 			// this.workspaceItem.mannequinType = str
 			// this.workspaceItem.mannequinUrl = item.presignedUrl
-			let id
-			if(this.workspaceItem.sexEnum.value == 'Female'){
-				id = this.workspaceItem.mannequinFemaleId
-				this.workspaceItem.femalePresignedUrl = item.presignedUrl
-				this.workspaceItem.mannequinFemaleType  = str
-				this.workspaceItem.mannequinFemaleId = item.id
-			}else if(this.workspaceItem.sexEnum.value == 'Male'){
-				id = this.workspaceItem.mannequinMaleId
-				this.workspaceItem.malePresignedUrl = item.presignedUrl
-				this.workspaceItem.mannequinMaleType  = str
-				this.workspaceItem.mannequinMaleId = item.id
-			}
-			// if(id != item.id){
-			if(this.driver__.driver){
-				// this.openType.habit = false
-				nextTick().then(()=>{
-					// driverObj__.moveTo(2);
-					driverObj__.moveNext();
-					this.openType.model = false
+			return new Promise((resolve, reject) => {
+				let id
+				if(this.workspaceItem.sexEnum.value == 'Female'){
+					id = this.workspaceItem.mannequinFemaleId
+					this.workspaceItem.femalePresignedUrl = item.presignedUrl
+					this.workspaceItem.mannequinFemaleType  = str
+					this.workspaceItem.mannequinFemaleId = item.id
+				}else if(this.workspaceItem.sexEnum.value == 'Male'){
+					id = this.workspaceItem.mannequinMaleId
+					this.workspaceItem.malePresignedUrl = item.presignedUrl
+					this.workspaceItem.mannequinMaleType  = str
+					this.workspaceItem.mannequinMaleId = item.id
+				}
+				// if(id != item.id){
+				if(this.driver__.driver){
+					// this.openType.habit = false
+					nextTick().then(()=>{
+						// driverObj__.moveTo(2);
+						driverObj__.moveNext();
+						this.openType.model = false

-					// driverObj__.moveNext();
-				})
-			}
-			// }
-			this.workspaceItem.mannequinUrl = item.presignedUrl
-			this.workspaceItem.mannequinType = str
-			this.workspaceItem.mannequinId = item.id
+						// driverObj__.moveNext();
+					})
+				}
+				// }
+				this.workspaceItem.mannequinUrl = item.presignedUrl
+				this.workspaceItem.mannequinType = str
+				this.workspaceItem.mannequinId = item.id
+				resolve('')
+			})
+		
 		},
 		// FEMALE     MALE
 		setMannequinsSex(){
@@ -755,7 +772,7 @@ export default defineComponent({
 				this.openType.workspace = false
 				this.openType.sex = false
 				this.openType.model = !this.openType.model
-				this.getMannequins()
+				this.getMannequins(false)
 				if(this.driver__.driver && this.openType.model){
 					nextTick().then(()=>{
 						driverObj__.moveTo(4);
@@ -794,9 +811,14 @@ export default defineComponent({
 		// sureSelectModel(event: any) {
 		// 	this.store.commit("setTemplateData", event);
 		// },
-		setWorkspaceStyle(data: any){
-			this.workspaceItem.styleId = data.id
+		async setWorkspaceStyle(data: any){
+			// this.workspaceItem.styleId = data.id
 			this.workspaceItem.styleName = data.name
+			this.workspaceItem.style = data.value
+			this.workspaceItem.styleId = data.id
+			if(data.isRevampModel){
+				await this.getMannequins(true)
+			}
 			this.putWorkspace(this.workspaceItem,this.workspaceItem.id)
 		},
 		setStyle(){
@@ -1025,6 +1047,8 @@ export default defineComponent({
 				justify-content: space-between;
 				.model_current{
 					margin-right: calc(3rem*1.2);
+					display: flex;
+					flex-direction: column;
 					.model_text{
 						text-align: center;
 					}
--- a/src/component/Detail/habitSetStyle.vue
+++ b/src/component/Detail/habitSetStyle.vue
@@ -121,6 +121,7 @@ setup(props,{emit}) {
 		let data = {
 			id:habitSetStyleData.selectStyle.id,
 			name:habitSetStyleData.selectStyle.name,
+			value:habitSetStyleData.selectStyle.value,
 			isRevampModel:false,
 		}
 		if(oldDataId == data.id){
@@ -150,10 +151,10 @@ setup(props,{emit}) {
 	let setClear = ()=>{
 		habitSetStyleData.selectStyle.id = ''
 		habitSetStyleData.selectStyle.name = ''
+		habitSetStyleData.selectStyle.value = ''
 	}
 	let setItemSelect = (item:any)=>{
-		habitSetStyleData.selectStyle.name = item.name
-		habitSetStyleData.selectStyle.id = item.id
+		habitSetStyleData.selectStyle = Object.assign({},item)
 	}
 	return {
 		habitSetStyle,