From a5081078510ed40f40a71a547b666af76f649344 Mon Sep 17 00:00:00 2001
From: wxd <1627315083@qq.com>
Date: Tue, 5 Nov 2024 22:00:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/component/HomePage/ExportModel.vue       | 2 ++
 src/component/HomePage/Generate.vue          | 2 +-
 src/component/LibraryPage/ModelPlacement.vue | 2 +-
 src/component/WorksPage/newScaleImage.vue    | 5 ++++-
 src/tool/webSocket.js                        | 1 +
 5 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/component/HomePage/ExportModel.vue b/src/component/HomePage/ExportModel.vue
index 21511b8a..72e52568 100644
--- a/src/component/HomePage/ExportModel.vue
+++ b/src/component/HomePage/ExportModel.vue
@@ -728,6 +728,7 @@ export default defineComponent({
 				imgUrl = data.designOutfitUrl;
 				imgWidth[key] = setImageWidth(key,img); 
 			}
+			if(key == 'upImgFiles')imgWidth[key] = setImageWidth(key,img); 
 
 			let url = imgUrl.split('?')[0]
 			var match = url.match(/:(\d+)\/(.*)/);
@@ -1372,6 +1373,7 @@ export default defineComponent({
 					Https.axiosPost(Https.httpUrls.canvasElementUpload, formData,config).then((rv)=>{
 						rv.imgUrl = rv.minioUrl
 						fabric.Image.fromURL(rv.minioUrl,(img) => {
+							console.log(canvas.wrapperEl.parentNode.scrollTop);
 							setCanvasImage(img,"upImgFiles",0,canvas.wrapperEl.parentNode.scrollTop,rv)
 							canvas.add(img);
 						},{ crossOrigin: "Anonymous" })
diff --git a/src/component/HomePage/Generate.vue b/src/component/HomePage/Generate.vue
index 5e2205ca..3296a77e 100644
--- a/src/component/HomePage/Generate.vue
+++ b/src/component/HomePage/Generate.vue
@@ -339,7 +339,7 @@ export default defineComponent({
 			]
 		}else if(this.type_.type2 == 'Sketchboard'){
 			this.printModelList = JSON.parse(JSON.stringify(this.store.state.UserHabit.SketchStyle))
-			let imgList = ['/image/sketch/sketch-fine.jpg','/image/sketch/sketch-medium.jpg','/image/sketch/sketch-thick.jpg']
+			let imgList = ['/image/sketch/sketch-thick.jpg','/image/sketch/sketch-medium.jpg','/image/sketch/sketch-fine.jpg']
 			this.printModelList.forEach((item:any,index:number)=>{
 				item.img = imgList[index]
 			})
diff --git a/src/component/LibraryPage/ModelPlacement.vue b/src/component/LibraryPage/ModelPlacement.vue
index e1b7a42b..abae0ba2 100644
--- a/src/component/LibraryPage/ModelPlacement.vue
+++ b/src/component/LibraryPage/ModelPlacement.vue
@@ -62,7 +62,7 @@
 							</a-select> -->
 							<div>{{ sex.label }}</div>
 						</div>
-                        <div class="placement_point_item" v-for="(point,index) in pointList" :key="index"  @touchmove="touchmove($event)">
+                        <div class="placement_point_item" v-for="(point,index) in pointList" :key="index" @mousemove="mouseMove" @touchmove="touchmove($event)">
                             <div class="ponit_title">{{point.title}}</div>
                             <div class="point_list">
                                 <div class="point_item" v-for="item in point.pointList" :key="item.color" :style="{borderColor:item.color,visibility:item.show?'inherit':'hidden'}" @mousedown="AddDian(item)" @touchstart="AddDian(item)"><div class="point_block" :style="{background:item.color}"></div></div>
diff --git a/src/component/WorksPage/newScaleImage.vue b/src/component/WorksPage/newScaleImage.vue
index c1b68909..080e2a68 100644
--- a/src/component/WorksPage/newScaleImage.vue
+++ b/src/component/WorksPage/newScaleImage.vue
@@ -54,7 +54,7 @@
 
 								</div>
 								<div class="detail_right_user_content">
-									<div>
+									<div style="text-align: center;">
 										<div class="scaleImage_chunk_title_intro">@{{scaleImageData.userName}}</div>
 										<div v-if="scaleImageData.isFollow == 0 && userInfo?.userId != scaleImageData?.accountId" style="margin-bottom: 0;" class="started_btn" @click="setFollow()" >{{$t('newScaleImage.Follow')}}</div>
 										<div v-else-if="userInfo?.userId != scaleImageData?.accountId" class="started_btn" style="margin-bottom: 0;" @click="setFollow()" >{{$t('newScaleImage.Unfollow')}}</div>
@@ -364,6 +364,8 @@ export default defineComponent({
 		    Https.axiosPost(Https.httpUrls.getPorfolioDetail,data).then(
 				(rv: any) => {
 					imgData.loadingShow = false
+					
+					if(rv.portfolioDes)rv.portfolioDes = rv.portfolioDes.replace(/#/g, ' ');
 					imgData.scaleImageData = rv
 					let canvasUrl = [rv.canvasUrl]
 					var findUrl = []
@@ -788,6 +790,7 @@ export default defineComponent({
 			justify-content: space-between;
 			width: 100%;
 			align-items: flex-start;
+			
 			.scaleImage_chunk_title_Original{
 				color: #39215b;
 				background: #c9a2ff;
diff --git a/src/tool/webSocket.js b/src/tool/webSocket.js
index 5a8111c7..da80c80b 100644
--- a/src/tool/webSocket.js
+++ b/src/tool/webSocket.js
@@ -34,6 +34,7 @@ class MyWs {
 	reconnection(){
 		clearTimeout(this.reconnectionTime)
 		this.reconnectionTime = setTimeout(()=>{
+			this.wsUrl = url +`/${JSON.parse(getCookie("userInfo")).userId}`
 		    this.linkWs(this.wsUrl)
 		},1000)
 	}