物品选择后返回总类页获取数量

lib/const/resource.dart

@@ -124,6 +124,10 @@ class R {
   static const String ASSETS_ICONS_ARTICLE_NAME_PNG =
       'assets/icons/article_name.png';
 
+  /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/borrow_status.png)
+  static const String ASSETS_ICONS_BORROW_STATUS_PNG =
+      'assets/icons/borrow_status.png';
+
   /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/comment_notice.png)
   static const String ASSETS_ICONS_COMMENT_NOTICE_PNG =
       'assets/icons/comment_notice.png';

lib/pages/goods_manage_page/borrow/borrow_goods_page.dart

@@ -21,6 +21,8 @@ class BorrowGoodsPage extends StatefulWidget {
 
 class _BorrowGoodsPageState extends State<BorrowGoodsPage> {
   EasyRefreshController _easyRefreshController;
+  List<int> _submitIds = [];
+  List<int> _counts = [];
   @override
   void initState() {
     super.initState();
@@ -50,6 +52,7 @@ class _BorrowGoodsPageState extends State<BorrowGoodsPage> {
           path: API.manager.articleBorrow,
           controller: _easyRefreshController,
           convert: (models) {
+            _counts.addAll(List.filled(models.tableList.length, 0));
             return models.tableList
                 .map((e) => ArticleBorrowModel.fromJson(e))
                 .toList();
@@ -58,7 +61,7 @@ class _BorrowGoodsPageState extends State<BorrowGoodsPage> {
             return ListView.separated(
                 padding: EdgeInsets.symmetric(vertical: 16.w, horizontal: 32.w),
                 itemBuilder: (context, index) {
-                  return _goodsCard(items[index]);
+                  return _goodsCard(items[index], _counts[index]);
                 },
                 separatorBuilder: (_, __) {
                   return 16.w.heightBox;
@@ -93,7 +96,7 @@ class _BorrowGoodsPageState extends State<BorrowGoodsPage> {
     );
   }
 
-  Widget _goodsCard(ArticleBorrowModel model) {
+  Widget _goodsCard(ArticleBorrowModel model, int index) {
     return Row(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
@@ -137,16 +140,48 @@ class _BorrowGoodsPageState extends State<BorrowGoodsPage> {
               ],
             ),
           ],
-        )
+        ),
+        _counts[index] == 0
+            ? SizedBox()
+            : Column(
+              crossAxisAlignment: CrossAxisAlignment.end,
+                children: [
+                  Container(
+                    alignment: Alignment.center,
+                    width: 40.w,
+                    height: 40.w,
+                    decoration: BoxDecoration(
+                      borderRadius: BorderRadius.circular(20.w),
+                      color: kPrimaryColor,
+                    ),
+                    child: '${_counts[index]}'
+                        .text
+                        .color(ktextPrimary)
+                        .size(24.sp)
+                        .bold
+                        .make(),
+                  ),
+                ],
+              ).expand()
       ],
     )
         .box
         .color(Colors.white)
+        .height(232.w)
+        .width(686.w)
         .padding(EdgeInsets.symmetric(vertical: 24.w, horizontal: 24.w))
         .withRounded(value: 6.w)
         .make()
-        .onInkTap(() {
+        .onInkTap(() async {
-      Get.to(() => BorrowGoodsDetailPage());
+      List<int> ids;
+      await Get.to(() => BorrowGoodsDetailPage(
+            articleId: model.id,
+          )).then((value) {
+        ids = value;
+        _counts[index] = ids.length;
+        _submitIds.addAll(ids);
+        setState(() {});
+      });
     });
   }
 }

lib/pages/goods_manage_page/borrow_goods_detail_page.dart

@@ -6,9 +6,12 @@ import 'package:akuCommunity/pages/goods_deto_page/deto_create_page/widget/commo
 import 'package:akuCommunity/pages/things_page/widget/bee_list_view.dart';
 import 'package:akuCommunity/utils/network/base_model.dart';
 import 'package:akuCommunity/utils/network/net_util.dart';
+import 'package:akuCommunity/widget/animated/animated_scale.dart';
 import 'package:akuCommunity/widget/bee_scaffold.dart';
+import 'package:akuCommunity/widget/buttons/radio_button.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_easyrefresh/easy_refresh.dart';
+import 'package:get/get.dart';
 import 'package:velocity_x/velocity_x.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:akuCommunity/const/resource.dart';
@@ -26,6 +29,7 @@ class _BorrowGoodsDetailPageState extends State<BorrowGoodsDetailPage> {
   List<ArticleBorrowDetailModel> _models;
   bool _onload = true;
   List<int> _selectItems = [];
+  bool get allSelect => _selectItems.length == _models.length;
   @override
   void initState() {
     super.initState();
@@ -58,9 +62,93 @@ class _BorrowGoodsDetailPageState extends State<BorrowGoodsDetailPage> {
                 children: [..._models.map((e) => _goodsCard(e)).toList()],
               ),
       ),
+      bottomNavi: _onload ? _empty() : _bottomButton(),
     );
   }
 
+  Widget _allSelectButton() {
+    return GestureDetector(
+      onTap: () {
+        if (allSelect) {
+          _selectItems.clear();
+        } else {
+          _selectItems.clear();
+          _models.forEach((element) {
+            _selectItems.add(element.id);
+          });
+        }
+        setState(() {});
+      },
+      child: AnimatedContainer(
+        height: 40.w,
+        width: 40.w,
+        decoration: BoxDecoration(
+          border: Border.all(
+            color: allSelect ? kPrimaryColor : Color(0xFF979797),
+            width: 3.w,
+          ),
+          borderRadius: BorderRadius.circular(20.w),
+        ),
+        duration: Duration(milliseconds: 300),
+        curve: Curves.easeInOutCubic,
+        alignment: Alignment.center,
+        child: AnimatedOpacity(
+          duration: Duration(milliseconds: 300),
+          curve: Curves.easeInOutCubic,
+          opacity: allSelect ? 1 : 0,
+          child: AnimatedScale(
+            scale: allSelect ? 1 : 0,
+            child: Container(
+              height: 24.w,
+              width: 24.w,
+              decoration: BoxDecoration(
+                color: kPrimaryColor,
+                borderRadius: BorderRadius.circular(12.w),
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _bottomButton() {
+    return Row(
+      children: [
+        _allSelectButton(),
+        16.w.widthBox,
+        '全选'.text.color(ktextSubColor).size(24.sp).make(),
+        Spacer(),
+        '已选择 '.richText.color(ktextPrimary).size(24.sp).withTextSpanChildren([
+          '${_selectItems.length}'
+              .textSpan
+              .size(32.sp)
+              .color(ktextPrimary)
+              .make(),
+          ' 项'.textSpan.size(24.sp).color(ktextPrimary).make(),
+        ]).make(),
+        32.w.widthBox,
+        MaterialButton(
+          elevation: 0,
+          shape:
+              RoundedRectangleBorder(borderRadius: BorderRadius.circular(37.w)),
+          color: kPrimaryColor,
+          padding: EdgeInsets.symmetric(horizontal: 50.w, vertical: 15.w),
+          onPressed: () {
+            Get.back(result: _selectItems);
+          },
+          child: '确定'.text.black.size(32.sp).bold.make(),
+        ),
+      ],
+    )
+        .pSymmetric(v: 22.w, h: 32.w)
+        .box
+        .color(Colors.white)
+        .width(double.infinity)
+        .padding(EdgeInsets.only(bottom: MediaQuery.of(context).padding.bottom))
+        .make();
+  }
+
   Widget _empty() {
     return Container();
   }
@@ -77,11 +165,24 @@ class _BorrowGoodsDetailPageState extends State<BorrowGoodsDetailPage> {
     return Row(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
-        CommonRadio(
+        GestureDetector(
-          size: 32.w,
+          onTap: () {
+            if (_selectItems.contains(model.id)) {
+              _selectItems.remove(model.id);
+            } else {
+              _selectItems.add(model.id);
+            }
+            setState(() {});
+          },
+          child: Container(
+            height: 232.w - 48.w,
+            alignment: Alignment.center,
+            child: BeeRadio(
               value: model.id,
-          groupValue: _selectItems,
+              groupValues: _selectItems,
+            ),
           ),
+        ).material(color: Colors.transparent),
         24.w.widthBox,
         SizedBox(
           width: 184.w,
@@ -105,7 +206,7 @@ class _BorrowGoodsDetailPageState extends State<BorrowGoodsDetailPage> {
                   height: 40.w,
                 ),
                 4.w.widthBox,
-                '物品名称:'.text.color(ktextSubColor).size(28.sp).make(),
+                '物品名称：'.text.color(ktextSubColor).size(28.sp).make(),
                 '${model.name}'.text.color(ktextPrimary).size(28.sp).make(),
               ],
             ),
@@ -118,7 +219,20 @@ class _BorrowGoodsDetailPageState extends State<BorrowGoodsDetailPage> {
                   height: 40.w,
                 ),
                 4.w.widthBox,
-                '剩余数量:'.text.color(ktextSubColor).size(28.sp).make(),
+                '物品单号：'.text.color(ktextSubColor).size(28.sp).make(),
+                '${model.code}'.text.color(ktextPrimary).size(28.sp).make(),
+              ],
+            ),
+            12.w.heightBox,
+            Row(
+              children: [
+                Image.asset(
+                  R.ASSETS_ICONS_BORROW_STATUS_PNG,
+                  width: 40.w,
+                  height: 40.w,
+                ),
+                4.w.widthBox,
+                '出借状态：'.text.color(ktextSubColor).size(28.sp).make(),
                 '${model.borrowStatus}'
                     .text
                     .color(ktextPrimary)