diff --git a/star_lock/lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetail/electronicKeyDetail_logic.dart b/star_lock/lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetail/electronicKeyDetail_logic.dart index 6de796a0..ba70139e 100644 --- a/star_lock/lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetail/electronicKeyDetail_logic.dart +++ b/star_lock/lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetail/electronicKeyDetail_logic.dart @@ -247,18 +247,17 @@ class ElectronicKeyDetailLogic extends BaseGetXController { Future openModalBottomSheet(BuildContext context) async { var textList = []; - if (CommonDataManage().currentKeyInfo.keyRight == 1) { + if (state.itemData.value.keyRight == 1) { + // 授权管理员 textList = [ - state.itemData.value.keyStatus == XSConstantMacro.keyStatusFrozen - ? '取消冻结'.tr - : "冻结".tr + state.itemData.value.keyStatus == XSConstantMacro.keyStatusFrozen ? '取消冻结'.tr : "冻结".tr, + "取消授权".tr ]; } else if (CommonDataManage().currentKeyInfo.isLockOwner == 1) { + // 锁拥有者 if (state.keyType.value == 1 || state.keyType.value == 2) { textList = [ - state.itemData.value.keyStatus == XSConstantMacro.keyStatusFrozen - ? '取消冻结'.tr - : "冻结".tr, + state.itemData.value.keyStatus == XSConstantMacro.keyStatusFrozen ? '取消冻结'.tr : "冻结".tr, state.itemData.value.keyRight == 1 ? '取消授权'.tr : '授权'.tr ]; } else if (state.keyType.value == 4) { @@ -268,6 +267,10 @@ class ElectronicKeyDetailLogic extends BaseGetXController { : "冻结".tr ]; } + }else{ + textList = [ + state.itemData.value.keyStatus == XSConstantMacro.keyStatusFrozen ? '取消冻结'.tr : "冻结".tr, + ]; } showModalBottomSheet( context: context, @@ -280,8 +283,7 @@ class ElectronicKeyDetailLogic extends BaseGetXController { chooseCallback: (value) { int index = value; if (index == 0) { - if (state.itemData.value.keyStatus == - XSConstantMacro.keyStatusFrozen) { + if (state.itemData.value.keyStatus == XSConstantMacro.keyStatusFrozen) { // 取消冻结 if (state.itemData.value.keyRight == 1) { // 管理员