Merge branch 'dev_vite' of ssh://18.167.251.121:10002/aidlab/aida_front into dev_vite

src/component/Canvas/CanvasEditor/components/LayersPanel/LayersPanel.vue

@@ -584,15 +584,16 @@ function handleLayerClick(layer, event) {
       // 如果不是多选模式，才可激活图层
       // 1.如果是组，则设置组下的第一个子图层为活动图层
       // 2.否则直接设置活动图层
-      if (isGroupLayerType(layer) && layer.children && layer.children.length > 0) {
+      if (isGroupLayerType(layer) && layer.children && layer.children.length > 0 && !layer.isPrintTrimsGroup) {
         // 如果是组图层，设置第一个子图层为活动图层
         layerManager?.setAllActiveGroupLayerCanvasObject?.(layer);
         setActiveLayer(layer.children[0].id, { parentId: layer.id });
       } else {
+		let id = layer.isPrintTrimsGroup ? layer.children?.[0]?.id || layer.id : layer.id;
         // 选中画布中的图层对象
-        layerManager?.selectLayerObjects(layer.id);
+        layerManager?.selectLayerObjects(id);
         // 否则直接设置当前图层为活动图层
-        setActiveLayer(layer.id);
+        setActiveLayer(id);
         layerManager?.updateLayersObjectsInteractivity();
       }
     }

src/views/AwardPage/apply.vue

@@ -7,16 +7,16 @@
 			<div class="title poppins-medium">Application Form</div>
 			<div
 				class="form-header"
-				v-if="!isCompleted"
+				v-if="!isCompleted && !isExpired"
 			>
 				<div class="form-title poppins-bold">Email Verification</div>
 				<div class="desc">AiDA Users Only</div>
 			</div>
 		</div>
-		<Success v-if="isCompleted" />
+		<Success :isExpired="isExpired" v-if="isCompleted || isExpired" />
 		<div
 			class="form-container"
-			v-if="!isCompleted"
+			v-if="!isCompleted && !isExpired"
 		>
 			<div class="form-content">
 				<a-form
@@ -154,6 +154,7 @@
 							class="full-row"
 							name="pdfPath"
 							required
+							:validate-trigger="[]"
 							label="How will you use AiDA in your design process?"
 						>
 							<div
@@ -205,6 +206,7 @@
 							class="full-row"
 							name="videoPath"
 							required
+							:validate-trigger="[]"
 							label="How will you use AiDA in your design process?"
 						>
 							<div
@@ -348,6 +350,13 @@
 	import UploadStatus from './components/UploadStatus.vue'
 	import Success from './components/Success.vue'
 
+	// 是否晚于2026年7月22日
+	const isExpired = computed(() => {
+		const now = new Date()
+		const targetDate = new Date('2026-03-15')
+		return now > targetDate
+	})
+
 	const route = useRoute()
 	const isCompleted = ref(false)
 	const hasValidEmail = ref(false)
@@ -432,6 +441,36 @@
 		],
 		lastName: [
 			{ required: true, message: 'Please input your last name', trigger: 'blur' }
+		],
+		gender: [
+			{ required: true, message: 'Please select your gender', trigger: 'blur' }
+		],
+		occupation: [
+			{ required: true, message: 'Please input your occupation', trigger: 'blur' }
+		],
+		age: [{ required: true, message: 'Please input your age', trigger: 'blur' }],
+		countryRegionCity: [
+			{
+				required: true,
+				message: 'Please input your country/region and city',
+				trigger: 'blur'
+			}
+		],
+		phoneNumber: [{ required: true, validator: validatePhone, trigger: 'blur' }],
+
+		designTitle: [
+			{ required: true, message: 'Please input your design title', trigger: 'blur' }
+		],
+		designDescription: [
+			{
+				required: true,
+				message: 'Please input your design description',
+				trigger: 'blur'
+			}
+		],
+		pdfPath: [{ required: true, message: 'Please upload your PDF', trigger: 'null' }],
+		videoPath: [
+			{ required: true, message: 'Please upload your video', trigger: 'null' }
 		]
 	}
 
@@ -962,8 +1001,9 @@
 		height: 1rem;
 	}
 	.apply-container {
-		min-height: calc(100% -18rem);
+		min-height: calc(100% - 18rem);
 		background-color: #f5f5f5;
+		box-sizing: border-box;
 	}
 
 	.banner {

src/views/AwardPage/components/Bloom.vue

@@ -26,13 +26,105 @@
 </template>
 
 <script setup lang="ts">
-		import { ref, onMounted } from 'vue'
+	import { ref, onMounted, onBeforeUnmount, nextTick } from 'vue'
-		import gsap from 'gsap'
+	import { gsap } from 'gsap'
 
-		const titleRef = ref<HTMLElement | null>(null)
+	const titleRef = ref<HTMLElement | null>(null)
-		const subtitleRef = ref<HTMLElement | null>(null)
+	const subtitleRef = ref<HTMLElement | null>(null)
-		const textRef = ref<HTMLElement | null>(null)
+	const textRef = ref<HTMLElement | null>(null)
 
+	const hasPlayedBloomAnim = ref(false)
+	let bloomObserver: IntersectionObserver | null = null
+
+	const setupBloomInitialState = () => {
+		const titleEls = [titleRef.value, subtitleRef.value].filter(Boolean) as HTMLElement[]
+		if (titleEls.length) {
+			gsap.set(titleEls, {
+				opacity: 0,
+				// start larger than final size, then animate down to scale:1
+				scale: 1.6,
+				transformOrigin: '50% 50%'
+			})
+		}
+
+		if (textRef.value) {
+			// start below and hidden
+			gsap.set(textRef.value, {
+				opacity: 0,
+				y: 60
+			})
+		}
+	}
+
+	const playBloomAnimation = () => {
+		if (hasPlayedBloomAnim.value) return
+		const titleEls = [titleRef.value, subtitleRef.value].filter(Boolean) as HTMLElement[]
+		const textEl = textRef.value
+		if (!titleEls.length || !textEl) return
+
+		const tl = gsap.timeline({ defaults: { ease: 'power2.out' } })
+
+		tl.to(titleEls, {
+			opacity: 1,
+			scale: 1,
+			duration: 0.9,
+			ease: 'back.out(1.6)',
+			stagger: 0.12
+		})
+
+		tl.to(
+			textEl,
+			{
+				opacity: 1,
+				y: -12,
+				scale: 1.05,
+				duration: 0.3,
+				ease: 'power2.out'
+			},
+			'+=0.12'
+		)
+		tl.to(
+			textEl,
+			{
+				y: 0,
+				scale: 1,
+				duration: 0.18,
+				ease: 'bounce.out'
+			},
+			'+=0.08'
+		)
+
+		hasPlayedBloomAnim.value = true
+		bloomObserver?.disconnect()
+	}
+
+	onMounted(() => {
+		nextTick(() => {
+			setupBloomInitialState()
+			if ('IntersectionObserver' in window) {
+				bloomObserver = new IntersectionObserver(
+					(entries) => {
+						entries.forEach((entry) => {
+							if (entry.isIntersecting) {
+								playBloomAnimation()
+							}
+						})
+					},
+					{ threshold: 0.3 }
+				)
+				if (titleRef.value) {
+					bloomObserver.observe(titleRef.value)
+				}
+			} else {
+				// fallback
+				playBloomAnimation()
+			}
+		})
+	})
+
+	onBeforeUnmount(() => {
+		bloomObserver?.disconnect()
+	})
 
 </script>
 
@@ -66,3 +158,4 @@
 		}
 	}
 </style>
+

src/views/AwardPage/components/Slogan.vue

@@ -0,0 +1,149 @@
+<template>
+	<div class="blocks-list flex" ref="root" :class="{ 'in-view': inView }">
+		<div
+			class="block-item flex flex-col flex-center"
+			v-for="(item, idx) in blocksList"
+			:key="item.number"
+			:style="{ '--delay': `${idx * 0.18}s` }"
+		>
+			<div class="number">{{ item.number }}</div>
+			<div class="label">{{ item.label }}</div>
+			<div class="line"></div>
+		</div>
+	</div>
+</template>
+
+<script setup lang="ts">
+	import { ref, onMounted, onUnmounted } from 'vue'
+
+	const blocksList = ref([
+		{
+			number: 'NETWORKING\n OPPORTUNITIES',
+			label: 'with international\nmedia and designers'
+		},
+		{
+			number: 'INTERNATIONAL\nMEDIA EXPOSE',
+			label: 'through\nleading outlets'
+		},
+		{
+			number: 'UP TO\nUS$9000',
+			label: 'in total prize\npool awards'
+		},
+		{
+			number: 'TRAVEL\NALLOWANCE',
+			label: 'for finalists to attend\naward ceremony'
+		}
+	])
+	const root = ref<HTMLElement | null>(null)
+	const inView = ref(false)
+	let io: IntersectionObserver | null = null
+
+	onMounted(() => {
+		io = new IntersectionObserver(
+			(entries) => {
+				for (const entry of entries) {
+					if (entry.isIntersecting) {
+						// 延迟 0.5s 后触发动画并断开观察
+						setTimeout(() => {
+							inView.value = true
+						}, 500)
+						if (io) {
+							io.disconnect()
+						}
+					}
+				}
+			},
+			{ threshold: 0.05 }
+		)
+		if (root.value) {
+			io.observe(root.value)
+		}
+	})
+
+	onUnmounted(() => {
+		io?.disconnect()
+	})
+</script>
+
+<style lang="less" scoped>
+	.blocks-list {
+		height: 31.4rem;
+		background: linear-gradient(98.55deg, #232323 18.22%, #898989 101.1%);
+
+		.block-item {
+			flex: 1;
+			height: 100%;
+			color: #fff;
+			position: relative;
+			text-align: center;
+			white-space: pre-line;
+			row-gap: 3rem;
+			/* text scale-in animations */
+			.number {
+				font-size: 3.6rem;
+				font-family: 'PoppinsBold';
+				font-weight: 600;
+				transform: scale(0);
+				opacity: 0;
+				will-change: transform, opacity;
+			}
+			.label {
+				font-size: 2.4rem;
+				font-family: 'Arial';
+				font-weight: 400;
+				letter-spacing: 0.05em;
+				transform: scale(0);
+				opacity: 0;
+				will-change: transform, opacity;
+			}
+			/* vertical line grows top -> bottom */
+			.line {
+				position: absolute;
+				right: 0;
+				/* 固定 top 为最终高度的一半位置，这样 height 从 0 -> 27.4rem 时会从上向下增长 */
+				top: calc(50% - 13.7rem);
+				width: 0.1rem;
+				height: 0;
+				background-color: #8d8d8d;
+				will-change: height;
+			}
+		}
+	}
+
+	/* 当组件进入视口并且等待 0.5s 后，.in-view 会加入根节点，下面规则触发动画 */
+	.in-view .block-item .number {
+		animation: scaleIn 0.48s cubic-bezier(.2,.9,.2,1) forwards;
+		animation-delay: var(--delay);
+	}
+
+	.in-view .block-item .label {
+		animation: scaleIn 0.48s cubic-bezier(.2,.9,.2,1) forwards;
+		animation-delay: calc(var(--delay) + 0.12s);
+	}
+
+	.in-view .block-item .line {
+		animation: growLine 0.7s cubic-bezier(.2,.9,.2,1) forwards;
+		animation-delay: calc(var(--delay) + 0.18s);
+	}
+
+	/* keyframes */
+	@keyframes scaleIn {
+		from {
+			transform: scale(0);
+			opacity: 0;
+		}
+		to {
+			transform: scale(1);
+			opacity: 1;
+		}
+	}
+
+	@keyframes growLine {
+		from {
+			height: 0;
+		}
+		to {
+			height: 27.4rem;
+		}
+	}
+</style>

src/views/AwardPage/components/Success.vue

@@ -1,24 +1,51 @@
 <template>
 	<div class="success-container flex flex-col align-center">
 		<img
-			src="@/assets/images/award/successful.png"
+			:src="info.icon"
 			alt=""
 			class="icon-img"
 		/>
-		<div class="title">Submission Successful</div>
+		<div class="title">{{ info.title }}</div>
 		<div class="desc">
-			<div>
+			{{ info.desc }}
+			<!-- <div>
 				Please review your submitted information in the AiDA in-platform message.
 			</div>
 			<div>
 				You may edit it if needed. Competition updates and results will be sent
 				via email.
-			</div>
+			</div> -->
 		</div>
 	</div>
 </template>
 
-<script setup lang="ts"></script>
+<script setup lang="ts">
+	import { computed } from 'vue'
+	import successIcon from '@/assets/images/award/successful.png'
+	import expiredIcon from '@/assets/images/award/expired.png'
+	const props = defineProps({
+		isExpired: {
+			type: Boolean,
+			default: false
+		}
+	})
+
+	const info = computed(() => {
+		if (props.isExpired) {
+			return {
+				icon: expiredIcon,
+				title: 'Application Deadline Passed',
+				desc: 'The submission deadline for AIDA Global Fashion Award 2026 has ended.\nWe are no longer accepting new applications. '
+			}
+		} else {
+			return {
+				icon: successIcon,
+				title: 'Submission Successful',
+				desc: 'Please review your submitted information in the AiDA in-platform message.\nYou may edit it if needed. Competition updates and results will be sent via email.'
+			}
+		}
+	})
+</script>
 <style lang="less" scoped>
 	.success-container {
 		margin: 0 21.5rem;

src/views/AwardPage/container.vue

@@ -141,6 +141,7 @@
 		overflow: auto;
 		height: 100vh;
 		// 隐藏滚动条箭头，只显示滚动条本体
+		box-sizing: border-box;
 		&::-webkit-scrollbar {
 			display: none;
 			width: 0;
@@ -154,6 +155,7 @@
 		background-color: #232323;
 		padding-left: 21.5rem;
 		padding-right: 8.6rem;
+		box-sizing: border-box;
 		.header-left {
 			.logo {
 				width: 13rem;
@@ -176,6 +178,7 @@
 	.footer {
 		height: 10rem;
 		padding-left: 21.5rem;
+		box-sizing: border-box;
 		padding-right: 22rem;
 		background-color: #232323;
 		.social-list {

src/views/AwardPage/index.vue

@@ -14,18 +14,8 @@
 				<div class="ddl">Application Deadline:15th March 2026</div>
 			</div>
 		</div>
-		<div class="blocks-list flex">
-			<div
-				class="block-item flex flex-col flex-center"
-				v-for="item in blocksList"
-				:key="item.number"
-			>
-				<div class="number">{{ item.number }}</div>
-				<div class="label">{{ item.label }}</div>
-				<div class="line"></div>
-			</div>
-		</div>
 
+		<Slogan />
 		<Bloom />
 		<TimeLine />
 		<JudgesSection />
@@ -44,31 +34,13 @@
 	import PrizesSection from './components/PrizesSection.vue'
 	import TimeLine from './components/TimeLine.vue'
 	import Bloom from './components/Bloom.vue'
+	import Slogan from './components/Slogan.vue'
 
 	const router = useRouter()
 
 	const handleSubmitApplication = () => {
 		router.push('/award/contestants')
 	}
-
-	const blocksList = ref([
-		{
-			number: 'NETWORKING\n OPPORTUNITIES',
-			label: 'with international\nmedia and designers'
-		},
-		{
-			number: 'INTERNATIONAL\nMEDIA EXPOSE',
-			label: 'through\nleading outlets'
-		},
-		{
-			number: 'UP TO\nUS$9000',
-			label: 'in total prize\npool awards'
-		},
-		{
-			number: 'TRAVEL\NALLOWANCE',
-			label: 'for finalists to attend\naward ceremony'
-		}
-	])
 </script>
 
 <style lang="less" scoped>
@@ -83,7 +55,7 @@
 	.banner {
 		height: 108rem;
 		background: url('@/assets/images/award/banner.png') no-repeat;
-		background-size: 100% 100%;
+		background-size: cover;
 		position: relative;
 		.submit-btn {
 			width: 41rem;
@@ -91,6 +63,7 @@
 			line-height: 6.394rem;
 			text-align: center;
 			border-radius: 3.2rem;
+			background-color: rgba(35, 35, 35, 0.7);
 			box-shadow: inset 0 0 1119px 0 rgba(255, 255, 255, 0.3),
 				inset -0.8px -2.4px 1.6px 0.4px rgba(255, 255, 255, 0.1),
 				inset 0.8px 2.4px 1.6px 0 rgba(255, 255, 255, 0.3);
@@ -100,8 +73,8 @@
 			font-size: 2.4rem;
 			column-gap: 3.2rem;
 			position: absolute;
-			top: 23.88rem;
+			left: 42.1rem;
-			left: 51rem;
+			bottom: 15.7rem;
 			backdrop-filter: blur(5px);
 			cursor: pointer;
 			.arrow {
@@ -118,40 +91,7 @@
 				font-weight: 400;
 				font-size: 2rem;
 				line-height: 2.2rem;
-			}
+				color: #232323E5;
-		}
-	}
-	.blocks-list {
-		height: 31.4rem;
-		background: linear-gradient(98.55deg, #232323 18.22%, #898989 101.1%);
-
-		.block-item {
-			flex: 1;
-			height: 100%;
-			color: #fff;
-			position: relative;
-			text-align: center;
-			white-space: pre-line;
-			row-gap: 3rem;
-			.number {
-				font-size: 3.6rem;
-				font-family: 'PoppinsBold';
-				font-weight: 600;
-			}
-			.label {
-				font-size: 2.4rem;
-				font-family: 'Arial';
-				font-weight: 400;
-				letter-spacing: 0.05em;
-			}
-			.line {
-				position: absolute;
-				bottom: 50%;
-				right: 0;
-				transform: translate(0, 50%);
-				width: 0.1rem;
-				height: 27.4rem;
-				background-color: #8d8d8d;
 			}
 		}
 	}