From a2b2e4e691d1e0ac8aa73d2795b4da81a29a42a3 Mon Sep 17 00:00:00 2001 From: laiiihz Date: Tue, 11 May 2021 17:32:52 +0800 Subject: [PATCH] update --- .../borrow/borrow_goods_detail_page.dart | 18 +++++++++--------- .../borrow/borrow_goods_page.dart | 6 +++--- pubspec.yaml | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/lib/pages/goods_manage_page/borrow/borrow_goods_detail_page.dart b/lib/pages/goods_manage_page/borrow/borrow_goods_detail_page.dart index 5b1c5b1e..43884435 100644 --- a/lib/pages/goods_manage_page/borrow/borrow_goods_detail_page.dart +++ b/lib/pages/goods_manage_page/borrow/borrow_goods_detail_page.dart @@ -28,7 +28,7 @@ class BorrowGoodsDetailPage extends StatefulWidget { class _BorrowGoodsDetailPageState extends State { EasyRefreshController? _easyRefreshController; - late List _models; + List _models = []; bool _onload = true; List? _selectItems = []; bool get allSelect => _selectItems!.length == _models.length; @@ -54,13 +54,13 @@ class _BorrowGoodsDetailPageState extends State { body: EasyRefresh( firstRefresh: true, header: MaterialHeader(), - onRefresh: () async { - List models = await (getModels()); - _models = - models.map((e) => ArticleBorrowDetailModel.fromJson(e)).toList(); - _onload = false; - setState(() {}); - }, + // onRefresh: () async { + // List models = await (getModels()); + // _models = + // models.map((e) => ArticleBorrowDetailModel.fromJson(e)).toList(); + // _onload = false; + // setState(() {}); + // }, child: _onload ? _empty() : ListView( @@ -155,7 +155,7 @@ class _BorrowGoodsDetailPageState extends State { } Widget _empty() { - return Container(); + return ListView(); } Future getModels() async { diff --git a/lib/pages/goods_manage_page/borrow/borrow_goods_page.dart b/lib/pages/goods_manage_page/borrow/borrow_goods_page.dart index e03f2428..965db29c 100644 --- a/lib/pages/goods_manage_page/borrow/borrow_goods_page.dart +++ b/lib/pages/goods_manage_page/borrow/borrow_goods_page.dart @@ -194,7 +194,7 @@ class _BorrowGoodsPageState extends State { .withRounded(value: 6.w) .make() .onInkTap(() async { - _receiveIds!.forEach((element) { + _receiveIds?.forEach((element) { _submitIds.remove(element); }); await Get.to(() => BorrowGoodsDetailPage( @@ -204,8 +204,8 @@ class _BorrowGoodsPageState extends State { .then((value) { _receiveIds = value; }); - _counts[index] = _receiveIds!.length; - _submitIds.addAll(_receiveIds!); + _counts[index] = _receiveIds?.length ?? 0; + _submitIds.addAll(_receiveIds ?? []); setState(() {}); }); } diff --git a/pubspec.yaml b/pubspec.yaml index 36577394..2fd3a68b 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -2,7 +2,7 @@ name: aku_community description: A new Flutter project. publish_to: "none" -version: 1.2.0-dev+37 +version: 1.3.0-dev+38 environment: sdk: ">=2.12.0 <3.0.0"