From 68a6e82253b4f7b0090cbd20f57c47219f0a09cf Mon Sep 17 00:00:00 2001
From: zhangrenyuan <18990852002@163.com>
Date: Mon, 19 Jan 2026 14:29:13 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat(=E6=B6=88=E8=B4=B9=E4=BF=A1=E6=81=AF):?=
=?UTF-8?q?=20=E6=B7=BB=E5=8A=A0=E7=BA=A2=E5=8C=85=E4=BD=BF=E7=94=A8?=
=?UTF-8?q?=E9=80=89=E9=A1=B9=E5=B9=B6=E6=9B=B4=E6=96=B0=E7=9B=B8=E5=85=B3?=
=?UTF-8?q?=E9=AA=8C=E8=AF=81=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/consume/gold/addCoinConsume.vue | 22 +++++++++++++---------
1 file changed, 13 insertions(+), 9 deletions(-)
diff --git a/src/views/consume/gold/addCoinConsume.vue b/src/views/consume/gold/addCoinConsume.vue
index 9de4d8f..34a19bc 100644
--- a/src/views/consume/gold/addCoinConsume.vue
+++ b/src/views/consume/gold/addCoinConsume.vue
@@ -64,7 +64,8 @@ const addConsume = ref({
taskGold: null, // 任务金币
remark: "",//备注
adminId: null,// 当前管理员id
- adminName: adminData.value.adminName
+ adminName: adminData.value.adminName,
+ redMoney: 1 // 是否使用红包：1-使用，0-不使用
})
const Ref = ref(null)
const rules = reactive({
@@ -193,7 +194,7 @@ function validateInput() {
return true;
}
-// 仅在鼠标离开（blur）时校验：sumGold 是否为有效值（无红包逻辑）
+// 仅在鼠标离开（blur）时校验：消耗金币数 + 红包抵扣金额 ≥ 原价
function validateRedLimit() {
const sumGold = parseFloat(addConsume.value.sumGold);
const price = Number(addConsume.value.price || 0);
@@ -245,7 +246,7 @@ function calculateCoins(sumGold) {
remaining = parseFloat((remaining - permanentUsed).toFixed(4));
}
- // 3. 最后消耗任务金币
+ // 最后消耗任务金币
if (remaining > 0 && nowTaskGold > 0) {
const availableTaskGold = parseFloat(nowTaskGold.toFixed(4));
taskUsed = Math.min(availableTaskGold, remaining);
@@ -352,7 +353,8 @@ function resetForm() {
taskGold: null,
remark: "",
adminId: adminData.value.id,
- adminName: adminData.value.adminName
+ adminName: adminData.value.adminName,
+ redMoney: 1 // 默认使用红包
}
// 清空红包相关数据
@@ -455,7 +457,7 @@ const addBefore = () => {
});
return;
}
- if (!validateInput()) {
+ if (!validateInput() || !validateRedLimit()) {
return;
}
ReadCookies.value = `coinConsume:${addConsume.value.jwcode}:${addConsume.value.goodsName.value}`
@@ -600,8 +602,6 @@ watch(
}
);
-/* 红包逻辑已在当前分支移除 */
-
/*
====================红包逻辑=================================
*/
@@ -738,6 +738,10 @@ onMounted(async function () {
+
使用红包
@@ -868,11 +872,11 @@ onMounted(async function () {
{{ user.market }}
-
+
From b0066f222c58222097b40073dd1a460234980a69 Mon Sep 17 00:00:00 2001
From: zhangrenyuan <18990852002@163.com>
Date: Mon, 19 Jan 2026 14:51:22 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat(=E6=B6=88=E8=B4=B9=E4=BF=A1=E6=81=AF):?=
=?UTF-8?q?=20=E6=B7=BB=E5=8A=A0=E7=BA=A2=E5=8C=85=E7=9B=B8=E5=85=B3?=
=?UTF-8?q?=E6=96=87=E6=9C=AC=E5=9B=BD=E9=99=85=E5=8C=96=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/locales/lang/en.js | 5 +++++
src/components/locales/lang/zh-CN.js | 7 ++++++-
src/views/consume/gold/addCoinConsume.vue | 12 ++++++------
3 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/src/components/locales/lang/en.js b/src/components/locales/lang/en.js
index 55cf245..2f4daba 100644
--- a/src/components/locales/lang/en.js
+++ b/src/components/locales/lang/en.js
@@ -616,6 +616,11 @@ export default {
receiveAreaPlaceholder: "Select region",
price: "Price",
goodsNamePlaceholder: "Select product",
+ 使用红包: "Use Red Envelope",
+ 不使用红包: "Do Not Use Red Envelope",
+ 选择红包: "Select Red Envelope",
+ 请选择红包: "Please Select Red Envelope",
+ 已抵扣: "Already Deducted",
payModel: "Collection",
refundType: "Refund Type",
refundTypePlaceholder: "Select type",
diff --git a/src/components/locales/lang/zh-CN.js b/src/components/locales/lang/zh-CN.js
index c6ecbae..1dc8831 100644
--- a/src/components/locales/lang/zh-CN.js
+++ b/src/components/locales/lang/zh-CN.js
@@ -616,6 +616,11 @@ export default {
receiveAreaPlaceholder: "请选择到账地区",
price: "原价",
goodsNamePlaceholder: "请选择商品",
+ 使用红包: "使用红包",
+ 不使用红包: "不使用红包",
+ 选择红包: "选择红包",
+ 请选择红包: "请选择红包",
+ 已抵扣: "已抵扣",
payModel: "收款方式",
refundType: "退款类型",
refundTypePlaceholder: "请选择退款类型",
@@ -686,7 +691,7 @@ export default {
consumptionTimes: "消费次数",
onlyStatisticsDataAfter20250101: "仅统计2025-01-01后的数据",
store: "所属门店",
- // maxReductionAmount: "红包最大抵扣金额",
+ maxReductionAmount: "红包最大抵扣金额",
//金豆
currentPayableBean: "当前付费金豆",
currentFreeBean: "当前免费金豆",
diff --git a/src/views/consume/gold/addCoinConsume.vue b/src/views/consume/gold/addCoinConsume.vue
index 34a19bc..5fab6a0 100644
--- a/src/views/consume/gold/addCoinConsume.vue
+++ b/src/views/consume/gold/addCoinConsume.vue
@@ -180,7 +180,7 @@ function validateInput() {
// 校验消耗金币数是否超过可用金币数
if (user.value.jwcode && sumGold > totalAvailableGold) {
if (addConsume.value.redMoney === 1) {
- ElMessage.error('红包抵扣额不足');
+ ElMessage.error(t('elmessage.limitRedAmount'));
// 如果红包额不足，清空已选红包
selectedReds.value = []
} else {
@@ -744,15 +744,15 @@ onMounted(async function () {
-->
- 使用红包
- 不使用红包
+ {{ t('common_add.使用红包') }}
+ {{ t('common_add.不使用红包') }}
-
+
- 已抵扣: {{ totalRedAmount }}
+ {{ t('common_add.已抵扣') }}: {{ totalRedAmount }}