diff --git a/lib/app/modules/hi_menu/views/hi_menu_view.dart b/lib/app/modules/hi_menu/views/hi_menu_view.dart index 301a4e0..8dc50df 100755 --- a/lib/app/modules/hi_menu/views/hi_menu_view.dart +++ b/lib/app/modules/hi_menu/views/hi_menu_view.dart @@ -39,7 +39,7 @@ class HIMenuView extends GetView { Obx(() { final account = KRAppRunData.getInstance().kr_account.value; final isDeviceLogin = account != null && account.startsWith('9000'); - final accountText = isDeviceLogin ? '待绑定' : 'ID: ${KRAppRunData.getInstance().kr_account.value.toString()}'; + final accountText = isDeviceLogin ? '待绑定' : '${KRAppRunData.getInstance().kr_account.value.toString()}'; return UserInfoCard( controller: controller, userId: accountText, diff --git a/lib/app/modules/hi_user_info/views/hi_user_info_view.dart b/lib/app/modules/hi_user_info/views/hi_user_info_view.dart index 3aa6188..6d89c19 100755 --- a/lib/app/modules/hi_user_info/views/hi_user_info_view.dart +++ b/lib/app/modules/hi_user_info/views/hi_user_info_view.dart @@ -77,7 +77,7 @@ class HIUserInfoView extends GetView { account.startsWith('9000'); final accountText = isDeviceLogin ? '待绑定' - : 'ID: ${KRAppRunData.getInstance().kr_account.value.toString()}'; + : '${KRAppRunData.getInstance().kr_account.value.toString()}'; return Text( accountText, style: TextStyle( @@ -494,19 +494,11 @@ class HIUserInfoView extends GetView { fontWeight: FontWeight.w600, ), ) - /*Obx(() { - // final current = controller.kr_subscribeService.kr_currentSubscribe.value; - - // 如果 current 为 null,显示默认值 0 - // final deviceLimit = current?.deviceLimit ?? 0; - - return - }),*/ ], ), ), confirmText: KRAppRunData.getInstance().isDeviceLogin() ? '前往' : null, - cancelText: '取消', + cancelText: KRAppRunData.getInstance().isDeviceLogin() ? '取消' : null, onConfirm: () { Get.toNamed( Routes.MR_LOGIN, diff --git a/lib/app/modules/kr_delete_account/controllers/kr_delete_account_controller.dart b/lib/app/modules/kr_delete_account/controllers/kr_delete_account_controller.dart index 1297e7c..93da001 100755 --- a/lib/app/modules/kr_delete_account/controllers/kr_delete_account_controller.dart +++ b/lib/app/modules/kr_delete_account/controllers/kr_delete_account_controller.dart @@ -6,6 +6,7 @@ import 'package:kaer_with_panels/app/model/enum/kr_request_type.dart'; import 'package:kaer_with_panels/app/services/api_service/kr_auth_api.dart'; import 'package:kaer_with_panels/app/utils/kr_common_util.dart'; import 'package:kaer_with_panels/app/services/kr_subscribe_service.dart'; +import 'package:kaer_with_panels/app/widgets/dialogs/hi_dialog.dart'; import '../../../localization/app_translations.dart'; @@ -65,6 +66,11 @@ class KRDeleteAccountController extends GetxController { KRCommonUtil.kr_showToast(error.msg); }, (success) { + HIDialog.show( + title: '*重要提示', + message: + '验证邮件已发送至邮箱,如无法找到,请检查垃圾邮件箱或营销邮件箱。', + ); kr_canSendCode.value = false; kr_countdown.value = 60; diff --git a/lib/app/modules/kr_delete_account/views/kr_delete_account_view.dart b/lib/app/modules/kr_delete_account/views/kr_delete_account_view.dart index 6cbe66d..79a9c08 100755 --- a/lib/app/modules/kr_delete_account/views/kr_delete_account_view.dart +++ b/lib/app/modules/kr_delete_account/views/kr_delete_account_view.dart @@ -136,7 +136,7 @@ class KRDeleteAccountView extends GetView { account.startsWith('9000'); final accountText = isDeviceLogin ? '待绑定' - : 'ID: ${KRAppRunData.getInstance().kr_account.value.toString()}'; + : '${KRAppRunData.getInstance().kr_account.value.toString()}'; return Text( accountText, style: TextStyle( diff --git a/lib/app/modules/kr_login/controllers/kr_login_controller.dart b/lib/app/modules/kr_login/controllers/kr_login_controller.dart index 56c7c73..008f157 100755 --- a/lib/app/modules/kr_login/controllers/kr_login_controller.dart +++ b/lib/app/modules/kr_login/controllers/kr_login_controller.dart @@ -326,6 +326,12 @@ class KRLoginController extends GetxController either.fold((l) { KRCommonUtil.kr_showToast(l.msg); }, (r) async { + HIDialog.show( + title: '*重要提示', + message: + '验证邮件已发送至邮箱,如无法找到,请检查垃圾邮件箱或营销邮件箱。', + ); + _startCountdown(); }); } @@ -388,7 +394,13 @@ class KRLoginController extends GetxController ); either.fold( - (l) => KRCommonUtil.kr_showToast(l.msg), + (l) { + HIDialog.show( + message: l.msg, + preventBackDismiss: true, + confirmText: '确定', + ); + }, (r) async { _saveLoginData(r); KRCommonUtil.kr_showToast('登录成功'); diff --git a/lib/app/modules/kr_login/views/kr_login_view.dart b/lib/app/modules/kr_login/views/kr_login_view.dart index 25f6777..d9884f0 100755 --- a/lib/app/modules/kr_login/views/kr_login_view.dart +++ b/lib/app/modules/kr_login/views/kr_login_view.dart @@ -86,7 +86,7 @@ class KRLoginView extends GetView { account.startsWith('9000'); final accountText = isDeviceLogin ? '待绑定' - : 'ID: ${KRAppRunData.getInstance().kr_account.value.toString()}'; + : '${KRAppRunData.getInstance().kr_account.value.toString()}'; return Text( accountText,