From 4a2158d48c895fc58783e6085a4cbf180ecfcbcf Mon Sep 17 00:00:00 2001 From: zhangmeng <494089941@qq.com> Date: Mon, 31 May 2021 15:57:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E6=89=80=E6=9C=89?= =?UTF-8?q?=E5=BA=94=E7=94=A8-=E5=BA=94=E7=94=A8=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=BB=91=E5=8A=A8=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=20=E8=AE=BE=E6=96=BD=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=E9=A1=B5tab=E6=98=BE=E7=A4=BA=E9=A1=BA=E5=BA=8F=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=20=E4=BF=AE=E5=A4=8D=20=E8=AE=BE=E6=96=BD?= =?UTF-8?q?=E6=A3=80=E6=9F=A5=E9=A6=96=E9=A1=B5=20=E6=A0=87=E9=A2=98?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=20=E5=BD=92=E8=BF=98=E9=92=A5=E5=8C=99=20?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E7=B1=BB=E5=9E=8B=E9=94=99=E8=AF=AF=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../home/application/applications_page.dart | 5 +++-- .../facilities/facilities_card.dart | 19 ++++++++++--------- .../facilities/facilities_page.dart | 2 +- .../facilities/facilities_select_page.dart | 2 +- .../key_manage/key_manage_card.dart | 2 +- 5 files changed, 16 insertions(+), 14 deletions(-) diff --git a/lib/ui/home/application/applications_page.dart b/lib/ui/home/application/applications_page.dart index 0ff454f..6c03f08 100644 --- a/lib/ui/home/application/applications_page.dart +++ b/lib/ui/home/application/applications_page.dart @@ -232,6 +232,7 @@ class _ApplicationPageState extends State child: Material( color: Colors.white, child: PageView( + physics: NeverScrollableScrollPhysics(), controller: _pageController, scrollDirection: Axis.vertical, onPageChanged: (index) { @@ -244,7 +245,7 @@ class _ApplicationPageState extends State gridDelegate: SliverGridDelegateWithFixedCrossAxisCount( crossAxisCount: 3, ), - physics: NeverScrollableScrollPhysics(), + // physics: NeverScrollableScrollPhysics(), itemBuilder: (context, index) { final application = _recommandApplications[index]; return _buildBottomAppCard(application); @@ -255,7 +256,7 @@ class _ApplicationPageState extends State gridDelegate: SliverGridDelegateWithFixedCrossAxisCount( crossAxisCount: 3, ), - physics: NeverScrollableScrollPhysics(), + // physics: NeverScrollableScrollPhysics(), itemBuilder: (context, index) { final application = _wisdomApplications[index]; return _buildBottomAppCard(application); diff --git a/lib/ui/manage_pages/facilities/facilities_card.dart b/lib/ui/manage_pages/facilities/facilities_card.dart index c0dc3e6..a909739 100644 --- a/lib/ui/manage_pages/facilities/facilities_card.dart +++ b/lib/ui/manage_pages/facilities/facilities_card.dart @@ -109,16 +109,8 @@ class _FacilitiesCardState extends State { _buildTile(R.ASSETS_MANAGE_CLOCK_PNG, '任务时间', '${DateUtil.formatDateStr(widget.model.beginDate, format: 'yyyy-MM-dd HH:mm')}-${DateUtil.formatDateStr(widget.model.endDate, format: 'HH;mm')}'), ]; + case 1: - return [ - 15.w.heightBox, - _buildTile(R.ASSETS_MANAGE_CLOCK_PNG, '未完成原因', widget.model.detail, - color: Colors.red), - 15.w.heightBox, - _buildTile(R.ASSETS_MANAGE_CLOCK_PNG, '规定任务时间', - '${DateUtil.formatDateStr(widget.model.beginDate, format: 'yyyy-MM-dd HH:mm')}-${DateUtil.formatDateStr(widget.model.endDate, format: 'HH;mm')}'), - ]; - case 2: return [ 15.w.heightBox, _buildTile( @@ -134,6 +126,15 @@ class _FacilitiesCardState extends State { DateUtil.formatDateStr(widget.model.checkDate, format: 'yyyy-MM-dd HH:mm')), ]; + case 2: + return [ + 15.w.heightBox, + _buildTile(R.ASSETS_MANAGE_CLOCK_PNG, '未完成原因', widget.model.detail, + color: Colors.red), + 15.w.heightBox, + _buildTile(R.ASSETS_MANAGE_CLOCK_PNG, '规定任务时间', + '${DateUtil.formatDateStr(widget.model.beginDate, format: 'yyyy-MM-dd HH:mm')}-${DateUtil.formatDateStr(widget.model.endDate, format: 'HH;mm')}'), + ]; default: return []; } diff --git a/lib/ui/manage_pages/facilities/facilities_page.dart b/lib/ui/manage_pages/facilities/facilities_page.dart index adfad37..cb659fd 100644 --- a/lib/ui/manage_pages/facilities/facilities_page.dart +++ b/lib/ui/manage_pages/facilities/facilities_page.dart @@ -20,7 +20,7 @@ class FacilitiesPage extends StatefulWidget { class _FacilitiesPageState extends State with TickerProviderStateMixin { List get _tabs { - return ['待检查', '未完成', '已完成']; + return ['待检查', '已完成', '未完成']; } TabController _tabController; diff --git a/lib/ui/manage_pages/facilities/facilities_select_page.dart b/lib/ui/manage_pages/facilities/facilities_select_page.dart index 4e5cbc5..422a290 100644 --- a/lib/ui/manage_pages/facilities/facilities_select_page.dart +++ b/lib/ui/manage_pages/facilities/facilities_select_page.dart @@ -19,7 +19,7 @@ class _FacilitiesSelectPageState extends State { @override Widget build(BuildContext context) { return AkuScaffold( - title: '借还管理', + title: '设施检查', body: ListView( padding: EdgeInsets.symmetric(vertical: 40.w, horizontal: 36.w), children: [ diff --git a/lib/ui/manage_pages/key_manage/key_manage_card.dart b/lib/ui/manage_pages/key_manage/key_manage_card.dart index afd9875..634e535 100644 --- a/lib/ui/manage_pages/key_manage/key_manage_card.dart +++ b/lib/ui/manage_pages/key_manage/key_manage_card.dart @@ -101,7 +101,7 @@ class _KeyManageCardState extends State { case 2: button = _bottomButton('归还钥匙', () async { BaseModel baseModel = await NetUtil() - .post(API.manage.returnKey, params: {"keyId": widget.model.id}); + .get(API.manage.returnKey, params: {"keyId": widget.model.id}); BotToast.showText(text: baseModel.message); widget.callRefresh(); }, Color(0xFFFFC40C), Colors.black);