diff --git a/src/lang/en.ts b/src/lang/en.ts index f94a3b8..d7c62b5 100644 --- a/src/lang/en.ts +++ b/src/lang/en.ts @@ -142,7 +142,6 @@ export default { sort: { label: 'Sort by', placeholder: 'Select', - default: 'Default', dateAdded: 'Date Added', selectedFirst: 'Selected First' }, diff --git a/src/lang/zh-cn.ts b/src/lang/zh-cn.ts index 10de1ad..3fd8852 100644 --- a/src/lang/zh-cn.ts +++ b/src/lang/zh-cn.ts @@ -142,7 +142,6 @@ export default { sort: { label: '排序', placeholder: '请选择', - default: '默认', dateAdded: '添加日期', selectedFirst: '已选优先' }, diff --git a/src/views/wardrobe/Assets.vue b/src/views/wardrobe/Assets.vue index 8571e9c..c9abf9d 100644 --- a/src/views/wardrobe/Assets.vue +++ b/src/views/wardrobe/Assets.vue @@ -14,7 +14,7 @@
- + {{ t('Wardrobe.assets.selectedCount', { count: selectedCount }) }} @@ -38,7 +38,12 @@
-
+
- +
@@ -306,10 +311,6 @@ return (index + 1) % gridColumnCount.value === 0 } - const goToDigitalItems = () => { - router.push('/digitalItem') - } - watch( () => dataList.value.length, async (len) => { diff --git a/src/views/wardrobe/Empty.vue b/src/views/wardrobe/Empty.vue index 6ec150a..adc21fa 100644 --- a/src/views/wardrobe/Empty.vue +++ b/src/views/wardrobe/Empty.vue @@ -1,60 +1,66 @@ diff --git a/src/views/wardrobe/Orders.vue b/src/views/wardrobe/Orders.vue index cdec213..e50cc4c 100644 --- a/src/views/wardrobe/Orders.vue +++ b/src/views/wardrobe/Orders.vue @@ -13,7 +13,7 @@
-
+
+
@@ -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 @@ -192,21 +196,21 @@ const dateLocale = isChinese ? 'zh-CN' : 'en-US' const options: Intl.DateTimeFormatOptions = isChinese ? { - year: 'numeric', - month: 'long', - day: 'numeric', - hour: '2-digit', - minute: '2-digit', - hour12: false - } + year: 'numeric', + month: 'long', + day: 'numeric', + hour: '2-digit', + minute: '2-digit', + hour12: false + } : { - month: 'short', - day: 'numeric', - year: 'numeric', - hour: 'numeric', - minute: '2-digit', - hour12: true - } + month: 'short', + day: 'numeric', + year: 'numeric', + hour: 'numeric', + minute: '2-digit', + hour12: true + } return new Intl.DateTimeFormat(dateLocale, options).format(date) } @@ -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 diff --git a/src/views/wardrobe/index.vue b/src/views/wardrobe/index.vue index a073e63..4cecbd0 100644 --- a/src/views/wardrobe/index.vue +++ b/src/views/wardrobe/index.vue @@ -1,234 +1,248 @@ + +