调整画布bug

.env.dev

@@ -3,8 +3,8 @@ NODE_ENV = 'development'
 # VUE_APP_BASE_URL = 'https://api.aida.com.hk'
 
 # VUE_APP_BASE_URL = 'http://18.167.251.121:10086'
-VUE_APP_BASE_URL = 'https://develop.api.aida.com.hk'
+# VUE_APP_BASE_URL = 'https://develop.api.aida.com.hk'
-# VUE_APP_BASE_URL = 'https://api.aida.com.hk'
+VUE_APP_BASE_URL = 'https://api.aida.com.hk'
 # 佩佩
 # VUE_APP_BASE_URL = 'http://192.168.1.7:5567'
 # 海波

src/component/Detail/addDetails.vue

@@ -184,10 +184,13 @@ export default defineComponent({
 				keyDown = keyDown.filter(function(item) {
 					return event.code !== item;
 				})
+				
 			}
 		let clearCanvas = ()=>{
 		    canvasBtn.canvasState = 'move'
 		    canvasBtn.spreadState = false
+			document.removeEventListener("keydown", canvasKeyDown);
+			document.removeEventListener("keyup", canvasKeyUp);
 		}
 		let rgba = 'rgba(0, 0, 0, 1)'
 		let brushIndicator = new fabric.Circle({

src/component/HomePage/ExportModel.vue

@@ -28,7 +28,7 @@
 				</label> -->
 				<label>
 				<div>{{ $t('exportModel.Height') }}:</div>
-					<input type="number" @input="setMaxInput('height', 10000)" v-model="canvasWH.height" />
+					<input type="number" @input="setMaxInput('height', 30000)" v-model="canvasWH.height" />
 				</label>
                 <div class="exportCanvasBox_title" @click.stop="setCloseNav('nav')">
 					{{ $t('exportModel.CanvasNav') }}
@@ -403,7 +403,7 @@ export default defineComponent({
 				// canvas.wrapperEl.onmouseover = setCanvasKeyDown;//document上添加按下和抬起事件
 				// canvas.wrapperEl.onmouseout  = clearCanvasKeyDown;//document上添加按下和抬起事件
 				canvas.on("mouse:over", event =>setCanvasKeyDown(event));//document上添加按下和抬起事件
-				canvas.on("mouse:out", event =>clearCanvasKeyDown(event));//document上添加按下和抬起事件
+				canvas.on("mouse:out", clearCanvasKeyDown);//document上添加按下和抬起事件
 
 				canvas.on("mouse:move", event =>setCanvasMove(event));
 				canvas.on("mouse:out", event=>setCanvasOut(event));
@@ -833,6 +833,7 @@ export default defineComponent({
 				centered:true,
 				onOk() {
 					showUpgradePlan.value = false;
+					canvas.off("mouse:out", clearCanvasKeyDown);
 					canvas.dispose();
 					position = {
 						//设置每个图形位置的初始值
@@ -1465,7 +1466,6 @@ export default defineComponent({
 		let setPencilColor = ()=>{//切换颜色给铅笔设置颜色
 			clearTimeout(setTimeOut.color)
 			setTimeOut.color = setTimeout(()=>{
-				console.log(createText);
 				if(createText.set){
 					setFontFamily()
 					return
@@ -1873,7 +1873,7 @@ export default defineComponent({
 			canvasPencilColor.value = obj.fill
 		}
 		let setFontFamily = ()=>{
-			if(createText){
+			if(createText.set){
 				createText.set({
 					fontFamily:fontFamily.value,
 					fontSize:canvasPencilWidth.value[operation.value]?canvasPencilWidth.value[operation.value]:20,

src/component/HomePage/createSlogan.vue

@@ -189,9 +189,11 @@ export default defineComponent({
 			setBtnPosition(oldClickedObject)
 
 		}
+		let clickedObject
 		let setTextBtn = (e) =>{//点击判断是否点击到文字
-			var clickedObject = e.target;
+			clickedObject = e.target;
 			if (clickedObject instanceof fabric.IText){
+				if(oldClickedObject)oldClickedObject.off('changed',clickObjChanged);
 				selectTextbox.value = clickedObject
 				textData.fill = clickedObject.fill
 				textData.fontSize = clickedObject.fontSize
@@ -202,7 +204,6 @@ export default defineComponent({
 				textData.underline = clickedObject.underline
 				setBtnPosition(clickedObject)
 				clickedObject.on('changed',clickObjChanged);
-				if(oldClickedObject)oldClickedObject.off('changed',clickObjChanged);
 				oldClickedObject = clickedObject
 			}else{
 				selectTextbox.value = null
@@ -254,7 +255,7 @@ export default defineComponent({
 				// 检查对象是否与另一个对象相交
 				if (obj.intersectsWithObject(options)) {
 					messageShow = true
-					message.info('看到输入的内容可能存在重叠,重叠会影响最终效果哦~',()=>{
+					message.info(t('Generate.jsContent11'),()=>{
 						messageShow = false
 					});
 				}
@@ -318,7 +319,7 @@ export default defineComponent({
 		let setSubmit = ()=>{
 			var allObjects = canvas.getObjects();
 			if(allObjects.length == 0){
-				message.info('最少需要创建一个文字')
+				message.info(t('Generate.jsContent12'))
 				return
 			}
 			var canvasDom = document.createElement("canvas");
@@ -358,6 +359,10 @@ export default defineComponent({
 			// console.log(exportCanvas.toDataURL('png')	);
 		}
 		let cancelDsign = ()=>{
+			canvas.off('object:moving',canvasMoving)
+			if(oldClickedObject)oldClickedObject.off('changed',clickObjChanged);
+			if(clickedObject)clickedObject.off('changed',clickObjChanged);
+			canvas.off('mouse:down',setTextBtn)
 			canvas.dispose();
 			showPayOrder.value = false
 		}

src/component/HomePage/productImg.vue

@@ -395,8 +395,6 @@ export default defineComponent({
 						productImgData.generateList.splice(index,1)
 					}else{
 						productImgData.generateList.push(item)
-						console.log(item,productImgData.generateList);
-						
 						productImgData.likeList.splice(index,1)
 					}
 					

src/lang/cn.ts

@@ -411,6 +411,9 @@ export default {
 		jsContent7:"上传失败",
 		jsContent8:"您{str}还有{num}次生成额度。",
 		jsContent9:"您的{str}生成额度已用完。",
+		jsContent10:"请完成标语图片",
+		jsContent11:"看到输入的内容可能存在重叠,重叠会影响最终效果哦~",
+		jsContent12:"最少需要创建一个文字",
 	},
 	collectionModal:{
 		Moodboard:'情绪板',

src/lang/en.ts

@@ -413,6 +413,8 @@ export default {
 		jsContent8:"You have {num} remaining opportunity to generate {str}.",
 		jsContent9:"You have exhausted your generation opportunities {str}.",
 		jsContent10:"Please complete the slogan picture",
+		jsContent11:"See the input content may overlap, overlap will affect the final effect oh",
+		jsContent12:"Complete at least one slogan",
 	},
 	collectionModal:{
 		Moodboard:'Moodboard',

src/views/HomeView/library.vue

@@ -1098,8 +1098,6 @@ export default defineComponent({
         //给模特打点编辑
         placementClick(data:any){
             let placementModal:any = isMoible() ? this.$refs.ModelPlacementMobile : this.$refs.ModelPlacement
-			console.log(this.sex);
-			
             placementModal.showPlacementModal(data,this.sex)
         },
 		setTextareaShow(){