From 0c7d1e024c1bcf32de609e0966e4a80a1d7b1c01 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Tue, 16 Jul 2024 10:09:20 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=88=90=E5=8A=9F=E5=90=8E?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E7=94=B5=E8=84=91=E6=89=8D=E5=8F=AF=E4=BB=A5?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E8=AE=BE=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/component/Detail/addDetails.vue     | 12 +++++++++---
 src/component/HomePage/createSlogan.vue |  4 ++++
 src/views/LoginPage.vue                 |  1 +
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/component/Detail/addDetails.vue b/src/component/Detail/addDetails.vue
index f378e75b..543ccb7e 100644
--- a/src/component/Detail/addDetails.vue
+++ b/src/component/Detail/addDetails.vue
@@ -91,10 +91,10 @@ export default defineComponent({
 		let canvasState = ref()//存放canvas操作
 		let keyDown = []//监听键盘的 keydown 和 keyup 事件
 		let init = (data,index)=>{
+			loadingShow.value = true
 			normalCanvasState.value = []
 			reverseCanvasState.value = []
             showPayOrder.value = true;
-			loadingShow.value = true
 			scale = 2;
 			ratio = [1,1]
 			exportWH = 512
@@ -109,7 +109,13 @@ export default defineComponent({
 				
 
 				let oldCanvasDom = canvasBox.querySelector('.canvas-container')
-				if(oldCanvasDom)oldCanvasDom.remove()
+				let oldCanvasDom1 =  canvasBox.querySelector('canvas')
+				if(oldCanvasDom){
+					oldCanvasDom.remove()
+				}
+				if(oldCanvasDom1){
+					oldCanvasDom1.remove()
+				}
 				canvasBox.appendChild(canvasDom);
 				let img = new Image();
 
@@ -150,6 +156,7 @@ export default defineComponent({
 							fabric.Object.prototype.controls.deleteControl.mouseUpHandler = deleteObj
 						}
 						updateCanvasState()
+						loadingShow.value = false
 					},{ crossOrigin: "Anonymous" });
 					// 鼠标抬起事件
 					canvas.on('mouse:up', function(event) {
@@ -161,7 +168,6 @@ export default defineComponent({
 					//画布上移动
 					canvas.on("mouse:move", event =>setCanvasMove(event));
 					canvas.add(brushIndicator)
-				    loadingShow.value = false
 					setOperation('pencil')
 					img.remove()
 				}
diff --git a/src/component/HomePage/createSlogan.vue b/src/component/HomePage/createSlogan.vue
index df70710f..d838e392 100644
--- a/src/component/HomePage/createSlogan.vue
+++ b/src/component/HomePage/createSlogan.vue
@@ -150,6 +150,7 @@ export default defineComponent({
 				canvasWH.value = height
 				scale = exportWH/canvasWH.value
 				let oldCanvasDom = canvasBox.querySelector('.canvas-container')
+				let oldCanvasDom1 = canvasBox.querySelector('canvas')
 				if(isDeleteSlogan.value && oldCanvasDom){
 					oldCanvasDom.remove()
 					canvas.remove(textbox);
@@ -157,6 +158,9 @@ export default defineComponent({
 					oldCanvasDom = null
 					isDeleteSlogan.value = false
 				}
+				if(oldCanvasDom1){
+					oldCanvasDom1.remove()
+				}
 				// if(oldCanvasDom)oldCanvasDom.remove()
 				if(!oldCanvasDom){
 					var canvasDom = document.createElement("canvas");
diff --git a/src/views/LoginPage.vue b/src/views/LoginPage.vue
index f5ea7c58..3e74f11d 100644
--- a/src/views/LoginPage.vue
+++ b/src/views/LoginPage.vue
@@ -479,6 +479,7 @@ export default defineComponent({
 							this.turnToHomePage('/');
 						}else{
 							if(window.innerWidth < 768){
+								message.info("If you need to design, please log in using an iPad or computer.");
 								this.turnToHomePage('/');
 							}else{
 								this.turnToHomePage('/home');