Merge branch 'master' of http://159.75.73.143:8080/laiiihz/akuCommunity

* 'master' of http://159.75.73.143:8080/laiiihz/akuCommunity:
  生活缴费默认选中

lib/pages/life_pay/life_pay_page.dart

@@ -1,3 +1,6 @@
+import 'package:akuCommunity/pages/life_pay/life_pay_record_page.dart';
+import 'package:akuCommunity/provider/app_provider.dart';
+import 'package:akuCommunity/ui/profile/house/pick_my_house_page.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
@@ -9,12 +12,9 @@ import 'package:velocity_x/velocity_x.dart';
 import 'package:akuCommunity/base/base_style.dart';
 import 'package:akuCommunity/constants/api.dart';
 import 'package:akuCommunity/model/manager/life_pay_model.dart';
-import 'package:akuCommunity/pages/life_pay/life_pay_record_page.dart';
 import 'package:akuCommunity/pages/life_pay/widget/life_pay_detail_page.dart';
 import 'package:akuCommunity/pages/things_page/widget/bee_list_view.dart';
-import 'package:akuCommunity/provider/app_provider.dart';
 import 'package:akuCommunity/provider/user_provider.dart';
-import 'package:akuCommunity/ui/profile/house/pick_my_house_page.dart';
 import 'package:akuCommunity/utils/bee_parse.dart';
 import 'package:akuCommunity/utils/headers.dart';
 import 'package:akuCommunity/widget/bee_divider.dart';
@@ -213,6 +213,15 @@ class _LifePayPageState extends State<LifePayPage> {
     );
   }
 
+  double getPayTotal(LifePayModel list) {
+    num total = 0;
+    for (var item in list.dailyPaymentTypeVos) {
+      total += ((item.detailedVoList[1].paymentPrice ?? 0) +
+          (item.detailedVoList[2].paymentPrice ?? 0));
+    }
+    return total;
+  }
+
   @override
   Widget build(BuildContext context) {
     UserProvider userProvider = Provider.of<UserProvider>(context);
@@ -236,12 +245,15 @@ class _LifePayPageState extends State<LifePayPage> {
           controller: _controller,
           extraParams: {'estateId': appProvider.selectedHouse.estateId},
           convert: (model) {
-            _selectPay = List.generate(
+            List<LifePayModel> lifePayModels =
-                (_selectPay.length ?? 0) + model.tableList.length,
+                model.tableList.map((e) => LifePayModel.fromJson(e)).toList();
-                (index) => SelectPay(payCount: 0, payTotal: 0.0));
+            _selectPay.addAll(lifePayModels
-            return model.tableList
+                .map((e) => SelectPay(
-                .map((e) => LifePayModel.fromJson(e))
+                      payCount: e.dailyPaymentTypeVos.length,
-                .toList();
+                      payTotal: getPayTotal(e),
+                    ))
+                .toList());
+            return lifePayModels;
           },
           builder: (items) {
             _models = items;
@@ -284,7 +296,7 @@ class _LifePayPageState extends State<LifePayPage> {
                     if (!_selectYears.contains(i)) {
                       _selectYears.add(i);
                     }
-                  }
+                  }  
                   _totalCost = 0;
                   _count = 0;
                   for (var item in _selectPay) {