From 16a8ee95ee0cfd998a1578e70b9fbb2490ebac8f Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Thu, 28 Dec 2023 17:00:39 +0800
Subject: [PATCH] fix

---
 src/component/Detail/DesignDetail.vue             |  1 +
 src/component/Detail/DesignDetailEnd.vue          |  2 --
 src/component/Detail/DesignPrintOperation.vue     | 13 ++++++-------
 .../Detail/DesignPrintOperationMobile.vue         | 15 +++++++++------
 src/component/HomePage/SketchboardUpload.vue      |  2 --
 src/component/HomePage/scaleImage.vue             |  2 --
 src/tool/util.js                                  |  1 -
 7 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue
index a828e9c0..b3d8ef2d 100644
--- a/src/component/Detail/DesignDetail.vue
+++ b/src/component/Detail/DesignDetail.vue
@@ -517,6 +517,7 @@ export default defineComponent({
 			this.designShowPrview = 1
             // this.showDesignDetailModal(data,str)
             this.loadingShow = false
+			this.clearSelect()
 		},
 		removeRevocation(){
 			sessionStorage.removeItem('oppositeRevocation')
diff --git a/src/component/Detail/DesignDetailEnd.vue b/src/component/Detail/DesignDetailEnd.vue
index f0616590..4458a224 100644
--- a/src/component/Detail/DesignDetailEnd.vue
+++ b/src/component/Detail/DesignDetailEnd.vue
@@ -286,7 +286,6 @@ export default defineComponent({
 					data.designSingleItemDTOList[index].scale = 1
 				}
 				data.designSingleItemDTOList = this.soleId(data.designSingleItemDTOList,index)
-				console.log(this.sketchImg);
 				this.sketchImg.id_ = data.designSingleItemDTOList[index].id
 				data.designSingleItemDTOList[index].path =this.sketchImg.minIOPath? this.sketchImg.minIOPath: this.current.minIOPath
 				data.designSingleItemDTOList[index].type =this.sketchImg.type? this.sketchImg.type: this.current.type
@@ -301,7 +300,6 @@ export default defineComponent({
 				let color = `${this.$parent.selectColor.rgba.r} ${this.$parent.selectColor.rgba.g} ${this.$parent.selectColor.rgba.b}`
 				data.designSingleItemDTOList[index].color = color
 			}
-			console.log(data);
 			data.timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone
 			this.loadingShow = true
 			Https.axiosPost(Https.httpUrls.designSingle, data).then(
diff --git a/src/component/Detail/DesignPrintOperation.vue b/src/component/Detail/DesignPrintOperation.vue
index 1557bd94..a4a453e0 100644
--- a/src/component/Detail/DesignPrintOperation.vue
+++ b/src/component/Detail/DesignPrintOperation.vue
@@ -212,7 +212,7 @@ export default defineComponent({
 				num = value.instance.printStyleList[value.instance.imgDomIndex].transform.scale
 				angle = value.instance.printStyleList[value.instance.imgDomIndex].transform.rotateZ
 				// 添加鼠标按下事件监听器
-				el.style.transform = "rotateZ("+ angle + "deg)"
+				el.style.transform = "translate(-50%, -50%)rotateZ("+ angle + "deg)"
 				// let scale = Number(elParent.firstElementChild.style.transform?.split('scale(')[1]?.split(')')[0])
 				// let rotateZ = Number(elParent.firstElementChild.style.transform?.split('rotateZ(')[1]?.split('deg')[0])
 					e.stopPropagation()
@@ -228,7 +228,7 @@ export default defineComponent({
 							let y = Y - e.clientY
 							angle = Math.atan2(x,y)*(180 / Math.PI)
 							elParent.firstElementChild.style.transform = "rotateZ("+ angle + "deg)"
-							el.style.transform = "rotateZ("+ angle + "deg)"
+							el.style.transform = "translate(-50%, -50%)rotateZ("+ angle + "deg)"
 						}
 					}
 					document.addEventListener('mousemove', mousemove);
@@ -316,9 +316,8 @@ export default defineComponent({
 				this.printAmount = 1
 				this.setprintAmount()
 			}else{
-				this.random()
 			}
-			
+			this.random()
 		},
 		setpitch(item,index){
 			this.printStyleList.forEach((v)=>{
@@ -515,11 +514,11 @@ export default defineComponent({
 			let sketch = document.getElementsByClassName("designOpenrtion_modal")[0]?.getElementsByClassName('designOpenrtion_sketch')[0]
 			let width
 			let scale
-			if(this.print.width<this.print.height){
-				width = Math.trunc(Math.random()*(sketch?.width-sketch?.width/2))+sketch?.width/3
+			if(sketch.width<sketch.height){
+				width = Math.trunc(Math.random()*(sketch?.width-sketch?.width/2))+sketch?.width/4
 				scale = width / this.print.width.replace(/px/g,'')
 			}else{
-				width = Math.trunc(Math.random()*(sketch?.height-sketch?.height/2))+sketch?.height/3
+				width = Math.trunc(Math.random()*(sketch?.height-sketch?.height/2))+sketch?.height/4
 				scale = width / this.print.height.replace(/px/g,'')
 			}
 			// let x = sketch.width-Number(this.print.width.replace(/px/g,''))
diff --git a/src/component/Detail/DesignPrintOperationMobile.vue b/src/component/Detail/DesignPrintOperationMobile.vue
index 8aa0e08b..8ba38768 100644
--- a/src/component/Detail/DesignPrintOperationMobile.vue
+++ b/src/component/Detail/DesignPrintOperationMobile.vue
@@ -207,7 +207,7 @@ export default defineComponent({
 				num = value.instance.printStyleList[value.instance.imgDomIndex].transform.scale
 				angle = value.instance.printStyleList[value.instance.imgDomIndex].transform.rotateZ
 				// 添加鼠标按下事件监听器
-				el.style.transform = "rotateZ("+ angle + "deg)"
+				el.style.transform = "translate(-50%, -50%)rotateZ("+ angle + "deg)"
 				// let scale = Number(elParent.firstElementChild.style.transform?.split('scale(')[1]?.split(')')[0])
 				// let rotateZ = Number(elParent.firstElementChild.style.transform?.split('rotateZ(')[1]?.split('deg')[0])
 					e.stopPropagation()
@@ -223,7 +223,7 @@ export default defineComponent({
 							let y = Y - e.targetTouches[0].clientY
 							angle = Math.atan2(x,y)*(180 / Math.PI)
 							elParent.firstElementChild.style.transform = "rotateZ("+ angle + "deg)"
-							el.style.transform = "rotateZ("+ angle + "deg)"
+							el.style.transform = "translate(-50%, -50%)rotateZ("+ angle + "deg)"
 						}
 					}
 					document.addEventListener('touchmove', touchmove);
@@ -510,16 +510,19 @@ export default defineComponent({
 			let sketch = document.getElementsByClassName("designOpenrtion_modal")[0]?.getElementsByClassName('designOpenrtion_sketch')[0]
 			let width
 			let scale
-			if(this.print.width<this.print.height){
-				width = Math.trunc(Math.random()*(sketch?.width-sketch?.width/2))+sketch?.width/3
+			if(sketch.width<sketch.height){
+				width = Math.trunc(Math.random()*(sketch?.width-sketch?.width/2))+sketch?.width/4
 				scale = width / this.print.width.replace(/px/g,'')
 			}else{
-				width = Math.trunc(Math.random()*(sketch?.height-sketch?.height/2))+sketch?.height/3
+				width = Math.trunc(Math.random()*(sketch?.height-sketch?.height/2))+sketch?.height/4
 				scale = width / this.print.height.replace(/px/g,'')
 			}
 			// let x = sketch.width-Number(this.print.width.replace(/px/g,''))
 			// let y = sketch.height-Number(this.print.height.replace(/px/g,''))
-			let x = sketch?.width-this.print.width.replace(/px/g,'')*scale
+			let x = sketch?.width - this.print.width.replace(/px/g,'')*scale 
+			if(!this.overallSingle){
+				x = sketch?.width - this.print.width.replace(/px/g,'')*scale/2
+			}
 			let y = sketch?.height-this.print.height.replace(/px/g,'')*scale
 			this.printStyleList[index]={
 				centers:{
diff --git a/src/component/HomePage/SketchboardUpload.vue b/src/component/HomePage/SketchboardUpload.vue
index 190677b5..9677eae5 100644
--- a/src/component/HomePage/SketchboardUpload.vue
+++ b/src/component/HomePage/SketchboardUpload.vue
@@ -681,8 +681,6 @@ export default defineComponent({
 				version:1,//为1就是Print
 				gender:this.workspace.sex,
 			}
-			console.log(data);
-			
 			if(generateType == 'image'){
 				if(generage?.collectionElementid){
 					data.text = ''
diff --git a/src/component/HomePage/scaleImage.vue b/src/component/HomePage/scaleImage.vue
index c820cd39..354bf726 100644
--- a/src/component/HomePage/scaleImage.vue
+++ b/src/component/HomePage/scaleImage.vue
@@ -91,8 +91,6 @@ export default defineComponent({
 		init(list:any){
 			this.scaleImage = true
 			this.scaleImageList = list
-			console.log(list);
-			
 			// let scaleImageList = this.store.state.UploadFilesModule.moodboard
 		},
 		cancelDsign(){
diff --git a/src/tool/util.js b/src/tool/util.js
index 4b1cc639..6710e317 100644
--- a/src/tool/util.js
+++ b/src/tool/util.js
@@ -6,7 +6,6 @@ const isEmail = (email)=>{
 
 const getUploadUrl = () =>{
     let url = process.env.VUE_APP_BASE_URL || ''
-	console.log(process.env.VUE_APP_BASE_URL);
     // let url = "http://18.167.251.121:10086"
     return url
 }