From f6556ec9a9a762e095e673c350cb3af802834149 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Wed, 28 Jan 2026 17:10:58 +0800
Subject: [PATCH 1/8] fix

---
 src/component/Detail/DesignDetail.vue | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue
index acb7e80b..a4f36f18 100644
--- a/src/component/Detail/DesignDetail.vue
+++ b/src/component/Detail/DesignDetail.vue
@@ -372,8 +372,13 @@ export default defineComponent({
 				color = list[i].color?.rgba?.r != null?`${list[i].color.rgba.r} ${list[i].color.rgba.g} ${list[i].color.rgba.b}`:''
 					gradient = list[i].gradient
 				if((detailData.currentDetailType == 'sketch' && newData?.sketch) || detailData.isEditPattern.value == 'editSketch'){
-					color = detailData.designDetail.clothes?.[0]?.color?.rgba?.r?`${detailData.designDetail.clothes?.[0].color.rgba.r} ${detailData.designDetail.clothes[0].color.rgba.g} ${detailData.designDetail.clothes[0].color.rgba.b}`:''
-					gradient = detailData.designDetail.clothes?.[0]?.gradient || null
+					if(detailData.isEditPattern.value == 'editSketch'){
+						color = detailData.selectDetail?.color?.rgba?.r != null?`${detailData.selectDetail.color.rgba.r} ${detailData.selectDetail.color.rgba.g} ${detailData.selectDetail.color.rgba.b}`:''
+						gradient = detailData.selectDetail?.gradient || null
+					}else{
+						color = detailData.designDetail.clothes?.[0]?.color?.rgba?.r?`${detailData.designDetail.clothes?.[0].color.rgba.r} ${detailData.designDetail.clothes[0].color.rgba.g} ${detailData.designDetail.clothes[0].color.rgba.b}`:''
+						gradient = detailData.designDetail.clothes?.[0]?.gradient || null
+					}
 					detailData.selectDetail.maskUrl = ''
 					detailData.selectDetail.maskMinioUrl = ''
 				}
@@ -680,7 +685,7 @@ export default defineComponent({
 					let color = detailData.selectDetail.newDetail?.color
 					// let colorData:any = await getColorName(color?.rgba)
 					if(detailData.selectDetail.newDetail?.color){
-						if(color.r){
+						if(color.r != null){
 							color.rgba = {r:color.r,g:color.g,b:color.b,a:color.a}
 						}else{
 							color.rgba = {}

From 2d5d1b7a5e1d75c8da0d67cacb1f4e8fb274b68e Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Thu, 29 Jan 2026 09:55:15 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=A1=A3=E6=9C=8D?=
 =?UTF-8?q?=E6=97=B6=E5=80=99imgDom=E8=A6=81=E9=9A=8F=E7=9D=80=E5=8F=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/component/Detail/model/modelPosition.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/component/Detail/model/modelPosition.vue b/src/component/Detail/model/modelPosition.vue
index 904bd8fc..400b47ce 100644
--- a/src/component/Detail/model/modelPosition.vue
+++ b/src/component/Detail/model/modelPosition.vue
@@ -406,7 +406,12 @@ export default defineComponent({
 			selectItem.imgDomIndex = detailData.frontBack.front.findIndex((item:any)=>item.id == newValue.id)
 			initMoveableForSelected()
 		},{immediate: true,})
-
+		watch(()=>detailData.frontBack.front.length,(newValue,oldValue)=>{
+			if(selectItem.selectDetail?.id)selectItem.imgDomIndex = detailData.frontBack.front.findIndex((item:any)=>item.id == selectItem.selectDetail?.id)
+			setTimeout(()=>{
+				initMoveableForSelected()
+			},100)
+		})
 		const setRevocation = async ()=>{
 			let frontBack = JSON.parse(JSON.stringify(detailData.frontBack))	
 			let revocation:any = JSON.parse((await KeyValueDB.get("revocation") as any) || '[]')

From 012f0ef1b58b74238e7532e8d070a1fc6c8f828c Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Thu, 29 Jan 2026 16:55:38 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=BB=E5=B8=83?=
 =?UTF-8?q?=E6=89=93=E5=BC=80=E5=8F=91=E5=B8=83=E5=90=8E=E4=BB=8D=E7=84=B6?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E5=AF=B9=E7=94=BB=E5=B8=83=E9=87=8C=E9=9D=A2?=
 =?UTF-8?q?=E5=A4=8D=E5=88=B6=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/component/home/design/tools.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/component/home/design/tools.vue b/src/component/home/design/tools.vue
index 69722c19..d058a40f 100644
--- a/src/component/home/design/tools.vue
+++ b/src/component/home/design/tools.vue
@@ -56,7 +56,7 @@
 							@changeCanvas="changeCanvas" 
 							@trigger-library="triggerLibrary"
 							:canvasJSON="canvasJSON"
-							:hideCanvas="hideCanvas"
+							:hideCanvas="hideCanvas || !key"
 							ref="editCanvas">
 							<template #existsImageList>
 								<ExistsImageList :list="canvasSelectList" @select="handleImageSelect" />
@@ -135,7 +135,7 @@ export default defineComponent({
 			unLikeList:[],
 			locale:null as any,
 			t:null as any,
-
+			key:true as any
 		})
 		const dataDom = reactive({
 			toProduct:null as any,
@@ -462,9 +462,11 @@ export default defineComponent({
 				imgUrl:imageDataURL,
 				userlikeGroupId:'',
 			}
+			data.key = false
 			dataDom.publish.init(value)
 		}
 		const setPublish = ()=>{
+			data.key = true
 			saveCanvas()
 		}
 		return{

From 96b3636aeaef23526548bded3bb783c175176856 Mon Sep 17 00:00:00 2001
From: "X1627315083@163.com" <1627315083@qq.com>
Date: Wed, 4 Feb 2026 15:59:45 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E5=8F=96=E6=B6=883d=20=E6=8B=BC=E8=B4=B4?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/tool/listData.js | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/tool/listData.js b/src/tool/listData.js
index c5d18b96..b896abbd 100644
--- a/src/tool/listData.js
+++ b/src/tool/listData.js
@@ -272,12 +272,12 @@ const navTypeList = (t)=>{
 				// },
 
 
-				{
-					icon:'fi fi-rr-puzzle-alt',
-					value:'deReconstruction',
-					label:t('Header.toolsDeReconstruction'),
-					router:'tools=deReconstruction'
-				},
+				// {
+				// 	icon:'fi fi-rr-puzzle-alt',
+				// 	value:'deReconstruction',
+				// 	label:t('Header.toolsDeReconstruction'),
+				// 	router:'tools=deReconstruction'
+				// },
 				{
 					icon:'fi fi-ss-box-open',
 					value:'toProduct',
@@ -294,18 +294,18 @@ const navTypeList = (t)=>{
 					label:t('Header.toolsToTransferPose'),
 					router:'tools=poseTransfer'
 				},
-				{
-					icon:'fi fi-rr-cubes',
-					value:'patternMaking3D',
-					label:t('Header.toolsPatternMaking'),
-					router:'tools=patternMaking3D'
-				},
-				{
-					icon:'fi fi-rr-pen-swirl',
-					value:'canvasUpload',
-					label:t('Header.toolsCanvas'),
-					router:'tools=canvasUpload'
-				},
+				// {
+				// 	icon:'fi fi-rr-cubes',
+				// 	value:'patternMaking3D',
+				// 	label:t('Header.toolsPatternMaking'),
+				// 	router:'tools=patternMaking3D'
+				// },
+				// {
+				// 	icon:'fi fi-rr-pen-swirl',
+				// 	value:'canvasUpload',
+				// 	label:t('Header.toolsCanvas'),
+				// 	router:'tools=canvasUpload'
+				// },
 			]
 		},
 		library:{

From dc1ab330cf9589ba5a824466fb1c248f68f01325 Mon Sep 17 00:00:00 2001
From: zhangyahui <yhzhang@aidlab.hk>
Date: Thu, 5 Feb 2026 10:33:42 +0800
Subject: [PATCH 5/8] =?UTF-8?q?AiDA=E8=B7=B3=E8=BD=AC=E7=AB=9E=E8=B5=9B?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/component/Events/eventsDetail.vue | 264 +++++++++++++++-----------
 1 file changed, 158 insertions(+), 106 deletions(-)

diff --git a/src/component/Events/eventsDetail.vue b/src/component/Events/eventsDetail.vue
index aaccbc03..c38fb403 100644
--- a/src/component/Events/eventsDetail.vue
+++ b/src/component/Events/eventsDetail.vue
@@ -1,142 +1,171 @@
 <template>
-    <div class="eventsDetail_page" :class="{active:isScroll}">
-		<div class="eventsDetail_title ">
+	<div class="eventsDetail_page" :class="{ active: isScroll }">
+		<div class="eventsDetail_title">
 			<div class="modal_title_text" @click="setBack">
 				<i class="fi fi-sr-left"></i>
-				<div class="eventsDetail_title_text">{{ $t('event.back') }}</div>
+				<div class="eventsDetail_title_text">{{ $t("event.back") }}</div>
 			</div>
 		</div>
 		<div class="eventsDetail_content">
 			<div class="eventsDetail_content_left">
-				<fullScreenImg :src="eventsDetail.imgUrl" width="100%" :center="true"></fullScreenImg>
+				<fullScreenImg
+					:src="eventsDetail.imgUrl"
+					width="100%"
+					:center="true"
+				></fullScreenImg>
 			</div>
 			<div class="eventsDetail_content_right">
-				<div class="modal_title_text">
+				<div class="modal_title_text modal_title_text-header flex space-between">
 					<div>{{ eventsDetail.title }}</div>
+					<div class="detail-btn" v-if="eventsDetail.id === 3" @click="openDetail">
+						View Details
+					</div>
 				</div>
-				<div class="modal_title_text" v-for="item in eventsDetail.textList">
+				<div class="modal_title_text content" v-for="item in eventsDetail.textList">
 					<div class="eventsDetail_content_right_btn_box">
-						<div class="eventsDetail_content_right_btn" v-for="buttonItem,buttonIndex in item?.button" @click="openButton(buttonItem,buttonIndex)">
-							<div v-show="!loadingShow[buttonIndex]" class="started_btn">{{ buttonItem.text }}</div>
-							<div v-show="loadingShow[buttonIndex]" class="started_btn"><i class="fi fi-br-loading"></i></div>
+						<div
+							class="eventsDetail_content_right_btn"
+							v-for="(buttonItem, buttonIndex) in item?.button"
+							@click="openButton(buttonItem, buttonIndex)"
+						>
+							<div v-show="!loadingShow[buttonIndex]" class="started_btn">
+								{{ buttonItem.text }}
+							</div>
+							<div v-show="loadingShow[buttonIndex]" class="started_btn">
+								<i class="fi fi-br-loading"></i>
+							</div>
 						</div>
 					</div>
-					<div class="modal_title_text_intro" v-for="introItem in item?.paragraph" :class="{active:introItem.display == 'flex'}" v-detailText="introItem.text">
-					</div>
+					<div
+						class="modal_title_text_intro"
+						v-for="introItem in item?.paragraph"
+						:class="{ active: introItem.display == 'flex' }"
+						v-detailText="introItem.text"
+					></div>
 				</div>
 			</div>
 		</div>
-	
-    </div>
+	</div>
 </template>
 <script lang="ts">
-import { LoadingOutlined } from "@ant-design/icons-vue";
-import { defineComponent,h ,toRefs,ref,reactive,onMounted,nextTick,provide,computed} from 'vue'
+import { LoadingOutlined } from "@ant-design/icons-vue"
+import {
+	defineComponent,
+	h,
+	toRefs,
+	ref,
+	reactive,
+	onMounted,
+	nextTick,
+	provide,
+	computed
+} from "vue"
 // import RobotAssist from "@/component/HomePage/RobotAssist.vue";
-import { Https } from "@/tool/https";
-import { message, Upload, Modal } from "ant-design-vue";
-import fullScreenImg from '@/component/HomePage/fullScreenImg.vue'
-import { useRouter } from 'vue-router';
-import { useI18n } from "vue-i18n";
-import generalMenu from "@/component/HomePage/generalMenu.vue";
-import eventData from "@/assets/json/events.json";
-import eventDataCn from "@/assets/json/events_cn.json";
-import { useStore } from "vuex";
+import { Https } from "@/tool/https"
+import { message, Upload, Modal } from "ant-design-vue"
+import fullScreenImg from "@/component/HomePage/fullScreenImg.vue"
+import { useRouter } from "vue-router"
+import { useI18n } from "vue-i18n"
+import generalMenu from "@/component/HomePage/generalMenu.vue"
+import eventData from "@/assets/json/events.json"
+import eventDataCn from "@/assets/json/events_cn.json"
+import { useStore } from "vuex"
 export default defineComponent({
-    components: {
+	components: {
 		generalMenu,
-		fullScreenImg,
-    },
-	props:{
-		isScroll:{
-			 type:Boolean,
-			 default:true,
-		 },
+		fullScreenImg
 	},
-    setup() {
-		const router = useRouter();
-        const store = useStore();
-		let filter:any = reactive({
-			eventsDetail: {
-			},
-			getListDate:{
-				"getLikePortfolio": 0,
-				"getMyPortfolio": 0,
-				page:1,
-				size:10,
-			},
-			isShowMark:false,
-			isNoData:false,//如果数据为空就不加载
-			loadingShow:{},
-		})
-		let likeFile = (item:any,type:string) => {
+	props: {
+		isScroll: {
+			type: Boolean,
+			default: true
 		}
-		let setBack = ()=>{
-			router.go(-1);
+	},
+	setup() {
+		const router = useRouter()
+		const store = useStore()
+		let filter: any = reactive({
+			eventsDetail: {},
+			getListDate: {
+				getLikePortfolio: 0,
+				getMyPortfolio: 0,
+				page: 1,
+				size: 10
+			},
+			isShowMark: false,
+			isNoData: false, //如果数据为空就不加载
+			loadingShow: {}
+		})
+		let likeFile = (item: any, type: string) => {}
+		let setBack = () => {
+			router.go(-1)
 			// router.push('/home/events')
-		} 
-		let openButton = (data:any,index:number)=>{
-			if(filter.loadingShow[index]){
+		}
+		let openButton = (data: any, index: number) => {
+			if (filter.loadingShow[index]) {
 				return
 			}
 			filter.loadingShow[index] = true
-			Https.axiosGet(data.https).then(
-                (rv: any) => {
-					if(rv){
+			Https.axiosGet(data.https)
+				.then((rv: any) => {
+					if (rv) {
 						message.success(data.success)
 						filter.loadingShow[index] = false
 					}
-                }
-            ).catch(res=>{
-                filter.loadingShow[index] = false
-            });
+				})
+				.catch((res) => {
+					filter.loadingShow[index] = false
+				})
 		}
-		onMounted (()=>{
-			const { t, locale } = useI18n();
-			const currentLocale = locale.value;
-			let eventLangData:any
-			if(currentLocale == 'ENGLISH'){
+		const openDetail = () => {
+			// window.open("https://aida-global-design-awards.com.hk", "_blank")
+			router.push("/award/index")
+		}
+		onMounted(() => {
+			const { t, locale } = useI18n()
+			const currentLocale = locale.value
+			let eventLangData: any
+			if (currentLocale == "ENGLISH") {
 				eventLangData = eventData
-			}else{
+			} else {
 				eventLangData = eventDataCn
 			}
-			eventLangData.eventsItem.forEach((item:any)=>{
-				if(item.id == router.currentRoute.value.query.eventId){
-					filter.eventsDetail = item;
+			eventLangData.eventsItem.forEach((item: any) => {
+				if (item.id == router.currentRoute.value.query.eventId) {
+					filter.eventsDetail = item
 				}
 			})
 		})
-        return {
+		return {
 			...toRefs(filter),
 			likeFile,
 			setBack,
 			openButton,
-        }
-    },
-	directives:{
-		detailText:{
-			mounted (el,binding) {
+			openDetail
+		}
+	},
+	directives: {
+		detailText: {
+			mounted(el, binding) {
 				el.innerHTML = binding.value
 			}
 		}
 	},
-    async mounted(){
-	
-    },
+	async mounted() {}
 })
 </script>
 <style lang="less">
 .eventsDetail_page {
 	min-height: 100%;
-    width: 100%;
+	width: 100%;
 	padding: 0 6rem;
 	padding-top: 5rem;
 
-	&.active{
+	&.active {
 		display: flex;
 		flex-direction: column;
 		height: 100%;
-		.eventsDetail_content{
+		.eventsDetail_content {
 			overflow-y: auto;
 			width: 100%;
 		}
@@ -146,7 +175,7 @@ export default defineComponent({
 		min-height: auto;
 		padding-bottom: 10rem;
 	}
-	.eventsDetail_title{
+	.eventsDetail_title {
 		display: flex;
 		padding: 2rem 0rem;
 		align-items: center;
@@ -154,21 +183,21 @@ export default defineComponent({
 		top: 0;
 		z-index: 222;
 		background: #fff;
-		.modal_title_text{
+		.modal_title_text {
 			cursor: pointer;
 			display: flex;
 			margin-bottom: 0;
 		}
-		.modal_title_text:hover .eventsDetail_title_text{
+		.modal_title_text:hover .eventsDetail_title_text {
 			text-decoration: underline;
 		}
-		i{
+		i {
 			display: flex;
 			align-items: center;
 			margin-right: 1rem;
 		}
 	}
-	.eventsDetail_content{
+	.eventsDetail_content {
 		border-top: 1px solid #f0f0f0;
 		display: flex;
 		justify-content: space-between;
@@ -176,59 +205,69 @@ export default defineComponent({
 		@media (max-width: 768px) {
 			flex-direction: column;
 		}
-		.eventsDetail_content_left,.eventsDetail_content_right{
+		.eventsDetail_content_left,
+		.eventsDetail_content_right {
 			width: 50%;
 			@media (max-width: 768px) {
 				width: 100%;
 			}
 		}
-		.eventsDetail_content_left{
+		.eventsDetail_content_left {
 			width: 40%;
 			max-height: 60rem;
 			@media (max-width: 768px) {
 				width: 100%;
 			}
-			.ant-image{
+			.ant-image {
 				// height: auto;
 				height: 100%;
 			}
-			.eventsDetail_content_left_img{
+			.eventsDetail_content_left_img {
 				width: 100%;
 				cursor: zoom-in;
 			}
 		}
-		.eventsDetail_content_right{
-			.modal_title_text{
-				letter-spacing: .4rem;
+		.eventsDetail_content_right {
+			.modal_title_text {
+				letter-spacing: 0.4rem;
 				font-weight: 600;
-				.modal_title_text_intro{
+				&-header {
+					display: flex;
+					flex-wrap: wrap;
+					align-items: flex-end;
+					justify-content: space-between;
+					gap: 1rem;
+					> div:first-child {
+						flex: 1;
+						min-width: 0;
+					}
+				}
+				.modal_title_text_intro {
 					display: block;
-					&.active{
+					&.active {
 						display: flex;
 						justify-content: space-between;
 					}
-					li{
+					li {
 						width: 48%;
-						
 					}
-					em{
+					em {
 						// font-family: auto;
 					}
-					a{
+					a {
 						display: inline;
 					}
 				}
-				.eventsDetail_content_right_btn_box{
+				.eventsDetail_content_right_btn_box {
 					display: flex;
 					justify-content: space-evenly;
-					.eventsDetail_content_right_btn{
+					.eventsDetail_content_right_btn {
 					}
 				}
-				
 			}
-			.modal_title_text:last-child{
+			.modal_title_text:last-child {
 			}
-			.modal_title_text:last-child::after{
+			.modal_title_text:last-child::after {
 				content: "";
 				display: block;
 				border-top: 3px solid;
@@ -237,4 +276,17 @@ export default defineComponent({
 		}
 	}
 }
-</style>
\ No newline at end of file
+.detail-btn {
+	// width: 11rem;
+	padding: 0 1.4rem;
+	height: 4rem;
+	line-height: 4rem;
+	text-align: center;
+	color: #fff;
+	border-radius: 2rem;
+	background-color: #000;
+	font-size: 1.4rem;
+	white-space: nowrap;
+	cursor: pointer;
+}
+</style>

From f7e6926ee91b897cdb364f211839931a33946f7f Mon Sep 17 00:00:00 2001
From: zhangyahui <yhzhang@aidlab.hk>
Date: Thu, 5 Feb 2026 16:25:12 +0800
Subject: [PATCH 6/8] bugfix: events i18n

---
 src/component/Events/eventsDetail.vue | 2 +-
 src/lang/cn.ts                        | 3 ++-
 src/lang/en.ts                        | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/component/Events/eventsDetail.vue b/src/component/Events/eventsDetail.vue
index c38fb403..a1339e17 100644
--- a/src/component/Events/eventsDetail.vue
+++ b/src/component/Events/eventsDetail.vue
@@ -18,7 +18,7 @@
 				<div class="modal_title_text modal_title_text-header flex space-between">
 					<div>{{ eventsDetail.title }}</div>
 					<div class="detail-btn" v-if="eventsDetail.id === 3" @click="openDetail">
-						View Details
+						{{ $t("event.detail") }}
 					</div>
 				</div>
 				<div class="modal_title_text content" v-for="item in eventsDetail.textList">
diff --git a/src/lang/cn.ts b/src/lang/cn.ts
index 0e3f6d61..413486ec 100644
--- a/src/lang/cn.ts
+++ b/src/lang/cn.ts
@@ -1529,7 +1529,8 @@ export default {
 		LiquefactionTool: '液化工具'
 	},
 	event: {
-		back: '返回'
+		back: '返回',
+		detail:'查看详情'
 	},
 	admin: {
 		allUser: '所有用户',
diff --git a/src/lang/en.ts b/src/lang/en.ts
index 420c3f95..3ec78bec 100644
--- a/src/lang/en.ts
+++ b/src/lang/en.ts
@@ -1586,7 +1586,8 @@ export default {
 		LiquefactionTool: 'Liquefaction Tool'
 	},
 	event: {
-		back: 'Back'
+		back: 'Back',
+		detail:'View Details'
 	},
 	admin: {
 		allUser: 'All User',

From 4d9ea751464efd3460c4375f01de6a76c832c75f Mon Sep 17 00:00:00 2001
From: zhangyahui <yhzhang@aidlab.hk>
Date: Thu, 5 Feb 2026 16:30:24 +0800
Subject: [PATCH 7/8] =?UTF-8?q?chore:=20i18n=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/json/events.json    | 2 +-
 src/assets/json/events_cn.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/assets/json/events.json b/src/assets/json/events.json
index 647059e9..85c53e11 100644
--- a/src/assets/json/events.json
+++ b/src/assets/json/events.json
@@ -25,7 +25,7 @@
 				{
 					"paragraph": [
 						{
-							"text": "Scan the QR code for more information and to join the competition! The AiDA Global Design Award 2026 is an international design competition hosted by Code‑Create, a globally leading AI fashion solutions provider, celebrating the future of creativity powered by artificial intelligence. Open to designers from Hong Kong, China, Singapore, South Korea, and beyond, the competition brings together global talent, empowering AI as a creative partner—pushing fashion beyond traditional boundaries and unlocking new possibilities where technology amplifies human imagination."
+							"text": "Click the “View Details” button for more information and to join the competition! The AiDA Global Design Award 2026 is an international design competition hosted by Code‑Create, a globally leading AI fashion solutions provider, celebrating the future of creativity powered by artificial intelligence. Open to designers from Hong Kong, China, Singapore, South Korea, and beyond, the competition brings together global talent, empowering AI as a creative partner—pushing fashion beyond traditional boundaries and unlocking new possibilities where technology amplifies human imagination."
 						}
 					]
 				},
diff --git a/src/assets/json/events_cn.json b/src/assets/json/events_cn.json
index cc704db1..a3589714 100644
--- a/src/assets/json/events_cn.json
+++ b/src/assets/json/events_cn.json
@@ -25,7 +25,7 @@
 				{
 					"paragraph": [
 						{
-							"text": "秉承推动 AI 赋能创意设计的初衷，Code‑Create 举办了「AiDA 全球设计大奖 2026」，面向来自香港、中国、新加坡、韩国及全球的设计师，鼓励大家探索 AI 与时尚设计的无限可能，突破传统界限，释放科技与想象力的创新潜能。扫描二维码获取更多比赛信息，抓住成为 AI 时尚先锋的机会吧！"
+							"text": "秉承推动 AI 赋能创意设计的初衷，Code‑Create 举办了「AiDA 全球设计大奖 2026」，面向来自香港、中国、新加坡、韩国及全球的设计师，鼓励大家探索 AI 与时尚设计的无限可能，突破传统界限，释放科技与想象力的创新潜能。点击“查看详情”按钮获取更多比赛信息，抓住成为 AI 时尚先锋的机会吧！"
 						}
 					]
 				},

From b2cb7378d6669a96c8843577251a6089c05f2425 Mon Sep 17 00:00:00 2001
From: "X1627315083@163.com" <1627315083@qq.com>
Date: Thu, 5 Feb 2026 16:41:56 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8Doverall=E6=A8=A1=E5=BC=8F?=
 =?UTF-8?q?=E8=A7=92=E5=BA=A6=E8=AE=BE=E7=BD=AE=E4=B8=8D=E4=B8=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/component/Detail/detailRight/editPrintElement.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/component/Detail/detailRight/editPrintElement.vue b/src/component/Detail/detailRight/editPrintElement.vue
index 1b8c393d..4fcf2db0 100644
--- a/src/component/Detail/detailRight/editPrintElement.vue
+++ b/src/component/Detail/detailRight/editPrintElement.vue
@@ -300,7 +300,7 @@ export default defineComponent({
 					// location = [item.pattern.style.left,item.pattern.style.top]
 				}
 				let value  ={
-					angle : item.pattern.transform.rotateZ,
+					angle:0,
 					// angle : !this.overallSingle ? 0:item.pattern.transform.rotateZ,
 					location : location,
 					priority:item.priority,
@@ -312,7 +312,9 @@ export default defineComponent({
 					ifSingle:!!item.ifSingle,
 					globalCompositeOperation:'',
 				}
-				if(item.object)value.object = item.object
+				if(item.object)value.object = item.object;
+				value.angle = value.ifSingle?item.pattern.transform.rotateZ:item.angle
+				
 				return value
 			}
 			if(editPrintElementData.printStyleList[props.type].single.length>0){
@@ -915,6 +917,7 @@ export default defineComponent({
 		}
 		const inputFillAngle = (angle:any)=>{
 			let arr = editPrintElementData.printStyleList[props.type].overall
+			console.log(angle)
 			arr[editPrintElementData.imgDomIndex].angle = angle
 			editPrintElementDom.pingpuRef.updataList([
 				{