From 8f6bac3558dcc783edc7afc2cf49c3148ff72238 Mon Sep 17 00:00:00 2001
From: DaxPay Dev <dev@daxpay.com>
Date: Fri, 3 Jul 2026 14:01:00 +0800
Subject: [PATCH] =?UTF-8?q?fix(merchant):=20=E4=BF=AE=E5=A4=8D=E5=95=86?=
 =?UTF-8?q?=E6=88=B7=E7=94=A8=E6=88=B7/=E5=B9=B3=E5=8F=B0=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=B0=81=E7=A6=81=E5=90=8E=E6=97=A0=E6=B3=95=E8=A7=A3?=
 =?UTF-8?q?=E9=94=81=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

后端 unlock 无条件置为 NORMAL，对 lock/ban 均生效；
解锁条件由 status !== 'lock' 改为 status === 'normal'
---
 apps/daxpay-admin/src/views/iam/user/UserList.vue             | 4 ++--
 .../src/views/payment/merchant/user/MerchantUserList.vue      | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/apps/daxpay-admin/src/views/iam/user/UserList.vue b/apps/daxpay-admin/src/views/iam/user/UserList.vue
index a9ab8c63a..212e0d96b 100644
--- a/apps/daxpay-admin/src/views/iam/user/UserList.vue
+++ b/apps/daxpay-admin/src/views/iam/user/UserList.vue
@@ -222,11 +222,11 @@
           label: $t('iam.user.action.ban'),
           disabled: !hasPermission(PermCodes.Iam.UserManager.STATUS) || row.status === 'ban',
         },
-        // 解锁
+        // 解锁（后端 unlock 无条件置为 NORMAL，对 lock/ban 均生效）
         {
           key: 'unlock',
           label: $t('iam.user.action.unlock'),
-          disabled: !hasPermission(PermCodes.Iam.UserManager.STATUS) || row.status !== 'lock',
+          disabled: !hasPermission(PermCodes.Iam.UserManager.STATUS) || row.status === 'normal',
         },
       ],
       onClick: ({ key }: { key: string }) => {
diff --git a/apps/daxpay-admin/src/views/payment/merchant/user/MerchantUserList.vue b/apps/daxpay-admin/src/views/payment/merchant/user/MerchantUserList.vue
index c4c8b38d8..1110b8318 100644
--- a/apps/daxpay-admin/src/views/payment/merchant/user/MerchantUserList.vue
+++ b/apps/daxpay-admin/src/views/payment/merchant/user/MerchantUserList.vue
@@ -179,7 +179,8 @@
         {
           key: 'unlock',
           label: $t('iam.user.action.unlock'),
-          disabled: row.status !== 'lock',
+          // 后端 unlock 无条件置为 NORMAL，对 lock/ban 均生效
+          disabled: row.status === 'normal',
         },
       ],
       onClick: ({ key }: { key: string }) => {