diff --git a/package.json b/package.json index 6dc98a6..7c61148 100644 --- a/package.json +++ b/package.json @@ -90,4 +90,4 @@ "vite": "5.2.8", "vue-tsc": "^1.0.24" } -} +} \ No newline at end of file diff --git a/src/i18n/pages/order/zh-cn.ts b/src/i18n/pages/order/zh-cn.ts index cc575c3..dcedfd1 100644 --- a/src/i18n/pages/order/zh-cn.ts +++ b/src/i18n/pages/order/zh-cn.ts @@ -8,12 +8,12 @@ export default { tab: { all: "全部", pendingShip: "待发货", - pendingReceive: "待收货/待使用", + pendingReceive: "待收货/待核销", received: "已核销/已收货", afterSale: "售后", pendingPay: "待支付", closed: "已关闭", - pendingUse: "待使用", + pendingUse: "待核销", afterSaleing: "售后中", completed: "已完成", }, @@ -66,7 +66,7 @@ export default { }, status: { pendingPay: "待支付", - pendingUse: "待使用", + pendingUse: "待核销", pendingShip: "待发货", paid: "已支付", pendingReceive: "待收货", diff --git a/src/i18n/pages/order/zh-hk.ts b/src/i18n/pages/order/zh-hk.ts index 28c7fe7..d73215c 100644 --- a/src/i18n/pages/order/zh-hk.ts +++ b/src/i18n/pages/order/zh-hk.ts @@ -8,12 +8,12 @@ export default { tab: { all: "全部", pendingShip: "待發貨", - pendingReceive: "待收貨/待使用", + pendingReceive: "待收貨/待核销", received: "已核銷/已收貨", afterSale: "售後", pendingPay: "待支付", closed: "已關閉", - pendingUse: "待使用", + pendingUse: "待核销", afterSaleing: "售後中", completed: "已完成", }, @@ -66,7 +66,7 @@ export default { }, status: { pendingPay: "待支付", - pendingUse: "待使用", + pendingUse: "待核销", pendingShip: "待發貨", paid: "已支付", pendingReceive: "待收貨", diff --git a/src/manifest.json b/src/manifest.json index b04c08c..8a129ec 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -2,8 +2,8 @@ "name" : "资安信", "appid" : "__UNI__1BFE88F", "description" : "资安信后勤管理系统", - "versionName" : "1.5.36", - "versionCode" : 1536, + "versionName" : "1.5.37", + "versionCode" : 1537, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/src/sheep/components/order/order-reservation-card.vue b/src/sheep/components/order/order-reservation-card.vue index b2dceea..a149d55 100644 --- a/src/sheep/components/order/order-reservation-card.vue +++ b/src/sheep/components/order/order-reservation-card.vue @@ -75,7 +75,7 @@ const mealSlotText = computed( const dinerName = computed(() => props.cardetail?.username || t("mobile.order.unknownUser")) -/** 卡片视觉态:待使用 / 售后成功 / 已完成,决定色条与日期数字颜色。 */ +/** 卡片视觉态:待核销 / 售后成功 / 已完成,决定色条与日期数字颜色。 */ const visualStatus = computed<"pending" | "refundSuccess" | "completed" | "other">(() => { const refundStatus = String(props.cardetail?.refundStatus || "0") const orderStatus = String(props.cardetail?.orderStatus || "") @@ -135,7 +135,7 @@ const showRefundButton = computed( const showDetailButton = computed(() => Boolean(props.cardetail?.id)) -/** 待使用卡片「详情」用实心深色,其余描边,贴近设计稿。 */ +/** 待核销卡片「详情」用实心深色,其余描边,贴近设计稿。 */ const detailBtnSolid = computed(() => visualStatus.value === "pending") const doRefund = () => { @@ -174,7 +174,8 @@ const doDetail = () => { - {{ t("mobile.order.list.comboAmount", { count: productCount }) }} + {{ t("mobile.order.list.comboAmount", { count: productCount }) + }} ¥{{ hooks.useMoney(cardetail.payPrice) }} @@ -199,12 +200,8 @@ const doDetail = () => { {{ hasAfterSale ? t("mobile.order.continueRefund") : t("mobile.order.list.applyRefund") }} - + {{ t("mobile.order.detailBtn") }}