From 4747489d8440d2c2629a0ee14c86a7cc28644c68 Mon Sep 17 00:00:00 2001 From: zhangyahui Date: Thu, 4 Jun 2026 15:37:29 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=E5=8F=91=E7=A5=A8=E6=9C=AA?= =?UTF-8?q?=E7=94=9F=E6=88=90=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/lang/en.ts | 5 +++-- src/lang/zh-cn.ts | 5 +++-- src/views/wardrobe/Orders.vue | 4 ++++ 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/lang/en.ts b/src/lang/en.ts index 8ab8029..6575f00 100644 --- a/src/lang/en.ts +++ b/src/lang/en.ts @@ -49,7 +49,7 @@ export default { enterNewPassword: 'Enter a new password for
{email}', passwordsDoNotMatch: 'Passwords do not match', logOffTip: 'Are you sure to log off?', - pleaseLogTip: 'Please log in and try again.', + pleaseLogTip: 'Please log in and try again.' }, RegisterSuccess: { title1: 'Welcome to Stylish Parade!', @@ -218,7 +218,8 @@ export default { invoice: 'Invoice', completePayment: 'Complete Payment', buyAgain: 'Buy Again' - } + }, + invoiceMessage: 'Invoice is being prepared. Please refresh later.' }, empty: { title: 'Nothing in Wardrobe yet', diff --git a/src/lang/zh-cn.ts b/src/lang/zh-cn.ts index f0f6230..5ff6a5d 100644 --- a/src/lang/zh-cn.ts +++ b/src/lang/zh-cn.ts @@ -47,7 +47,7 @@ export default { enterNewPassword: '请输入新密码
{email}', passwordsDoNotMatch: '两次输入密码不一致', logOffTip: '确定退出登录吗?', - pleaseLogTip: '请重新登录并重试。', + pleaseLogTip: '请重新登录并重试。' }, RegisterSuccess: { title1: '欢迎来到 Stylish Parade!', @@ -213,7 +213,8 @@ export default { invoice: '发票', completePayment: '完成付款', buyAgain: '再次购买' - } + }, + invoiceMessage: '发票生成中,请稍后刷新页面查看。' }, empty: { title: '衣橱暂无内容', diff --git a/src/views/wardrobe/Orders.vue b/src/views/wardrobe/Orders.vue index ef94297..9814581 100644 --- a/src/views/wardrobe/Orders.vue +++ b/src/views/wardrobe/Orders.vue @@ -283,6 +283,10 @@ const handleClickAction = (order) => { if (order.status === 1) { // 已支付,查看发票 + if (!order.hostedInvoiceUrl) { + ElMessage.primary(t('Wardrobe.orders.invoiceMessage')) + return + } window.open(order.hostedInvoiceUrl, '_blank') return } From 35c3c3aed486db97b48f7c63f280b9127964e76c Mon Sep 17 00:00:00 2001 From: "X1627315083@163.com" <1627315083@qq.com> Date: Thu, 4 Jun 2026 15:53:41 +0800 Subject: [PATCH 2/4] fix --- src/components/CommodityItem.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/components/CommodityItem.vue b/src/components/CommodityItem.vue index 2eb7ef8..3ccbd43 100644 --- a/src/components/CommodityItem.vue +++ b/src/components/CommodityItem.vue @@ -50,7 +50,7 @@
HK${{ props.price }}
@@ -79,6 +79,8 @@ width: 100%; cursor: pointer; height: var(--commodity-height, auto); + aspect-ratio: 0.8/1; + object-fit: cover; margin-bottom: var(--commodity-marginBottom, 1rem); } > .detail { From 46d1b0e381db4c7316f04c93806ead31e8f21f7d Mon Sep 17 00:00:00 2001 From: zhangyahui Date: Mon, 8 Jun 2026 10:12:15 +0800 Subject: [PATCH 3/4] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=E4=BE=9D?= =?UTF-8?q?=E8=B5=96,=E8=A7=A3=E5=86=B3=E5=A4=B4=E5=83=8F=E8=A3=81?= =?UTF-8?q?=E5=89=AA=E5=BC=B9=E7=AA=97=E5=9B=BE=E7=89=87=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=E6=BC=82=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 49f2862..a5c87c6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "hasInstallScript": true, "dependencies": { "axios": "^1.3.6", - "cropper-next-vue": "^0.3.0", + "cropper-next-vue": "^0.3.1", "crypto-js": "^4.2.0", "element-plus": "^2.13.2", "gsap": "^3.13.0", @@ -2155,9 +2155,9 @@ } }, "node_modules/cropper-next-vue": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/cropper-next-vue/-/cropper-next-vue-0.3.0.tgz", - "integrity": "sha512-7xw0gGGCc0bKZhtHZ1BU6cxy9QYN5j2BpgIbM27Zdw8f9+W0FekNxSDVpQ4pGbSR540hVuzA+9uO8obUV7ugeA==", + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/cropper-next-vue/-/cropper-next-vue-0.3.1.tgz", + "integrity": "sha512-B80WRLPavJ/xAjDEofPWLEqnMy99yzXy+Kpak3wMFf+X/TqebvhvBL3fM0P5ZHLRq0v9k0qSAqFjukBhHc3XZA==", "license": "ISC", "engines": { "node": ">=22.0.0" @@ -10162,9 +10162,9 @@ } }, "cropper-next-vue": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/cropper-next-vue/-/cropper-next-vue-0.3.0.tgz", - "integrity": "sha512-7xw0gGGCc0bKZhtHZ1BU6cxy9QYN5j2BpgIbM27Zdw8f9+W0FekNxSDVpQ4pGbSR540hVuzA+9uO8obUV7ugeA==", + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/cropper-next-vue/-/cropper-next-vue-0.3.1.tgz", + "integrity": "sha512-B80WRLPavJ/xAjDEofPWLEqnMy99yzXy+Kpak3wMFf+X/TqebvhvBL3fM0P5ZHLRq0v9k0qSAqFjukBhHc3XZA==", "requires": {} }, "cross-spawn": { diff --git a/package.json b/package.json index 7744696..e03d9a6 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ }, "dependencies": { "axios": "^1.3.6", - "cropper-next-vue": "^0.3.0", + "cropper-next-vue": "^0.3.1", "crypto-js": "^4.2.0", "element-plus": "^2.13.2", "gsap": "^3.13.0", From 73dbd34e0acd1feceff20b1c24b7225129d011cf Mon Sep 17 00:00:00 2001 From: zhangyahui Date: Mon, 8 Jun 2026 11:39:49 +0800 Subject: [PATCH 4/4] =?UTF-8?q?bugfix:=20=E6=88=AA=E5=9B=BE=E6=A1=86?= =?UTF-8?q?=E5=8D=A0=E6=BB=A1=E5=AE=B9=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/setting/components/AvatarCropDialog.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/setting/components/AvatarCropDialog.vue b/src/views/setting/components/AvatarCropDialog.vue index 35444b2..910dbff 100644 --- a/src/views/setting/components/AvatarCropDialog.vue +++ b/src/views/setting/components/AvatarCropDialog.vue @@ -12,7 +12,7 @@