fix(merchant): 修复商户用户/平台用户封禁后无法解锁的问题

后端 unlock 无条件置为 NORMAL,对 lock/ban 均生效;
解锁条件由 status !== 'lock' 改为 status === 'normal'
This commit is contained in:
DaxPay Dev
2026-07-03 14:01:00 +08:00
parent 7501649953
commit 8f6bac3558
2 changed files with 4 additions and 3 deletions

View File

@@ -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 }) => {

View File

@@ -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 }) => {