diff --git a/lib/constants/application_objects.dart b/lib/constants/application_objects.dart index 2a68d565..c5c33107 100644 --- a/lib/constants/application_objects.dart +++ b/lib/constants/application_objects.dart @@ -83,7 +83,7 @@ List userAppObjects = [ AO('我的车', R.ASSETS_ICONS_USER_ICON_WDC_PNG, MineCarPage()), AO('社区活动', R.ASSETS_ICONS_USER_ICON_WDSQHD_PNG, ActivityListPage()), AO('我的缴费', R.ASSETS_ICONS_USER_ICON_WDJF_PNG, LifePayPage()), - AO('我的保修', R.ASSETS_ICONS_USER_ICON_WDBX_PNG, FixedSubmitPage()), + AO('我的报修', R.ASSETS_ICONS_USER_ICON_WDBX_PNG, FixedSubmitPage()), AO('我的地址', R.ASSETS_ICONS_USER_ICON_WDDZ_PNG, AddressPage()), AO('我的管家', R.ASSETS_ICONS_USER_ICON_WDGJ_PNG, Scaffold()), AO('我的访客', R.ASSETS_ICONS_USER_ICON_WDFK_PNG, VisitorAccessPage()), diff --git a/lib/widget/picker/bee_date_picker.dart b/lib/widget/picker/bee_date_picker.dart index 3f28f62d..0657fa48 100644 --- a/lib/widget/picker/bee_date_picker.dart +++ b/lib/widget/picker/bee_date_picker.dart @@ -1,4 +1,5 @@ // Flutter imports: +import 'package:akuCommunity/widget/picker/bee_custom_picker.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; @@ -50,36 +51,16 @@ class __BeeDatePickerState extends State<_BeeDatePicker> { @override Widget build(BuildContext context) { - return SizedBox( - child: Material( - borderRadius: BorderRadius.vertical(top: Radius.circular(10)), - child: Column( - children: [ - SizedBox( - height: 48, - child: NavigationToolbar( - leading: TextButton( - onPressed: Get.back, - child: '取消'.text.black.make(), - ), - trailing: TextButton( - onPressed: () => Get.back(result: _date), - child: '确定'.text.black.make(), - ), - ), - ), - CupertinoDatePicker( - use24hFormat: widget.use24H, - maximumDate: widget.max, - minimumDate: widget.min, - initialDateTime: _date, - onDateTimeChanged: (date) => _date = date, - mode:widget.mode?? CupertinoDatePickerMode.date, - ).expand(), - ], - ), - ), - height: Get.height / 3, + return BeeCustomPicker( + onPressed: () => Get.back(result: _date), + body: CupertinoDatePicker( + use24hFormat: widget.use24H, + maximumDate: widget.max, + minimumDate: widget.min, + initialDateTime: _date, + onDateTimeChanged: (date) => _date = date, + mode: widget.mode ?? CupertinoDatePickerMode.date, + ).expand(), ); } }