diff --git a/.env.development b/.env.development index eac1010..73c6444 100644 --- a/.env.development +++ b/.env.development @@ -1 +1,3 @@ VITE_APP_URL = http://192.168.31.82:10094 +VITE_APP_URL = https://www.develop-ms.api.aida.com.hk + diff --git a/.env.production b/.env.production index eac1010..c5b107e 100644 --- a/.env.production +++ b/.env.production @@ -1 +1,2 @@ VITE_APP_URL = http://192.168.31.82:10094 +VITE_APP_URL = https://www.develop-ms.api.aida.com.hk diff --git a/src/lang/en.ts b/src/lang/en.ts index 6dca4c0..d145070 100644 --- a/src/lang/en.ts +++ b/src/lang/en.ts @@ -314,7 +314,7 @@ export default { digitalDetail: { Sketch: 'Sketch', Illustration: 'Illustration', - Product: 'Product', + Product: 'Product Image', EditorialVisual: 'Editorial Visual', Back: 'Back', ReleaseIn: 'Release in', @@ -325,7 +325,37 @@ export default { BuyNow: 'Buy Now', AddToCart: 'Add to Cart' }, - addShoppingCart: { + Home: { + IndexTitle: 'We’re Seeking
Fashion Voice
Worth Featuring.', + IndexTip: 'Discover collections through the stories behind their creation. A curated space connecting designers, narratives, and fashion commerce.', + DesignerTitle: 'Designer Community', + DesignerTip: 'Discover the designers shaping AiDA’s creative landscape.
Each month, we will showcase a curated selection of their most distinguished works.', + SearchBrands: 'Search Brands', + AidaTitle: 'Design with AiDA', + AidaTip: 'Each garment on this platform is where designer vision blooms through AiDA. A tool that nurtures your creativity, never overshadows it. Let your ideas flourish.', + TryNow: 'Try Now', + DigitalItems: 'Digital Items', + DigitalItemsTip1: 'AiDA captures your boldest thoughts and transforms them into vivid
digital visions—a virtual realm where creativity collides and evolves.', + DigitalItemsTip2: 'AiDA accelerates style innovation, shaping daily pieces that keep
your wardrobe in sync with modern fashion’s rhythm.', + FooterTip: "Stylish Parade is a commerce platform for designers, serving as AiDA's commercial extension.", + FooterAidaTip: "Bloom your Creativity with AiDA!", + Help: "Help", + FAQ: "FAQ", + MyAccount: "My Account", + MyOrders: "My Orders", + PaymentInvoices: "Payment and Invoices", + CopyrightLicense: "Copyright Licence", + Polices: "Policies", + Legal: "Legal", + PrivacyPolicy: "Privacy Policy", + CookiesSettings: "Cookies Settings", + PurchaseConditions: "Purchase Conditions", + Company: "Company", + AboutUs: "About Us", + Offices: "Offices", + JoinWithUs: "Join with Us", + }, + addShoppingCart:{ title: 'Added to your Shopping Cart', statement: 'Digital Assets Only. No physical product included.', button: 'Set Shopping Cart' diff --git a/src/lang/zh-cn.ts b/src/lang/zh-cn.ts index 0016d87..7c44cb8 100644 --- a/src/lang/zh-cn.ts +++ b/src/lang/zh-cn.ts @@ -306,7 +306,7 @@ export default { selected: '已选', brands: '品牌', item: '数字藏品', - checkoutSelected: '结账已选' + checkoutSelected: '结账', }, digitalDetail: { Sketch: '草图', @@ -342,5 +342,39 @@ export default { germany: '德国', australia: '澳大利亚', canada: '加拿大' + Home: { + IndexTitle: '我们正在寻
找值得推广
的时尚之声。', + IndexTip: '通过了解每件作品背后的故事来探索其收藏品。这是一个精心打造的场所，将设计师、故事和时尚商业紧密相连。', + DesignerTitle: '设计师社区', + DesignerTip: '发现 AiDA 创意社区的设计师。
每月我们都会展示他们最杰出的作品。', + SearchBrands: '搜索品牌', + AidaTitle: '使用 AiDA 设计', + AidaTip: '在这个平台上，每一件服装都是设计师创意在 AiDA 软件中绽放的成果。AiDA 是一款能激发您的创造力的工具，它从不掩盖您的才华。让您的创意尽情绽放吧。', + TryNow: '立即试用', + DigitalItems: '数字藏品', + DigitalItemsTip1: 'AiDA 能够捕捉您最激昂的想法，并将其转化为生动的形象。
“数字愿景”一个充满创造力碰撞与发展的虚拟世界。', + DigitalItemsTip2: 'AiDA 风格的创新，打造出实用性强的日常服饰，这些服饰能够经久耐用。
你的衣橱与现代时尚的节奏保持同步。', + FooterTip: 'Stylish Parade 是一个为设计师提供的商业平台，它作为 AiDA 商业的商业扩展。', + FooterAidaTip: '使用 AiDA 设计', + Help: "帮助", + FAQ: "常见问题", + MyAccount: "我的账户", + MyOrders: "我的订单", + PaymentInvoices: "支付发票", + CopyrightLicense: "版权与许可声明", + Polices: "政策", + Legal: "法律", + PrivacyPolicy: "隐私政策", + CookiesSettings: "Cookie 设置", + PurchaseConditions: "购买条件", + Company: "公司", + AboutUs: "关于我们", + Offices: "办公室", + JoinWithUs: "加入我们", + }, + addShoppingCart:{ + title: "已添加到您的购物车", + statement: "仅限数字资产。不包含实体产品。", + button: "去购物车" } } diff --git a/src/views/digitalDetail/index.vue b/src/views/digitalDetail/index.vue index 6ad3a12..b1159bb 100644 --- a/src/views/digitalDetail/index.vue +++ b/src/views/digitalDetail/index.vue @@ -111,7 +111,7 @@ defineExpose({})
-
+
{{ $t('digitalDetail.Illustration') }}
@@ -125,7 +125,7 @@ defineExpose({})
-
+
{{ $t('digitalDetail.EditorialVisual') }}
@@ -195,13 +195,14 @@ defineExpose({}) .digitalItemDetail{ width: 100%; height: 100%; + overflow-y: auto; position: relative; display: flex; flex-direction: column; .center{ - flex: 1; + // flex: 1; display: flex; - overflow: hidden; + // overflow: hidden; .img-list{ flex: 1; display: grid; @@ -211,6 +212,7 @@ defineExpose({}) // --row-width: 29.3rem; overflow-y: auto; position: relative; + border-right: 0.5px solid #585858; &::-webkit-scrollbar{ display: none; } @@ -232,8 +234,40 @@ defineExpose({}) flex-wrap: wrap; img{ width: 100%; + // height: 51rem; + // margin: 0 auto; } } + &.sketch{ + .imgBox{ + flex-direction: column; + gap: 2rem; + padding: 5rem 0; + img{ + height: 20.4rem; + width: auto; + margin: auto; + } + } + } + &.illustration{ + display: flex; + flex-direction: column; + .imgBox{ + flex: 1; + > img{ + aspect-ratio: 9 / 16; + object-fit: contain; + padding: 3.6rem; + } + } + } + &.editorialVisual{ + .imgBox{ + row-gap: 60px; + } + } + } > .left{ @@ -258,6 +292,7 @@ defineExpose({}) display: flex; } > .bottom{ + margin-top: 10.5rem; .imgBox{ display: flex; img{ @@ -268,12 +303,15 @@ defineExpose({}) } } .img-detail{ - border-left: 0.5px solid #585858; padding-left: 3.2rem; width: 57rem; display: flex; flex-direction: column; overflow-y: auto; + height: calc(var(--app-view-height) - var(--footer-height)); + position: sticky; + top: 0; + // height: 100%; &::-webkit-scrollbar{ display: none; } @@ -331,6 +369,9 @@ defineExpose({}) object-fit: cover; } > .detail{ + display: flex; + flex-direction: column; + align-items: flex-start; .name{ text-decoration: underline; font-weight: 500; diff --git a/src/views/home/section-aida.vue b/src/views/home/section-aida.vue index ade0002..6b84f45 100644 --- a/src/views/home/section-aida.vue +++ b/src/views/home/section-aida.vue @@ -3,12 +3,9 @@
-
Design with AiDA
-
- Each garment on this platform is where designer vision blooms through AiDA. A tool - that nurtures your creativity, never overshadows it. Let your ideas flourish. -
- +
{{ $t('Home.AidaTitle') }}
+
{{ $t('Home.AidaTip') }}
+
diff --git a/src/views/home/section-designer.vue b/src/views/home/section-designer.vue index 9274207..8649a11 100644 --- a/src/views/home/section-designer.vue +++ b/src/views/home/section-designer.vue @@ -1,11 +1,8 @@ diff --git a/src/views/home/section-digital-items1.vue b/src/views/home/section-digital-items1.vue index 0c40728..157d2ea 100644 --- a/src/views/home/section-digital-items1.vue +++ b/src/views/home/section-digital-items1.vue @@ -2,12 +2,8 @@
-
Digital Items
-
- AiDA captures your boldest thoughts and transforms them into vivid -
- digital visions—a virtual realm where creativity collides and evolves. -
+
{{ $t('Home.DigitalItems') }}
+
@@ -27,7 +23,7 @@ const list = ref([ { - title: 'Women’s Itemk', + title: 'Women’s Item', tip: 'Blue Pleat Aria', url: 'http://118.31.39.42:3000/falls/digital-items-1.png' }, diff --git a/src/views/home/section-digital-items2.vue b/src/views/home/section-digital-items2.vue index 83e7c51..4b2899d 100644 --- a/src/views/home/section-digital-items2.vue +++ b/src/views/home/section-digital-items2.vue @@ -2,11 +2,7 @@
-
- AiDA accelerates style innovation, shaping daily pieces that keep -
- your wardrobe in sync with modern fashion’s rhythm. -
+
@@ -22,7 +18,7 @@ import { computed, ref } from 'vue' const list = ref([ { - title: 'Women’s Itemk', + title: 'Women’s Item', tip: 'Blue Pleat Aria', url: 'http://118.31.39.42:3000/falls/digital-items-1.png' }, diff --git a/src/views/home/section-footer.vue b/src/views/home/section-footer.vue index b057d52..b1387d5 100644 --- a/src/views/home/section-footer.vue +++ b/src/views/home/section-footer.vue @@ -7,35 +7,32 @@
-
- Stylish Parade is a commerce platform for designers, serving as AiDA's - commercial extension. -
+
{{ $t('Home.FooterTip') }}
- Bloom your Creativity with AiDA! + {{ $t('Home.FooterAidaTip') }}
-
HELP
-
FAQ
-
My Account
-
My Orders
-
Payment and Invoices
-
Copyright Licence
+
{{ $t('Home.Help') }}
+
{{ $t('Home.FAQ') }}
+
{{ $t('Home.MyAccount') }}
+
{{ $t('Home.MyOrders') }}
+
{{ $t('Home.PaymentInvoices') }}
+
{{ $t('Home.CopyrightLicense') }}
-
POLICES
-
Legal
-
Privacy Policy
-
Cookies Settings
-
Purchase Conditions
+
{{ $t('Home.Polices') }}
+
{{ $t('Home.Legal') }}
+
{{ $t('Home.PrivacyPolicy') }}
+
{{ $t('Home.CookiesSettings') }}
+
{{ $t('Home.PurchaseConditions') }}
-
COMPANY
-
About us
-
Offices
-
Join with us
+
{{ $t('Home.Company') }}
+
{{ $t('Home.AboutUs') }}
+
{{ $t('Home.Offices') }}
+
{{ $t('Home.JoinWithUs') }}
@@ -124,6 +121,7 @@ font-size: 1.8rem; color: #232323; margin-bottom: 2.3rem; + text-transform: uppercase; } > .item { font-family: KaiseiOpti-Regular; diff --git a/src/views/home/section-index.vue b/src/views/home/section-index.vue index fae41bc..65b0bdf 100644 --- a/src/views/home/section-index.vue +++ b/src/views/home/section-index.vue @@ -2,11 +2,8 @@
-
-
- Discover collections through the stories behind their creation. A curated space connecting - designers, narratives, and fashion commerce. -
+
+
{{ $t('Home.IndexTip') }}
@@ -18,8 +15,6 @@ import { computed } from 'vue' import { useRouter } from 'vue-router' const router = useRouter() - const title = - 'We’re Seeking
Fashion Voice
Worth Featuring.' const handleClickArrow = () => { router.push({ name: 'collectionStory' }) } diff --git a/src/views/shoppingCart/sc-item.vue b/src/views/shoppingCart/sc-item.vue index 08031a0..8cb41d8 100644 --- a/src/views/shoppingCart/sc-item.vue +++ b/src/views/shoppingCart/sc-item.vue @@ -85,7 +85,7 @@ }) const handleBrandClick = () => { router.push({ - name: 'brand', + name: 'brandDetail', params: { id: props.info.sellerId } }) } diff --git a/src/views/shoppingCart/sc-list.vue b/src/views/shoppingCart/sc-list.vue index 2aeec68..23f5247 100644 --- a/src/views/shoppingCart/sc-list.vue +++ b/src/views/shoppingCart/sc-list.vue @@ -134,9 +134,9 @@ const list_ = ref([]) const list = computed(() => { - // if(sortBy.value === 'BestSelling') { - // return list_.value.sort((a, b) => b.sales - a.sales) - // } + if(sortBy.value === 'BestSelling') { + return list_.value.sort((a, b) => b.salesVolume - a.salesVolume) + } if (sortBy.value === 'PriceLowToHigh') { return list_.value.filter(() => true).sort((a, b) => a.amount - b.amount) } @@ -165,6 +165,7 @@ status: v.status, //状态 date: v.addTime, //添加时间 tags: v.productCategory, //标签 + salesVolume: v.salesVolume, //销售量 checked: false } arr.push(obj)