Merge branch 'main' of ssh://18.167.251.121:10002/aidlab/Aida_Purchaser_Front

.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
+

.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

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<br /><span>Fashion Voice</span><br /><span class="small">Worth Featuring.</span>',
+		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. <br />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<br/>digital visions—a virtual realm where creativity collides and evolves.',
+		DigitalItemsTip2: 'AiDA accelerates style innovation, shaping daily pieces that keep<br/>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'

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: '我们正在寻<br />找值得推广<br />的时尚之声。',
+		IndexTip: '通过了解每件作品背后的故事来探索其收藏品。这是一个精心打造的场所，将设计师、故事和时尚商业紧密相连。',
+		DesignerTitle: '设计师社区',
+		DesignerTip: '发现 AiDA 创意社区的设计师。<br />每月我们都会展示他们最杰出的作品。',
+		SearchBrands: '搜索品牌',
+		AidaTitle: '使用 AiDA 设计',
+		AidaTip: '在这个平台上，每一件服装都是设计师创意在 AiDA 软件中绽放的成果。AiDA 是一款能激发您的创造力的工具，它从不掩盖您的才华。让您的创意尽情绽放吧。',
+		TryNow: '立即试用',
+		DigitalItems: '数字藏品',
+		DigitalItemsTip1: 'AiDA 能够捕捉您最激昂的想法，并将其转化为生动的形象。<br />“数字愿景”一个充满创造力碰撞与发展的虚拟世界。',
+		DigitalItemsTip2: 'AiDA 风格的创新，打造出实用性强的日常服饰，这些服饰能够经久耐用。<br/>你的衣橱与现代时尚的节奏保持同步。',
+		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: "去购物车"
 	}
 }

src/views/digitalDetail/index.vue

@@ -111,7 +111,7 @@ defineExpose({})
 				</div>
 				<div class="right">
 					<div class="top">
-						<div class="box">
+						<div class="box illustration">
 							<div class="title">{{ $t('digitalDetail.Illustration') }}</div>
 							<div class="imgBox">
 								<img :src="item?.imgUrl" v-for="item in illustrationList" :key="item" alt="">
@@ -125,7 +125,7 @@ defineExpose({})
 						</div>
 					</div>
 					<div class="bottom">
-						<div class="box aa">
+						<div class="box editorialVisual">
 							<div class="title">{{ $t('digitalDetail.EditorialVisual') }}</div>
 							<div class="imgBox">
 								<img :src="item?.gif||item?.imgUrl" v-for="item in editorialVisualList" :key="item" alt="">
@@ -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;

src/views/home/section-aida.vue

@@ -3,12 +3,9 @@
 		<img src="@/assets/images/home/aida-bg.jpg" class="bg" />
 		<div class="content">
 			<div class="aida-logo"><img src="@/assets/images/logos/aida.png" /></div>
-			<div class="title">Design with AiDA</div>
+			<div class="title">{{ $t('Home.AidaTitle') }}</div>
-			<div class="tip">
+			<div class="tip">{{ $t('Home.AidaTip') }}</div>
-				Each garment on this platform is where designer vision blooms through AiDA. A tool
+			<button custom @click="openAida">{{ $t('Home.TryNow') }}</button>
-				that nurtures your creativity, never overshadows it. Let your ideas flourish.
-			</div>
-			<button custom @click="openAida">Try Now</button>
 		</div>
 	</section>
 </template>

src/views/home/section-designer.vue

@@ -1,11 +1,8 @@
 <template>
 	<section class="section-designer">
-		<div class="title">Designer Community</div>
+		<div class="title" v-html="$t('Home.DesignerTitle')"></div>
-		<div class="tip">
+		<div class="tip" v-html="$t('Home.DesignerTip')"></div>
-			Discover the designers shaping AiDA’s creative landscape. <br />
+		<button custom="black" @click="onSearchBrand">{{ $t('Home.SearchBrands') }}</button>
-			Each month, we will showcase a curated selection of their most distinguished works.
-		</div>
-		<button custom="black" @click="onSearchBrand">Search Brands</button>
 		<img src="@/assets/images/home/designer-bg.png" />
 	</section>
 </template>

src/views/home/section-digital-items1.vue

@@ -2,12 +2,8 @@
 	<section class="digital-items1 bgw">
 		<img src="@/assets/images/home/digital-items-1.jpg" class="bg" />
 		<div class="content">
-			<div class="title">Digital Items</div>
+			<div class="title">{{ $t('Home.DigitalItems') }}</div>
-			<div class="tip">
+			<div class="tip" v-html="$t('Home.DigitalItemsTip1')"></div>
-				AiDA captures your boldest thoughts and transforms them into vivid
-				<br />
-				digital visions—a virtual realm where creativity collides and evolves.
-			</div>
 			<button custom="black" @click="onShopAll">Shop All</button>
 			<div class="list">
 				<div v-for="v in list" :key="v.url">
@@ -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'
 		},

src/views/home/section-digital-items2.vue

@@ -2,11 +2,7 @@
 	<section class="digital-items2 bgw">
 		<img src="@/assets/images/home/digital-items-1.jpg" class="bg" />
 		<div class="content">
-			<div class="tip">
+			<div class="tip" v-html="$t('Home.DigitalItemsTip2')"></div>
-				AiDA accelerates style innovation, shaping daily pieces that keep
-				<br />
-				your wardrobe in sync with modern fashion’s rhythm.
-			</div>
 			<div class="list">
 				<div v-for="v in list" :key="v.url">
 					<img :src="v.url" alt="" />
@@ -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'
 		},

src/views/home/section-footer.vue

@@ -7,35 +7,32 @@
 					<img src="@/assets/images/logos/stylish-parade-black.png" />
 					<img src="@/assets/images/logos/aida-black.png" />
 				</div>
-				<div class="tip">
+				<div class="tip">{{ $t('Home.FooterTip') }}</div>
-					Stylish Parade is a commerce platform for designers, serving as AiDA's
-					commercial extension.
-				</div>
 				<div class="link">
-					<span class="text" @click="openAida">Bloom your Creativity with AiDA!</span>
+					<span class="text" @click="openAida">{{ $t('Home.FooterAidaTip') }}</span>
 					<span class="icon"><svg-icon name="arrow_right" size="12" /></span>
 				</div>
 			</div>
 			<div class="help">
-				<div class="title">HELP</div>
+				<div class="title">{{ $t('Home.Help') }}</div>
-				<div class="item">FAQ</div>
+				<div class="item">{{ $t('Home.FAQ') }}</div>
-				<div class="item">My Account</div>
+				<div class="item">{{ $t('Home.MyAccount') }}</div>
-				<div class="item">My Orders</div>
+				<div class="item">{{ $t('Home.MyOrders') }}</div>
-				<div class="item">Payment and Invoices</div>
+				<div class="item">{{ $t('Home.PaymentInvoices') }}</div>
-				<div class="item">Copyright Licence</div>
+				<div class="item">{{ $t('Home.CopyrightLicense') }}</div>
 			</div>
 			<div class="polices">
-				<div class="title">POLICES</div>
+				<div class="title">{{ $t('Home.Polices') }}</div>
-				<div class="item">Legal</div>
+				<div class="item">{{ $t('Home.Legal') }}</div>
-				<div class="item">Privacy Policy</div>
+				<div class="item">{{ $t('Home.PrivacyPolicy') }}</div>
-				<div class="item">Cookies Settings</div>
+				<div class="item">{{ $t('Home.CookiesSettings') }}</div>
-				<div class="item">Purchase Conditions</div>
+				<div class="item">{{ $t('Home.PurchaseConditions') }}</div>
 			</div>
 			<div class="company">
-				<div class="title">COMPANY</div>
+				<div class="title">{{ $t('Home.Company') }}</div>
-				<div class="item">About us</div>
+				<div class="item">{{ $t('Home.AboutUs') }}</div>
-				<div class="item">Offices</div>
+				<div class="item">{{ $t('Home.Offices') }}</div>
-				<div class="item">Join with us</div>
+				<div class="item">{{ $t('Home.JoinWithUs') }}</div>
 			</div>
 		</div>
 		<div class="footer">
@@ -124,6 +121,7 @@
 					font-size: 1.8rem;
 					color: #232323;
 					margin-bottom: 2.3rem;
+					text-transform: uppercase;
 				}
 				> .item {
 					font-family: KaiseiOpti-Regular;

src/views/home/section-index.vue

@@ -2,11 +2,8 @@
 	<section class="section-index bgw">
 		<img src="@/assets/images/home/bg.png" class="bg" />
 		<div class="content">
-			<div class="title" v-html="title"></div>
+			<div class="title" v-html="$t('Home.IndexTitle')"></div>
-			<div class="tip">
+			<div class="tip">{{ $t('Home.IndexTip') }}</div>
-				Discover collections through the stories behind their creation. A curated space connecting
-				designers, narratives, and fashion commerce.
-			</div>
 			<button custom="black-box" @click="handleClickArrow">
 				<svg-icon name="arrow_right" size="34" />
 			</button>
@@ -18,8 +15,6 @@
 	import { computed } from 'vue'
 	import { useRouter } from 'vue-router'
 	const router = useRouter()
-	const title =
-		'We’re Seeking<br /><span>Fashion Voice</span><br /><span class="small">Worth Featuring.</span>'
 	const handleClickArrow = () => {
 		router.push({ name: 'collectionStory' })
 	}

src/views/shoppingCart/sc-item.vue

@@ -85,7 +85,7 @@
 	})
 	const handleBrandClick = () => {
 		router.push({
-			name: 'brand',
+			name: 'brandDetail',
 			params: { id: props.info.sellerId }
 		})
 	}

src/views/shoppingCart/sc-list.vue

@@ -134,9 +134,9 @@
 
 	const list_ = ref([])
 	const list = computed(() => {
-		// if(sortBy.value === 'BestSelling') {
+		if(sortBy.value === 'BestSelling') {
-		// 	return list_.value.sort((a, b) => b.sales - a.sales)
+			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)