From 4c22311e082967d7c01fbb0e1694f7ba165cfdd9 Mon Sep 17 00:00:00 2001 From: zhangyahui Date: Fri, 22 May 2026 11:39:17 +0800 Subject: [PATCH] feat: wardrobe assets --- .prettierrc.json | 16 +- src/api/user.ts | 10 +- src/lang/en.ts | 3 +- src/lang/zh-cn.ts | 3 +- src/utils/ClothesCategory.ts | 4 +- src/views/shoppingCart/sc-item.vue | 3 +- src/views/wardrobe/Assets.vue | 975 +++++++++++++-------------- src/views/wardrobe/FilterSidebar.vue | 301 +++++++++ src/views/wardrobe/Orders.vue | 852 ++++++++++++----------- 9 files changed, 1262 insertions(+), 905 deletions(-) create mode 100644 src/views/wardrobe/FilterSidebar.vue diff --git a/.prettierrc.json b/.prettierrc.json index 66e2335..e6a82c6 100644 --- a/.prettierrc.json +++ b/.prettierrc.json @@ -1,8 +1,10 @@ { - "$schema": "https://json.schemastore.org/prettierrc", - "semi": false, - "tabWidth": 2, - "singleQuote": true, - "printWidth": 100, - "trailingComma": "none" -} \ No newline at end of file + "$schema": "https://json.schemastore.org/prettierrc", + "semi": false, + "tabWidth": 4, + "singleQuote": true, + "printWidth": 100, + "useTabs": true, + "trailingComma": "none", + "vueIndentScriptAndStyle": true +} diff --git a/src/api/user.ts b/src/api/user.ts index f95e98e..ae2967d 100644 --- a/src/api/user.ts +++ b/src/api/user.ts @@ -16,15 +16,19 @@ export const fetchMyWardrobe = (data: WardrobeItem): Promise => { } export interface OrderItem { - status: number // 0未支付 1已支付 2已取消 不穿查全部 + status?: number // 0未支付 1已支付 2已取消 不传查全部 page: number size: number } -export const fetchMyOrders = (data: OrderItem): Promise => { + +export interface OrdersPageResponse { + content: any[] +} + +export const fetchMyOrders = (data: OrderItem): Promise => { return request({ url: '/buyer/buyer/order/page', method: 'get', params: data }) } - diff --git a/src/lang/en.ts b/src/lang/en.ts index ee75b00..f94a3b8 100644 --- a/src/lang/en.ts +++ b/src/lang/en.ts @@ -133,7 +133,6 @@ export default { subtitle: 'Your digital pieces, all in one place', common: { all: 'All', - currencyHkd: 'HKD' }, tabs: { ariaLabel: 'Wardrobe tabs', @@ -187,7 +186,7 @@ export default { } }, ClothesCategories: { - blouses: 'Blouse', + blouse: 'Blouse', dress: 'Dress', trousers: 'Trousers', skirt: 'Skirt', diff --git a/src/lang/zh-cn.ts b/src/lang/zh-cn.ts index 56100c3..10de1ad 100644 --- a/src/lang/zh-cn.ts +++ b/src/lang/zh-cn.ts @@ -133,7 +133,6 @@ export default { subtitle: '你的数字单品尽在此处', common: { all: '全部', - currencyHkd: 'HKD' }, tabs: { ariaLabel: '衣橱标签页', @@ -187,7 +186,7 @@ export default { } }, ClothesCategories: { - blouses: '衬衫', + blouse: '衬衫', dress: '连衣裙', trousers: '裤子', skirt: '短裙', diff --git a/src/utils/ClothesCategory.ts b/src/utils/ClothesCategory.ts index cd8d276..eac9c9f 100644 --- a/src/utils/ClothesCategory.ts +++ b/src/utils/ClothesCategory.ts @@ -6,8 +6,8 @@ type Translate = (key: string) => string const clothesCategoryConfigs = [ { - key: 'blouses', - value: 'blouses' + key: 'blouse', + value: 'blouse' }, { key: 'dress', diff --git a/src/views/shoppingCart/sc-item.vue b/src/views/shoppingCart/sc-item.vue index 4283378..92ecffa 100644 --- a/src/views/shoppingCart/sc-item.vue +++ b/src/views/shoppingCart/sc-item.vue @@ -11,7 +11,7 @@
{{ info.title }}
-
+
{{ info.brand }}
@@ -57,6 +57,7 @@ showDate: { type: Boolean, default: true }, showRemove: { type: Boolean, default: true }, orderActionsLayout: { type: Boolean, default: false }, + showBrand: { type: Boolean, default: true }, info: { type: Object as () => { status: number diff --git a/src/views/wardrobe/Assets.vue b/src/views/wardrobe/Assets.vue index b114e39..2b7847e 100644 --- a/src/views/wardrobe/Assets.vue +++ b/src/views/wardrobe/Assets.vue @@ -1,559 +1,544 @@ diff --git a/src/views/wardrobe/FilterSidebar.vue b/src/views/wardrobe/FilterSidebar.vue new file mode 100644 index 0000000..bae379c --- /dev/null +++ b/src/views/wardrobe/FilterSidebar.vue @@ -0,0 +1,301 @@ + + + + + diff --git a/src/views/wardrobe/Orders.vue b/src/views/wardrobe/Orders.vue index 373e620..cdec213 100644 --- a/src/views/wardrobe/Orders.vue +++ b/src/views/wardrobe/Orders.vue @@ -1,450 +1,516 @@