diff --git a/lib/ui/community/facility/facility_preorder_page.dart b/lib/ui/community/facility/facility_preorder_page.dart index 112079a9..75e3416c 100644 --- a/lib/ui/community/facility/facility_preorder_page.dart +++ b/lib/ui/community/facility/facility_preorder_page.dart @@ -180,7 +180,7 @@ class _FacilityPreorderPageState extends State { BotToast.showText(text: '预约成功'); Get.back(result: true); } else if (model.message == '该时段已被预约') { - Get.dialog(_hasBeenOrder()); + await Get.dialog(_hasBeenOrder()); } else { BotToast.showText(text: '预约失败'); } @@ -209,19 +209,19 @@ class _FacilityPreorderPageState extends State { Widget _hasBeenOrder() { return CupertinoAlertDialog( - title: '此设施已被预约'.text.size(32.sp).bold.color(ktextPrimary).make(), - content: '是否查看此设施已被预约时段?'.text.size(28.sp).color(ktextPrimary).make(), + title: '此设施已被预约'.text.size(32.sp).bold.color(ktextPrimary).isIntrinsic.make(), + content: '是否查看此设施已被预约时段?'.text.size(28.sp).color(ktextPrimary).isIntrinsic.make(), actions: [ CupertinoActionSheetAction( onPressed: () { Get.back(); }, - child: '取消'.text.size(26.sp).color(ktextPrimary).make()), + child: '取消'.text.size(30.sp).color(ktextPrimary).isIntrinsic.make()), CupertinoActionSheetAction( onPressed: () { - Get.to(() => FacilityOrderDateListPage(facilitiesId: widget.id)); + Get.off(() => FacilityOrderDateListPage(facilitiesId: typeModel!.id)); }, - child: '查看'.text.size(26.sp).color(kPrimaryColor).make()), + child: '查看'.text.size(30.sp).color(kPrimaryColor).isIntrinsic.make()), ], ); } diff --git a/lib/ui/community/facility/fcility_order_date_list_page.dart b/lib/ui/community/facility/fcility_order_date_list_page.dart index e0397ff4..d327f6a5 100644 --- a/lib/ui/community/facility/fcility_order_date_list_page.dart +++ b/lib/ui/community/facility/fcility_order_date_list_page.dart @@ -51,6 +51,7 @@ class _FacilityOrderDateListPageState extends State { }, builder: (items) { return ListView.separated( + padding: EdgeInsets.all(32.w), itemBuilder: (context, index) { return _buildCard(items[index]); },