Merge remote-tracking branch 'origin/dev_vite' into research

.prettierrc.js

@@ -0,0 +1,33 @@
+/** @type {import('prettier').Config} */
+module.exports = {
+  // 打印宽度
+  printWidth: 100,
+  // 使用 4 空格缩进
+  tabWidth: 4,
+  // 使用 4 空格缩进，不使用制表符
+  useTabs: true,
+  // 行尾使用 LF (Unix 风格)
+  endOfLine: 'lf',
+  // 语句末尾使用分号
+  semi: false,
+  // 使用单引号
+  singleQuote: false,
+  // 对象和数组末尾不添加尾随逗号
+  trailingComma: 'none',
+  // JSX 引号使用单引号
+  jsxSingleQuote: false,
+  // 括号内侧空格
+  bracketSpacing: true,
+  // JSX 标签不换行
+  bracketSameLine: false,
+  // 箭头函数参数始终使用括号
+  arrowParens: 'always',
+  // HTML、Vue、Angular 和 Markdown 使用 LF
+  htmlWhitespaceSensitivity: 'css',
+  // Vue 文件脚本和样式缩进
+  vueIndentScriptAndStyle: false,
+  // 行注释位置在注释上方，不加空格
+  proseWrap: 'preserve',
+  // 根据文件类型自动推断
+  embeddedLanguageFormatting: 'auto',
+};

src/assets/json/events.json

@@ -9,11 +9,6 @@
 			"id": 2,
 			"title": "AiDA X SFT AI Fashion Award 2024",
 			"imgUrl": "/image/events/Fashion-Award-2024.png"
-		},
-		{
-			"id": 3,
-			"title": "AiDA Global Design Awards 2026",
-			"imgUrl": "/image/events/award-poster.gif"
 		}
 	],
 	"eventsItem": [
@@ -25,7 +20,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."
 						}
 					]
 				},

src/assets/json/events_cn.json

@@ -9,23 +9,18 @@
 			"id": 2,
 			"title": "AiDA X SFT AI时尚设计比赛2024",
 			"imgUrl": "/image/events/Fashion-Award-2024.png"
-		},
-		{
-			"id": 3,
-			"title": "AiDA全球设计奖 2026",
-			"imgUrl": "/image/events/award-poster.gif"
 		}
 	],
 	"eventsItem": [
 		{
 			"id": 3,
 			"title": "AiDA全球设计奖 2026",
-			"imgUrl": "/image/events/award-poster.gif",
+			"imgUrl": "/image/events/award-poster-zh.gif",
 			"textList": [
 				{
 					"paragraph": [
 						{
-							"text": "秉承推动 AI 赋能创意设计的初衷，Code‑Create 举办了「AiDA 全球设计大奖 2026」，面向来自香港、中国、新加坡、韩国及全球的设计师，鼓励大家探索 AI 与时尚设计的无限可能，突破传统界限，释放科技与想象力的创新潜能。扫描二维码获取更多比赛信息，抓住成为 AI 时尚先锋的机会吧！"
+							"text": "秉承推动 AI 赋能创意设计的初衷，Code‑Create 举办了「AiDA 全球设计大奖 2026」，面向来自香港、中国、新加坡、韩国及全球的设计师，鼓励大家探索 AI 与时尚设计的无限可能，突破传统界限，释放科技与想象力的创新潜能。点击“查看详情”按钮获取更多比赛信息，抓住成为 AI 时尚先锋的机会吧！"
 						}
 					]
 				},

src/component/Administrator/Transaction/TransactionTable.vue

@@ -148,6 +148,7 @@
                     total: total,
                     showQuickJumper: true,
                     bordered: false,
+                    showTotal: (total) => `Total Transaction: ${total}`
                 }"
             >
 				<template #bodyCell="{ column, text, record, index }">
@@ -465,13 +466,16 @@ export default defineComponent({
                 (rv: any) => {
                     if (rv) {
                         // this.dataList = rv
+                        // console.log('rv----',rv);
+                        
                         filter.dataList = rv.content;
                         filterData.total = rv.total;
                         filter.tableLoading = false;
-                        filterData.totalPayer = rv.content.reduce((total: number, item: any) => {
+                        filterData.totalPayer = rv.totalAmount;
-                            const value = item && item.status === 'Success' ? parseFloat(item.payerTotal) : 0;
+                        // filterData.totalPayer = rv.content.reduce((total: number, item: any) => {
-                            return total + (isNaN(value) ? 0 : value);
+                        //     const value = item && item.status === 'Success' ? parseFloat(item.payerTotal) : 0;
-                        }, 0);
+                        //     return total + (isNaN(value) ? 0 : value);
+                        // }, 0);
 
                         // this.workspaceItem.position = this.singleTypeList[0].label
                     }

src/component/Canvas/CanvasEditor/managers/CanvasManager.js

@@ -9,7 +9,6 @@ import {
   isGroupLayer,
   OperationType,
   OperationTypes,
-  findLayer,
   createLayer,
   LayerType,
   SpecialLayerId,
@@ -20,7 +19,6 @@ import { AnimationManager } from "./animation/AnimationManager";
 import { createCanvas } from "../utils/canvasFactory";
 import { CanvasEventManager } from "./events/CanvasEventManager";
 import CanvasConfig from "../config/canvasConfig";
-import { RedGreenModeManager } from "./RedGreenModeManager";
 import { EraserStateManager } from "./EraserStateManager";
 import {
   deepClone,
@@ -1337,7 +1335,7 @@ backgroundObject.scaleY,'CanvasManager resetCanvasSizeByFixedLayer')
     }
   }
   loadJSON(json, calllBack) {
-
+	this.canvas.loading.value = true;
     // 确保传入的json是字符串格式
     if (typeof json === "object") {
       json = JSON.stringify(json);
@@ -1509,7 +1507,6 @@ backgroundObject.scaleY,'CanvasManager resetCanvasSizeByFixedLayer')
   */
   async createOtherLayers(otherData) {
 	if (!otherData) return console.warn("otherData 为空不需要添加");
-	this.canvas.loading.value = true;
 	let resolve = ()=>{};
 	this.awaitCanvasRun = ()=>(new Promise((v) => resolve = v))
 	const otherData_ = JSON.parse(JSON.stringify(otherData));
@@ -1557,7 +1554,6 @@ backgroundObject.scaleY,'CanvasManager resetCanvasSizeByFixedLayer')
 	console.log("==========创建其他图层成功");
 	resolve();
 	this.awaitCanvasRun = null;
-	this.canvas.loading.value = false;
   }
 
   // 设置画布对象的裁剪信息

src/component/Canvas/CanvasEditor/managers/LayerManager.js

@@ -1580,7 +1580,7 @@ export class LayerManager {
   /**
    * 排序图层，确保图层顺序: 普通图层 > 固定图层 > 背景图层
    */
-  sortLayers() {
+  async sortLayers() {
     // 对图层进行排序：背景图层在最底层（数组最后），固定图层在中间
     this.layers.value.sort((a, b) => {
       // 如果a是背景图层，它应该排在后面（最底层）
@@ -1604,17 +1604,17 @@ export class LayerManager {
     });
 
     // 更新画布对象顺序
-    this._rearrangeObjects();
+    await this._rearrangeObjects();
   }
 
   /**
    * 重新排列画布上的对象以匹配图层顺序
    * @private
    */
-  _rearrangeObjects() {
+  async _rearrangeObjects() {
     if (this.layerSort) {
       // 使用LayerSort的高级排序
-      this.layerSort.rearrangeObjects();
+      await this.layerSort.rearrangeObjects();
       return;
     }
 

src/component/Canvas/CanvasEditor/managers/PartManager.js

@@ -90,16 +90,17 @@ export class PartManager {
 
 		if (toolId === OperationType.PART_ERASER) {
 			this.setEraserTool();
-		} else if (toolId === OperationType.PART || toolId === OperationType.PART_RECTANGLE) {
-			this.clearPointData();
-			this.resetPartObject();
-		}
-		if (toolId === OperationType.PART_ERASER || toolId === OperationType.PART_BRUSH) {
-			if (this.pointList.length > 0) {
-				this.clearPointData();
-				this.resetPartObject();
-			}
 		} 
+		// else if (toolId === OperationType.PART || toolId === OperationType.PART_RECTANGLE) {
+		// 	this.clearPointData();
+		// 	this.resetPartObject();
+		// }
+		// if (toolId === OperationType.PART_ERASER || toolId === OperationType.PART_BRUSH) {
+		// 	if (this.pointList.length > 0) {
+		// 		this.clearPointData();
+		// 		this.resetPartObject();
+		// 	}
+		// }
 
 		// 如果从非选区工具切换到选区工具，初始化事件
 		if (!wasActive && this.isActive) {
@@ -380,7 +381,8 @@ export class PartManager {
 			box: [...this.pointList],
 		});
 		const image = await this.loadImageToObject(url);
-		const canvas = getObjectAlphaToCanvas(image, null, 0, this.rgba);
+		const data = this.partCanvas?.getContext("2d")?.getImageData(0, 0, this.partCanvas.width, this.partCanvas.height);
+		const canvas = getObjectAlphaToCanvas(image, data, 0, this.rgba, !!data);
 		this.partDrawCommand(canvas);
 	}
 	/** 获取分隔后图片 */

src/component/Canvas/CanvasEditor/utils/LayerSort.js

@@ -30,7 +30,8 @@ export class LayerSort {
     if (canvasObjects.length === 0) return;
 
     // 使用画布渲染优化
-    await optimizeCanvasRendering(this.canvas, () => {
+	await new Promise((resolve) => {
+		optimizeCanvasRendering(this.canvas, () => {
 		// 计算每个对象应该在的 z-index 位置
 		const objectZIndexMap = this.calculateObjectZIndexes();
 
@@ -51,6 +52,8 @@ export class LayerSort {
 			this.canvas.moveTo(item.object, index);
 			}
 		});
+		resolve();
+		});
     });
   }
 

src/component/Canvas/CanvasEditor/utils/objectHelper.js

@@ -65,9 +65,10 @@ export async function restoreFabricObject(serializedObject, canvas) {
  * @param {ImageData} revData - 相反的ImageData，白通道的相同位置是否为透明，revData为白色为透明，黑色为不透明
  * @param {number} diff - 差值，默认 25
  * @param {Object} rgba - 自定义 rgba 值，默认 { r: 255, g: 255, b: 255, a: 255 }
+ * @param {boolean} isMerge - 是否合并，true=合并revData，false=反转revData
  * @returns {HTMLCanvasElement|null} 包含黑白通道的画布，或 null 如果失败
 */
-export function getObjectAlphaToCanvas(object, revData, diff = 30, rgba = { r: 255, g: 255, b: 255, a: 255 }) {
+export function getObjectAlphaToCanvas(object, revData, diff = 30, rgba = { r: 255, g: 255, b: 255, a: 255 }, isMerge = false) {
 	const image = object.getElement();
 	if (image.nodeName !== "IMG" && image.nodeName !== "CANVAS") {
 		console.warn("对象不是图片");
@@ -93,18 +94,20 @@ export function getObjectAlphaToCanvas(object, revData, diff = 30, rgba = { r: 2
 		const revG = revData?.data[i + 1] || 0;
 		const revB = revData?.data[i + 2] || 0;
 		const revA = revData?.data[i + 3] || 0;
+		let isHave = false;
 		if (r || g || b || a) {
 			if (revR > diff || revG > diff || revB > diff || revA > diff) {
-				data.data[i + 0] = 0;
+				isHave = false;
-				data.data[i + 1] = 0;
-				data.data[i + 2] = 0;
-				data.data[i + 3] = 0;
 			} else {
+				isHave = true;
+			}
+		}
+		if (isMerge && (revR || revG || revB || revA)) isHave = true;
+		if (isHave) {
 			data.data[i + 0] = rgba.r;
 			data.data[i + 1] = rgba.g;
 			data.data[i + 2] = rgba.b;
 			data.data[i + 3] = rgba.a;
-			}
 		} else {
 			data.data[i + 0] = 0;
 			data.data[i + 1] = 0;

src/component/Canvas/ExistsImageList/index.vue

@@ -375,6 +375,7 @@ const confirm = ()=>{
 /* 图片网格 */
 .image-grid {
   display: grid;
+  align-content: start;
   grid-template-columns: repeat(auto-fill, minmax(20rem, 1fr));
   gap: 16px;
   min-height: 20rem;

src/component/Canvas/canvasExample.vue

@@ -333,6 +333,7 @@
 	]);
 	const canvasLoadJsonSuccess = () => {
 		console.log("画布加载JSON成功");
+		return;
 		canvasEditor.value?.updateOtherLayers({
 			color: { rgba: { r: 255, g: 0, b: 0, a: 1 } },
 			printObject: {

src/component/Canvas/index.vue

@@ -7,7 +7,7 @@
         :enabledRedGreenMode="false"
       />
     </div>
-	<div class="btn">123
+	<div class="btn">
 		<div class="gallery_btn" @click="exportElement">Export</div>
 	</div>
   </div>

src/component/Detail/DesignDetail.vue

@@ -759,7 +759,6 @@ export default defineComponent({
 		const uploadSelectDetail = async ()=>{//更新选中的detail
 			// await detailDom.canvasBox.saveCanvas()
 			const allInfo = await (detailDom.canvasBox as any).getCanvasElement()
-			console.log(allInfo)
 			let color:any = {}
 			if(allInfo.color?.color?.rgba || allInfo.color?.color?.gradient){
 				let canvasColor = allInfo.color.color;

src/component/Detail/canvas/index.vue

@@ -12,7 +12,6 @@
 							is-edit
 							:clothingImageUrl="selectDetail.path"
 							:clothingImageUrl2="selectDetail.maskUrl || selectDetail.layersObject[0].maskUrl"
-							:clothingMinIOPath="selectDetail.minIOPath"
 							showFixedLayer
 							:canvasJSON="canvasJSON"
 							@canvasLoadJsonSuccess="canvasLoadJsonSuccess"
@@ -52,9 +51,9 @@
 			</div>
 		 </div>
 		
-		<div class="mark_loading" v-show="isShowMark">
+		<!-- <div class="mark_loading" v-show="isShowMark">
 			<a-spin size="large" />
-		</div>
+		</div> -->
     </div>
     
 </template>

src/component/Detail/detailLeft/module/currentList.vue

@@ -40,11 +40,29 @@ export default defineComponent({
     setup(props,{emit}) {
 		const {t} = useI18n();
         const store = useStore();
+		const updateCatecory = (arr)=>{
+			arr.forEach((v:any) => {
+				if(props.catecoryList)props.catecoryList.forEach((item:any) => {
+					if(v.level2Type == item.value && !v.category){
+						v.category=item.name
+						v.categoryValue=item.value
+					}
+				})
+			});
+		}
 		const detailData = reactive({
 			allBoardData:computed(()=>store.state.UploadFilesModule.allBoardData),
 			currentList:{
-				sketch:computed(()=>store.state.UploadFilesModule.allBoardData.sketchboardFiles),
+				sketch:computed(()=>{
-				print:computed(()=>store.state.UploadFilesModule.allBoardData.printboardFiles),
+					let sketch = store.state.UploadFilesModule.allBoardData.sketchboardFiles
+					updateCatecory(sketch)
+					return sketch
+				}),
+				print:computed(()=>{
+					let print = store.state.UploadFilesModule.allBoardData.printboardFiles
+					updateCatecory(print)
+					return print
+				}),
 				color:computed(()=>store.state.UploadFilesModule.allBoardData.colorBoards),
 				models:computed(()=>store.state.Workspace.probjects.model),
 			},

src/component/Detail/detailLeft/sketch.vue

@@ -76,6 +76,7 @@ export default defineComponent({
 				selectImgItem(data)
 				return
 			}
+			data.id = id
 			if(data?.imgUrl)data.url = data.imgUrl
 			let value = {
 				data,

src/component/Detail/detailRight/editPrintElement.vue

@@ -273,7 +273,7 @@ export default defineComponent({
 				minIOPath:data.minIOPath || data.originalUrl,
 				path:data.url,
 				priority:printIndex,
-				scale,
+				scale:editPrintElementData.stateOverallSingle == 'single'?scale:[1,1],
 				globalCompositeOperation:'',
 			}
 			getItemPosition(item)
@@ -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){
@@ -359,7 +361,7 @@ export default defineComponent({
 				//overall
 				left = item.location[0] / editPrintElementData.sketchWH.scale[0]
 				top = item.location[1] / editPrintElementData.sketchWH.scale[1]
-				item.scale = [1,1]
+				item.scale = item.scale || [1,1]
 			}
 			let pattern = {
 				centers:{left:0,top: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([
 				{

src/component/Detail/detailRight/overallSetting/RepeatSetting.vue

@@ -16,7 +16,7 @@
 				:max="1000"
 				:step="1"
 				is-input
-				:tipFormatter="(v) => `${scale.toFixed(0)}%`"
+				:tipFormatter="(v) => `${Number(scale)?.toFixed(0)}%`"
 				:value="scale"
 				@input="inputFillScale"
 			/>
@@ -25,7 +25,7 @@
 		<div class="repeat-setting-item">
 			<span class="label">Gap X</span>
 			<slider
-				:min="0"
+				:min="1"
 				:max="1000"
 				:step="1"
 				is-input
@@ -39,7 +39,7 @@
 		<div class="repeat-setting-item">
 			<span class="label">Gap Y</span>
 			<slider
-				:min="0"
+				:min="1"
 				:max="1000"
 				:step="1"
 				is-input
@@ -84,7 +84,7 @@
 	const scale = computed(() => {
 		// let scaleValue = props.object?.scale/10;
 		// return props.object?.scale/10;
-		return props.object?.scale[0] * 100;
+		return (props.object?.scale[0] * 100).toFixed(0);
 	});
 	const scalePrint = computed(() => {
 		let index = sketchWH.value[0] > sketchWH.value[1]?0:1;

src/component/Events/eventsDetail.vue

@@ -1,108 +1,142 @@
 <template>
-    <div class="eventsDetail_page" :class="{active:isScroll}">
+	<div class="eventsDetail_page" :class="{ active: isScroll }">
-		<div class="eventsDetail_title ">
+		<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">
+						{{ $t("event.detail") }}
 					</div>
-				<div class="modal_title_text" v-for="item in eventsDetail.textList">
+				</div>
+				<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
-							<div v-show="!loadingShow[buttonIndex]" class="started_btn">{{ buttonItem.text }}</div>
+							class="eventsDetail_content_right_btn"
-							<div v-show="loadingShow[buttonIndex]" class="started_btn"><i class="fi fi-br-loading"></i></div>
+							v-for="(buttonItem, buttonIndex) in item?.button"
+							@click="openButton(buttonItem, buttonIndex)"
+						>
+							<div v-show="!loadingShow[buttonIndex]" class="started_btn">
+								{{ buttonItem.text }}
 							</div>
-					</div>
+							<div v-show="loadingShow[buttonIndex]" class="started_btn">
-					<div class="modal_title_text_intro" v-for="introItem in item?.paragraph" :class="{active:introItem.display == 'flex'}" v-detailText="introItem.text">
+								<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>
+			</div>
 		</div>
-	
 	</div>
 </template>
 <script lang="ts">
-import { LoadingOutlined } from "@ant-design/icons-vue";
+import { LoadingOutlined } from "@ant-design/icons-vue"
-import { defineComponent,h ,toRefs,ref,reactive,onMounted,nextTick,provide,computed} from '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 { Https } from "@/tool/https"
-import { message, Upload, Modal } from "ant-design-vue";
+import { message, Upload, Modal } from "ant-design-vue"
-import fullScreenImg from '@/component/HomePage/fullScreenImg.vue'
+import fullScreenImg from "@/component/HomePage/fullScreenImg.vue"
-import { useRouter } from 'vue-router';
+import { useRouter } from "vue-router"
-import { useI18n } from "vue-i18n";
+import { useI18n } from "vue-i18n"
-import generalMenu from "@/component/HomePage/generalMenu.vue";
+import generalMenu from "@/component/HomePage/generalMenu.vue"
-import eventData from "@/assets/json/events.json";
+import eventData from "@/assets/json/events.json"
-import eventDataCn from "@/assets/json/events_cn.json";
+import eventDataCn from "@/assets/json/events_cn.json"
-import { useStore } from "vuex";
+import { useStore } from "vuex"
+
 export default defineComponent({
 	components: {
 		generalMenu,
-		fullScreenImg,
+		fullScreenImg
-    },
-	props:{
-		isScroll:{
-			 type:Boolean,
-			 default:true,
 	},
+	props: {
+		isScroll: {
+			type: Boolean,
+			default: true
+		}
 	},
 	setup() {
-		const router = useRouter();
+		const { t, locale } = useI18n()
-        const store = useStore();
+		const router = useRouter()
-		let filter:any = reactive({
+		const store = useStore()
-			eventsDetail: {
+		let filter: any = reactive({
+			eventsDetail: {},
+			getListDate: {
+				getLikePortfolio: 0,
+				getMyPortfolio: 0,
+				page: 1,
+				size: 10
 			},
-			getListDate:{
+			isShowMark: false,
-				"getLikePortfolio": 0,
+			isNoData: false, //如果数据为空就不加载
-				"getMyPortfolio": 0,
+			loadingShow: {}
-				page:1,
-				size:10,
-			},
-			isShowMark:false,
-			isNoData:false,//如果数据为空就不加载
-			loadingShow:{},
 		})
-		let likeFile = (item:any,type:string) => {
+		let likeFile = (item: any, type: string) => {}
-		}
+		let setBack = () => {
-		let setBack = ()=>{
+			router.go(-1)
-			router.go(-1);
 			// router.push('/home/events')
 		}
-		let openButton = (data:any,index:number)=>{
+		let openButton = (data: any, index: number) => {
-			if(filter.loadingShow[index]){
+			if (filter.loadingShow[index]) {
 				return
 			}
 			filter.loadingShow[index] = true
-			Https.axiosGet(data.https).then(
+			Https.axiosGet(data.https)
-                (rv: any) => {
+				.then((rv: any) => {
-					if(rv){
+					if (rv) {
 						message.success(data.success)
 						filter.loadingShow[index] = false
 					}
-                }
+				})
-            ).catch(res=>{
+				.catch((res) => {
 					filter.loadingShow[index] = false
-            });
+				})
 		}
-		onMounted (()=>{
+		const openDetail = () => {
-			const { t, locale } = useI18n();
+			let language = locale.value === "ENGLISH" ? "en" : "zh"
-			const currentLocale = locale.value;
+			let url = `https://aida-global-design-awards.com.hk/${language}`
-			let eventLangData:any
+			window.open(url, "_blank")
-			if(currentLocale == 'ENGLISH'){
+
+		//	router.push("/award/index")
+		}
+		onMounted(() => {
+			const currentLocale = locale.value
+			let eventLangData: any
+			if (currentLocale == "ENGLISH") {
 				eventLangData = eventData
-			}else{
+			} else {
 				eventLangData = eventDataCn
 			}
-			eventLangData.eventsItem.forEach((item:any)=>{
+			eventLangData.eventsItem.forEach((item: any) => {
-				if(item.id == router.currentRoute.value.query.eventId){
+				if (item.id == router.currentRoute.value.query.eventId) {
-					filter.eventsDetail = item;
+					filter.eventsDetail = item
 				}
 			})
 		})
@@ -111,18 +145,17 @@ export default defineComponent({
 			likeFile,
 			setBack,
 			openButton,
+			openDetail
 		}
 	},
-	directives:{
+	directives: {
-		detailText:{
+		detailText: {
-			mounted (el,binding) {
+			mounted(el, binding) {
 				el.innerHTML = binding.value
 			}
 		}
 	},
-    async mounted(){
+	async mounted() {}
-	
-    },
 })
 </script>
 <style lang="less">
@@ -132,11 +165,11 @@ export default defineComponent({
 	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 +179,7 @@ export default defineComponent({
 		min-height: auto;
 		padding-bottom: 10rem;
 	}
-	.eventsDetail_title{
+	.eventsDetail_title {
 		display: flex;
 		padding: 2rem 0rem;
 		align-items: center;
@@ -154,21 +187,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 +209,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{
+		.eventsDetail_content_right {
-			.modal_title_text{
+			.modal_title_text {
-				letter-spacing: .4rem;
+				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 +280,17 @@ export default defineComponent({
 		}
 	}
 }
+.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>

src/component/HomePage/Generate.vue

@@ -853,9 +853,7 @@ export default defineComponent({
           level2Type = this.sketchboardList?.[0]?.categoryValue
             ? this.sketchboardList[0].categoryValue
             : ''
-          if (this.workspace.styleName) {
+            sloganText = `${this.workspace.styleName || 'all'},${sloganText}`
-            sloganText = `${this.workspace.styleName},${sloganText}`
-          }
         } else if (this.upload.level1Type == 'Printboard') {
           level2Type = this.scene?.value
           if (level2Type == 'Slogan' && this.searchPictureName == '') {

src/component/HomePage/UpgradePlan.vue

@@ -7,6 +7,7 @@
 			:get-container="() => $refs.upgradePlan"
             width="35%"
 			height="auto"
+			zIndex="9999999"
             :maskClosable="false"
             :centered="true"
 			:closable="false"

src/component/common/SelectImages.vue

@@ -517,6 +517,7 @@ defineExpose({
 /* 图片网格 */
 .image-grid {
   display: grid;
+  align-content: start;
   overflow-y: auto;
   grid-template-columns: repeat(auto-fill, minmax(20rem, 1fr));
   gap: 16px;

src/component/home/design/index.vue

@@ -379,6 +379,7 @@ export default defineComponent({
 	setup(props,{emit}) {
 		const {t,locale} = useI18n()
 		const store = useStore();
+		const route = useRoute()
 		const editDesignType = reactive({
 			selectProbject:computed(()=>{
 				return store.state.Workspace.probjects
@@ -624,6 +625,7 @@ export default defineComponent({
 			collItemSize.collTime = setTimeout(()=>{
 			nextTick(()=>{
 				let parentWidth = likeItemDom.value.parentElement.offsetWidth
+				if(parentWidth == 0)return
 				collItemSize.widthValue.value = collItemSize.widthValue.value == -1?100:collItemSize.widthValue.value
 				collItemSize.widthValue.value = collItemSize.widthValue.value > parentWidth?parentWidth:collItemSize.widthValue.value
 				collItemSize.collValue = Math.floor(parentWidth / collItemSize.widthValue.value)
@@ -634,7 +636,6 @@ export default defineComponent({
 				
 				collItemSize.collStyle.width = (collItemDom.value.offsetWidth - 30) / 3 * collItemSize.scale[0] + 'px'
 				collItemSize.collStyle.height = (collItemDom.value.offsetWidth - 30) / 3 * collItemSize.scale[1] + 'px'
-
 				collItemSize.likeStyle.width = collItemSize.itemStyle.width + 'px'
 				collItemSize.likeStyle.height = collItemSize.itemStyle.height + 'px'
 				let elArr = likeItemDom.value.children

src/component/home/design/tools.vue

@@ -271,7 +271,7 @@ export default defineComponent({
 			allCollectionStr.forEach((itemStr:any)=>{
 				let list = [] as any
 				allCollection[itemStr.value].forEach((imgItem)=>{
-					list.push({url:imgItem.url || imgItem.imgUrl})
+					list.push({url:imgItem?.url || imgItem?.imgUrl})
 				})
 				let obj = {
 					value:itemStr.value,

src/component/home/index.vue

@@ -196,9 +196,9 @@ export default defineComponent({
 				type:rv.process == 'SERIES_DESIGN'?'seriesDesign':'singleProductDesign',
 				httpType:rv.process,//项目类型
 				ageGroup:rv.workspaceVO?.ageGroup,
-				style:rv.workspaceVO?.style,
+				style:rv.workspaceVO?.style || '',
-				styleId:rv.workspaceVO?.styleId,
+				styleId:rv.workspaceVO?.styleId || null,
-				styleName:rv.workspaceVO?.styleName,
+				styleName:rv.workspaceVO?.styleName || '',
 				sex:rv.workspaceVO?.sex,
 				userBrandDnaImg:rv.workspaceVO?.userBrandDnaImg,
 				userBrandDnaName:rv.workspaceVO?.userBrandDnaName,

src/component/home/newProject/setting.vue

@@ -94,9 +94,9 @@ export default defineComponent({
 				type:rv.process == 'SERIES_DESIGN'?'seriesDesign':'singleProductDesign',
 				httpType:rv.process,//项目类型
 				ageGroup:rv.workspaceVO.ageGroup,
-				style:rv.workspaceVO.style,
+				style:rv.workspaceVO.style || '',
-				styleId:rv.workspaceVO.styleId,
+				styleId:rv.workspaceVO.styleId || null,
-				styleName:rv.workspaceVO.styleName,
+				styleName:rv.workspaceVO.styleName || '',
 				sex:rv.workspaceVO.sex,
 				userBrandDnaImg:rv.workspaceVO.userBrandDnaImg,
 				userBrandDnaName:rv.workspaceVO.userBrandDnaName,

src/component/home/newProject/workspace.vue

@@ -179,9 +179,9 @@ export default defineComponent({
 			dataDom.brandDNA.init(data.selectObject);
 		}
 		const setWorkspaceStyle = (value:any)=>{
-			data.selectObject.styleName = value.name
+			data.selectObject.styleName = value.name || ''
-			data.selectObject.style = value.value
+			data.selectObject.style = value.value || ''
-			data.selectObject.styleId = value.id
+			data.selectObject.styleId = value.id || null
 			// store.commit('setProbject',data)
 		}
 		const setWorkspaceBrandDNA = (value:any)=>{
@@ -238,9 +238,9 @@ export default defineComponent({
 						// type:rv.process == 'SERIES_DESIGN'?'seriesDesign':'singleProductDesign',
 						// httpType:rv.process,//项目类型
 						ageGroup:rv.workspaceVO?.ageGroup,
-						style:rv.workspaceVO?.style,
+						style:rv.workspaceVO?.style || '',
-						styleId:rv.workspaceVO?.styleId,
+						styleId:rv.workspaceVO?.styleId || null,
-						styleName:rv.workspaceVO?.styleName,
+						styleName:rv.workspaceVO?.styleName || '',
 						sex:rv.workspaceVO?.sex,
 						userBrandDnaImg:rv.workspaceVO?.userBrandDnaImg,
 						userBrandDnaName:rv.workspaceVO?.userBrandDnaName,

src/component/home/tools/poseTransfer/index.vue

@@ -352,7 +352,8 @@ export default defineComponent({
   props: {
     isDesignPage: {
       type: Boolean,
-      default: false
+      default: false,
+      required:false
     },
     source: {
       type: String,
@@ -773,7 +774,7 @@ export default defineComponent({
           data.lastSelectImg = res.data
         }
       }
-      // 同步尾帧文件列表到全局 store
+      // 同步尾帧文件列表到全局 store（使用专门的 lastFrameList）
       store.commit('setPoseTransferLastFrameList', {
         str: 'set',
         list: [file]
@@ -989,6 +990,7 @@ export default defineComponent({
           if (data.lastSelectImg?.id === item.id) {
             data.lastSelectImg = {}
           }
+          // 使用专门的 lastFrameList mutation 清空列表
           store.commit('setPoseTransferLastFrameList')
         } else {
           // 如果删除的是当前选中的首帧，清空选中状态
@@ -1176,10 +1178,10 @@ export default defineComponent({
         firstFrameList.value = store.state.HomeStoreModule.uploadElement.filter(
           item => item.frameType === 'first'
         )
-
+        // 注意：尾帧通过专门的 watch (lastFrameList) 监听，不需要从这里过滤
-        lastFrameList.value = store.state.HomeStoreModule.uploadElement.filter(
+        // lastFrameList.value = store.state.HomeStoreModule.uploadElement.filter(
-          item => item.frameType === 'last'
+        //   item => item.frameType === 'last'
-        )
+        // )
         // 更新 showFirstFrameList 中项的选中状态
         showFirstFrameList.value.forEach((listItem: any) => {
           if (listItem.id == data.selectImg.id) {

src/component/modules/habitSetStyle.vue

@@ -102,9 +102,9 @@ setup(props,{emit}) {
 		// if(habitSetStyleData.styleList.length == 0){
 		// 	getStyleList()
 		// }
-		oldDataId = data.styleId
+		oldDataId = data.styleId || null
-		habitSetStyleData.selectStyle.id = data.styleId 
+		habitSetStyleData.selectStyle.id = data.styleId || null
-		habitSetStyleData.selectStyle.name = data.styleName 
+		habitSetStyleData.selectStyle.name = data.styleName  || ''
 		// habitSetStyleData.selectStyleId = 'feng2'
 	}
 	let setCover = (item:any)=>{

src/lang/cn.ts

@@ -231,8 +231,7 @@ export default {
     colorboard: '调色板',
     sketchboard: '线稿板',
     mannequins: '人体模型',
-		masnnequinHint:
+    masnnequinHint: '您使用的模特与当前的衣服不匹配，这将导致生成的模型不使用所选的衣服',
-			'您使用的模特与当前的衣服不匹配，这将导致生成的模型不使用所选的衣服',
     FinalizeCollection: '完成系列',
     jsContent1: '您必须选择一种或多种颜色进行下一步。',
     jsContent2: '您必须选择一种或多种颜色进行下一步。',
@@ -979,13 +978,17 @@ export default {
     subscriptionRenewal: '没有自动续订的订阅计划.'
   },
   guide: {
-		guide1: '在<strong>工作空间</strong>中，您可以个性化您的设计设置，包括选择适用于男装或女装的设计，以及选择用于创作的人体模型。',
+    guide1:
+      '在<strong>工作空间</strong>中，您可以个性化您的设计设置，包括选择适用于男装或女装的设计，以及选择用于创作的人体模型。',
     guide2: '选择您要设计的服装性别。',
     guide3: '在此更改人体模型。',
-		guide4: '您目前可以从我们的系统库中选择人体模型。稍后，您还可以在注册自己的人体模型后从用户库中进行选择。',
+    guide4:
+      '您目前可以从我们的系统库中选择人体模型。稍后，您还可以在注册自己的人体模型后从用户库中进行选择。',
     guide5: '在这里开始您的创意之旅。 ',
-		guide6: '对于情绪板、印花或服装，我们提供三种不同的图片添加方法。第一种选择是<strong>上传</strong>，允许您直接从本地设备上传。',
+    guide6:
-		guide7: '第二种方法是从您的<strong>收藏</strong>中选择。<br> 您可能会注意到您的库页面目前是空的；不必担心。您上传的所有图像都将自动添加到您的库中。将来，您无需每次上传，只需从您的库中选择即可。',
+      '对于情绪板、印花或服装，我们提供三种不同的图片添加方法。第一种选择是<strong>上传</strong>，允许您直接从本地设备上传。',
+    guide7:
+      '第二种方法是从您的<strong>收藏</strong>中选择。<br> 您可能会注意到您的库页面目前是空的；不必担心。您上传的所有图像都将自动添加到您的库中。将来，您无需每次上传，只需从您的库中选择即可。',
     guide8: '第三种方法是使用最新的图像生成技术<strong>生成</strong>图像。',
     guide9: '输入捕捉您希望表达的情绪的关键词，然后单击<strong>生成</strong>按钮。',
     guide10: '为您的心情板选择两个图像。',
@@ -1147,7 +1150,7 @@ export default {
   CanvasTitle: {
 	ModifySketch: '修改草图',
 	ModifyItem: '修改单品',
-		RedGreen: '编辑前片后片'
+	RedGreen: '编辑前片后片',
   },
   Canvas: {
     Canvas: '画布',
@@ -1505,7 +1508,7 @@ export default {
 	PointSelection: '点选',
 	MarqueeSelection: '框选',
 	BrushSelection: '画笔',
-		Erase: '擦除'
+	Erase: '擦除',
   },
   speedList: {
     High: '高级',
@@ -1529,7 +1532,8 @@ export default {
     LiquefactionTool: '液化工具'
   },
   event: {
-		back: '返回'
+    back: '返回',
+    detail:'查看详情'
   },
   admin: {
     allUser: '所有用户',
@@ -1603,7 +1607,7 @@ export default {
     Cancel: '取消',
     SelectPlan: '选择计划',
     AllPlan: '全部',
-		PlanStart: '订阅计划生效时间:'
+    PlanStart:'订阅计划生效时间:'
   },
   Login: {
     Login: '登录',
@@ -1611,7 +1615,8 @@ export default {
     ForgotPassword: '忘记密码',
     Welcome: '欢迎来到',
     AiDA: 'AiDA',
-		Slogan: 'AiDA是一个业界首创的平台，致力于赋能时装设计师融汇灵感，人机协同，共创原创设计。',
+    Slogan:
+      'AiDA是一个业界首创的平台，致力于赋能时装设计师融汇灵感，人机协同，共创原创设计。',
     LoginMethod: '使用以下方式登录：',
     Individual: '个人账号',
     Academic: '学术账号',
@@ -1621,7 +1626,7 @@ export default {
     AgreePolicies: '请勾选条款、隐私政策和费用',
     PasswordConditions: '您必须满足所有密码条件才能注册',
     LoginWithGoogle: '使用谷歌账号登录',
-		LoginWithWechat: '使用微信登录'
+    LoginWithWechat: '使用微信登录',
   },
   LoginPersonal: {
     Email: '邮箱',
@@ -1714,150 +1719,5 @@ export default {
     IncorrectEmailFormat: '请输入正确的邮箱格式',
     CompleteVerificationCode: '请输入完整的验证码',
     PleaseEnterYourAccountNumberOrPassword: '请输入您的账号或密码'
-	},
-	AwardsPage: {
-		submitApplication: '提交申请',
-		applicationDeadline: '申请期限：2026年7月15日',
-		howToApply: '申请方法',
-		stepByStep: '步骤指南',
-		step1Title: '1. 成为 AiDA 订阅用户',
-		step1Desc:
-			'所有申请者在提交时必须是\n活跃的AiDA 订阅用户。\n您可以选择按月或按年订阅。​',
-		step2Title: '2. 通过 AiDA 设计您的作品',
-		step2Desc: '申请者必须仅使用AiDA\n平台完成设计作品。​',
-		step2ListTitle: '您的作品应清楚体现以下内容：',
-		step2List: [
-			'· AiDA在创作中的应用方式',
-			'· 您的设计理念和创意方向',
-			'· AI与人类创意的融合'
-		],
-		step3Title: '3. 准备提交材料',
-		processVideo: '创作过程视频',
-		processVideoDesc: '请提供一段屏幕录制视频,展示您\n使用AiDA的创作过程。​',
-		videoRequirements: '视频要求：',
-		videoFormat: '格式：MP4',
-		videoResolution: '分辨率：1080×1920px',
-		videoDuration: '时长：最长1分钟',
-		videoSize: '文件大小：不超过20MB',
-		fileName: '文件命名',
-		fileNameDesc: 'AiDAGlobalDesignAward\n2026_[你的名字]​',
-		designPortfolio: '设计作品集(PDF)',
-		submitPdf: '提交一份包含以下内容的单一PDF文件：',
-		requiredStructure: '',
-		pdfDesignTitle: '设计标题',
-		pdfMoodboard: '灵感板,情绪板',
-		pdfConcept: '概念说明',
-		pdfConceptDesc: '(说明如何使用AiDA进行设计创作)',
-		pdfRequirements: 'PDF要求：',
-		pdfMaxPages: '最多15页',
-		pdfMaxSize: '最大文件大小：不超过20MB',
-		pdfLanguage: '语言：英文，或本国语言附带英文翻译',
-		step4Title: '4. 决赛入围选手提交要求',
-		step4Subtitle: '(前20名设计师)',
-		step4Desc: '入围的20名决赛选手需提交实体服装以供最终评审。',
-		finalistPieces: '件数：1件套装',
-		finalistBasedOn: '服装要求：必须根据提交的AiDA生成设计制作',
-		finalistShipping: '运输说明：\n将由Code-create提供',
-		bloomYourCreativity: '绽放你的创造力',
-		themeOf2026: '赛事主题',
-		bloomText: {
-			desc1: {
-				regular1: '',
-				bold1: 'AiDA全球设计奖2026',
-				regular2: '是由全球领先的AI时尚解决方案提供商',
-				bold2: ' Code-create ',
-				regular3: '主办的',
-				bold3: '国际设计竞赛，\n',
-				regular4:
-					'旨在庆祝人工只能赋能下的未来创意。该赛事汇聚来自世界各地的设计师，\n将AI视为创意伙伴,突破传统时尚边界,探索技术与人类想象力结合的无限可能。',
-				bold4: '',
-				regular5: ''
-			},
-			desc2: {
-				regular1: '本届大赛以',
-				bold1: '"想象遇见创新，创意绽放"',
-				regular2:
-					'为主题，邀请参赛者将大胆创意转化为非凡设计，\n在 AI 辅助下实现艺术与科技的完美融合。AiDA 鼓励设计师突破常规，挑战时尚边界，\n并通过平台展示才华，与全球同行、行业领袖及 AI 专家建立深度联系，共同探索未来设计的可能。'
-			}
-		},
-		panelOfJudges: '终审评委团',
-		expertise: '权威阵容',
-		judgesHat: {
-			jae: 'Code‑Create 韩国分公司总监\nBesfxxk 创意总监',
-			diego: 'OnTheList（香港）\n联合创始人兼首席执行官',
-			gregory: 'Gabriela Hearst\n（意大利）高级设计师',
-			vincenzo: '《南华早报》Style 杂志\n（香港）主编',
-			tim: '现代传播集团\n（上海）时尚总监',
-			desmond: '《Vogue》\n（新加坡）主编'
-		},
-		awardPrizes: '奖项与奖金',
-		recognition: '荣誉认可',
-		grandMoney: '5,000美元',
-		goldMoney: '3,000美元',
-		silverMoney: '1,000美元',
-		grandAwards: '最高奖项',
-		goldAwards: '金奖',
-		silverAwards: '银奖',
-		finalists: '决赛选手',
-		cashAward: '现金奖励',
-		awardCertificate: '获奖证书',
-		globalMediaExposure: '全球媒体曝光',
-		awardCertification: '获奖认证',
-		TravelAllowance: '差旅补贴',
-		selectionCriteria: '作品评选',
-		evaluation: '考量标准',
-		originality: '原创性',
-		originalityDesc:
-			'作品应体现设计师的独到视角与创新方法，展现突破常规的创意与实验性设计。',
-		creativity: '创造力',
-		creativityDesc:
-			'作品应展现设计师的艺术视野与卓越设计水准，体现高水平的创意表达与专业执行力。',
-		aidaIntegration: 'AiDA 创意整合程度',
-		aidaIntegrationDesc:
-			'作品应充分利用 AiDA 功能， 展现 AI 辅助创作在设计中的 有效应用与创新整合。',
-		execution: '样衣做工',
-		executionDesc:
-			'作品应具备高水平的呈现质量与精湛的技术工艺，体现专业执行力与细节把控能力。',
-		totalCashPrizes: '最高可达9,000美元',
-		totalCashPrizesLabel: '现金奖励总额',
-		globalMediaExpose: '全球媒体曝光',
-		globalMediaExposeLabel: '由国际顶级媒体平台展示​',
-		networkingOpportunities: '链接全球行业人脉',
-		networkingOpportunitiesLabel: '对接设计师与行业领军人物',
-		awardCeremonyHongKong: '香港颁奖盛会​',
-		awardCeremonyLabel: '入围者享有差旅支持',
-		competitionTimeline: '赛事时间表',
-		shapingTheFuture: '重要节点',
-		timelineApplicationLabel: '申请期限',
-		timelineDeadlineLabel: '',
-		timeJul15: '7月15日',
-		applicationDeadlineDesc: '申请截止日期及\n作品审核流程开始',
-		twentyFinalistsAnnounced: '20名入围者揭晓',
-		announcedLabel: '',
-		timeAug30: '8月30日',
-		twentyFinalistsDesc: '公布进入终评阶段的 20 名入围者',
-		finalistSubmission: '入围设计作品',
-		submissionLabel: '提交最后期限',
-		timeSept30: '9月30日',
-		finalistSubmissionDesc: '入围者上传完成的设计\n作品以进行终评',
-		receivingOutfits: '入围者',
-		fromFinalistsLabel: '提交成衣',
-		timeOctober: '10月',
-		receivingOutfitsDesc: 'AiDA 接收每位入围\n的1套实物服装',
-		awardCeremony: '奖项颁发仪式',
-		ceremonyLabel: '',
-		timeNov12: '11月12日',
-		awardCeremonyDesc: '颁奖盛典与设计师社\n群聚会 – Soho House',
-		submissionSuccessful: '提交成功',
-		submissionSuccessfulDesc:
-			'请在AiDA平台消息中查看您提交的信息。\n如需要，您可以编辑。竞赛更新和结果将通过邮件发送。',
-		deadlinePassed: '申请截止日期已过',
-		deadlinePassedDesc:
-			'AiDA全球时尚大奖2026的提交截止日期已结束。\n我们不再接受新的申请。',
-		uploadInProgress: '上传中…',
-		uploadSuccess: '上传成功',
-		uploadFailed: '上传失败',
-		pdfFileTip: 'PDF文件，最大20MB',
-		videoFileTip: '视频文件(MP4, MOV)，1080p，最大100MB'
   }
 }

src/lang/en.ts

@@ -133,8 +133,7 @@ export default {
 		UploadOpenimage: 'Upload/Open image',
 		jsContent1:
 			"Have you saved your canvas content? If not, please click 'Save' before closing.",
-		jsContent2:
+		jsContent2: 'We only provide super-resolution capabilities for printboard images.',
-			'We only provide super-resolution capabilities for printboard images.',
 		jsContent3: 'Your points are less than one SR',
 		jsContent4: 'Your points balance is insufficient',
 		jsContent5:
@@ -556,8 +555,7 @@ export default {
 		inputContent1: 'Input prompt',
 		GeneratePrint: 'Pattern',
 		maximumLength: 'The entered content exceeds the maximum length.',
-		PatternTitle:
+		PatternTitle: 'Generates repeatable designs that can be fully tiled across garments.',
-			'Generates repeatable designs that can be fully tiled across garments.',
 		LogoTitle:
 			'Creates standalone graphic designs that can be placed individually or tiled.',
 		SloganTitle:
@@ -1006,15 +1004,21 @@ export default {
 		subscriptionRenewal: 'There are no subscription plans with automatic renewal.'
 	},
 	guide: {
-		guide1: "You can personalize your design settings right here in the <strong>Workspace</strong>, including choosing to design for men's or women's wear, as well as selecting the mannequin to use for your creations.",
+		guide1:
+			"You can personalize your design settings right here in the <strong>Workspace</strong>, including choosing to design for men's or women's wear, as well as selecting the mannequin to use for your creations.",
 		guide2: "Select the apparel type you'd like to work on.",
 		guide3: 'Change the mannequin here.',
-		guide4: 'You can currently select a mannequin from our system library. Later, you can also choose from the user library after registering your own mannequin.',
+		guide4:
+			'You can currently select a mannequin from our system library. Later, you can also choose from the user library after registering your own mannequin.',
 		guide5: 'Begin your creative journey here. ',
-		guide6: 'For the Moodboard, Printboard, or Sketchboard, we provide three different sourcing methods to add images. The first option is <strong>Upload</strong>, allowing you to <stront>upload</stront> directly from your local device.',
+		guide6:
-		guide7: "The second method is to select from your <strong>Library</strong>. <br> You might notice that your library page is currently empty; there's no need to worry. All the images you upload will be automatically added to your library. In the future, you won't have to upload each time—you can simply choose from your library instead.",
+			'For the Moodboard, Printboard, or Sketchboard, we provide three different sourcing methods to add images. The first option is <strong>Upload</strong>, allowing you to <stront>upload</stront> directly from your local device.',
-		guide8: 'The third method is to <strong>Generate</strong> images using the latest Image Generation technology.',
+		guide7:
-		guide9: 'Enter keywords that capture the mood you wish to express and then click the <strong>Low Quality</strong> button.',
+			"The second method is to select from your <strong>Library</strong>. <br> You might notice that your library page is currently empty; there's no need to worry. All the images you upload will be automatically added to your library. In the future, you won't have to upload each time—you can simply choose from your library instead.",
+		guide8:
+			'The third method is to <strong>Generate</strong> images using the latest Image Generation technology.',
+		guide9:
+			'Enter keywords that capture the mood you wish to express and then click the <strong>Low Quality</strong> button.',
 		guide10: 'Select two images for your moodboard.',
 		guide11: 'Click here to layout your moodboard.',
 		guide12: 'Click here for next step.',
@@ -1064,8 +1068,7 @@ export default {
 		guide52: 'Click here to generate the product image.',
 		guide53: 'Click this button to apply more tools to the product image. ',
 		guide54: 'We can adjust the lighting and background of this image. ',
-		guide55:
+		guide55: 'Click here to generate a product image with lighting from the right side.',
-			'Click here to generate a product image with lighting from the right side.',
 		guide56: 'If you like this result, click the little heart to save it.',
 		guide57: 'Click here to go to the export page. ',
 		guide58: 'You can share your work to the gallery or export to your local device.',
@@ -1229,8 +1232,7 @@ export default {
 		touchDevicePrompts_2: 'Double-click an element to quickly enter edit mode.',
 		touchDevicePrompts_3: 'Two-finger drag to pan the canvas.',
 		touchDevicePrompts_4: 'Pinch to zoom.',
-		touchDevicePrompts_5:
+		touchDevicePrompts_5: "Two-finger tap to display the element's transform handles.",
-			"Two-finger tap to display the element's transform handles.",
 		touchDevicePrompts_6: 'Three-finger swipe left or right to undo/redo.',
 		TheDetectedPlatform: 'Guide Detected Platform',
 		BasicOperations: 'Basic Operations',
@@ -1361,8 +1363,7 @@ export default {
 		furCurvature: 'Curvature',
 		furCurvatureDescription: 'Control the degree of hair curvature',
 		randomizeDirection: 'Random Cirection',
-		randomizeDirectionDescription:
+		randomizeDirectionDescription: 'Whether to randomize the direction of hair growth',
-			'Whether to randomize the direction of hair growth',
 		//水墨
 		InkSettings: 'Ink painting settings',
 		InkAmount: 'The amount of ink',
@@ -1388,8 +1389,7 @@ export default {
 		//马克笔
 		MarkerSettings: 'Marker Settings',
 		MarkerWidth: 'Brush stroke width',
-		MarkerWidthDescription:
+		MarkerWidthDescription: 'Control the width of the brush strokes with the marker pen',
-			'Control the width of the brush strokes with the marker pen',
 		MarkerCapStyle: 'Writing style',
 		MarkerCapStyleDescription: 'Set the shape of the marker pen tip',
 		MarkerCapStyleRound: 'Round',
@@ -1520,18 +1520,15 @@ export default {
 		CompositeMultiply: 'Multiply',
 		CompositeMultiplyTip: 'Multiply: Darken the image',
 		CompositeColorBurn: 'Color Burn',
-		CompositeColorBurnTip:
+		CompositeColorBurnTip: 'Color Burn: Increase contrast and darken the bottom color',
-			'Color Burn: Increase contrast and darken the bottom color',
 		CompositeLighten: 'Lighten',
 		CompositeLightenTip: 'Lighten: Take the brightest color',
 		CompositeScreen: 'Screen',
 		CompositeScreenTip: 'Screen: Lighten the image',
 		CompositeColorDodge: 'Color Dodge',
-		CompositeColorDodgeTip:
+		CompositeColorDodgeTip: 'Color Dodge: Reduce contrast and lighten the bottom color',
-			'Color Dodge: Reduce contrast and lighten the bottom color',
 		CompositeLighter: 'Color Dodge (Add)',
-		CompositeLighterTip:
+		CompositeLighterTip: 'Color Dodge (Add): Add the brightness of the overlapping parts',
-			'Color Dodge (Add): Add the brightness of the overlapping parts',
 		CompositeOverlay: 'Overlay',
 		CompositeOverlayTip: 'Overlay: Highlight effect',
 		CompositeSoftLight: 'Soft Light',
@@ -1586,7 +1583,8 @@ export default {
 		LiquefactionTool: 'Liquefaction Tool'
 	},
 	event: {
-		back: 'Back'
+		back: 'Back',
+		detail: 'View Details'
 	},
 	admin: {
 		allUser: 'All User',
@@ -1668,7 +1666,8 @@ export default {
 		ForgotPassword: '忘记密码',
 		Welcome: 'Welcome to',
 		AiDA: 'AiDA',
-		Slogan: 'AiDA, a first-to-market technology that empowers fashion designers, based on their creative inspirations, to work with AI to create original designs.',
+		Slogan:
+			'AiDA, a first-to-market technology that empowers fashion designers, based on their creative inspirations, to work with AI to create original designs.',
 		LoginMethod: 'Continue with one of these:',
 		Individual: 'Individual',
 		Academic: 'Academic',
@@ -1709,8 +1708,7 @@ export default {
 		IncorrectEmail: 'The email format is incorrect',
 		IncorrectEmailFormat: 'The email format is incorrect',
 		CompleteVerificationCode: 'Please enter the complete verification code.',
-		PleaseEnterYourAccountNumberOrPassword:
+		PleaseEnterYourAccountNumberOrPassword: 'Please enter your account number or password'
-			'Please enter your account number or password'
 	},
 	LoginSchool: {
 		School: 'School',
@@ -1741,8 +1739,7 @@ export default {
 		IncorrectEmail: 'The email format is incorrect',
 		IncorrectEmailFormat: 'The email format is incorrect',
 		CompleteVerificationCode: 'Please enter the complete verification code.',
-		PleaseEnterYourAccountNumberOrPassword:
+		PleaseEnterYourAccountNumberOrPassword: 'Please enter your account number or password'
-			'Please enter your account number or password'
 	},
 	LoginEnterprise: {
 		Enterprise: 'Enterprise',
@@ -1772,160 +1769,6 @@ export default {
 		IncorrectEmail: 'The email format is incorrect',
 		IncorrectEmailFormat: 'The email format is incorrect',
 		CompleteVerificationCode: 'Please enter the complete verification code.',
-		PleaseEnterYourAccountNumberOrPassword:
+		PleaseEnterYourAccountNumberOrPassword: 'Please enter your account number or password'
-			'Please enter your account number or password'
-	},
-	AwardsPage: {
-		submitApplication: 'Submit your Application',
-		applicationDeadline: 'Application Deadline:15th July 2026',
-		howToApply: 'How to Apply',
-		stepByStep: 'Step by step',
-		step1Title: 'Step 1. Become an\nAiDA Subscriber​',
-		step1Desc:
-			'All applicants must be active\nAiDA subscribers at the time of\nsubmission.​ You may subscribe\nunder either a monthly or yearly plan.​',
-		step2Title: 'Step 2. Create Your Design Using AiDA',
-		step2Desc:
-			'Applicants must create their\ndesigns exclusively using the\nAiDA platform.​ ',
-		step2ListTitle: 'Your work should clearly demonstrate:',
-		step2List: [
-			'· How AiDA is used as a creative tool',
-			'· Your design concept and creative direction',
-			'· The intergration of AI and human creativity'
-		],
-		step3Title: 'Step 3. Prepare Your Submission',
-		processVideo: 'Process Video',
-		processVideoDesc:
-			'Include a screen‑recorded video\nyour creative process\nusing AiDA.​',
-		videoRequirements: 'Video requirements:',
-		videoFormat: 'Format: MP4',
-		videoResolution: 'Resolution: 1080×1920 px',
-		videoDuration: 'Duration: Maximum 1 minute',
-		videoSize: 'File size: Maximum 20MB',
-		fileName: 'File Name',
-		fileNameDesc: 'AiDAGlobalDesignAward\n2026_[Your Full Name]​',
-		designPortfolio: 'Design Portfolio(PDF)',
-		submitPdf: 'Submit one single PDF file that includes:',
-		requiredStructure: 'Required structure:',
-		pdfDesignTitle: 'Design title',
-		pdfMoodboard: 'Moodboard',
-		pdfConcept: 'Concept explanation',
-		pdfConceptDesc: '(How to use AiDA to develop design)',
-		pdfRequirements: 'PDF requirements:',
-		pdfMaxPages: 'Maximum 15 pages',
-		pdfMaxSize: 'Maximum file size: 20MB',
-		pdfLanguage: 'Language: English or native language\nwith English translation',
-		step4Title: 'Step 4. Finalist Requirement',
-		step4Subtitle: '(for top 20 Designers)',
-		step4Desc:
-			'The 20 finalists will be required to\nsubmit physical garments for final\nevaluation',
-		finalistPieces: 'Number of pieces: 1 full outfit',
-		finalistBasedOn:
-			'Garments must be produced\nbased on the submitted\nAiDA-generated designs',
-		finalistShipping: 'Shipping instructions will be provided by\nCode-create',
-		bloomYourCreativity: 'Bloom Your Creativity',
-		themeOf2026: 'Theme of 2026',
-		bloomText: {
-			desc1: {
-				regular1: 'The',
-				bold1: 'AiDA Global Design Award 2026',
-				regular2: 'is an ',
-				bold2: 'international design competition ',
-				regular3: 'hosted by ',
-				bold3: 'Code-create ',
-				regular4: ', a globally leading\n',
-				bold4: 'AI fashion solutions provider,',
-				regular5:
-					'celebrating the future of creativity powered by artificial intelligence.\nBringing together designers from around the world, AiDA empowers AI as a creative partner—pushing fashion beyond traditional boundaries and unlocking new possibilities where technology amplifies human imagination.'
-			},
-			desc2: {
-				regular1: 'Under the theme',
-				bold1: '“Where Imagination Meets Innovation, Creativity Blooms,” ',
-				regular2:
-					'participants are invited to transform bold ideas into extraordinary designs, seamlessly merging human artistry with artificial intelligence to shape the next era of fashion.'
-			}
-		},
-		bloomDesc1:
-			'The AiDA Global Design Award 2026 is an\ninternational design competition hosted by\nCode‑Create, a globally leading AI fashion solutions provider,\ncelebrating the future of creativity powered by artificial intelligence.\nBringing together designers from around the world, AiDA empowers AI as a creative partner—pushing fashion beyond traditional boundaries and unlocking new possibilities where technology amplifies human imagination.​',
-		bloomDesc2:
-			'Under the theme “Where Imagination Meets Innovation, Creativity Blooms,” participants are invited to transform bold ideas into extraordinary designs, seamlessly merging human artistry with artificial intelligence to shape the next era of fashion.',
-		panelOfJudges: 'Panel of Judges',
-		expertise: 'Expertise',
-		judgesHat: {
-			jae: 'Code-create\nKorea Branch Director\nBesfxxk creative director',
-			diego: 'Co-founder & Chief Father\nOfficer of OnTheList\n(Hong Kong)',
-			gregory: 'Senior Designer at\nGabriela Heasrst (Italy)',
-			vincenzo: 'Cheif Editor of SCMP Style\n(Hong Kong)',
-			tim: 'Group Fashion Direction of\n Modern Media Group\n(Shanghai)',
-			desmond: 'Cheif Editor of Vogue\n(Singapore)'
-		},
-		awardPrizes: 'Award & Prizes',
-		recognition: 'Recognition',
-		grandMoney: 'US$5,000',
-		goldMoney: 'US$3,000',
-		silverMoney: 'US$1,000',
-		grandAwards: 'Grand Awards',
-		goldAwards: 'Gold Awards',
-		silverAwards: 'Silver Awards',
-		finalists: 'Finalists',
-		cashAward: 'Cash Award',
-		awardCertificate: 'Award Certificate',
-		globalMediaExposure: 'Global Media Exposure',
-		awardCertification: 'Award\nCertification',
-		TravelAllowance: 'Travel Allowance',
-		selectionCriteria: 'Selection Criteria',
-		evaluation: 'Evaluation',
-		originality: 'Originality',
-		originalityDesc: 'Unique perspective and\ninnovative approach to\nfashion design',
-		creativity: 'Creativity',
-		creativityDesc: 'Artistic vision and exceptional\ndesign excellence',
-		aidaIntegration: 'AiDA Integration',
-		aidaIntegrationDesc: 'Effective application of\nAiDA functions',
-		execution: 'Execution',
-		executionDesc: 'Quality of presentation and\ntechnical craftsmanship',
-		totalCashPrizes: 'UP TO\nUS$9000',
-		totalCashPrizesLabel: 'In total cash prizes',
-		globalMediaExpose: 'GLOBAL MEDIA\nEXPOSE',
-		globalMediaExposeLabel: 'Showcased by top\ninternational media platforms​',
-		networkingOpportunities: 'NETWORKING\nOPPORTUNITIES',
-		networkingOpportunitiesLabel:
-			'Build connections with\ndesigners and industry leaders​',
-		awardCeremonyHongKong: 'AWARD CEREMONY\nIN HONG KONG​',
-		awardCeremonyLabel: 'Travel allowance\nprovided for finalists​',
-		competitionTimeline: 'Competition Timeline',
-		shapingTheFuture: 'Shaping the Future',
-		timelineApplicationLabel: 'Application',
-		timelineDeadlineLabel: 'Deadline',
-		timeJul15: 'Jul 15',
-		applicationDeadlineDesc:
-			'Application deadline and\nentry review process\nbegins.',
-		twentyFinalistsAnnounced: '20 Finallists',
-		announcedLabel: 'Announced',
-		timeAug30: 'Aug 30',
-		twentyFinalistsDesc:
-			'Announcement of 20\nfinalists entering final\nevaluation stage.',
-		finalistSubmission: 'Finallist\nSubmission',
-		submissionLabel: 'Deadline',
-		timeSept30: 'Sept 30',
-		finalistSubmissionDesc:
-			'Finalists submit\ncompleted outfits for\nfinal assessment.',
-		receivingOutfits: 'Receiving Outfits',
-		fromFinalistsLabel: 'from Finallists',
-		timeOctober: 'October',
-		receivingOutfitsDesc: 'AiDA receives physical\noutfits from all 20\nfinalists.',
-		awardCeremony: 'Award',
-		ceremonyLabel: 'Ceremony',
-		timeNov12: 'Nov 12',
-		awardCeremonyDesc: 'Award Ceremony &\nCommunity Gathering\n– Soho House.',
-		submissionSuccessful: 'Submission Successful',
-		submissionSuccessfulDesc:
-			'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.',
-		deadlinePassed: 'Application Deadline Passed',
-		deadlinePassedDesc:
-			'The submission deadline for AiDA Global Fashion Award 2026 has ended.\nWe are no longer accepting new applications.',
-		uploadInProgress: 'Upload in progress…',
-		uploadSuccess: 'Uploaded Successfully',
-		uploadFailed: 'Upload failed',
-		pdfFileTip: 'PDF file, max 20MB',
-		videoFileTip: 'Video file (MP4, MOV), 1080p, max 100MB'
 	}
 }

src/router/index.ts

@@ -53,6 +53,12 @@ const routes: Array<RouteRecordRaw> = [
     meta: { enter: "all" },
     component: () => import("@/views/Register.vue"),
   },
+  {
+    path: "/register/:lang",
+    name: "registerLang",
+    meta: { enter: "all" },
+    component: () => import("@/views/Register.vue"),
+  },
   {
     path: "/upgrade",
     name: "upgrade",

src/store/homeStore/homeStore.ts

@@ -74,7 +74,7 @@ const HomeStoreModule : Module<DesignDetail,RootState> = {
         },
 		setPoseTransferLastFrameList(state,data){
 			// 支持两种方式：set 替换整个列表；add/删除与 uploadElement 一致
-			if(data.str === 'set'){
+			if(data?.str === 'set'){
 				state.lastFrameList = data.list || []
 				return
 			}else{

src/store/userHabit/userHabit.ts

@@ -77,7 +77,7 @@ const userHabit : Module<UserHabit,RootState> = {
 			followeeCount: '-',
 			followerCount: '-',
 			accountExtendList:null,
-			systemList:[],
+			systemList:[1],
 			expireTime:null,
 			language:'',
 			organizationId: null,
@@ -194,7 +194,7 @@ const userHabit : Module<UserHabit,RootState> = {
 				followeeCount: '-',
 				followerCount: '-',
 				accountExtendList:null,
-				systemList:[],
+				systemList:[1],
 				expireTime:null,
 				language:'',
 				organizationId: null,
@@ -407,7 +407,7 @@ const userHabit : Module<UserHabit,RootState> = {
 								item.name = name
 							});
 							// const {t} = useI18n()
-							rv.unshift({name:t('Model.all'),value:'',id:''})
+							rv.unshift({name:t('Model.all'),value:'',id:null})
 							store.commit('setMannequinStyle',rv)
 							resolve('')
 						}

src/store/workspace/workspace.ts

@@ -74,7 +74,8 @@ const Workspace: Module<DesignDetail, RootState> = {
     },
     setProbject(state, data) {
       for (const key in data) {
-        if (data[key] == undefined) continue
+		let list = ['styleName','styleId','style']
+        if (data[key] == undefined && !list.includes(key)) continue
         state.probjects[key] = data[key]
       }
     },

src/views/AwardPage/components/JudgesSection.vue

@@ -202,6 +202,9 @@ onBeforeUnmount(() => {
 		column-gap: 23.22rem;
 		row-gap: 8rem;
 		padding: 0 25rem 0 26.6rem;
+		div{
+			text-align: center;
+		}
 		.judgement-item {
 			overflow: hidden;
 			.picture {

src/views/AwardPage/components/PrizesSection.vue

@@ -52,6 +52,13 @@
 
 	const { t } = useI18n()
 
+	const props = defineProps({
+		isZh: {
+			type: Boolean,
+			default: false
+		}
+	})
+
 	const prizes = [
 		{
 			money: 'AwardsPage.grandMoney',
@@ -83,11 +90,8 @@
 		{
 			money: 'AwardsPage.awardCertification',
 			name: 'AwardsPage.finalists',
-			desc: [
+			desc: ['AwardsPage.TravelAllowance', 'AwardsPage.globalMediaExposure'],
-				'AwardsPage.TravelAllowance',
+			smaller: !props.isZh
-				'AwardsPage.globalMediaExposure'
-			],
-			smaller: true
 		}
 	]
 

src/views/AwardPage/components/Success.vue

@@ -5,9 +5,9 @@
 			alt=""
 			class="icon-img"
 		/>
-		<div class="title">{{ info.title }}</div>
+		<div class="title">{{ $t(info.title) }}</div>
 		<div class="desc">
-			{{ info.desc }}
+			{{ $t(info.desc) }}
 			<!-- <div>
 				Please review your submitted information in the AiDA in-platform message.
 			</div>
@@ -37,14 +37,14 @@
 		if (props.isExpired) {
 			return {
 				icon: expiredIcon,
-				title: t('AwardsPage.deadlinePassed'),
+				title: 'AwardsPage.deadlinePassed',
-				desc: t('AwardsPage.deadlinePassedDesc')
+				desc: 'AwardsPage.deadlinePassedDesc'
 			}
 		} else {
 			return {
 				icon: successIcon,
-				title: t('AwardsPage.submissionSuccessful'),
+				title: 'AwardsPage.submissionSuccessful',
-				desc: t('AwardsPage.submissionSuccessfulDesc')
+				desc: 'AwardsPage.submissionSuccessfulDesc'
 			}
 		}
 	})

src/views/AwardPage/components/UploadStatus.vue

@@ -15,8 +15,8 @@
 					class="progress-icon successful-icon"
 				/>
 			</div>
-			<div class="text">{{ text }}</div>
+			<div class="text">{{ $t(text) }}</div>
-      <div class="tips">{{ tips }}</div>
+      <div class="tips">{{ $t(tips) }}</div>
 		</div>
 	</div>
 </template>
@@ -32,16 +32,16 @@
 
 	const textMap: Record<string, string> = {
 		idle: '',
-		uploading: computed(() => t('AwardsPage.uploadInProgress')).value,
+		uploading: 'AwardsPage.uploadInProgress',
-		success: computed(() => t('AwardsPage.uploadSuccess')).value,
+		success:'AwardsPage.uploadSuccess',
-		error: computed(() => t('AwardsPage.uploadFailed')).value
+		error: 'AwardsPage.fileUploadFailed'
 	}
 
 	const tips = computed(() => {
 		if (props.type === 'pdf') {
-			return t('AwardsPage.pdfFileTip')
+			return 'AwardsPage.pdfFileTip'
 		} else if (props.type === 'video') {
-			return t('AwardsPage.videoFileTip')
+			return 'AwardsPage.videoFileTip'
 		}
 		return ''
 	})

src/views/AwardPage/container.vue

@@ -83,12 +83,12 @@
 					class="close-icon"
 					@click="handleCloseQRcode"
 				/>
-				<div class="code-title">WeChat Official Account</div>
+				<div class="code-title">{{ $t('AwardsPage.wechatTitle') }}</div>
 				<img
 					src="@/assets/images/award/qrcode.jpg"
 					class="qrcode"
 				/>
-				<div class="tips">Scan the QR code in WeChat</div>
+				<div class="tips">{{ $t('AwardsPage.wechatDesc') }}</div>
 			</div>
 		</div>
 	</div>

src/views/AwardPage/index.vue

@@ -1,8 +1,11 @@
 <template>
-	<div class="award-page">
+	<div
+		class="award-page"
+		:class="{ 'is-zh': isZh }"
+	>
 		<div class="banner">
 			<video
-				src="@/assets/images/award/banner.mp4"
+				:src="bannerUrl"
 				autoplay
 				muted
 				loop
@@ -29,14 +32,15 @@
 		<Bloom />
 		<TimeLine />
 		<JudgesSection />
-		<PrizesSection />
+		<PrizesSection :is-zh="isZh" />
 		<ApplySection />
 		<SelectionSection />
 	</div>
 </template>
 
 <script setup lang="ts">
-	import { ref } from 'vue'
+	import { ref, computed } from 'vue'
+	import { useI18n } from 'vue-i18n'
 	import { useRouter } from 'vue-router'
 	import JudgesSection from './components/JudgesSection.vue'
 	import SelectionSection from './components/SelectionSection.vue'
@@ -46,7 +50,19 @@
 	import Bloom from './components/Bloom.vue'
 	import Slogan from './components/Slogan.vue'
 
+	import banner from '@/assets/images/award/banner.mp4'
+	import bannerZh from '@/assets/images/award/banner_chinese.mp4'
+
 	const router = useRouter()
+	const { locale } = useI18n()
+
+	const isZh = computed(() => {
+		return locale.value === 'CHINESE_SIMPLIFIED'
+	})
+
+	const bannerUrl = computed(() => {
+		return isZh.value ? bannerZh : banner
+	})
 
 	const handleSubmitApplication = () => {
 		router.push('/award/contestants')
@@ -110,4 +126,18 @@
 			}
 		}
 	}
+
+	.is-zh {
+		.submit-btn {
+			padding: 0 7.5rem;
+			height: 7.8rem;
+			border-radius: 7.74rem;
+			column-gap: 3.8rem;
+			// justify-content: space-between;
+			&,
+			.ddl {
+				width: 35.4rem;
+			}
+		}
+	}
 </style>

src/views/HomeView/library.vue

@@ -1721,9 +1721,8 @@ export default defineComponent({
 				sloganText = this.captionGeneration
 				if(this.selectCode == "Sketchboard"){
 					level2Type = this.selectGenerateList?.[0]?.categoryValue?this.selectGenerateList[0].categoryValue:''
-					if(this.workspace.styleName){
+					// sloganText = `${this.workspace.styleName || 'all'},${sloganText}`
-						sloganText = `${this.workspace.styleName},${sloganText}`
+					sloganText = `'all',${sloganText}`
-					}
 				}else if(this.selectCode == "Printboard"){
 					level2Type = this.scene?.value
 					if(level2Type == 'Slogan' && this.captionGeneration == ''){

src/views/Register.vue

@@ -85,7 +85,7 @@ import {
 import { setCookie, getCookie, WriteCookie, clonAllCookie } from '@/tool/cookie'
 import { Https } from '@/tool/https'
 import { useStore } from 'vuex'
-import { useRouter } from 'vue-router'
+import { useRouter, useRoute } from 'vue-router'
 import signUp from '@/component/mainPage/signUp/index.vue'
 export default defineComponent({
   components: {
@@ -93,6 +93,7 @@ export default defineComponent({
   },
   setup() {
     const store = useStore()
+	const route = useRoute();
     const router = useRouter()
     let data = reactive({
       homeRecommendMax: null,
@@ -148,7 +149,14 @@ export default defineComponent({
 
     onMounted(() => {
       updataIsMoblie()
-      const savedLang = localStorage.getItem('loginLanguage')
+      let savedLang = localStorage.getItem('loginLanguage') || 'ENGLISH'
+	  if(route?.params?.lang == 'cn'){
+		savedLang = 'CHINESE_SIMPLIFIED'
+        localStorage.setItem('loginLanguage', savedLang)
+	  }else if(route?.params?.lang == 'en'){
+		savedLang = 'ENGLISH'
+        localStorage.setItem('loginLanguage', savedLang)
+	  }
       if (savedLang) {
         data.isSelectSuccessively = savedLang === 'CHINESE_SIMPLIFIED'
       }