Merge branch 'main' of http://18.167.251.121:10003/aidlab/Aida_Purchaser_Front

src/assets/css/style.css

@@ -111,13 +111,16 @@ body,
 	--mosaic-bg-size: 1rem;
 	--mosaic-bg-color1: #efefef;
 	--mosaic-bg-color2: #fff;
-  background-image: repeating-conic-gradient(var(--mosaic-bg-color1) 0% 25%, var(--mosaic-bg-color2) 0% 50%);
+	background-image: repeating-conic-gradient(
+		var(--mosaic-bg-color1) 0% 25%,
+		var(--mosaic-bg-color2) 0% 50%
+	);
 	background-repeat: repeat;
 	background-position: 50% 50%;
 	background-size: var(--mosaic-bg-size) var(--mosaic-bg-size);
 }
 button[custom],
-button[custom="white"] {
+button[custom='white'] {
 	min-width: 19.4rem;
 	height: 5rem;
 	padding: 0 1rem;
@@ -130,18 +133,18 @@ button[custom="white"] {
 	cursor: pointer;
 }
 button[custom]:active,
-button[custom="white"]:active {
+button[custom='white']:active {
 	background: var(--button-click-bgcolor, #e4e4e4);
 	color: var(--button-click-color, #232323);
 }
-button[custom="black"] {
+button[custom='black'] {
 	--button-bgcolor: #232323;
 	--button-color: #fff;
 	--button-click-bgcolor: #333;
 	--button-click-color: #fff;
 	--button-font-size: 1.6rem;
 }
-button[custom="black-box"] {
+button[custom='black-box'] {
 	--button-bgcolor: transparent;
 	--button-color: #232323;
 	--button-border: 0.2rem solid #979797;
@@ -149,3 +152,7 @@ button[custom="black-box"] {
 	--button-click-color: #fff;
 	--button-font-size: 1.6rem;
 }
+
+.el-select-dropdown .el-select-dropdown__item {
+	padding: 0 2rem;
+}

src/components/Footer.vue

@@ -2,11 +2,11 @@
 	<section class="section-footer">
 		<div class="footer">
 			<div class="left">
-				<div>About</div>
-				<div>Privacy Policy</div>
-				<div>Terms of Use</div>
-				<div>Disclaimer</div>
-				<div>Site Map</div>
+				<div>{{ $t('footer.About') }}</div>
+				<div>{{ $t('footer.PrivacyPolicy') }}</div>
+				<div>{{ $t('footer.TermsOfUse') }}</div>
+				<div>{{ $t('footer.Disclaimer') }}</div>	
+				<div>{{ $t('footer.SiteMap') }}</div>
 			</div>
 			<div class="right">
 				<img src="@/assets/images/icons/xiaohongshu.png" />

src/components/checked.vue

@@ -58,7 +58,7 @@ const {} = toRefs(data);
 			v-model="checkAll"
 			@change="handleCheckAllChange"
 		>
-			All
+			{{ $t('checked.All') }}
 		</el-checkbox>
 	</div>
 	<el-checkbox-group v-model="checkList" @change="handleChange">

src/directives/avatarLoad.js

@@ -2,7 +2,7 @@
 import avatar from '@/assets/images/avatar.png'
 export default {
 	name: 'avatarLoad',
-	mmounted(el, binding) {
+	mounted(el, binding) {
 		loadImage(el, binding.value)
 	},
 	updated(el, binding) {

src/lang/en.ts

@@ -142,7 +142,6 @@ export default {
 		sort: {
 			label: 'Sort by',
 			placeholder: 'Select',
-			default: 'Default',
 			dateAdded: 'Date Added',
 			selectedFirst: 'Selected First'
 		},
@@ -194,5 +193,62 @@ export default {
 		bottoms: 'Bottoms',
 		outwear: 'Outwear',
 		others: 'Others'
+	},
+	collectionStory: {
+		back: 'Back to Home',
+		title: 'We’re Seeking',
+		description: 'Fashion Voice Worth Featuring.',
+		button: 'Contact Us if Interested',
+		joinUs: {
+			title: 'Join Our Designer Community',
+			info: 'Join our community of visionaries and publish your collection story.',
+			info2: 'We are currently seeking collections that deeply integrate the AiDA creative workflow, specifically those that resonate through powerful core concepts and evocative inspiration. ',
+			info3: 'This architecture is designed to elevate your exposure through profound "propositional expression," ensuring that soulful, story-driven designs achieve higher market premiums and superior sales conversion.'
+		}
+	},
+	footer:{
+		About: 'About',
+		PrivacyPolicy: 'Privacy Policy',
+		TermsOfUse: 'Terms of Use',
+		Disclaimer: 'Disclaimer',
+		SiteMap: 'Site Map',
+	},
+	brand:{
+		title: 'Brand',
+		description: "Every brand, every story — discover who's behind the collections.",
+		search: 'Search brand',
+		noFound: 'Brand No Found',
+		noFoundTip: 'Try using another keywords.',
+		searchHistory: 'Searching History',
+		brandItem:{
+			viewProfile: 'View Profile',
+		}
+	},
+	brandDetail:{
+		addShoppingTip: 'Please log in first.',
+		merchantInfo: {
+			Contact: 'Contact',
+			About: 'About',
+		},
+		All: 'All',
+	},
+	digitalItem:{
+		BestSelling: 'Best Selling',
+		Price: 'Price: Low to High',
+		NewestFirst: 'Newest First',
+		title: 'Digital Item',
+		info: 'Virtual fashion creations collected in your personal archive',
+		sortBy: 'Sort By',
+		noData: 'Nothing in Digital Item',
+		noDataTip: 'Try adjusting your filters or refreshing the page.',
+		MerchantInfo: {
+			Filters: 'Filters',
+			Clear: 'Clear',
+			Categories: 'Categories',
+			Gender: 'Gender',
+		}
+	},
+	checked: {
+		All: 'All',
 	}
 }

src/lang/zh-cn.ts

@@ -142,7 +142,6 @@ export default {
 		sort: {
 			label: '排序',
 			placeholder: '请选择',
-			default: '默认',
 			dateAdded: '添加日期',
 			selectedFirst: '已选优先'
 		},
@@ -194,5 +193,62 @@ export default {
 		bottoms: '下装',
 		outwear: '外套',
 		others: '其他'
+	},
+	collectionStory: {
+		back: '返回首页',
+		title: "我们在寻找",
+		description: "值得被听见的时尚之声",
+		button: "如有兴趣，请联系我们",
+		joinUs: {
+			title: '加入我们的设计师社区，',
+			info: "加入我们的远见者社区，发表你的系列故事。",
+			info2: "我们目前正在寻找深度整合 AiDA 创意工作流程的系列作品，特别是那些通过强大的核心理念和富有感染力的灵感而产生共鸣的作品。",
+			info3: "这一架构旨在通过深刻的‘命题式表达’提升你的曝光度，确保那些有灵魂、由故事驱动的设计能获得更高的市场溢价和卓越的销售转化率。"
+		}
+	},
+	footer:{
+		About: '关于我们',
+		PrivacyPolicy: '隐私政策',
+		TermsOfUse: '条款与条件',
+		Disclaimer: '免责声明',
+		SiteMap: '地图',
+	},
+	brand:{
+		title: "品牌",
+		description: "每一个品牌，每一个故事 — 发现系列作品背后的缔造者。",
+		search: "搜索品牌",
+		noFound: "未找到品牌",
+		noFoundTip: "请尝试使用其他关键词。",
+		searchHistory: "搜索历史",
+		brandItem: {
+			viewProfile: "查看简介"
+		}
+	},
+	brandDetail:{
+		addShoppingTip: "请先登录。",
+		merchantInfo: {
+			Contact: "联系方式",
+			About: "关于我们"
+		},
+		All: "全部"
+	},
+	digitalItem: {
+		BestSelling: "畅销优先",
+		Price: "价格：从低到高",
+		NewestFirst: "最新优先",
+		title: "数字藏品",
+		info: "收藏于个人档案中的虚拟时装作品",
+		sortBy: "排序方式",
+		noData: "暂无数字藏品",
+		noDataTip: "请尝试调整筛选条件或刷新页面。",
+		MerchantInfo: {
+			Filters: "筛选",
+			Clear: "清空",
+			Categories: "分类",
+			Gender: "适用性别"
+		}
+	},
+	checked: {
+		All: "全部"
 	}
 }

src/views/brand/brand-item.vue

@@ -33,7 +33,7 @@ const {} = toRefs(data);
 					{{ item.ownerName }} | 
 					{{ item?.listingTotal || 0 }} Collections
 				</div>
-				<div class="view-profile" @click="viewProfile(item)">View Profile</div>
+				<div class="view-profile" @click="viewProfile(item)">{{ $t('brand.brandItem.viewProfile') }}</div>
 			</div>
 		</div>
 		<div class="right">

src/views/brand/index.vue

@@ -29,11 +29,11 @@ const searchHistory = ref([
 
 let changeSearchBrandTime = null
 const changeSearchBrand = () => {
+	merchantList.value = []
 	clearTimeout(changeSearchBrandTime)
 	getDesignerList({
 		keyword: searchBrand.value,
 	}).then((res)=>{
-		merchantList.value = []
 		merchantList.value.push(...res)
 	})
 	// changeSearchBrandTime = setTimeout(()=>{
@@ -103,6 +103,11 @@ const viewProfile = (item) => {
 	})
 }
 
+const setSearchHistory = (item) => {
+	searchBrand.value = item
+	changeSearchBrand()
+}
+
 onMounted(()=>{
 	const value = localStorage.getItem('brandSearchHistory');
 	if(value)searchHistory.value = JSON.parse(value)
@@ -117,19 +122,19 @@ const {} = toRefs(data);
 		<div class="header-img" :class="{'active': searchBrand.length > 0}">
 			<img src="@/assets/images/brand/brandBg.png" alt="">
 			<div class="text-box">
-				<div class="title">Brand</div>
-				<span>Every brand, every story — discover who's behind the collections.</span>
+				<div class="title">{{ $t('brand.title') }}</div>
+				<span>{{ $t('brand.description') }}</span>
 			</div>
 		</div>
 		<div class="content">
 			<div class="input">
-				<input type="text" v-model="searchBrand" @input="changeSearchBrand" placeholder="Search brand">
+				<input type="text" v-model="searchBrand" @input="changeSearchBrand" :placeholder="$t('brand.search')">
 				<div class="icon">
 					<SvgIcon name="brand-search" size="32" />
 				</div>
 			</div>
 			<div class="merchantList" v-if="searchBrand.length > 0">
-				<brand-item v-for="item in merchantList" :key="item.name" :item="item" @viewProfile="viewProfile"></brand-item>
+				<brand-item v-for="item in merchantList" :key="item.sellerId" :item="item" @viewProfile="viewProfile"></brand-item>
 				<div class="end" v-show="!getMerchantData.isNoData && !getMerchantData.isShowMark">- The End-</div>
 				<!-- <div v-show="!getMerchantData.isNoData" class="material_content_list_loding">
 					<span class="page_loading" v-show="!getMerchantData.isShowMark" v-observe="getBrandList"></span>
@@ -140,8 +145,8 @@ const {} = toRefs(data);
 					<sc-list-null 
 						nullImage="brand"
 						:showButton="false" 
-						title="Brand No Found"
-						tip="Try using another keywords."
+						:title="$t('brand.noFound')"
+						:tip="$t('brand.noFoundTip')"
 					/>
 				</div>
 			</div>
@@ -150,10 +155,10 @@ const {} = toRefs(data);
 					<div class="icon">
 						<SvgIcon name="brand-time" size="20" />
 					</div>
-					<span>Searching History</span>
+					<span>{{ $t('brand.searchHistory') }}</span>
 				</div>
 				<div class="history">
-					<div v-for="item in searchHistory" :key="item" @click.stop="searchBrand = item" class="item">
+					<div v-for="item in searchHistory" :key="item" @click.stop="setSearchHistory(item)" class="item">
 						<span>{{item}}</span>
 						<div class="icon" @click.stop="deleteHistory(item)">
 							<SvgIcon name="brand-delete" size="18" />
@@ -287,7 +292,7 @@ const {} = toRefs(data);
 				.end{
 					font-family: 'KaiseiOpti-Regular';
 					font-weight: 400;
-					font-size: 12px;
+					font-size: 1.2rem;
 					line-height: 140%;
 					height: 7rem;
 					display: flex;

src/views/brandDetail/commodity-list.vue

@@ -73,9 +73,9 @@ defineExpose({})
 				Items
 			</div>
 			<div class="menu">
-				<div :class="{'active': type === 'all'}" @click="setType('all')">All</div>
-				<div :class="{'active': type === 'male'}" @click="setType('male')">Male</div>
-				<div :class="{'active': type === 'female'}" @click="setType('female')">Female</div>	
+				<div :class="{'active': type === 'all'}" @click="setType('all')">{{ $t('brandDetail.All') }}</div>
+				<div :class="{'active': type === 'male'}" @click="setType('male')">{{ $t('Wardrobe.assets.genders.male') }}</div>
+				<div :class="{'active': type === 'female'}" @click="setType('female')">{{ $t('Wardrobe.assets.genders.female') }}</div>	
 			</div>
 		</div>
 		<div class="list">

src/views/brandDetail/index.vue

@@ -8,6 +8,7 @@ import { ElMessage } from 'element-plus'
 import { getDesignerDetail } from '@/api/brand'
 import { AddShoppingCart } from '@/api/shoppingCart'
 import brandDetailBg from '@/assets/images/brand/brandDetailBg.png'
+import { useI18n } from 'vue-i18n'
 
 //const props = defineProps({
 //})
@@ -15,6 +16,7 @@ import brandDetailBg from '@/assets/images/brand/brandDetailBg.png'
 //])
 const router = useRouter()
 const route = useRoute()
+const { t, locale } = useI18n()
 
 const designerDetail = ref({
 	avatar: '',
@@ -28,7 +30,7 @@ const designerDetail = ref({
 })
 
 const addShopping = (item) => {
-	if(!item.price) return ElMessage.warning('Please log in first.')
+	if(!item.price) return ElMessage.warning(t('brandDetail.addShoppingTip'))
 	AddShoppingCart({listingIds:[item.id]}).then((res)=>{
 		item.shopName = designerDetail.value.shopName
 		myEvent.emit('addShopping', item)

src/views/brandDetail/merchant-info.vue

@@ -39,7 +39,7 @@ const {} = toRefs(data);
 				<div class="title">{{ designerDetail.shopName }}</div>
 			</div>
 			<div class="contact">
-				<div class="title">Contact</div>
+				<div class="title">{{ $t('brandDetail.merchantInfo.Contact') }}</div>
 				<div class="email label">
 					<div class="icon">
 						<svg-icon name="brand-email" size="24" />
@@ -60,7 +60,7 @@ const {} = toRefs(data);
 				</div>
 			</div>
 			<div class="about">
-				<div class="title">About</div>
+				<div class="title">{{ $t('brandDetail.merchantInfo.About') }}</div>
 				<div class="content">
 					{{ designerDetail.description }}
 				</div>

src/views/collectionStory/detail/join-us.vue

@@ -15,17 +15,17 @@ const {} = toRefs(data);
 </script>
 <template>
 	<div class="joinUs">
-		<div class="title">Join Our Designer Community</div>
+		<div class="title">{{ $t('collectionStory.joinUs.title') }}</div>
 		<div class="info">
 			<div>
-				Join our community of visionaries and publish your collection story.
+				{{ $t('collectionStory.joinUs.info') }}
 			</div>
 			<div>
-				We are currently seeking collections that deeply integrate the AiDA creative workflow, specifically those that resonate through powerful core concepts and evocative inspiration. 
+				{{ $t('collectionStory.joinUs.info2') }}
 			</div>
 			<br />
 			<div>
-				This architecture is designed to elevate your exposure through profound "propositional expression," ensuring that soulful, story-driven designs achieve higher market premiums and superior sales conversion.
+				{{ $t('collectionStory.joinUs.info3') }}
 			</div>
 		</div>
 	</div>

src/views/collectionStory/index.vue

@@ -24,19 +24,21 @@ const {} = toRefs(data);
 			<img class="banner" src="@/assets/images/collectionStory/collection_story_banner.png" alt="">
 			<div class="back">
 				<SvgIcon name="collectionStory-back" size="20" />
-				<div class="text">Back to Home</div>
+				<div class="text">{{ $t('collectionStory.back') }}</div>	
 			</div>
 			<div class="title-content">
 				<div class="title-box">
 					<div class="title">
-						We’re Seeking 
+						 {{ $t('collectionStory.title') }}
 					</div>
 					<div class="info">
-						Fashion Voice Worth Featuring.
+						 {{ $t('collectionStory.description') }}
 					</div>
 				</div>
 				<div class="button">
-					<a href="mailto:info@code-create.com.hk">Contact Us if Interested</a>
+					<a href="mailto:info@code-create.com.hk">
+						 {{ $t('collectionStory.button') }}
+					</a>
 				</div>
 			</div>
 		</div>

src/views/digitalDetail/index.vue

@@ -222,7 +222,7 @@ defineExpose({})
 				> .left{
 					border-right: 0.5px solid #C4C4C4;
 					.imgBox{
-						padding: 0 30px;
+						padding: 0 3rem;
 					}
 				}
 				> .right{

src/views/digitalItem/index.vue

@@ -4,7 +4,7 @@ import CommodityList from "./commodity-list.vue";
 import MerchantInfo from "./merchant-info.vue";
 import { useRouter } from "vue-router";
 import scListNull from '@/views/shoppingCart/sc-list-null.vue'
-import { getListingMallListApi } from '@/api/listing'
+import { useI18n } from 'vue-i18n'	
 
 // 定义组件名称
 defineOptions({
@@ -14,6 +14,7 @@ defineOptions({
 //})
 //const emit = defineEmits([
 //])
+const { t } = useI18n()
 const categories = ref(['all'])
 const gender = ref(['all'])
 const digitalItemRef = ref(null)
@@ -24,13 +25,13 @@ const commodityListRef = ref(null)
 const searechTypeList = ref([
 	{
 		value:'salesVolume',
-		label:'Best Selling'
+		label:t('digitalItem.BestSelling')
 	},{
 		value:'price',
-		label:'Price: Low to High'
+		label:t('digitalItem.Price')
 	},{
 		value:'updateTime',
-		label:'Newest First'
+		label:t('digitalItem.NewestFirst')
 	},
 ])
 
@@ -64,15 +65,15 @@ defineExpose({})
 		<div class="header-img">
 			<img src="@/assets/images/digitalItem/digital_item_banner.png" alt="">
 			<div class="text">
-				<div class="title">Digital Item</div>
-				<p class="info">Virtual fashion creations collected in your personal archive</p>
+				<div class="title">{{ $t('digitalItem.title') }}</div>
+				<p class="info">{{ $t('digitalItem.info') }}</p>
 			</div>
 		</div>
 		<div class="filters">
 			<div class="filter-item">
-				<el-select v-model="searechType" @change="updateSort" placeholder="Sort By" :teleported="false">
+				<el-select v-model="searechType" @change="updateSort" :placeholder="$t('digitalItem.sortBy')" :teleported="false">
 					<template #label="{ label }">
-						<span class="header-label">Sort By</span>
+						<span class="header-label">{{ $t('digitalItem.sortBy') }}</span>
 						<span class="header-value">{{ label }}</span>
 					</template>
 					<el-option
@@ -103,8 +104,8 @@ defineExpose({})
 					<sc-list-null 
 						nullImage="shopping-cart"
 						:showButton="false" 
-						title="Nothing in Digital Item"
-						tip="Try adjusting your filters or refreshing the page."
+						:title="$t('digitalItem.noData')"
+						:tip="$t('digitalItem.noDataTip')"
 					/>
 				</div>
 				

src/views/digitalItem/merchant-info.vue

@@ -36,15 +36,15 @@ defineExpose({})
 <template>
 	<div class="filters">
 		<div class="title">
-			<div class="left">Filters</div>
-			<div class="right" @click="clearFilters">Clear</div>
+			<div class="left">{{ $t('digitalItem.MerchantInfo.Filters') }}</div>
+			<div class="right" @click="clearFilters">{{ $t('digitalItem.MerchantInfo.Clear') }}</div>
 		</div>
-		<div class="categories">Categories</div>
+		<div class="categories">{{ $t('digitalItem.MerchantInfo.Categories') }}</div>
 		<div class="line"></div>
 		<div class="multiple">
 			<checked :list="categoriesList" @change="handleChange" v-model:selected="categories" />
 		</div>
-		<div class="categories">Gender</div>
+		<div class="categories">{{ $t('digitalItem.MerchantInfo.Gender') }}</div>	
 		<div class="line"></div>
 		<div class="multiple">
 			<checked :list="genderList" @change="handleChange" v-model:selected="gender" />

src/views/wardrobe/Assets.vue

@@ -14,7 +14,7 @@
 			<div class="assets-toolbar">
 				<div class="assets-toolbar__selection">
 					<div class="select-count flex align-center">
-						<img src="@/assets/images/wardrobe/select.png" />
+						<img loading="lazy" src="@/assets/images/wardrobe/select.png" />
 						<span class="assets-toolbar__count">
 							{{ t('Wardrobe.assets.selectedCount', { count: selectedCount }) }}
 						</span>
@@ -38,7 +38,12 @@
 					</div>
 				</div>
 			</div>
-			<div ref="assetsScrollRef" v-if="dataList.length" class="data-list-container" @scroll.passive="handleAssetsScroll">
+			<div
+				ref="assetsScrollRef"
+				v-if="dataList.length"
+				class="data-list-container"
+				@scroll.passive="handleAssetsScroll"
+			>
 				<div ref="dataListRef" class="data-list">
 					<div
 						v-for="(item, index) in dataList"
@@ -67,7 +72,7 @@
 				</div>
 			</div>
 
-			<Empty v-else @explore="goToDigitalItems" />
+			<Empty v-else />
 		</section>
 	</div>
 </template>
@@ -92,6 +97,14 @@
 
 	import { debounce } from 'lodash-es'
 
+	interface Props {
+		sortType?: number
+	}
+
+	const props = withDefaults(defineProps<Props>(), {
+		sortType: 1
+	})
+
 	const buyerId = useUserInfoStore().state.userInfo?.userId
 
 	interface FilterOption {
@@ -126,6 +139,7 @@
 	)
 
 	const dataList = ref([])
+	const rawDataList = ref([]) // Store the original API data
 	const dataListRef = ref<HTMLDivElement | null>(null)
 	const assetsScrollRef = ref<HTMLDivElement | null>(null)
 	const gridColumnCount = shallowRef(1)
@@ -169,15 +183,18 @@
 
 			const content = res.content ?? []
 			if (pageParams.page === 1) {
-				dataList.value = content
+				rawDataList.value = content
 			} else {
-				dataList.value = [...dataList.value, ...content]
+				rawDataList.value = [...rawDataList.value, ...content]
 			}
 
 			hasMoreAssets.value = content.length >= pageParams.size
 			if (hasMoreAssets.value) {
 				pageParams.page += 1
 			}
+
+			// Apply sorting after fetching data
+			applySorting()
 		} finally {
 			if (requestId === assetsRequestId.value) {
 				isLoadingAssets.value = false
@@ -185,6 +202,29 @@
 		}
 	}
 
+	// Function to apply sorting based on sortType
+	const applySorting = () => {
+		if (props.sortType === 1) {
+			// Date Added - use original API order
+			dataList.value = [...rawDataList.value]
+		} else if (props.sortType === 2) {
+			// Selected First - sort by checked status
+			dataList.value = [...rawDataList.value].sort((a, b) => {
+				if (a.checked && !b.checked) return -1
+				if (!a.checked && b.checked) return 1
+				return 0
+			})
+		}
+	}
+
+	// Watch for sortType changes
+	watch(
+		() => props.sortType,
+		() => {
+			applySorting()
+		}
+	)
+
 	watch(
 		() => filters,
 		debounce(() => {
@@ -264,12 +304,20 @@
 
 	const handleSelectItem = (item) => {
 		item.checked = !item.checked
+		// Re-apply sorting when selection changes and sortType is "Selected First"
+		if (props.sortType === 2) {
+			applySorting()
+		}
 	}
 
 	const handleSelectAll = (flag) => {
 		dataList.value.forEach((item) => {
 			item.checked = flag
 		})
+		// Re-apply sorting when selection changes and sortType is "Selected First"
+		if (props.sortType === 2) {
+			applySorting()
+		}
 	}
 
 	const handleDownloadSelected = () => {
@@ -306,10 +354,6 @@
 		return (index + 1) % gridColumnCount.value === 0
 	}
 
-	const goToDigitalItems = () => {
-		router.push('/digitalItem')
-	}
-
 	watch(
 		() => dataList.value.length,
 		async (len) => {

src/views/wardrobe/Empty.vue

@@ -1,22 +1,28 @@
 <script setup lang="ts">
 	import { useI18n } from 'vue-i18n'
+	import { useRouter } from 'vue-router'
 
 	const { t } = useI18n({ useScope: 'global' })
+	const router = useRouter()
 
-const emit = defineEmits<{
-  (event: 'explore'): void
-}>()
+	const handleExplore = () => {
+		router.push('/digitalItem')
+	}
 </script>
 
 <template>
 	<div class="wardrobe-empty flex flex-col flex-center">
-    <img src="@/assets/images/wardrobe/empty-wardrobe.png" class="wardrobe-empty__image" alt="" />
+		<img
+			src="@/assets/images/wardrobe/empty-wardrobe.png"
+			class="wardrobe-empty__image"
+			alt=""
+		/>
 
 		<h2 class="wardrobe-empty__title">{{ t('Wardrobe.empty.title') }}</h2>
 		<p class="wardrobe-empty__description">
 			{{ t('Wardrobe.empty.description') }}
 		</p>
-    <button class="wardrobe-empty__button" type="button" @click="emit('explore')">
+		<button class="wardrobe-empty__button" type="button" @click="handleExplore">
 			{{ t('Wardrobe.empty.action') }}
 		</button>
 	</div>

src/views/wardrobe/Orders.vue

@@ -13,7 +13,7 @@
 			</button>
 		</div>
 
-		<div class="orders-list">
+		<div class="orders-list" v-if="filteredOrders.length">
 			<article v-for="order in filteredOrders" :key="order.orderId" class="order-card">
 				<button
 					class="order-card__toggle"
@@ -27,7 +27,9 @@
 					<div class="order-card__meta">
 						<h3 class="order-card__id">{{ order.orderId }}</h3>
 						<div class="brand flex align-center">
-							<span class="icon"><svg-icon name="order-shop" size="24" /></span>
+							<span class="icon">
+								<svg-icon name="order-shop" size="24" />
+							</span>
 							<span class="text">{{ order.shopName }}</span>
 						</div>
 						<p class="order-card__date">{{ order.formatUpdatetime }}</p>
@@ -39,7 +41,7 @@
 							:key="item.id"
 							class="order-card__thumb"
 							:style="{ backgroundImage: `url(${item.thumbnailUrl})` }"
-						></span>
+						/>
 						<span v-if="getExtraCount(order)" class="order-card__extra">
 							{{ t('Wardrobe.orders.moreItems', { count: getExtraCount(order) }) }}
 						</span>
@@ -83,6 +85,7 @@
 				</div>
 			</article>
 		</div>
+		<Empty v-else />
 	</div>
 </template>
 
@@ -91,6 +94,7 @@
 	import { useI18n } from 'vue-i18n'
 	import { fetchMyOrders } from '@/api/user'
 	import ScItem from '@/views/shoppingCart/sc-item.vue'
+	import Empty from './Empty.vue'
 
 	type OrderStatus = 'all' | 'paid' | 'unpaid' | 'cancelled'
 	type ActualOrderStatus = Exclude<OrderStatus, 'all'>
@@ -232,7 +236,9 @@
 				page: orderParams.value.page,
 				size: orderParams.value.size
 			}
-			const currentStatus = statusOptions.value.find((option) => option.key === activeStatus.value)
+			const currentStatus = statusOptions.value.find(
+				(option) => option.key === activeStatus.value
+			)
 
 			if (currentStatus?.value !== undefined) {
 				params.status = currentStatus.value

src/views/wardrobe/index.vue

@@ -7,7 +7,11 @@
 
 		<div class="wardrobe-shell">
 			<div class="wardrobe-tabs">
-        <div class="wardrobe-tabs__nav" role="tablist" :aria-label="t('Wardrobe.tabs.ariaLabel')">
+				<div
+					class="wardrobe-tabs__nav"
+					role="tablist"
+					:aria-label="t('Wardrobe.tabs.ariaLabel')"
+				>
 					<button
 						v-for="tab in tabs"
 						:key="tab.key"
@@ -24,7 +28,11 @@
 
 				<div v-if="activeTab === 'assets'" class="wardrobe-tabs__sort">
 					<div class="wardrobe-tabs__sort-label">{{ t('Wardrobe.sort.label') }}</div>
-          <el-select v-model="activeSort" :placeholder="t('Wardrobe.sort.placeholder')">
+					<el-select
+						v-model="activeSort"
+						popper-class="wardrobe-sort-dropdown"
+						:placeholder="t('Wardrobe.sort.placeholder')"
+					>
 						<el-option
 							v-for="option in sortOptions"
 							:key="option.value"
@@ -35,7 +43,7 @@
 				</div>
 			</div>
 
-      <component :is="activePanel" class="wardrobe-shell__panel" />
+			<component :is="activePanel" class="wardrobe-shell__panel" :sort-type="activeSort" />
 		</div>
 		<Footer />
 	</div>
@@ -72,10 +80,6 @@ const tabs = computed<TabItem[]>(() => [
 	])
 
 	const sortOptions = computed<SortOption[]>(() => [
-  {
-    label: t('Wardrobe.sort.default'),
-    value: 0
-  },
 		{
 			label: t('Wardrobe.sort.dateAdded'),
 			value: 1
@@ -232,3 +236,13 @@ const activePanel = computed(() => {
 		}
 	}
 </style>
+
+<style lang="less">
+	.wardrobe-sort-dropdown {
+		.el-select-dropdown__list {
+			.el-select-dropdown__item {
+				padding: 0 2rem;
+			}
+		}
+	}
+</style>