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] =?UTF-8?q?feat(=E6=B6=88=E8=B4=B9=E4=BF=A1=E6=81=AF):=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BA=A2=E5=8C=85=E4=BD=BF=E7=94=A8=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9=E5=B9=B6=E6=9B=B4=E6=96=B0=E7=9B=B8=E5=85=B3=E9=AA=8C?=
 =?UTF-8?q?=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 () {
           <el-input v-model="addConsume.price" style="width: 120px" disabled />
         </el-form-item>
 
+        <!-- <el-form-item prop="sumGold" :label="t('common_add.consumeTotalGold')">
+          <el-input v-model="addConsume.sumGold" style="width: 120px" 
+          @blur="validateRedLimit()" />
+        </el-form-item> -->
         <el-form-item prop="sumGold" :label="t('common_add.consumeTotalGold')">
           <el-input v-model="addConsume.sumGold" style="width: 120px" @blur="validateRedLimit()" :disabled="addConsume.redMoney === 1" />
           <el-radio v-model="addConsume.redMoney" :label="1" style="margin-left: 10px;">使用红包</el-radio>
@@ -868,11 +872,11 @@ onMounted(async function () {
                 <p>{{ user.market }}</p>
               </el-form-item>
             </el-col>
-            <!-- <el-col :span="14">
+            <el-col :span="14">
               <el-form-item :label="$t('common_add_user.maxReductionAmount')">
                 <p style="color: #2fa1ff">{{ user.red }} </p>
               </el-form-item>
-            </el-col> -->
+            </el-col>
           </el-row>
         </el-form>
       </el-card>