修复注册选择订阅布局问题

src/assets/json/events.json

@@ -9,6 +9,11 @@
 			"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": [
@@ -16,18 +21,19 @@
 			"id": 3,
 			"title": "AiDA Global Design Awards 2026",
 			"imgUrl": "/image/events/award-poster.gif",
+			"tips": "For inquiries: awards2026@code-create.com.hk",
 			"textList": [
 				{
 					"paragraph": [
 						{
-							"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."
+							"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 worldwide 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."
 						}
 					]
 				},
 				{
 					"paragraph": [
 						{
-							"text": "Participants have the opportunity to compete for cash prizes totaling up to US$9,000, gain global media exposure showcased by top international platforms, and connect with designers and industry leaders worldwide. Finalists will also attend an exclusive award ceremony in Hong Kong, with travel support provided, allowing them to showcase their talent, network with professionals, and celebrate their achievements on an international stage."
+							"text": "Participants have the opportunity to compete for cash prizes totaling up to US$9,000, gain global media exposure showcased by top international platforms, and connect with designers and industry leaders worldwide. Finalists will also attend an exclusive award ceremony in Hong Kong, with travel allowance, allowing them to showcase their talent, network with professionals, and celebrate their achievements on an international stage."
 						}
 					]
 				}

src/assets/json/events_cn.json

@@ -9,6 +9,11 @@
 			"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-zh.gif"
 		}
 	],
 	"eventsItem": [
@@ -16,18 +21,19 @@
 			"id": 3,
 			"title": "AiDA全球设计奖 2026",
 			"imgUrl": "/image/events/award-poster-zh.gif",
+			"tips": "如有疑问，请联系：awards2026@code-create.com.hk",
 			"textList": [
 				{
 					"paragraph": [
 						{
-							"text": "秉承推动 AI 赋能创意设计的初衷，Code‑Create 举办了「AiDA 全球设计大奖 2026」，面向来自香港、中国、新加坡、韩国及全球的设计师，鼓励大家探索 AI 与时尚设计的无限可能，突破传统界限，释放科技与想象力的创新潜能。点击“查看详情”按钮获取更多比赛信息，抓住成为 AI 时尚先锋的机会吧！"
+							"text": "秉承推动 AI 赋能创意设计的初衷，Code‑Create 举办了「AiDA 全球设计大奖 2026」，面向来全球的设计师，鼓励大家探索 AI 与时尚设计的无限可能，突破传统界限，释放科技与想象力的创新潜能。点击“查看详情”按钮获取更多比赛信息，抓住成为 AI 时尚先锋的机会吧！"
 						}
 					]
 				},
 				{
 					"paragraph": [
 						{
-							"text": "参赛者将有机会赢取总奖金 9,000 美元，作品还将获得国际媒体展示机会，并与全球设计师和行业领袖建立联系。入围决赛者将受邀参加在香港举办的 专属颁奖典礼，主办方提供差旅支持，让设计师在国际舞台展示才华、拓展人脉，并共同庆祝创意成果。"
+							"text": "参赛者将有机会赢取总奖金 9,000 美元，作品还将获得国际媒体展示机会，并与全球设计师和行业领袖建立联系。入围决赛者将受邀参加在香港举办的 专属颁奖典礼，主办方提供差旅津贴，让设计师在国际舞台展示才华、拓展人脉，并共同庆祝创意成果。"
 						}
 					]
 				}

src/component/Account/message/system.vue

@@ -1,22 +1,37 @@
 <template>
-    <div class="account_systemMessage">
+	<div class="account_systemMessage">
 		<div class="account_generalMessage_title modal_title_text">
 			<!-- <span>系统消息</span> -->
-			<div class="account_generalMessage_title_setting" @click="allRead">{{$t('account.AllRead')}}</div>
+			<div class="account_generalMessage_title_setting" @click="allRead">
+				{{ $t("account.AllRead") }}
+			</div>
 		</div>
-		<div class="account_generalMessage_item modal_title_text" v-for="item in dataList" :key="item.id" @click="setRead(item)">
+		<div
+			class="account_generalMessage_item modal_title_text"
+			v-for="item in dataList"
+			:key="item.id"
+			@click="setRead(item)"
+		>
 			<a-badge :dot="item.isRead == 0"></a-badge>
 			<div class="account_generalMessage_item_title">
-				<div class="account_generalMessage_item_title_text" :title="item.content">{{ item.content.title }}</div>
+				<div class="account_generalMessage_item_title_text" :title="item.content">
+					{{ item.content.title }}
+				</div>
 				<div class="modal_title_text_intro">{{ item.createTime }}</div>
 			</div>
 			<div class="modal_title_text_intro">
 				{{ item.content.content }}
-				<span v-if="item.content.link" class="account_generalMessage_item_link">{{ item.content.link }}</span>
+				<span v-if="item.content.link" class="account_generalMessage_item_link">{{
+					item.content.link
+				}}</span>
 			</div>
 		</div>
-		<div class="account_generalMessage_item  modal_title_text" style="display:flex;justify-content: center;" v-if="dataList.length == 0 && isNoData">
+		<div
-			{{$t('account.dataNull')}}
+			class="account_generalMessage_item modal_title_text"
+			style="display: flex; justify-content: center"
+			v-if="dataList.length == 0 && isNoData"
+		>
+			{{ $t("account.dataNull") }}
 		</div>
 		<div class="page_loading_box" v-show="!isNoData">
 			<span class="page_loading" ref="loadingDom" v-show="!isShowMark"></span>
@@ -24,120 +39,138 @@
 				<a-spin size="large" />
 			</span>
 		</div>
-    </div>
+	</div>
 </template>
 <script lang="ts">
-import { defineComponent,computed,ref,reactive,nextTick,toRefs,createVNode, onMounted} from 'vue'
+import {
-import { Https } from "@/tool/https";
+	defineComponent,
-import { useRouter,useRoute } from 'vue-router'
+	computed,
-import { useStore } from "vuex";
+	ref,
-import { useI18n } from 'vue-i18n'
+	reactive,
+	nextTick,
+	toRefs,
+	createVNode,
+	onMounted
+} from "vue"
+import { Https } from "@/tool/https"
+import { useRouter, useRoute } from "vue-router"
+import { useStore } from "vuex"
+import { useI18n } from "vue-i18n"
+import { isValidUrl } from "@/tool/util"
 export default defineComponent({
-    components:{
+	components: {},
-    },
 	// emits:['putListData'],
-    props:['setReadStatus','setAllmessage','getHistory'],
+	props: ["setReadStatus", "setAllmessage", "getHistory"],
-    setup(prop,{emit}) {
+	setup(prop, { emit }) {
 		const router = useRouter()
-        const store = useStore();
+		const store = useStore()
 		let accountMessage = reactive({
 			dataList: [],
-			page:1,
+			page: 1,
-			size:10,
+			size: 10,
 			isNoData: false,
-			isShowMark: false,
+			isShowMark: false
 		})
-		let loadingDom:any = ref(null)
+		let loadingDom: any = ref(null)
-		let setmessageList = ()=>{
+		let setmessageList = () => {
 			accountMessage.isShowMark = true
 			let data = {
 				page: accountMessage.page,
-				size: accountMessage.size,
+				size: accountMessage.size
 			}
-			prop.getHistory(data).then((rv:any)=>{
+			prop.getHistory(data)
-				accountMessage.isShowMark = false
+				.then((rv: any) => {
-				
+					accountMessage.isShowMark = false
-				if(rv.content.length == 0) {
+
+					if (rv.content.length == 0) {
+						accountMessage.isNoData = true
+					} else {
+						rv.content.forEach((item: any) => {
+							item.content = JSON.parse(item.content)
+						})
+						accountMessage.dataList.push(...rv.content)
+					}
+				})
+				.catch(() => {
+					accountMessage.isShowMark = false
 					accountMessage.isNoData = true
-				}else{
+				})
-					rv.content.forEach((item:any) => {
+		}
-						item.content = JSON.parse(item.content)
+		let setRead = (item: any) => {
-					});
+			let content = item.content.content
-					accountMessage.dataList.push(...rv.content)
+			if (isValidUrl(content)) {
+				if (import.meta.env.VITE_APP_BASE_URL === "https://develop.api.aida.com.hk") {
+					content += "&env=dev"
 				}
-			}).catch(() => {
+				window.open(content, "_blank")
-				accountMessage.isShowMark = false
+			}
-				accountMessage.isNoData = true
+
-			})
+			prop.setReadStatus(item)
-		}
+				.then((rv: any) => {
-		let setRead = (item:any)=>{
-			prop.setReadStatus(item).then((rv:any)=>{
-				item.isRead = 1
-			}).catch((err:any)=>{
-			})
-		}
-		let allRead = ()=>{
-			// emit('setAllmessage')
-			prop.setAllmessage().then(()=>{
-				accountMessage.dataList.forEach((item:any)=>{
 					item.isRead = 1
 				})
-			}).catch((err:any)=>{
+				.catch((err: any) => {})
-			})
+		}
+		let allRead = () => {
+			// emit('setAllmessage')
+			prop.setAllmessage()
+				.then(() => {
+					accountMessage.dataList.forEach((item: any) => {
+						item.isRead = 1
+					})
+				})
+				.catch((err: any) => {})
 		}
 		// provide('exhibitionList',exhibitionList)
-		onMounted (()=>{
+		onMounted(() => {
 			accountMessage.isNoData = false
 			accountMessage.page = 0
-			let imgParent:any = document.querySelector('.account_systemMessage .page_loading')
+			let imgParent: any = document.querySelector(".account_systemMessage .page_loading")
 			new IntersectionObserver(
 				(entries, observer) => {
 					// 如果不是相交，则直接返回
 					// console.log(entries[0]);
-					if (!entries[0].intersectionRatio) return;
+					if (!entries[0].intersectionRatio) return
-					accountMessage.page+=1
+					accountMessage.page += 1
 					setmessageList()
-				},
+				}
 				// { root:worksPage }
-			).observe(loadingDom.value);
+			).observe(loadingDom.value)
 		})
-        return{
+		return {
-           ...toRefs(accountMessage),
+			...toRefs(accountMessage),
-		   setmessageList,
+			setmessageList,
-		   setRead,
+			setRead,
-		   allRead,
+			allRead,
-		   loadingDom,
+			loadingDom
-        }
+		}
-    },
+	},
-    data(){
+	data() {
-        return{
+		return {}
-            
+	}
-        }
-    },
 })
 </script>
 <style lang="less" scoped>
-.account_systemMessage{
+.account_systemMessage {
 	width: 100%;
-	.account_generalMessage_item{
+	.account_generalMessage_item {
 		font-size: var(--aida-fsize1-6);
-		.account_generalMessage_item_title{
+		.account_generalMessage_item_title {
 			display: flex;
 			align-items: center;
 			margin-bottom: 2rem;
-			.account_generalMessage_item_title_text{
+			.account_generalMessage_item_title_text {
 				max-width: 80%;
-				white-space: nowrap;      
+				white-space: nowrap;
-				overflow: hidden;          
+				overflow: hidden;
 				text-overflow: ellipsis;
 			}
-			.modal_title_text_intro{
+			.modal_title_text_intro {
 				margin-left: 4rem;
-				
 			}
 		}
 	}
-	.modal_title_text_intro{
+	.modal_title_text_intro {
 		word-break: break-word;
 		white-space: pre-wrap;
 		font-family: Arial, sans-serif;

src/component/Administrator/allUserPoerations.vue

@@ -321,6 +321,7 @@ export default defineComponent({
         data = setEditData()
         if (!data.userName || !data.userEmail || !data.validEndTime || !data.systemUser)
           return message.warning('Please check the input box marked with *')
+		delete data.userName
         Https.axiosPost(Https.httpUrls.modifyUser, {}, { params: data }).then(rv => {
           if (rv) {
             cancelDsign()

src/component/Administrator/globalAwardPopularity.vue

@@ -0,0 +1,99 @@
+<template>
+    <div class="admin_page globalAwardPopularity" ref="adminPage">
+        <div class="admin_table_search">
+			<div class="admin_state">
+				<div class="admin_state_item">
+					<span>Current Time:</span>
+					<span>{{ currentTimeStr }}</span>
+				</div>
+				<div class="admin_state_item">
+					<span>Raw Visi Count:</span>
+					<span>{{ rawVisitCount }}</span>
+				</div>
+				<div class="admin_state_item">
+					<span>Unique Visit Count:</span>
+					<span>{{ uniqueVisitCount }}</span>
+				</div>
+				
+			</div>
+			<div class="admin_search">
+				<div class="admin_search_item" @click="getGlobalAwardPopularity">
+					<i class="fi fi-br-refresh"></i>
+				</div>
+			</div>
+		</div>
+        <!-- <div class="admin_table_content" ref="questionnaireTable">
+			
+        </div> -->
+    </div>
+</template>
+<script lang="ts">
+import { defineComponent, ref, createVNode,toRefs, computed,reactive, onMounted, nextTick } from "vue";
+import { Https } from "@/tool/https";
+import type { TableColumnsType } from 'ant-design-vue';
+
+export default defineComponent({
+    components: {},
+    setup() {
+		const currentTime = ref(new Date())
+		const currentTimeStr = computed(()=>{
+			return currentTime.value.toLocaleString()
+		})
+		const rawVisitCount = ref(0)
+		const uniqueVisitCount = ref(0)
+		const getGlobalAwardPopularity = () => {
+			Https.axiosGet(Https.httpUrls.getGlobalAwardPopularity,).then((rv)=>{
+				currentTime.value = new Date()
+				rawVisitCount.value = rv.rawVisitCount
+				uniqueVisitCount.value = rv.uniqueVisitCount
+			})
+        }
+		onMounted(()=>{
+			getGlobalAwardPopularity()
+		})
+        return {
+			currentTimeStr,
+			getGlobalAwardPopularity,
+			rawVisitCount,
+			uniqueVisitCount,
+		};
+    },
+    data() {
+        return {
+		};
+    },
+    mounted() {
+		
+	},
+    methods: {},
+});
+</script>
+<style lang="less" scoped>
+.admin_page.globalAwardPopularity{
+	.admin_table_search{
+		// flex: 1;
+		width: min-content;
+		justify-content: flex-start;
+		border-radius: 2rem;
+		box-shadow: 0 0 1rem rgba(0, 0, 0, 0.2);
+		margin-left: 2rem;
+		flex-wrap: nowrap;
+		gap: 3rem;
+	}
+	.admin_state{
+		flex-direction: column;
+		width: auto;
+		cursor: auto;
+		.admin_state_item{
+			> span{
+				font-size: 2rem;
+			}
+		}
+	}
+	.admin_search{
+		i{
+			display: flex;
+		}
+	}
+}
+</style>

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

@@ -409,7 +409,7 @@ export class BrushIndicator {
         //   this.show(e.e);
 		this._mouseEnterHandler && this._mouseEnterHandler(e)
         } else {
-          // requestIdleCallback(() => {
+          // setTimeout(() => {
           //   this.updatePosition(e.e);
           // });
 

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

@@ -133,11 +133,12 @@ export class RedGreenModeManager {
     this.canvas.on("mouse:up", (event) => {
       // 可以在这里添加更多逻辑，比如生成图片或更新状态
       nextTick(() => {
-        requestIdleCallback(async () => {
+        setTimeout(async () => {
           if (!this.isInitialized) {
             console.warn("红绿图模式未初始化，无法处理鼠标事件");
             return;
           }
+		  console.log("鼠标抬起事件触发", this.onImageGenerated);
           if (this.onImageGenerated) {
             const imageData = await this.canvasManager.exportImage({
               restoreOpacityInRedGreen: true, // 恢复红绿图模式下的透明度

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

@@ -37,7 +37,6 @@ export class ThumbnailManager {
 
     // 延迟执行，避免阻塞UI
     fabricObjects.length > 0 &&
-      requestIdleCallback(() => {
         setTimeout(async () => {
           const base64 = await this._generateLayerThumbnailNow(fabricObjects, layer);
           // this.layerThumbnails.set(layerId, base64);
@@ -55,7 +54,6 @@ export class ThumbnailManager {
             console.error("生成图层缩略图时出错:", error);
           }
         });
-      });
   }
 
   /**
@@ -65,7 +63,7 @@ export class ThumbnailManager {
   generateAllLayerThumbnails(layers) {
     if (!layers || !Array.isArray(layers)) return;
 
-    requestIdleCallback(() => {
+    setTimeout(() => {
       setTimeout(() => {
         layers.forEach((layer) => {
           if (layer && layer.id) {

src/component/Canvas/CanvasEditor/managers/liquify/LiquifyRealTimeUpdater.js

@@ -155,7 +155,7 @@ export class LiquifyRealTimeUpdater {
         // 使用requestAnimationFrame进行批量渲染优化
         // if (!this.renderingScheduled && !this.config.skipRenderDuringDrag) {
         //   this.renderingScheduled = true;
-        //   requestIdleCallback(() => {
+        //   setTimeout(() => {
         //     this.canvas.renderAll();
         //     this.renderingScheduled = false;
         //   });

src/component/Detail/DesignDetail.vue

@@ -331,7 +331,6 @@ export default defineComponent({
 			store.commit('DesignDetail/setCurrentDetailType',str)
 		}
 		const setClothes = async (list:any,str:string)=>{
-			console.log(JSON.parse(JSON.stringify(list)))
 			let clothesList:any = []
 			if(detailData.isEditPattern.value == 'editSketch')await detailDom.canvasBox.submitBase64Data().then((rv)=>{
 				detailData.selectDetail.sketchString = rv
@@ -369,7 +368,6 @@ export default defineComponent({
 				// }else if(isCurrent){
 					
 				// }
-				console.log(JSON.parse(JSON.stringify(detailData.selectDetail.color)),'=====')
 				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'){
@@ -565,11 +563,14 @@ export default defineComponent({
 				}
 			}else{
 				//走画布合成图片并且直接分割
-				if(detailData.isEditPattern.value !== 'canvasEditor'){
+				if(detailData.isEditPattern.value !== 'canvasEditor' && detailData.isEditPattern.value !== 'redGreenExample'){
-					if(detailDom.detailRight?.privewDetail)await (detailDom.detailRight as any).privewDetail()
+					if(detailData.isEditPattern.value !== 'canvasEditor'){
+						if(detailDom.detailRight?.privewDetail)await (detailDom.detailRight as any).privewDetail()
+					}
 					let otherData = await updateOtherLayers('single')
 					await detailDom.canvasBox.updateOtherLayers(otherData)
 				}
+				
 				await detailDom.canvasBox.privewDetail()
 				await upDateFrontBackSketch()
 				await uploadSelectDetail()
@@ -625,7 +626,7 @@ export default defineComponent({
 				if(detailData.isEditPattern.value && detailData.isEditPattern.value == str){
 					// await detailDom.canvasBox.saveCanvas()
 					await (detailDom.canvasBox as any).privewDetail()
-					if(detailData.isEditPattern.value == 'canvasEditor')await uploadSelectDetail()
+					if(detailData.isEditPattern.value == 'canvasEditor' || detailData.isEditPattern.value == 'redGreenExample')await uploadSelectDetail()
 					detailData.isEditPattern.value = ''
 				}else{
 					// if(detailData.isEditPattern.value && (str == 'canvasEditor' || str == 'redGreenExample')){
@@ -780,8 +781,7 @@ export default defineComponent({
 					color.gradient = canvasColor.gradient
 				}
 			}
-
+			if(detailData.isEditPattern.value == 'canvasEditor' || detailData.isEditPattern.value == 'redGreenExample'){
-			if(detailData.isEditPattern.value == 'canvasEditor'){
 				delete detailData.selectDetail.newDetail
 				detailData.selectDetail.trims.prints = allInfo.trims || []
 				detailData.selectDetail.printObject.prints = allInfo.prints || []
@@ -804,7 +804,6 @@ export default defineComponent({
 			if(detailData.currentDetailType == 'color'){
 				detailData.detailLeftColorKey++
 			}
-			
 		}
 		const canvasReload = async ()=>{
 			if(detailData.isEditPattern.value){

src/component/Detail/model/index.vue

@@ -124,7 +124,11 @@ export default defineComponent({
 		const handleResize = ()=>{ 
 			clearTimeout(time)
 			time = setTimeout(()=>{
-				store.commit('DesignDetail/setDesignDetail',getDetailListData.designDetail)
+				let data = {
+					...getDetailListData.designDetail,
+					fromType:'resize',
+				}
+				store.commit('DesignDetail/setDesignDetail',data)
 				getDetailListDom.position?.updataPosition?.()
 				getDetailListDom.modelNav?.setItemPosition?.()
 				getDetailListDom.position?.updateRect?.()

src/component/Detail/model/modelPosition.vue

@@ -189,11 +189,11 @@ export default defineComponent({
 			}
 			return { scaleX, scaleY, rotate };
 		}
-		const initMoveableForSelected = () => {
+		const initMoveableForSelected = async (isDestroy:boolean = false) => {
 			// 销毁旧的实例
 			if(selectItem.imgDomIndex == -1)return
-			if (moveableInstance.value) {
+			if (moveableInstance?.value?.destroy && !isDestroy) {
-				moveableInstance.value.destroy();
+				moveableInstance?.value?.destroy();
 			}
 			
 			const selectedEl = elementRefs.value[selectItem.imgDomIndex];
@@ -509,7 +509,7 @@ export default defineComponent({
 		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()
+				initMoveableForSelected(oldValue == 0)
 			},100)
 		})
 		const setRevocation = async ()=>{

src/component/Events/eventsDetail.vue

@@ -21,7 +21,11 @@
 						{{ $t("event.detail") }}
 					</div>
 				</div>
-				<div class="modal_title_text content" v-for="item in eventsDetail.textList">
+				<div
+					class="modal_title_text content"
+					v-for="item in eventsDetail.textList"
+					:class="{ award: eventsDetail.id === 3 }"
+				>
 					<div class="eventsDetail_content_right_btn_box">
 						<div
 							class="eventsDetail_content_right_btn"
@@ -43,6 +47,7 @@
 						v-detailText="introItem.text"
 					></div>
 				</div>
+				<div class="tips" v-if="eventsDetail.tips">{{ eventsDetail.tips }}</div>
 			</div>
 		</div>
 	</div>
@@ -120,11 +125,16 @@ export default defineComponent({
 				})
 		}
 		const openDetail = () => {
-			let language = locale.value === "ENGLISH" ? "en" : "zh"
+			let language = locale.value === "ENGLISH" ? "en" : "cn"
 			let url = `https://aida-global-design-awards.com.hk/${language}`
+			// 如果是dev环境把域名换成http://192.168.31.198
+
+			if (import.meta.env.VITE_APP_BASE_URL === "https://develop.api.aida.com.hk") {
+				url += "?env=dev"
+			}
 			window.open(url, "_blank")
 
-		//	router.push("/award/index")
+			//	router.push("/award/index")
 		}
 		onMounted(() => {
 			const currentLocale = locale.value
@@ -233,7 +243,7 @@ export default defineComponent({
 		}
 		.eventsDetail_content_right {
 			.modal_title_text {
-				letter-spacing: 0.4rem;
+				letter-spacing: 0.3rem;
 				font-weight: 600;
 				&-header {
 					display: flex;
@@ -265,18 +275,21 @@ export default defineComponent({
 				.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 {
 				content: "";
 				display: block;
 				border-top: 3px solid;
 				height: 6rem;
 			}
+			.modal_title_text.award:last-child:after {
+				display: none;
+			}
 		}
 	}
 }
@@ -293,4 +306,13 @@ export default defineComponent({
 	white-space: nowrap;
 	cursor: pointer;
 }
+.tips{
+	color: rgba(0, 0, 0, 0.45);
+	font-size: var(--aida-fsize1-4);
+	font-weight: 400;
+	letter-spacing: 0.3rem;
+}
+.modal_title_text.content.award{
+	line-height: 1.3;
+}
 </style>

src/component/HomePage/Generate.vue

@@ -734,7 +734,9 @@ export default defineComponent({
       let maxImg = 8
       if (this.type_.type2 == 'Sketchboard') {
         maxImg = 20
-      }
+      }else if(this.type_.type2 == 'Printboard'){
+		maxImg = 16
+	}
       let parent: any = this.$parent
       if (parent.isUseGenerate) {
         // parent.useGenerate.designType = 'collection'

src/component/HomePage/layout.vue

@@ -70,7 +70,7 @@
 					<div class="layout_left_text">
 						{{ $t('layout.LayerOptions') }}
 					</div>
-					<div v-for="item,index in moodbList" class="layout_left_items" @click="setmoodb(item)">
+					<div v-for="item,index in moodbList" class="layout_left_items" :class="item.filter((item,index)=>item == 'w2h1').length != 0 ? 'active':''" @click="setmoodb(item)">
 						<div v-for="clasitem,clasindex in item" :class="clasitem" class="layout_left_item">
 						</div>
 					</div>
@@ -932,15 +932,17 @@ export default defineComponent({
 			height: calc(35rem*1.2);
 			width: calc(57rem*1.2);
 			// height: 60%;
-			flex-direction: column;
-			flex-wrap: wrap;
 			align-content: space-around;
 			margin: calc(3rem*1.2) auto;
 			overflow: hidden;
 			// padding: 3rem 0;
 			justify-content: space-between;
 			position: relative;
-			user-select:none
+			
+			flex-direction: column;
+			align-items: center;
+			flex-wrap: wrap;
+			justify-content: space-between;
 			&.active{
 				flex-direction: row;
 			}
@@ -1120,6 +1122,9 @@ export default defineComponent({
 				flex-direction: column;
 				margin-bottom: calc(2rem*1.2);
                 cursor: pointer;
+				&.active{
+					flex-direction: row;
+				}
 				.layout_left_item{
 					box-sizing: border-box;
 					border: 1px solid #000;
@@ -1152,6 +1157,9 @@ export default defineComponent({
 				flex-direction: column;
 				margin-bottom: calc(2rem*1.2);
                 cursor: pointer;
+				&.active{
+					flex-direction: row;
+				}
 				.layout_left_item{
 					box-sizing: border-box;
 					border: 1px solid #000;

src/component/HomePage/renew.vue

@@ -233,7 +233,7 @@
             {{ $t('upgradePlan.Continue') }}
           </div>
           <div class="payMethod_payAffirm_clause" ref="labelDisclaimer">
-            <label>
+            <label class="clause">
               <!-- <input type="checkbox" v-model="clause" /> -->
               <span class="generalModelDescription">
                 {{ $t('upgradePlan.policy') }}
@@ -251,6 +251,7 @@
                   {{ $t('upgradePlan.policy2') }}
                 </a>
                 <!-- . * -->
+                {{ $t('upgradePlan.statement') }}
               </span>
             </label>
             <label class="secure">
@@ -861,6 +862,7 @@ export default defineComponent({
           display: flex;
           flex-direction: column;
           align-items: center;
+		  color: #8A8A8A;
           label {
             input {
               margin-right: 1rem;
@@ -871,18 +873,22 @@ export default defineComponent({
               vertical-align: top;
               font-size: 1.4rem;
               a {
-                color: #000;
+		  		color: #8A8A8A;
                 text-decoration: underline;
               }
             }
           }
+		  > .clause{
+            margin-top: 2rem;
+			text-align: left;
+		  }
           > .secure {
             border: 1px solid #ededed;
             background: #f1fbf9;
             color: #1cb36c;
             padding: 0.4rem 0.8rem;
             border-radius: 0.5rem;
-            margin-top: 4rem;
+            margin-top: 2rem;
             > span {
               display: flex;
               align-items: center;

src/component/home/design/collection/MoodboardUpload.vue

@@ -476,6 +476,11 @@ export default defineComponent({
 		},
 		setmoodbClass(val:any){
 			this.moodb_className = val
+			if( val.filter((item,index)=> item == 'w2h1').length != 0  && val.length > 4){
+				this.flex_direction = true
+			}else{
+				this.flex_direction = false
+			}
 		}
     },
 });

src/component/home/design/index.vue

@@ -745,6 +745,12 @@ export default defineComponent({
 					"userLikeId": likeItem.id
 				}
 				arrData.push(obj)
+				designData.selectLikeDesign.forEach((v:any)=>{
+					if(v.id === likeItem.id){
+						v.oldSort = v.sort
+						v.sort = likeItem.sort
+					}
+				})
 			})
 			let data = {
 				"userLikeGroupId": userGroupId.value,
@@ -1304,9 +1310,9 @@ export default defineComponent({
 					})
 					return
 				}
-				const parents = designData.selectLikeDesign.filter((item:any) => item.resultType === 'Design');
+				const parents = designData.selectLikeDesign.filter((item:any) => item.resultType === 'Design').filter((item:any) => likeDesignCollectionList.value.some((v:any) => (v.id === item.id)));
 				parents.map((parent:any) => {
-					parent.sort = parent.oldSort||parent.sort
+					parent.sort = likeDesignCollectionList.value.find((v:any) => v.id === parent.id)?.sort || parent.oldSort||parent.sort
 					delete parent.oldSort
 					return {
 					...parent,
@@ -1533,7 +1539,7 @@ export default defineComponent({
 					this.observerData.time = setTimeout(()=>{
 						
 						this.setSystemDesigner(0)
-						this.setDesignItemStyle()
+						// this.setDesignItemStyle()
 					},100)
 					// const { width } = entry.contentRect;
 				}
@@ -1931,6 +1937,7 @@ export default defineComponent({
 			this.disLikeLoading = true;
 			Https.axiosPost(Https.httpUrls.designDislike, data)
 				.then((rv: any) => {
+					console.log(rv)
 					if (rv) {
 						this.recycleDomHidden = true
 						this.store.commit("addDesignCollectionList", [design]);

src/component/home/design/tools.vue

@@ -163,6 +163,7 @@ export default defineComponent({
 				if(value == 'toProduct'){
 					list.forEach((item:any) => {
 						item.type = 'DesignOutfit'
+						item.isChecked = false
 						fileList.push(item)
 						item.childList.forEach((child:any) => {
 							if(child.resultType == 'ToProductImage'){
@@ -174,6 +175,7 @@ export default defineComponent({
 					list.forEach((item:any) => {
 						if(item.childList){
 							item.childList.forEach((child:any) => {
+								child.isChecked = false
 								if(child.resultType == 'ToProductImage' || child.resultType == 'Relight'){
 									fileList.push(child)
 								}

src/component/mainPage/signUp/index.vue

@@ -75,6 +75,7 @@
           <div class="highlight" v-if="item?.highlight">{{ item?.highlight }}</div>
         </div>
       </div>
+		<span class="statement">{{ productList.Statement }}</span>
     </div>
     <registerModel ref="registerModel"></registerModel>
   </div>
@@ -104,6 +105,7 @@ export default defineComponent({
         Advantages: '我们的价格方案',
         Monthly: '月度',
         Yearly: '年度',
+		Statement: '*所有付费订阅服务均不可退款。',
         monthly: [
           {
             title: '试用版',
@@ -248,6 +250,7 @@ export default defineComponent({
         Advantages: 'Our Pricing Plan',
         Monthly: 'Monthly',
         Yearly: 'Yearly',
+		Statement: '*All paid subscription is non-refundable',
         monthly: [
           {
             title: 'Trial',
@@ -608,6 +611,13 @@ export default defineComponent({
       justify-content: center;
     }
   }
+  .statement{
+	width: 100%;
+	margin-top: 5rem;
+	font-size: 1.4rem;
+	text-align: center;
+	color: #8A8A8A;
+}
   .gallery_list {
     display: flex;
     // justify-content: center;
@@ -617,6 +627,7 @@ export default defineComponent({
     @media (max-width: 767px) {
       margin-top: 2.4rem;
     }
+	
     .gallery_item {
       width: 36.2rem;
       height: 46.8rem;

src/component/mainPage/signUp/registerModel.vue

@@ -226,7 +226,12 @@
               <div class="login_form_title marign_top30">
                 <label :class="{ active: emailStap == 2 }">
                   <input :state="emailStap" type="checkbox" v-model="checked" />
-                  <span>{{userI18n[selectUserI18n].articles}}</span>
+                   <span>
+					{{ userI18n[selectUserI18n].AgreeTo }} 
+					<a href="https://code-create.com.hk/aida-terms-and-conditions/" target="_blank" style="text-decoration: underline;color: #000;">{{ userI18n[selectUserI18n].Terms }}</a>, 
+					<a href="https://aida.com.hk/privacy-policy.html" target="_blank" style="text-decoration: underline;color: #000;">{{ userI18n[selectUserI18n].PrivacyPolicy }}</a>, 
+					{{ userI18n[selectUserI18n].AndFees }}
+				</span>
                 </label>
               </div>
               <div class="thirdPartyLogin marign_top30">
@@ -386,7 +391,10 @@ export default defineComponent({
 			SentTo:'Sent to',
 			Resend:'Resend',
 			PleaseCheck:"Please check the junk box if you haven't received verification code",
-			articles:'I agree to the Terms, Privacy Policy, and Fees.',
+			AgreeTo: 'I agree to the',
+			Terms: 'Terms',
+			PrivacyPolicy: 'Privacy Policy',
+			AndFees: 'and Fees.',
 			Register:'Register',
 			google:'Register with Google',
 			wechat:'Register with wechat',
@@ -407,7 +415,10 @@ export default defineComponent({
 			SentTo:'发送到',
 			Resend:'重新发送',
 			PleaseCheck:"如果没有收到验证码，请检查垃圾邮件",
-			articles:'我同意相关条款、隐私政策以及费用规定。',
+			AgreeTo: '我同意',
+			Terms: '条款',
+			PrivacyPolicy: '隐私政策',
+			AndFees: '和费用',
 			Register:'注册',
 			google:'使用谷歌进行注册',
 			wechat:'使用微信进行注册',

src/component/modules/habitSetStyle.vue

@@ -258,6 +258,7 @@ methods: {
 					display: flex;
 					justify-content: center;
 					align-items: center;
+					text-align: center;
 				}
 			}
 			.content_bottom_item:nth-child(4n){

src/lang/cn.ts

@@ -156,11 +156,12 @@ export default {
     Payment: '付款',
     PurchasePoints: '购买',
     paymentmethod: '请选择付款方式',
-    policy: '继续注册账号即表示您同意我们的使用',
+    policy: '*继续注册账号即表示您同意我们的使用',
     policy1: '条款',
     policy2: '服务协议',
     policy3: '(包括服务范围)及',
     policy4: '订购协议',
+	statement: '所有付费订阅服务均不可退款。',
     completed: '是否已完成支付？',
     hint: '请保持窗口打开，直到付款完成。如果您无法打开付款窗口，请检查您的浏览器设置，看看弹出窗口是否被阻止。成功付款后，积分可能会延迟发放。请等待1-3分钟，点击积分刷新按钮',
     Back: '返回'

src/lang/en.ts

@@ -158,11 +158,12 @@ export default {
 		Payment: 'Payment',
 		PurchasePoints: 'Purchase points',
 		paymentmethod: 'select a payment method',
-		policy: 'By continuing an account, you agree to our',
+		policy: '*By continuing an account, you agree to our',
 		policy1: 'Terms',
 		policy2: 'Conditions',
 		policy3: ' (including the Scope of service) and the ',
 		policy4: 'Subscription Agreement',
+		statement: 'All paid subscription is non-refundable',
 		completed: 'Is payment completed',
 		hint: 'Please keep the window open until the payment is completed. If you are unable to open the payment window, please check your browser settings to see if pop-ups are being blocked.Points may be delayed after successful payment. Please wait 1-3 minutes and click the credits refresh button',
 		Back: 'Back'

src/router/index.ts

@@ -337,6 +337,13 @@ const routes: Array<RouteRecordRaw> = [
         meta: { enter: 3 },
         component: () =>
           import("@/component/Administrator/SE/getGenerateFrequency/index.vue"),
+      },
+	  {
+        path: "globalAwardPopularity",
+        name: "globalAwardPopularity",
+        meta: { enter: 3 },
+        component: () =>
+          import("@/component/Administrator/globalAwardPopularity.vue"),
       },
     ],
   },

src/store/Detail/designDetail.ts

@@ -87,8 +87,10 @@ const DesignDetail : Module<DesignDetail,RootState> = {
 						left:0,
 						top:0,
 					}
-					v.maskMinioUrl = v.layersObject?.[0]?.maskMinioUrl
+					if(data?.fromType !== 'resize'){
-					v.maskUrl = v.layersObject?.[0]?.maskUrl
+						v.maskMinioUrl = v.layersObject?.[0]?.maskMinioUrl
+						v.maskUrl = v.layersObject?.[0]?.maskUrl
+					}
 					v.layersObject[i].designOpenrtionBtn = false
 					if(v.layersObject[i].imageCategory.indexOf("back") == -1){
 						front[index] = v.layersObject[i]

src/tool/adminRouter.js

@@ -198,6 +198,13 @@ const all = (t)=>{
       route: '/administrator/subscriptionPlan',
       key: 'sub14',
       isShow: true
+    },
+    {
+      name: 'Global Award Popularity',
+      icon: 'usetime',
+      route: '/administrator/globalAwardPopularity',
+      key: 'sub15',
+      isShow: true
     }
   ]
 }

src/tool/https.js

@@ -346,6 +346,7 @@ export const Https = {
 		switchSubscribePlan: '/api/subscription_plan/switchSubscriptionPlan', // 切换管理员订阅计划
 		switchSubAccountSubscribePlan:
 			'/api/subscription_plan/switchSubAccSubscriptionPlan', // 切换子账号订阅计划
+		getGlobalAwardPopularity: '/api/global-award/page/visit/count', // 获取global award流量
 
 		//云生成
 		designCloud: `/api/design/designCloud`, //创建云生成

src/tool/util.js

@@ -672,28 +672,40 @@ function sketchToMask(sketchImage) {
 		img.src = sketchImage;
 	});
 }
+
+function isValidUrl(string) {
+	try {
+		const url = new URL(string)
+		// 通常我们只需要 http 或 https 协议
+		return url.protocol === "http:" || url.protocol === "https:"
+	} catch (err) {
+		return false
+	}
+}
+
 export {
-  isEmail,
+	isEmail,
-  getUploadUrl,
+	getUploadUrl,
-  getUniversalZoomLevel,
+	getUniversalZoomLevel,
-  rgbaToHex,
+	rgbaToHex,
-  getMinioUrl,
+	getMinioUrl,
-  base64ToFile,
+	base64ToFile,
-  dataURLtoFile,
+	dataURLtoFile,
-  blobToFile,
+	blobToFile,
-  base64toFile,
+	base64toFile,
-  rgbToHsv,
+	rgbToHsv,
-  formatTime,
+	formatTime,
-  dataURLtoBlob,
+	dataURLtoBlob,
-  isMoible,
+	isMoible,
-  downloadIamge,
+	downloadIamge,
-  downloadVideoWithFetch,
+	downloadVideoWithFetch,
-  getBrowserInfo,
+	getBrowserInfo,
-  setPubDate,
+	setPubDate,
-  murmur,
+	murmur,
-  setGradual,
+	setGradual,
-  calculateGradientCoordinate,
+	calculateGradientCoordinate,
-  segmentImage,
+	segmentImage,
-  UrlToFile,
+	UrlToFile,
-  sketchToMask
+	sketchToMask,
+	isValidUrl
 }