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 }}
-
+