From bca7c167f139d1af92bc65bf95fef22daf8e2174 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Thu, 16 May 2024 17:46:22 +0800
Subject: [PATCH 01/12] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=A8=B3=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/component/HomePage/ExportModel.vue       | 2 +-
 src/component/HomePage/PrintboardUpload.vue  | 3 ++-
 src/component/HomePage/SketchboardUpload.vue | 3 ++-
 src/component/HomePage/UpgradePlan.vue       | 4 ++--
 src/tool/guide.js                            | 2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/component/HomePage/ExportModel.vue b/src/component/HomePage/ExportModel.vue
index 4119ca77..bc76e734 100644
--- a/src/component/HomePage/ExportModel.vue
+++ b/src/component/HomePage/ExportModel.vue
@@ -1241,7 +1241,7 @@ export default defineComponent({
 				var pointer = canvas.getPointer(e.pointer);
 				var x = pointer.x;
 				var y = pointer.y;
-				let textbox = new fabric.Textbox('#', {
+				let textbox = new fabric.Textbox('', {
 					left: x,
 					top: y,
 					width: 150,
diff --git a/src/component/HomePage/PrintboardUpload.vue b/src/component/HomePage/PrintboardUpload.vue
index b8d7bc77..c020f96f 100644
--- a/src/component/HomePage/PrintboardUpload.vue
+++ b/src/component/HomePage/PrintboardUpload.vue
@@ -1237,7 +1237,8 @@ export default defineComponent({
 						width: auto;
 					}
 					&:hover .delete_like_file_block{
-						display: block;
+						// display: block;
+						opacity: 1;
 					}
 					&.active{
 						opacity: 0.5;
diff --git a/src/component/HomePage/SketchboardUpload.vue b/src/component/HomePage/SketchboardUpload.vue
index 37872089..0ff285a8 100644
--- a/src/component/HomePage/SketchboardUpload.vue
+++ b/src/component/HomePage/SketchboardUpload.vue
@@ -976,7 +976,8 @@ export default defineComponent({
                     max-width: 100%;
                 }
 				&:hover .delete_like_file_block{
-						display: block;
+						// display: block;
+						opacity: 1;
 					}
                
 
diff --git a/src/component/HomePage/UpgradePlan.vue b/src/component/HomePage/UpgradePlan.vue
index 11740590..daa59e9d 100644
--- a/src/component/HomePage/UpgradePlan.vue
+++ b/src/component/HomePage/UpgradePlan.vue
@@ -83,14 +83,14 @@
 				<div class="UpgradePlan_payAffirm_content_btn" :class="[modeOfPayment == 'paypal'?'active':'']">
 
 				</div>
-				<label>
+				<!-- <label>
 					<input name="payAffirm" type="radio" value="alipay" v-model="modeOfPayment">
 					<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAACXBIWXMAAA7EAAAOxAGVKw4bAAAAEXRFWHRTb2Z0d2FyZQBTbmlwYXN0ZV0Xzt0AAANmSURBVEiJvZZdaFxFFMd/M/cj926yu02MWWObEm3quoHGYBJBC4aCqbRRKoE+aLH6JhUFBT9Aij4oiooSfKn4oiA+FKlIkfbBj3TZYkGDDVWs1M1aaKgkJqEJazab+zE+3Gziunu3qwmep7kz95zfzH/OmRmhlFL8D6aXGl9ecjl2dpncnIe/QbQmIdmm8dwei/6OACGUUiqTc3nqxBKbvTgp4NjBRu7u1JEAo+nlTYcA+Ao+OFcEVqWbnPXqcoxZgvdGGtEljE95jJ4pXNcnN+evg+rdkyZTcOc2DYA//vTr8inF1sN+MDXQpCjrs4z1b10KbEP80w3XVzhVBAoFvf5AhL1JI3Sm93TqfP1krKL/xIUV3hmrlDQU9MLJAi+Kcof2qODUE1EAvvjZ4ZXTS6ETqRvkK8XANp2bYnKtrzmyLtXOVsnhgYYyn29/c8jOVt+7UBBAe1zS1SrL+j76rrjWbm0U9G7V6d0aJMhDOTc0Vk3QyZ9Wag0D8OEjTQBcnvfJzYWXSVVQS0QylNRJtmlYusDxFNN5RXbWZ2LKZSYfyNPZoq2l++c/1p5UBWgoafDq/giWDtN5haVB3BaUMl0p+GXG46tLDqmEhgCuFRTHz/8LUGeL5I3hCO+fK/LJeJGCE1RbxBR0JzQGu3T2pUxSCY1UQlvzuzzvs71Z4+J0+B4JpZTqeWsBgGcHLYQQvFvjaNGlYKTH4Oheu2Ls6oLPWNblm18dfphy8XyI25LM09HyFW1v1vjsQm0JpAjkBSi6iquLiltagsy8OS451GdyqM9kcVmRybmMXwlWWQaayfsMdulkck5VyI1NgjcfjNDfoeP5QVGfyTrcu0Pnsbss+jvW5YxZguFug+FuoxL06USR449HWfHg4++L/L4YZNcNjZKRHpNH+0222IJ8UXH0VIGxbDCh9KRLejJPKqFxeKCB+2830MvLr3yPAPbsNHhtn03UCgI6HmyxBWI168aveLx8eompa+Gnd1uT4OG+Bg7eYRKzRHVQadn7Uya72iUxW1BYgdy8TzrrcHG6vrsLwDYEB3YZvHSfHYB6317Y8DshzKSAiefjwVV+a6t2vf//s+1YjS0BjuwO6mezTQjBM4NW0C696zI5l9H0MpOzG39uSRGodGS3xdBtf3tubSxsffYXznw1EQcnMd4AAAAASUVORK5CYII=" alt="">
 					支付宝
 				</label>
 				<div class="UpgradePlan_payAffirm_content_btn" :class="[modeOfPayment == 'alipay'?'active':'']">
 
-				</div>
+				</div> -->
 			</div>
 			<div class="UpgradePlan_payAffirm_clause" ref="labelDisclaimer">
 				<label>
diff --git a/src/tool/guide.js b/src/tool/guide.js
index dc027d70..40693a63 100644
--- a/src/tool/guide.js
+++ b/src/tool/guide.js
@@ -119,7 +119,7 @@ function createDriver(){
 		showButtons:false,
 		stagePadding:10,//切口到元素的距离
 		stageRadius:5,//切口圆弧度
-		allowKeyboardControl:true,//控制是否可以键盘控制下一步
+		allowKeyboardControl:false,//控制是否可以键盘控制下一步
 		disableActiveInteraction:false,//是否禁用显示元素的交互
 		overlayOpacity:.4,
 		overlay: true,

From ae70424bc3bb8baa23f9cf2724ae4fb838dc0e19 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Fri, 17 May 2024 09:31:18 +0800
Subject: [PATCH 02/12] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.ts   | 18 +++++++++---------
 src/views/Upgrade.vue |  6 +++---
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/router/index.ts b/src/router/index.ts
index 8e49de86..ca7bf688 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -10,8 +10,8 @@ const routes: Array<RouteRecordRaw> = [
 	{
 		path: "/",
 		// redirect重定向
-		redirect: "/login"
-		// redirect: "/upgrade"
+		// redirect: "/login"
+		redirect: "/upgrade"
 	},
 	{
 		path: '/login',
@@ -135,13 +135,13 @@ const router = createRouter({
 router.beforeEach((to, from, next) => {
 	
 	// 	系统维护
-	// const toName = to.name === 'upgrade';
-	// if (toName) {
-	// 	next();
-	// } else {
-	// 	next({ name: 'upgrade' });
-	// }
-	// return
+	const toName = to.name === 'upgrade';
+	if (toName) {
+		next();
+	} else {
+		next({ name: 'upgrade' });
+	}
+	return
 	// 检查路由是否存在
 	// 机房用户
 	let userInfo = JSON.parse(getCookie("userInfo") as any);
diff --git a/src/views/Upgrade.vue b/src/views/Upgrade.vue
index a3171921..67ee436b 100644
--- a/src/views/Upgrade.vue
+++ b/src/views/Upgrade.vue
@@ -5,9 +5,9 @@
 				<i class="fi fi-rr-settings"></i>
 			</div>
 			<div class="upgrade-content-wire"></div>
-			<!-- <div class="upgrade-content-text">System upgrading</div> -->
-			<div class="upgrade-content-text">System maintenance</div>
-			<div class="upgrade-content-textab">Due to system server upgrades, we will be conducting maintenance on Monday, March 27th, from 10:30 AM to 11:30 PM Hong Kong time. During this period, access to the AiDA system will be temporarily unavailable.<br> We apologize for any inconvenience this may cause and appreciate your understanding.</div>
+			<div class="upgrade-content-text">System upgrading</div>
+			<!-- <div class="upgrade-content-text">System maintenance</div> -->
+			<div class="upgrade-content-textab">Due to system server upgrades, we will carry out repairs on Friday, March 17th, from 9:30 AM to 16:00 PM Hong Kong time. During this period, access to the AiDA system will be temporarily unavailable.<br> We apologize for any inconvenience this may cause and appreciate your understanding.</div>
 		</div>
 	</div>
 </template>

From 3d4f2939d2248c2a7c9ebec4ba522ba9a1317f81 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Fri, 17 May 2024 09:33:39 +0800
Subject: [PATCH 03/12] fix

---
 src/router/index.ts | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/router/index.ts b/src/router/index.ts
index ca7bf688..8e49de86 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -10,8 +10,8 @@ const routes: Array<RouteRecordRaw> = [
 	{
 		path: "/",
 		// redirect重定向
-		// redirect: "/login"
-		redirect: "/upgrade"
+		redirect: "/login"
+		// redirect: "/upgrade"
 	},
 	{
 		path: '/login',
@@ -135,13 +135,13 @@ const router = createRouter({
 router.beforeEach((to, from, next) => {
 	
 	// 	系统维护
-	const toName = to.name === 'upgrade';
-	if (toName) {
-		next();
-	} else {
-		next({ name: 'upgrade' });
-	}
-	return
+	// const toName = to.name === 'upgrade';
+	// if (toName) {
+	// 	next();
+	// } else {
+	// 	next({ name: 'upgrade' });
+	// }
+	// return
 	// 检查路由是否存在
 	// 机房用户
 	let userInfo = JSON.parse(getCookie("userInfo") as any);

From 91103b5e45aedfa09d686bdd1c65b8943dd38c8a Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Fri, 17 May 2024 15:04:22 +0800
Subject: [PATCH 04/12] fix

---
 src/assets/images/homePage/slider.png       | Bin 0 -> 637 bytes
 src/component/Detail/habit.vue              |  11 +++++++++--
 src/component/HomePage/ColorboardUpload.vue |   3 +++
 3 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 src/assets/images/homePage/slider.png

diff --git a/src/assets/images/homePage/slider.png b/src/assets/images/homePage/slider.png
new file mode 100644
index 0000000000000000000000000000000000000000..422fadebe56e87474e801a9c47bb54725a69ffa0
GIT binary patch
literal 637
zcmeAS@N?(olHy`uVBq!ia0y~yV4MJCr*N<V$rY#5${84#Ts&PILn`LHz2lfA94Nv5
zp*~kYr{e`{h)rvrZQBdh7_AQP^^ataxZ3tOioe?uwRY{=iR%8EhkMjA)h1`w+n-R<
zcm8!Yd-DH1Chxg{rcwgdT)tLfrECArYtnO1IhCEU$NaB;&^?*x?HfNyW_wS)mr-`l
zU!P6ai{A9B{MLPZf3nP$o_gP+D@Ok;PkNsIaeUgw$yGI%18e`4USl$dnyg~&c~52M
z?Lr~zuh&ZMuK#;RjCXUhREF<w)1KMivMT1Atya8W5~I&Gi|@7T5w+`=N+&XZS;2B*
zbA1c@-&<lw_DUs9tqBZ!^TFCdZWi0Qm8)f!t8O`;cQN#nfV_Qw;?z5#r!}T9?6kc0
zsPSOTy6tKY_eeRn+_YK!<kOGcD(ffh(Pu2ml-<mD;Lf^InTllRWgFJ~nl~*!(bT@4
zwc-EF$XbRCJ-Uoc2ZC5Q7`z1)7<6147&h?ycVSOROr8AfvFF{pJ9Garux;;}W?q}8
zqjP+(?<cF1?Vfv!kKgAtXkS+sQ~RdsU-HF!3CZhHL%bUH_<Txwqt3KE=8IZa?KP(Q
zsdHZ}4gH-rsd`yzZrIh(tI|u&-WkmBtQEZH|4HTKVwLS#lehS0+1K97Vx%O-Kzg4|
Zdm{egten)!ps%qYzNf37%Q~loCIGk{>iGZw

literal 0
HcmV?d00001

diff --git a/src/component/Detail/habit.vue b/src/component/Detail/habit.vue
index ede2625a..91b5dc7a 100644
--- a/src/component/Detail/habit.vue
+++ b/src/component/Detail/habit.vue
@@ -90,6 +90,7 @@
                 <a-slider id="system_silder"
                     v-model:value="workspaceItem.systemDesignerPercentage"
                     @afterChange="systemDesigner"
+					:tooltip-visible="openType.slider"
 					:tip-formatter="formatter"
 				>
                 </a-slider>
@@ -194,7 +195,8 @@ export default defineComponent({
 			habit:false,
 			model:false,
 			addWorkspace:false,
-			sex:false
+			sex:false,
+			slider:false,
 		})
 		let driver__:any = computed(()=>{
 			return store.state.Guide.guide
@@ -217,7 +219,6 @@ export default defineComponent({
 				value:[],
 			},
 		])
-		
 		const {t} = useI18n()
 	return{
 			systemSeleves,
@@ -239,6 +240,7 @@ export default defineComponent({
 			handler(newVal:any,oldVal:any){
 				// this.store.state.Workspace.workspace
 				if(!newVal){
+					this.openType.slider = newVal
 					if(!this.workspaceItem.overallSingle){
 						this.workspaceItem.position = 'Overall'
 					}
@@ -348,6 +350,8 @@ export default defineComponent({
 					el.style.display="block"
 					setTimeout(() => {
 						el.classList.add("active")
+						let value:any = model.instance
+						value.openType.slider = true
 					}, 100);
 				}else{
 					el.classList.remove("active")
@@ -892,8 +896,11 @@ export default defineComponent({
 			margin-top: calc(8rem*1.2);
             :deep(.ant-slider-track),
             :deep(.ant-slider-rail) {
+
                 height: calc(.6rem*1.2);
                 background-color: #e1e1e1;
+				// background-image: url(@../../../../assets/images/homePage/slider.png);
+				background-size: 100% 100%;
                 border-radius: calc(0.5rem*1.2);
             }
             :deep(.ant-slider .ant-slider-handle:not(.ant-tooltip-open)),
diff --git a/src/component/HomePage/ColorboardUpload.vue b/src/component/HomePage/ColorboardUpload.vue
index 74c97b6f..0a12345d 100644
--- a/src/component/HomePage/ColorboardUpload.vue
+++ b/src/component/HomePage/ColorboardUpload.vue
@@ -406,7 +406,10 @@ export default defineComponent({
             this.selectColor = {}
             // this.fileList = []
 			this.reviewColor={}
+			this.colorList[this.selectIndex] = {}
             this.pantongName = ''
+			let colorList =this.colorList.filter((v) => Object.keys(v).length)
+			this.setColorboardList(colorList)
             // this.pantongNameList = []
             this.tcxColor = ''
         },

From b3659ad67ba6679b89c65e09f4ead74eb7c82b07 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Fri, 17 May 2024 17:10:35 +0800
Subject: [PATCH 05/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9develop=E6=89=93?=
 =?UTF-8?q?=E5=8C=85=E7=94=A8=E7=9A=84=E5=90=8E=E7=AB=AF=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.dev_build | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.env.dev_build b/.env.dev_build
index dfdddc08..13c76fb1 100644
--- a/.env.dev_build
+++ b/.env.dev_build
@@ -3,5 +3,6 @@ NODE_ENV = 'production'
 # VUE_APP_BASE_URL = 'http://18.167.251.121:10088'
 # VUE_APP_BASE_URL = 'https://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'
+
 

From f7f2fa0911693a197d57b486646e60e93086c5c4 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Fri, 17 May 2024 17:18:25 +0800
Subject: [PATCH 06/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=93=E5=8C=85?=
 =?UTF-8?q?=E5=90=8E=E7=AB=AF=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.dev_build | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.env.dev_build b/.env.dev_build
index 13c76fb1..ce7505ea 100644
--- a/.env.dev_build
+++ b/.env.dev_build
@@ -3,6 +3,5 @@ NODE_ENV = 'production'
 # VUE_APP_BASE_URL = 'http://18.167.251.121:10088'
 # VUE_APP_BASE_URL = 'https://api.aida.com.hk'
 VUE_APP_BASE_URL = 'https://develop.api.aida.com.hk'
-VUE_APP_BASE_URL = 'https://api.aida.com.hk'
 
 

From da14fe949a6927b80578522f59bb8c78e245fcaa Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Fri, 17 May 2024 18:20:37 +0800
Subject: [PATCH 07/12] =?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/Detail/habit.vue  | 1 -
 src/views/HomeView/HomeView.vue | 5 ++++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/component/Detail/habit.vue b/src/component/Detail/habit.vue
index 91b5dc7a..932ccf16 100644
--- a/src/component/Detail/habit.vue
+++ b/src/component/Detail/habit.vue
@@ -90,7 +90,6 @@
                 <a-slider id="system_silder"
                     v-model:value="workspaceItem.systemDesignerPercentage"
                     @afterChange="systemDesigner"
-					:tooltip-visible="openType.slider"
 					:tip-formatter="formatter"
 				>
                 </a-slider>
diff --git a/src/views/HomeView/HomeView.vue b/src/views/HomeView/HomeView.vue
index b25e43a2..766e33ac 100644
--- a/src/views/HomeView/HomeView.vue
+++ b/src/views/HomeView/HomeView.vue
@@ -516,8 +516,11 @@ export default defineComponent({
 			this.isMannequinShow = false
 			let num = 0
 			this.allBoardData?.sketchboardFiles?.forEach((sketchItem:any) => {
+				
 				this.workspacePosition.forEach((positionItem:any) => {
-					if(positionItem.name == sketchItem.category){
+				console.log(sketchItem,positionItem);
+
+					if(positionItem.value == sketchItem.category){
 						num ++ 
 						// console.log(num,this.allBoardData?.sketchboardFiles.length);
 					}

From 25d3d40fd1ca0fa24b6b5dc83f1a6789eb199fd5 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Fri, 17 May 2024 19:41:19 +0800
Subject: [PATCH 08/12] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=BA=E7=89=A9?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.dev                            | 4 ++--
 src/component/Detail/habit.vue      | 1 +
 src/component/HomePage/TaskPage.vue | 8 ++++----
 src/views/HomeView/HomeView.vue     | 5 +++--
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/.env.dev b/.env.dev
index d429345a..b6e5858c 100644
--- a/.env.dev
+++ b/.env.dev
@@ -1,8 +1,8 @@
 NODE_ENV = 'development'
 # 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://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 = 'http://192.168.1.9:17088'
 # VUE_APP_BASE_URL = 'http://192.168.1.7:5567'
diff --git a/src/component/Detail/habit.vue b/src/component/Detail/habit.vue
index 932ccf16..91b5dc7a 100644
--- a/src/component/Detail/habit.vue
+++ b/src/component/Detail/habit.vue
@@ -90,6 +90,7 @@
                 <a-slider id="system_silder"
                     v-model:value="workspaceItem.systemDesignerPercentage"
                     @afterChange="systemDesigner"
+					:tooltip-visible="openType.slider"
 					:tip-formatter="formatter"
 				>
                 </a-slider>
diff --git a/src/component/HomePage/TaskPage.vue b/src/component/HomePage/TaskPage.vue
index bcd695bc..58c7a2bc 100644
--- a/src/component/HomePage/TaskPage.vue
+++ b/src/component/HomePage/TaskPage.vue
@@ -152,13 +152,13 @@ export default defineComponent({
         init(data:any){
 			this.visible = true
 			// this.getTaskList()
-			this.isShowMark = true
-			let time = 0
+			let time = 100
 			if(data){
 				time = 1000
 			}
 			setTimeout(() => {
 				this.currentPage = 1
+				this.isShowMark = true
 				this.getTaskMoreList()
 				this.getTaskTime = null
 			}, time);
@@ -236,11 +236,11 @@ export default defineComponent({
 			}
 			Https.axiosPost(Https.httpUrls.getTasksHistory,data).then((rv)=>{
 				this.isShowMark = false
-				this.currentPage += 1
-				if(this.currentPage > 1 && rv.content.length == 0){
+				if(this.currentPage != 1 && rv.content.length == 0){
 					this.currentPage = 1
 					this.getTaskMoreList()
 				}else{
+					this.currentPage += 1
 					this.taskListMore.push(...rv.content)
 					this.total = rv.total
 					this.taskListUnfinished = []
diff --git a/src/views/HomeView/HomeView.vue b/src/views/HomeView/HomeView.vue
index 766e33ac..929db62a 100644
--- a/src/views/HomeView/HomeView.vue
+++ b/src/views/HomeView/HomeView.vue
@@ -518,7 +518,6 @@ export default defineComponent({
 			this.allBoardData?.sketchboardFiles?.forEach((sketchItem:any) => {
 				
 				this.workspacePosition.forEach((positionItem:any) => {
-				console.log(sketchItem,positionItem);
 
 					if(positionItem.value == sketchItem.category){
 						num ++ 
@@ -635,6 +634,7 @@ export default defineComponent({
 							"setDesignCollectionList",
 							rv.designCollectionItems
 						);
+						
 						this.store.commit("setLikeDesignCollectionList", []);
 						this.store.commit("deleteUserGroupId");
 						this.store.commit(
@@ -644,7 +644,6 @@ export default defineComponent({
 						this.store.commit("setDesignId", rv.designId);
 						// this.designProgress = 0;
 						this.startDesignType = "design";
-						
 					}
 				})
 				.catch((res) => {
@@ -679,6 +678,7 @@ export default defineComponent({
 						);
 						// this.designProgress = 0,
 						this.startDesignType = "resDesign";
+						this.store.commit("setDesignId", rv.designId);
 					}
 				})
 				.catch((res) => {
@@ -828,6 +828,7 @@ export default defineComponent({
 			if (this.likeLoading) {
 				return;
 			}
+			
 			this.likeLoading = true;
 			Https.axiosPost(Https.httpUrls.designLike, data)
 				.then((rv: any) => {

From 3961638804b2b6b1ddae2ac694a56fa0dd387b93 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Fri, 17 May 2024 20:02:32 +0800
Subject: [PATCH 09/12] fix

---
 src/views/HomeView/HomeView.vue | 2 +-
 src/views/LoginPage.vue         | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/views/HomeView/HomeView.vue b/src/views/HomeView/HomeView.vue
index 929db62a..50febce2 100644
--- a/src/views/HomeView/HomeView.vue
+++ b/src/views/HomeView/HomeView.vue
@@ -441,7 +441,6 @@ export default defineComponent({
 		
 		let noRefresh = this.$route.params.noRefresh; //判断是否主动刷新还是路由跳转过来的 true 路由跳转过来的
 		window.addEventListener('beforeunload', (event)=>{
-			this.store.commit("setUserGroupId", this.$route.params.id);
 			this.store.commit("clearAllCollection");
 		});
 		if (this.$route.name == "homePage") {
@@ -892,6 +891,7 @@ export default defineComponent({
 				Https.httpUrls.historyChoose + `?userGroupId=${userGroupId}`;
 			Https.axiosGet(url)
 				.then((rv: any) => {
+					this.store.commit("setUserGroupId", rv.userGroupId);
 					this.dealHistoryChooseData(rv, type);
 					this.isShowMark = false;
 				})
diff --git a/src/views/LoginPage.vue b/src/views/LoginPage.vue
index cc0119da..0ca19b7c 100644
--- a/src/views/LoginPage.vue
+++ b/src/views/LoginPage.vue
@@ -527,6 +527,8 @@ export default defineComponent({
             // this.$router.push("/home");
 			// console.log(window.location.search.substring(1));
 			this.store.commit("clearAllData");
+			this.store.commit("clearAllCollection");
+			this.store.commit("setAllBoardDataChoose",{});
 			this.$router.push("/home");
         },
 		//获取当前语言

From c0c035e7c67b7d23dbb8f6b75b580ff08e32cf68 Mon Sep 17 00:00:00 2001
From: WangXiaoDong <1627315083@qq.com>
Date: Fri, 17 May 2024 22:48:06 +0800
Subject: [PATCH 10/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E5=8D=87=E7=BA=A7=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.ts   | 18 +++++++++---------
 src/views/Upgrade.vue |  3 ++-
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/router/index.ts b/src/router/index.ts
index 8e49de86..ca7bf688 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -10,8 +10,8 @@ const routes: Array<RouteRecordRaw> = [
 	{
 		path: "/",
 		// redirect重定向
-		redirect: "/login"
-		// redirect: "/upgrade"
+		// redirect: "/login"
+		redirect: "/upgrade"
 	},
 	{
 		path: '/login',
@@ -135,13 +135,13 @@ const router = createRouter({
 router.beforeEach((to, from, next) => {
 	
 	// 	系统维护
-	// const toName = to.name === 'upgrade';
-	// if (toName) {
-	// 	next();
-	// } else {
-	// 	next({ name: 'upgrade' });
-	// }
-	// return
+	const toName = to.name === 'upgrade';
+	if (toName) {
+		next();
+	} else {
+		next({ name: 'upgrade' });
+	}
+	return
 	// 检查路由是否存在
 	// 机房用户
 	let userInfo = JSON.parse(getCookie("userInfo") as any);
diff --git a/src/views/Upgrade.vue b/src/views/Upgrade.vue
index 67ee436b..36014cf2 100644
--- a/src/views/Upgrade.vue
+++ b/src/views/Upgrade.vue
@@ -7,7 +7,8 @@
 			<div class="upgrade-content-wire"></div>
 			<div class="upgrade-content-text">System upgrading</div>
 			<!-- <div class="upgrade-content-text">System maintenance</div> -->
-			<div class="upgrade-content-textab">Due to system server upgrades, we will carry out repairs on Friday, March 17th, from 9:30 AM to 16:00 PM Hong Kong time. During this period, access to the AiDA system will be temporarily unavailable.<br> We apologize for any inconvenience this may cause and appreciate your understanding.</div>
+			<div class="upgrade-content-textab">Due to system server upgrades, We will be upgrading from 9:30 am Hong Kong time on Friday, March 17 until further notice. During this period, access to the AiDA system will be temporarily unavailable.<br> We apologize for any inconvenience this may cause and appreciate your understanding.</div>
+			<!-- <div class="upgrade-content-textab">Due to system server upgrades, we will carry out repairs on Friday, March 17th, from 9:30 AM to 16:00 PM Hong Kong time. During this period, access to the AiDA system will be temporarily unavailable.<br> We apologize for any inconvenience this may cause and appreciate your understanding.</div> -->
 		</div>
 	</div>
 </template>

From e34289e15dbc10822bfe3b0d98beb3e7deaf205e Mon Sep 17 00:00:00 2001
From: WangXiaoDong <1627315083@qq.com>
Date: Sat, 18 May 2024 07:31:53 +0800
Subject: [PATCH 11/12] =?UTF-8?q?=E5=8F=96=E6=B6=88=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E7=BB=B4=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.ts | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/router/index.ts b/src/router/index.ts
index ca7bf688..8e49de86 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -10,8 +10,8 @@ const routes: Array<RouteRecordRaw> = [
 	{
 		path: "/",
 		// redirect重定向
-		// redirect: "/login"
-		redirect: "/upgrade"
+		redirect: "/login"
+		// redirect: "/upgrade"
 	},
 	{
 		path: '/login',
@@ -135,13 +135,13 @@ const router = createRouter({
 router.beforeEach((to, from, next) => {
 	
 	// 	系统维护
-	const toName = to.name === 'upgrade';
-	if (toName) {
-		next();
-	} else {
-		next({ name: 'upgrade' });
-	}
-	return
+	// const toName = to.name === 'upgrade';
+	// if (toName) {
+	// 	next();
+	// } else {
+	// 	next({ name: 'upgrade' });
+	// }
+	// return
 	// 检查路由是否存在
 	// 机房用户
 	let userInfo = JSON.parse(getCookie("userInfo") as any);

From e2a98459ad1c25eaca9863ca29df1164faeca20e Mon Sep 17 00:00:00 2001
From: WangXiaoDong <1627315083@qq.com>
Date: Sat, 18 May 2024 15:39:32 +0800
Subject: [PATCH 12/12] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AF=AD=E8=A8=80?=
 =?UTF-8?q?=E5=92=8Cipad=E5=AF=BC=E5=87=BA=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/component/HomePage/ExportModel.vue | 92 +++++++++++++++++++++-----
 src/lang/cn.ts                         |  2 +-
 src/lang/en.ts                         |  2 +-
 src/tool/util.js                       | 11 ++-
 4 files changed, 84 insertions(+), 23 deletions(-)

diff --git a/src/component/HomePage/ExportModel.vue b/src/component/HomePage/ExportModel.vue
index bc76e734..6f3392b4 100644
--- a/src/component/HomePage/ExportModel.vue
+++ b/src/component/HomePage/ExportModel.vue
@@ -194,11 +194,13 @@
 						<div class="subitOkPreviewBtn Guide_1_32" @click="setExport">{{ $t('exportModel.Export') }}</div>
 					</div>
 				</div>
-				
             </div>
 			<!-- <div @click="toSvg">12312312312</div> -->
-            <div class="exportCanvasBox_center">
-            </div>
+            <div class="exportCanvasBox_center" :style="[isMoible?'overflow: hidden;':'']">
+			</div>
+			<div v-if="isMoible" class="exportCanvasBox_scroll">
+				<div></div>
+			</div>
             <!-- <div class="exportCanvasBox_right">
                 <div class="exportCanvasBox_title">
 					High-definition Download
@@ -308,7 +310,7 @@ export default defineComponent({
         // let canvasDom = ref()
         let canvasWH = ref({
             width: 400,
-            height: 1200,
+            height: 100,
         });
 		
 		// canvasWH.value.width = [window.innerWidth/2.4]
@@ -341,6 +343,7 @@ export default defineComponent({
 		let normalCanvasState = ref([])//存放canvas操作
 		let isLoadCanvas = false//撤回或者反撤回false为撤回
         let init = () => {
+			canvasWH.value.height = 100
 			normalCanvasState.value = []
 			reverseCanvasState.value = []
             showUpgradePlan.value = true;
@@ -1666,23 +1669,64 @@ export default defineComponent({
         };
     },
     data(prop) {
-        return {};
+        return {
+			isMoible:isMoible()
+		};
     },
-
-    mounted() {},
     watch: {
-        // driver__:{
-        // 	handler(newVal,oldVal){
-        // 		if(this.type_.type2 == 'Printboard'){
-        // 			if(newVal.index >= 14 && newVal.index < 15){
-        // 				this.setKeyword(newVal.index-14)
-        // 			}else{
-        // 			}
-        // 		}else if(this.type_.type2 == 'Sketchboard'){
-        // 		}
-        // 	}
-        // },
+        'canvasWH.height':{
+        	handler(newVal,oldVal){
+				if(!this.isMoible){
+					return
+				}
+				let canvasBox = document.querySelector('.exportCanvasBox .exportCanvasBox_center')
+				let scrollBox = document.querySelector('.exportCanvasBox_scroll div')
+				canvasBox.scroll({
+					top: 0, // 纵向滚动距离
+					left: 0, // 横向滚动距离
+				});
+				scrollBox.style.marginTop = 0+'px'
+				let height = canvasBox.offsetHeight / (newVal / canvasBox.offsetHeight )
+				scrollBox.style.height = height +'px'
+				let scale = (newVal - canvasBox.offsetHeight) / (canvasBox.offsetHeight - height)
+				
+
+				let mousedown = (event)=>{//按下
+					// console.log(event.target.getBoundingClientRect());
+					let position = {
+						y:event.touches[0].screenY,
+						top : scrollBox.style.marginTop?scrollBox.style.marginTop.split('px')[0]*1:0
+					}
+					// let top = 
+					let scrollMousemove = (e)=>{
+						let height = scrollBox.style.height.split('px')[0]*1
+						let offsetTop = position.top+e.touches[0].screenY - position.y
+						offsetTop = offsetTop <= 0? 0 : offsetTop
+						offsetTop = height+offsetTop >= canvasBox.offsetHeight? canvasBox.offsetHeight - height : offsetTop
+						console.log();
+						scrollBox.style.marginTop = offsetTop+'px'
+						canvasBox.scroll({
+							top: offsetTop*scale, // 纵向滚动距离
+							left: 0, // 横向滚动距离
+						});
+					}
+					let mouseup = ()=>{//抬起
+						window.removeEventListener('touchmove',scrollMousemove)
+						scrollBox.removeEventListener('touchend',mouseup)
+					}
+					window.addEventListener('touchmove',scrollMousemove)
+					scrollBox.addEventListener('touchend',mouseup)
+				}
+				scrollBox.removeEventListener('touchstart',mousedown)
+				scrollBox.addEventListener('touchstart',mousedown)
+				
+
+				
+        	}
+        },
     },
+    mounted() {},
+
     methods: {
 		
 	},
@@ -1909,6 +1953,18 @@ export default defineComponent({
             height: 100%;
             overflow-x: hidden;
         }
+		.exportCanvasBox_scroll{
+			height: 100%;
+			width: 2rem;
+			background: #d6cfe3;
+			border-radius: 1rem;
+			div{
+				background: #543087;
+				border-radius: 1rem;
+				width: 100%;
+				height: 30rem;
+			}
+		}
         .export_new_collection_review {
             position: initial;
             margin: 10rem auto;
diff --git a/src/lang/cn.ts b/src/lang/cn.ts
index f328444f..d5d43ee4 100644
--- a/src/lang/cn.ts
+++ b/src/lang/cn.ts
@@ -61,7 +61,7 @@ export default {
 		jsContent2:'我们只支持对印花进行超分',
 		jsContent3:'您的积分小于一次超分',
 		jsContent4:'您的积分余额不足',
-		jsContent5:'您选择的{str}张图像在超分辨率增强后的分辨率超过2048。请选择较低的放大倍数。',
+		jsContent5:'您选择的第{str}张图像在超分辨率增强后的分辨率超过2048。请选择较低的放大倍数。',
 		jsContent6:'请选择需要超分的图片',
 	},
 	upgradePlan:{
diff --git a/src/lang/en.ts b/src/lang/en.ts
index 521d4243..58163e6d 100644
--- a/src/lang/en.ts
+++ b/src/lang/en.ts
@@ -62,7 +62,7 @@ export default {
 		jsContent2:'We only provide super-resolution capabilities for printboard images.',
 		jsContent3:'Your points are less than one SR',
 		jsContent4:'Your points balance is insufficient',
-		jsContent5:'The resolution of the {str} images you selected exceeds 2048 after super-resolution enhancement, Please choose a lower magnification level.',
+		jsContent5:'After super-resolution enhancement, the {str} th image you selected has a resolution exceeding 2048, Please choose a lower magnification level.',
 		jsContent6:'Please select the picture that requires upscale',
 	},
 	upgradePlan:{
diff --git a/src/tool/util.js b/src/tool/util.js
index d4c3ff6d..3eacdc46 100644
--- a/src/tool/util.js
+++ b/src/tool/util.js
@@ -150,11 +150,16 @@ const isMoible = () => {//判断是否是移动端
 	let is_mobile = navigator.userAgent.toLowerCase().match(/(ipad|ipod|iphone|android|coolpad|mmp|smartphone|midp|wap|xoom|symbian|j2me|blackberry|wince)/i) != null;
 	// alert(navigator.userAgent.toLowerCase())
 	var isiPad = (navigator.maxTouchPoints && navigator.maxTouchPoints > 0);
+	// if (is_mobile) {
+	// 	return true//判断是否在正则内
+	// } else if(window.matchMedia("(pointer:fine)").matches){
+	// 	return false//判断是否支持鼠标
+	// }else{
+	// 	isiPad//判断触摸点
+	// }
 	if (is_mobile) {
 		return true//判断是否在正则内
-	} else if(window.matchMedia("(pointer:fine)").matches){
-		return false//判断是否支持鼠标
-	}else{
+	} else{
 		isiPad//判断触摸点
 	}
 }