diff --git a/public/image/events/AiDA2025-Cn.jpg b/public/image/events/AiDA2025-Cn.jpg new file mode 100644 index 00000000..7734147c Binary files /dev/null and b/public/image/events/AiDA2025-Cn.jpg differ diff --git a/public/image/events/AiDA2025-En.jpg b/public/image/events/AiDA2025-En.jpg new file mode 100644 index 00000000..d3285bf0 Binary files /dev/null and b/public/image/events/AiDA2025-En.jpg differ diff --git a/src/assets/json/events.json b/src/assets/json/events.json index b3231f11..018fecae 100644 --- a/src/assets/json/events.json +++ b/src/assets/json/events.json @@ -8,7 +8,11 @@ "id": 2, "title":"AiDA X SFT AI Fashion Award 2024", "imgUrl": "/image/events/Fashion-Award-2024.png" - } + },{ + "id": 3, + "title":"✨New Year 2025！🎉Let's kick off the year with a burst of inspiration and design!", + "imgUrl": "/image/events/AiDA2025-En.jpg" + } ], "eventsItem":[ { @@ -88,6 +92,53 @@ ] } ] + },{ + "id":3, + "title":"✨New Year 2025！🎉Let's kick off the year with a burst of inspiration and design!", + "imgUrl": "/image/events/AiDA2025-En.jpg", + "textList":[ + { + "paragraph":[ + { + "text":"Share your work and get 1 month of free access to AiDA！" + } + ] + },{ + "paragraph":[ + { + "text":" Just do the following:" + } + ] + },{ + "paragraph":[ + { + "text":" ✅Share your designs on AiDA's Gallery " + },{ + "text":" ✅Add the tag #NewYear_2025 in the work description" + },{ + "text":" ✅At least 20 likes " + } + ] + },{ + "paragraph":[ + { + "text":"📅 Duration: January 1, 2025 – January 31, 2025" + } + ] + },{ + "paragraph":[ + { + "text":"Join in the fun and embark on a new year's journey of design. Mix your creativity with tech to make amazing, unique creations! Get your friends to help you seize this opportunity! Invite them to give your design some love with their likes～💗" + } + ] + },{ + "paragraph":[ + { + "text":"👍 AiDA is waiting for you to unlock a new world of design!" + } + ] + } + ] } ] } \ No newline at end of file diff --git a/src/assets/json/events_cn.json b/src/assets/json/events_cn.json index ce253a69..f4240123 100644 --- a/src/assets/json/events_cn.json +++ b/src/assets/json/events_cn.json @@ -8,7 +8,11 @@ "id": 2, "title":"AiDA X SFT AI时尚设计比赛2024", "imgUrl": "/image/events/Fashion-Award-2024.png" - } + },{ + "id": 3, + "title":"🎉搭上2025的列车！打开新设计的大门！", + "imgUrl": "/image/events/AiDA2025-Cn.jpg" + } ], "eventsItem":[ { @@ -88,6 +92,53 @@ ] } ] + },{ + "id":3, + "title":"🎉搭上2025的列车！打开新设计的大门！", + "imgUrl": "/image/events/AiDA2025-Cn.jpg", + "textList":[ + { + "paragraph":[ + { + "text":"快来发布作品获得1个月免费使用AiDA的福利！" + } + ] + },{ + "paragraph":[ + { + "text":" 只需要：" + } + ] + },{ + "paragraph":[ + { + "text":" ✅在AiDA将设计作品分享至广场/Gallery，" + },{ + "text":" ✅点赞至少20" + },{ + "text":" ✅在作品描述加上tag #NewYear_2025" + } + ] + },{ + "paragraph":[ + { + "text":"📅 活动时间：2025.1.1—2025.1.31" + } + ] + },{ + "paragraph":[ + { + "text":"快来参与，让我们共同开启新年的设计之旅，让创意与科技完美融合，创造出属于你的独一无二的作品！机会难得，叫上你的朋友们助你一臂之力，为你点上大拇指哦！" + } + ] + },{ + "paragraph":[ + { + "text":"👍 点赞即启程，AiDA等你来解锁设计新世界！" + } + ] + } + ] } ] } \ No newline at end of file diff --git a/src/component/Administrator/TestClickData.vue b/src/component/Administrator/TestClickData.vue index d71ed1bf..b61ceb42 100644 --- a/src/component/Administrator/TestClickData.vue +++ b/src/component/Administrator/TestClickData.vue @@ -299,7 +299,7 @@ export default defineComponent({ endTime:endDate, startTime:startDate, ids:ids, - email:this.email, + email:this.email.trim(), } Https.axiosGet(Https.httpUrls.getDesignStatistic,{params:data}).then((rv: any) => { if (rv) { diff --git a/src/component/Administrator/allUser.vue b/src/component/Administrator/allUser.vue index dd06e151..ba8962c7 100644 --- a/src/component/Administrator/allUser.vue +++ b/src/component/Administrator/allUser.vue @@ -424,7 +424,7 @@ export default defineComponent({ page: filterData.currentPage, systemUser: filterData.systemUser, country: filterData.country, - email: filterData.email, + email: filterData.email.trim(), userType: filterData.userType, ids: filterData.ids, occupation: filterData.occupation, diff --git a/src/component/WorksPage/publish.vue b/src/component/WorksPage/publish.vue index 5b6017b4..242bdb02 100644 --- a/src/component/WorksPage/publish.vue +++ b/src/component/WorksPage/publish.vue @@ -115,7 +115,10 @@ export default defineComponent({ }) let portfolio:any = inject('portfolio') let setPortfolio:any = inject('setPortfolio') - let tagList = ref([{id:1,tagName:'#AiDAworkshop_2024',title:'The process is simple: use AiDA to post your design work on the "Gallery ", and the one with the most likes(at least 20 likes) will be invited to the AiDA Workshop offline event in Hong Kong on November 14th, to exchange ideas with the Royal College of Art (RCA), Jae Lim, co-founder of the renowned fashion brand BESFXXK, and outstanding designers! '}]) + let tagList = ref([ + // {id:1,tagName:'#AiDAworkshop_2024',title:'The process is simple: use AiDA to post your design work on the "Gallery ", and the one with the most likes(at least 20 likes) will be invited to the AiDA Workshop offline event in Hong Kong on November 14th, to exchange ideas with the Royal College of Art (RCA), Jae Lim, co-founder of the renowned fashion brand BESFXXK, and outstanding designers! '}, + {id:3,tagName:'#NewYear_2025',title:"✨New Year 2025！🎉Let's kick off the year with a burst of inspiration and design!"} + ]) // let textarea: any = ref(null) // let setCopy = ()=>{ // textarea.value.select() diff --git a/src/lang/cn.ts b/src/lang/cn.ts index 74cec9bf..da4f1359 100644 --- a/src/lang/cn.ts +++ b/src/lang/cn.ts @@ -545,6 +545,7 @@ export default { FavoriteWorks:'点赞的作品', MyWorks:'我的作品', RCAworkshop_2024:'AiDA工作坊 2024', + NewYear_2025:'新年 2025', }, Publish:{ Publish:'发布', diff --git a/src/lang/en.ts b/src/lang/en.ts index 586dc0f0..1bb0f6e1 100644 --- a/src/lang/en.ts +++ b/src/lang/en.ts @@ -545,6 +545,7 @@ export default { FavoriteWorks:'Like Works', MyWorks:'My Works', RCAworkshop_2024:'AiDA Workshop 2024', + NewYear_2025:'NewYear 2025', }, Publish:{ Publish:'Publish', diff --git a/src/views/HomeMain.vue b/src/views/HomeMain.vue index 7a190ae9..4b072e2c 100644 --- a/src/views/HomeMain.vue +++ b/src/views/HomeMain.vue @@ -457,9 +457,9 @@ export default defineComponent({ }, //教程 getTutorial(){ - let url = 'https://code-create.com.hk/wp-content/uploads/2024/10/aida_3.0-Manual-10_21-CN.pdf' + let url = 'https://code-create.com.hk/wp-content/uploads/2024/12/aida_3.0-Manual-10_21-CN.pdf' if(this.locale == 'ENGLISH'){ - url = 'https://code-create.com.hk/wp-content/uploads/2024/10/aida_3.0-Manual-10_21-EN.pdf' + url = 'https://code-create.com.hk/wp-content/uploads/2024/12/aida_3.0-Manual-10_21-EN.pdf' showViewVideo({url:'https://code-create.com.hk/wp-content/uploads/2024/10/AiDA-demo-video_10_21_EN.mp4'}) }else{ showViewVideo({url:'https://code-create.com.hk/wp-content/uploads/2024/10/AiDA-demo-video_10_21_CN.mp4'}) diff --git a/src/views/HomeRecommend.vue b/src/views/HomeRecommend.vue index 84b1308f..1c006677 100644 --- a/src/views/HomeRecommend.vue +++ b/src/views/HomeRecommend.vue @@ -109,7 +109,11 @@ export default defineComponent({ router.push('/register'); } onMounted(()=>{ - updataIsMoblie() + if(window.innerWidth < 768){ + isMoblie.value = true + }else{ + isMoblie.value = false + } window.addEventListener('resize',updataIsMoblie) }) onBeforeUnmount(() => { diff --git a/src/views/HomeView/Events.vue b/src/views/HomeView/Events.vue index fd78cb34..f76cf933 100644 --- a/src/views/HomeView/Events.vue +++ b/src/views/HomeView/Events.vue @@ -8,12 +8,12 @@
-
-
- +
+
+
-
{{ item.time }}
-
{{ item.title }}
+
{{ eventsList[eventsList.length-1-index].time }}
+
{{ eventsList[eventsList.length-1-index].title }}
diff --git a/src/views/HomeView/Works.vue b/src/views/HomeView/Works.vue index e9e00eda..ec2d18aa 100644 --- a/src/views/HomeView/Works.vue +++ b/src/views/HomeView/Works.vue @@ -73,14 +73,6 @@ export default defineComponent({ name: useI18n().t('works.all'), value: 'all' }, - // { - // name: 'generate', - // value: 'generate' - // }, - // { - // name: 'freehand sketching', - // value: 'freehandSketching' - // }, { name: useI18n().t('works.FavoriteWorks'), value: 'favoriteWorks' @@ -89,9 +81,13 @@ export default defineComponent({ name: useI18n().t('works.MyWorks'), value: 'myWorks' }, + // { + // name: useI18n().t('works.RCAworkshop_2024'), + // value: 'RCAworkshop_2024' + // }, { - name: useI18n().t('works.RCAworkshop_2024'), - value: 'RCAworkshop_2024' + name: useI18n().t('works.NewYear_2025'), + value: 'NewYear_2025' }, ], worksList: [ @@ -146,6 +142,8 @@ export default defineComponent({ filter.getListDate.getMyPortfolio = 1 }else if(val.value == 'RCAworkshop_2024'){ filter.getListDate.tagId = 1 + }else if(val.value == 'NewYear_2025'){ + filter.getListDate.tagId = 3 } filter.getListDate.page = 0