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