From d661159c8a7e8347b472a067e2bb889bafc0df4b Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Mon, 30 Sep 2024 16:07:35 +0800
Subject: [PATCH] fix

---
 src/component/Detail/editFrontBack.vue | 24 +++++++++++++++++++++++-
 src/views/HomeMain.vue                 |  3 ++-
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/component/Detail/editFrontBack.vue b/src/component/Detail/editFrontBack.vue
index 347dd142..eed74d09 100644
--- a/src/component/Detail/editFrontBack.vue
+++ b/src/component/Detail/editFrontBack.vue
@@ -125,6 +125,28 @@ export default defineComponent({
 					fabric.Object.prototype.cornerSize = 10
 					fabric.Object.prototype.transparentCorners = false 
 					exportUrl = data.maskUrl
+					canvas.on('mouse:wheel', opt => {
+						const delta = opt.e.deltaY // 滚轮，向上滚一下是 -100，向下滚一下是 100
+						let zoom = canvas.getZoom() // 获取画布当前缩放值
+						zoom *= 0.999 ** delta
+						if (zoom > 20) zoom = 20
+						if (zoom < 0.01) zoom = 0.01
+
+						// 以左上角为原点
+						// this.canvas.setZoom(zoom)
+
+						// 以鼠标所在位置为原点缩放
+						console.log(zoom);
+						canvas.zoomToPoint(
+							{ // 关键点
+							x: opt.e.offsetX,
+							y: opt.e.offsetY
+							},
+							zoom
+						)
+						opt.e.preventDefault()
+						opt.e.stopPropagation()
+					})
 					await new Promise((resolve, reject) => {
 						fabric.Image.fromURL(data.maskUrl, function(img) {
 							// 设置背景图对象的宽度和高度与 canvas 相同
@@ -473,7 +495,7 @@ export default defineComponent({
 			}
 		}
 		.editFrontBack_center_btn_colorRed,.editFrontBack_center_btn_colorGreen,.editFrontBack_center_btn_colorWhite{
-			width: 10rem;
+			width: 9rem;
 			line-height: 3rem;
 			text-align: center;
 			height: 3rem;
diff --git a/src/views/HomeMain.vue b/src/views/HomeMain.vue
index ee5021f6..40e6b5db 100644
--- a/src/views/HomeMain.vue
+++ b/src/views/HomeMain.vue
@@ -260,7 +260,8 @@ export default defineComponent({
 				}
 			})
 		}
-		MyWs.linkWs("ws://"+MyWs.messageUrl+`/${JSON.parse(getCookie("userInfo")).userId}`,'message')
+		MyWs.linkWs("wss://"+MyWs.messageUrl,'message')
+		// MyWs.linkWs("ws://"+MyWs.messageUrl+`/${JSON.parse(getCookie("userInfo")).userId}`,'message')
 		let getWsMessage = (data)=>{
 			let userInfo = ['followeeCount','followerCount']
 			let obj = {}