合并代码

This commit is contained in:
魏少阳 2023-07-29 18:45:48 +08:00
parent b8f44e330c
commit bcc4d5e69a
2 changed files with 12 additions and 4 deletions

View File

@ -1,4 +1,5 @@
import 'package:get/get.dart';
import 'package:star_lock/common/safetyVerification/safetyVerification_binding.dart';
import 'package:star_lock/login/register/starLock_register_binding.dart';
import 'package:star_lock/mine/minePersonInfo/minePersonInfoEmail/minePersonInfoEmail_page.dart';
import 'package:star_lock/mine/mineSet/authorizedAdministrator/addAuthorizedAdministrator_page.dart';
@ -10,7 +11,7 @@ import 'package:star_lock/mine/mineSet/transferSmartLock/recipientInformation_pa
import 'package:star_lock/mine/mineSet/transferSmartLock/selectBranch_page.dart';
import 'package:star_lock/mine/mineSet/transferSmartLock/transferSmartLock_page.dart';
import 'common/safetyVerification_page.dart';
import 'common/safetyVerification/safetyVerification_page.dart';
import 'login/forgetPassword/starLock_forgetPassword_page.dart';
import 'login/login/starLock_login_page.dart';
import 'login/register/starLock_register_page.dart';
@ -24,6 +25,7 @@ import 'main/lockDetail/checkingIn/checkingInSetHolidays/checkingInSetHolidays_p
import 'main/lockDetail/checkingIn/checkingInSetStaffManage/checkingInStaffManage_page.dart';
import 'main/lockDetail/checkingIn/checkingInSetWorkTime/checkingInSetWorkTime_page.dart';
import 'main/lockDetail/checkingIn/checkingInSetWorkdaySet/checkingInSetWorkdaySet_page.dart';
import 'main/lockDetail/electronicKey/electronicKeyDetail/keyOperationRecord_page.dart';
import 'main/lockDetail/lcokSet/automaticBlocking/automaticBlocking_page.dart';
import 'main/lockDetail/lcokSet/basicInformation/adminOpenLockPassword/adminOpenLockPassword_page.dart';
import 'main/lockDetail/lcokSet/basicInformation/basicInformation/basicInformation_page.dart';
@ -263,6 +265,8 @@ abstract class Routers {
static const starLockForgetPasswordPage = '/StarLockForgetPasswordPage'; //
static const seletCountryRegionPage = '/SeletCountryRegionPage'; //
static const safetyVerificationPage = '/SafetyVerificationPage'; //
static const keyOperationRecordPage = '/keyOperationRecordPage'; //-
}
abstract class AppRouters {
@ -698,10 +702,14 @@ abstract class AppRouters {
),
GetPage(
name: Routers.safetyVerificationPage,
page: () => const SafetyVerificationPage()
page: () => const SafetyVerificationPage(),
binding: SafetyVerificationBinding(),
),
GetPage(
name: Routers.ownedKeyListPage, page: () => const OwnedKeyListPage()
)
),
GetPage(
name: Routers.keyOperationRecordPage,
page: () => const KeyOperationRecordPage())
];
}

View File

@ -78,7 +78,7 @@ class _ElectronicKeyDetailPageState extends State<ElectronicKeyDetailPage> {
rightTitle: "",
isHaveDirection: true,
action: () {
Navigator.pushNamed(context, Routers.keyOperationRecordPage);
Navigator.pushNamed(context, Routers.keyOperationRecordPage, arguments: {});
}),
Container(height: 40.h),
SubmitBtn(