fix
This commit is contained in:
@@ -517,6 +517,7 @@ export default defineComponent({
|
|||||||
this.designShowPrview = 1
|
this.designShowPrview = 1
|
||||||
// this.showDesignDetailModal(data,str)
|
// this.showDesignDetailModal(data,str)
|
||||||
this.loadingShow = false
|
this.loadingShow = false
|
||||||
|
this.clearSelect()
|
||||||
},
|
},
|
||||||
removeRevocation(){
|
removeRevocation(){
|
||||||
sessionStorage.removeItem('oppositeRevocation')
|
sessionStorage.removeItem('oppositeRevocation')
|
||||||
|
|||||||
@@ -286,7 +286,6 @@ export default defineComponent({
|
|||||||
data.designSingleItemDTOList[index].scale = 1
|
data.designSingleItemDTOList[index].scale = 1
|
||||||
}
|
}
|
||||||
data.designSingleItemDTOList = this.soleId(data.designSingleItemDTOList,index)
|
data.designSingleItemDTOList = this.soleId(data.designSingleItemDTOList,index)
|
||||||
console.log(this.sketchImg);
|
|
||||||
this.sketchImg.id_ = data.designSingleItemDTOList[index].id
|
this.sketchImg.id_ = data.designSingleItemDTOList[index].id
|
||||||
data.designSingleItemDTOList[index].path =this.sketchImg.minIOPath? this.sketchImg.minIOPath: this.current.minIOPath
|
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
|
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}`
|
let color = `${this.$parent.selectColor.rgba.r} ${this.$parent.selectColor.rgba.g} ${this.$parent.selectColor.rgba.b}`
|
||||||
data.designSingleItemDTOList[index].color = color
|
data.designSingleItemDTOList[index].color = color
|
||||||
}
|
}
|
||||||
console.log(data);
|
|
||||||
data.timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone
|
data.timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone
|
||||||
this.loadingShow = true
|
this.loadingShow = true
|
||||||
Https.axiosPost(Https.httpUrls.designSingle, data).then(
|
Https.axiosPost(Https.httpUrls.designSingle, data).then(
|
||||||
|
|||||||
@@ -212,7 +212,7 @@ export default defineComponent({
|
|||||||
num = value.instance.printStyleList[value.instance.imgDomIndex].transform.scale
|
num = value.instance.printStyleList[value.instance.imgDomIndex].transform.scale
|
||||||
angle = value.instance.printStyleList[value.instance.imgDomIndex].transform.rotateZ
|
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 scale = Number(elParent.firstElementChild.style.transform?.split('scale(')[1]?.split(')')[0])
|
||||||
// let rotateZ = Number(elParent.firstElementChild.style.transform?.split('rotateZ(')[1]?.split('deg')[0])
|
// let rotateZ = Number(elParent.firstElementChild.style.transform?.split('rotateZ(')[1]?.split('deg')[0])
|
||||||
e.stopPropagation()
|
e.stopPropagation()
|
||||||
@@ -228,7 +228,7 @@ export default defineComponent({
|
|||||||
let y = Y - e.clientY
|
let y = Y - e.clientY
|
||||||
angle = Math.atan2(x,y)*(180 / Math.PI)
|
angle = Math.atan2(x,y)*(180 / Math.PI)
|
||||||
elParent.firstElementChild.style.transform = "rotateZ("+ angle + "deg)"
|
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);
|
document.addEventListener('mousemove', mousemove);
|
||||||
@@ -316,9 +316,8 @@ export default defineComponent({
|
|||||||
this.printAmount = 1
|
this.printAmount = 1
|
||||||
this.setprintAmount()
|
this.setprintAmount()
|
||||||
}else{
|
}else{
|
||||||
this.random()
|
|
||||||
}
|
}
|
||||||
|
this.random()
|
||||||
},
|
},
|
||||||
setpitch(item,index){
|
setpitch(item,index){
|
||||||
this.printStyleList.forEach((v)=>{
|
this.printStyleList.forEach((v)=>{
|
||||||
@@ -515,11 +514,11 @@ export default defineComponent({
|
|||||||
let sketch = document.getElementsByClassName("designOpenrtion_modal")[0]?.getElementsByClassName('designOpenrtion_sketch')[0]
|
let sketch = document.getElementsByClassName("designOpenrtion_modal")[0]?.getElementsByClassName('designOpenrtion_sketch')[0]
|
||||||
let width
|
let width
|
||||||
let scale
|
let scale
|
||||||
if(this.print.width<this.print.height){
|
if(sketch.width<sketch.height){
|
||||||
width = Math.trunc(Math.random()*(sketch?.width-sketch?.width/2))+sketch?.width/3
|
width = Math.trunc(Math.random()*(sketch?.width-sketch?.width/2))+sketch?.width/4
|
||||||
scale = width / this.print.width.replace(/px/g,'')
|
scale = width / this.print.width.replace(/px/g,'')
|
||||||
}else{
|
}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,'')
|
scale = width / this.print.height.replace(/px/g,'')
|
||||||
}
|
}
|
||||||
// let x = sketch.width-Number(this.print.width.replace(/px/g,''))
|
// let x = sketch.width-Number(this.print.width.replace(/px/g,''))
|
||||||
|
|||||||
@@ -207,7 +207,7 @@ export default defineComponent({
|
|||||||
num = value.instance.printStyleList[value.instance.imgDomIndex].transform.scale
|
num = value.instance.printStyleList[value.instance.imgDomIndex].transform.scale
|
||||||
angle = value.instance.printStyleList[value.instance.imgDomIndex].transform.rotateZ
|
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 scale = Number(elParent.firstElementChild.style.transform?.split('scale(')[1]?.split(')')[0])
|
||||||
// let rotateZ = Number(elParent.firstElementChild.style.transform?.split('rotateZ(')[1]?.split('deg')[0])
|
// let rotateZ = Number(elParent.firstElementChild.style.transform?.split('rotateZ(')[1]?.split('deg')[0])
|
||||||
e.stopPropagation()
|
e.stopPropagation()
|
||||||
@@ -223,7 +223,7 @@ export default defineComponent({
|
|||||||
let y = Y - e.targetTouches[0].clientY
|
let y = Y - e.targetTouches[0].clientY
|
||||||
angle = Math.atan2(x,y)*(180 / Math.PI)
|
angle = Math.atan2(x,y)*(180 / Math.PI)
|
||||||
elParent.firstElementChild.style.transform = "rotateZ("+ angle + "deg)"
|
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);
|
document.addEventListener('touchmove', touchmove);
|
||||||
@@ -510,16 +510,19 @@ export default defineComponent({
|
|||||||
let sketch = document.getElementsByClassName("designOpenrtion_modal")[0]?.getElementsByClassName('designOpenrtion_sketch')[0]
|
let sketch = document.getElementsByClassName("designOpenrtion_modal")[0]?.getElementsByClassName('designOpenrtion_sketch')[0]
|
||||||
let width
|
let width
|
||||||
let scale
|
let scale
|
||||||
if(this.print.width<this.print.height){
|
if(sketch.width<sketch.height){
|
||||||
width = Math.trunc(Math.random()*(sketch?.width-sketch?.width/2))+sketch?.width/3
|
width = Math.trunc(Math.random()*(sketch?.width-sketch?.width/2))+sketch?.width/4
|
||||||
scale = width / this.print.width.replace(/px/g,'')
|
scale = width / this.print.width.replace(/px/g,'')
|
||||||
}else{
|
}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,'')
|
scale = width / this.print.height.replace(/px/g,'')
|
||||||
}
|
}
|
||||||
// let x = sketch.width-Number(this.print.width.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 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
|
let y = sketch?.height-this.print.height.replace(/px/g,'')*scale
|
||||||
this.printStyleList[index]={
|
this.printStyleList[index]={
|
||||||
centers:{
|
centers:{
|
||||||
|
|||||||
@@ -681,8 +681,6 @@ export default defineComponent({
|
|||||||
version:1,//为1就是Print
|
version:1,//为1就是Print
|
||||||
gender:this.workspace.sex,
|
gender:this.workspace.sex,
|
||||||
}
|
}
|
||||||
console.log(data);
|
|
||||||
|
|
||||||
if(generateType == 'image'){
|
if(generateType == 'image'){
|
||||||
if(generage?.collectionElementid){
|
if(generage?.collectionElementid){
|
||||||
data.text = ''
|
data.text = ''
|
||||||
|
|||||||
@@ -91,8 +91,6 @@ export default defineComponent({
|
|||||||
init(list:any){
|
init(list:any){
|
||||||
this.scaleImage = true
|
this.scaleImage = true
|
||||||
this.scaleImageList = list
|
this.scaleImageList = list
|
||||||
console.log(list);
|
|
||||||
|
|
||||||
// let scaleImageList = this.store.state.UploadFilesModule.moodboard
|
// let scaleImageList = this.store.state.UploadFilesModule.moodboard
|
||||||
},
|
},
|
||||||
cancelDsign(){
|
cancelDsign(){
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ const isEmail = (email)=>{
|
|||||||
|
|
||||||
const getUploadUrl = () =>{
|
const getUploadUrl = () =>{
|
||||||
let url = process.env.VUE_APP_BASE_URL || ''
|
let url = process.env.VUE_APP_BASE_URL || ''
|
||||||
console.log(process.env.VUE_APP_BASE_URL);
|
|
||||||
// let url = "http://18.167.251.121:10086"
|
// let url = "http://18.167.251.121:10086"
|
||||||
return url
|
return url
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user