From 8b9e5294fa34bb8cd5991de40cf0f44fc14419d0 Mon Sep 17 00:00:00 2001
From: mengyxu <kekeningxiaobai@sina.com>
Date: Tue, 27 May 2025 15:17:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=A3=85=E5=A4=87=E8=9E=8D?=
 =?UTF-8?q?=E5=90=88BUG=E5=8F=AF=E4=BB=A5=E4=B8=8D=E6=B6=88=E8=80=97?=
 =?UTF-8?q?=E6=9D=90=E6=96=99BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/backpack/equip-menu/fusion/fusion.vue | 3 +++
 src/views/version/update-log.vue                | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/views/backpack/equip-menu/fusion/fusion.vue b/src/views/backpack/equip-menu/fusion/fusion.vue
index 7c7a61c..0058f27 100644
--- a/src/views/backpack/equip-menu/fusion/fusion.vue
+++ b/src/views/backpack/equip-menu/fusion/fusion.vue
@@ -95,6 +95,9 @@ watch(() => prop.equip, (n) => {
 })
 
 const confirmFusion = () => {
+    if (!material.value) {
+        return;
+    }
     if (userCoins.value < needCoins.value) {
         commit("set_sys_info", { msg: t('stNoCoins'), type: "warning", });
         return
diff --git a/src/views/version/update-log.vue b/src/views/version/update-log.vue
index 45b8d27..9a1e896 100644
--- a/src/views/version/update-log.vue
+++ b/src/views/version/update-log.vue
@@ -47,7 +47,8 @@ const updateLogs: any = [{
         '降低太古升2/3星费用',
     ],
     bug: [
-        '修复远古装备也能做融合材料BUG'
+        '修复远古装备也能做融合材料BUG',
+        '修复装备融合BUG可以不消耗材料BUG'
     ]
 }, {
     date: '2025-05-26', version: '1.0',