From 39f60bb2c7e378d9e17cbeeb3f468bd69ffdce21 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Tue, 15 Sep 2026 17:43:18 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8?=
=?UTF-8?q?=E5=B1=95=E7=A4=BA=E8=B4=AD=E4=B9=B0=E5=95=86=E5=93=81=E6=95=B0?=
=?UTF-8?q?=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/i18n/pages/order/en.ts | 2 +-
src/i18n/pages/order/zh-cn.ts | 2 +-
src/i18n/pages/order/zh-hk.ts | 2 +-
src/manifest.json | 4 +--
src/pages/root/login.vue | 6 ++--
src/sheep/components/order/order-car.vue | 36 ++++++++++++++++++------
6 files changed, 36 insertions(+), 16 deletions(-)
diff --git a/src/i18n/pages/order/en.ts b/src/i18n/pages/order/en.ts
index a1be7e1..ec2f173 100644
--- a/src/i18n/pages/order/en.ts
+++ b/src/i18n/pages/order/en.ts
@@ -54,7 +54,7 @@ export default {
pendingPay: "Unpaid",
noProduct: "No product",
goodsExpandHint: "{count} item(s), tap to expand",
- goodsOneHint: "1 item",
+ goodsOneHint: "{count} item(s)",
goodsTotal: "{count} item(s)",
expand: "Expand",
collapse: "Collapse",
diff --git a/src/i18n/pages/order/zh-cn.ts b/src/i18n/pages/order/zh-cn.ts
index 1ccc589..51c9ddb 100644
--- a/src/i18n/pages/order/zh-cn.ts
+++ b/src/i18n/pages/order/zh-cn.ts
@@ -54,7 +54,7 @@ export default {
pendingPay: "待支付",
noProduct: "暂无商品",
goodsExpandHint: "共 {count} 件，点击展开",
- goodsOneHint: "共 1 件商品",
+ goodsOneHint: "共 {count} 件商品",
goodsTotal: "共 {count} 件",
expand: "展开",
collapse: "收起",
diff --git a/src/i18n/pages/order/zh-hk.ts b/src/i18n/pages/order/zh-hk.ts
index e8a9144..2ded6c1 100644
--- a/src/i18n/pages/order/zh-hk.ts
+++ b/src/i18n/pages/order/zh-hk.ts
@@ -54,7 +54,7 @@ export default {
pendingPay: "待支付",
noProduct: "暫無商品",
goodsExpandHint: "共 {count} 件，點擊展開",
- goodsOneHint: "共 1 件商品",
+ goodsOneHint: "共 {count} 件商品",
goodsTotal: "共 {count} 件",
expand: "展開",
collapse: "收起",
diff --git a/src/manifest.json b/src/manifest.json
index b83665f..5532fa7 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -2,8 +2,8 @@
"name" : "资安信",
"appid" : "__UNI__1BFE88F",
"description" : "资安信后勤管理系统",
- "versionName" : "1.5.40",
- "versionCode" : 1540,
+ "versionName" : "1.5.41",
+ "versionCode" : 1541,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
diff --git a/src/pages/root/login.vue b/src/pages/root/login.vue
index 472a942..83de7aa 100644
--- a/src/pages/root/login.vue
+++ b/src/pages/root/login.vue
@@ -462,7 +462,7 @@ const doAppleLogin = async () => {
{{
t("mobile.login.forgotPassword") }}
- {{
+ {{
t("mobile.login.register") }}
@@ -471,11 +471,11 @@ const doAppleLogin = async () => {
{{ t("mobile.login.otherLogin")
- }}
+ }}
-
diff --git a/src/sheep/components/order/order-car.vue b/src/sheep/components/order/order-car.vue
index fa988e5..459f5f0 100644
--- a/src/sheep/components/order/order-car.vue
+++ b/src/sheep/components/order/order-car.vue
@@ -55,6 +55,19 @@ const getOrderKey = (order: any, index: number) => String(order?.id ?? index)
const hasMultipleGoods = (order: any) => (order?.carList?.length || 0) > 1
+/** 商品行购买数量；缺失或非正数时返回 0，模板据此隐藏 ×N 角标。 */
+const goodsCount = (item: any) => {
+ const count = Number(item?.productCount ?? 0)
+ return Number.isFinite(count) && count > 0 ? count : 0
+}
+
+/** 订单商品总件数，按各行 productCount 汇总；历史数据缺数量时回退商品种类数，展示与旧口径一致。 */
+const goodsTotalCount = (order: any) => {
+ const list: any[] = order?.carList || []
+ const total = list.reduce((sum, item) => sum + goodsCount(item), 0)
+ return total > 0 ? total : list.length
+}
+
const isGoodsCollapsed = (order: any, index: number) => {
if (!props.goodsCollapsed || !hasMultipleGoods(order)) return false
return collapseState.value[getOrderKey(order, index)] ?? true
@@ -296,13 +309,20 @@ const refundStatusLabel = computed(() => {
:src="filePath(props.cardetail.carList?.[0]?.productPic) || '/static/logo/zax.png'"
mode="aspectFill" />
-
- {{ props.cardetail.carList?.[0]?.productName || t('mobile.order.noProduct') }}
+
+
+ {{ props.cardetail.carList?.[0]?.productName || t('mobile.order.noProduct') }}
+
+
+ ×{{ goodsCount(props.cardetail.carList?.[0]) }}
+
- {{ t('mobile.order.goodsExpandHint', { count: props.cardetail.carList?.length || 0 }) }}
+ {{ t('mobile.order.goodsExpandHint', { count: goodsTotalCount(props.cardetail) }) }}
- {{ t('mobile.order.goodsOneHint') }}
+
+ {{ t('mobile.order.goodsOneHint', { count: goodsTotalCount(props.cardetail) }) }}
@@ -316,6 +336,9 @@ const refundStatusLabel = computed(() => {
{{ item.productName }}
+
+ ×{{ goodsCount(item) }}
+
@@ -328,10 +351,7 @@ const refundStatusLabel = computed(() => {
}}
- {{ t('mobile.order.goodsTotal', {
- count:
- props.cardetail.carList?.length || 0
- }) }}
+ {{ t('mobile.order.goodsTotal', { count: goodsTotalCount(props.cardetail) }) }}