feats

lib/pages/addressList/index.dart

@@ -57,19 +57,48 @@ class AddressList extends BasicPage {
           child: const Text('确定要删除此地址吗？'),
         ),
         onCancel: () => true,
-        onConfirm: () => {
+        onConfirm: () {
               addressDelete(id).then((value) {
-                List<Address> newslist = [];
-                for (var item in addressController.addressList()) {
-                  if (item.addressId != id) {
-                    newslist.add(item);
-                  }
-                }
-                addressController.addressList(newslist);
-
+                List<Address> list = addressController.addressList.value.toList();
+                list.removeWhere((element) => element.addressId == id);
+                addressController.addressList(list);
                 Fluttertoast.showToast(msg: '删除成功！');
-              }),
+              });
+            });
+  }
+
+  Widget buildList() {
+    return Obx(() {
+      var index = 0;
+      var list = addressController.addressList.value;
+      List<Widget> children = list.map((item) {
+        return AddressCard(
+          No: index ++,
+          item: item,
+          isBack: isBack,
+          onChange: () {
+            onChange(item.addressId);
+          },
+          onEdit: () {
+            Get.offNamed('/addAddress', arguments: {
+              'isBack': isBack,
+              'id': item.addressId,
+              'item': item.address.toString()
             });
+          },
+          onDelete: () {
+            onDelete(item.addressId);
+          },
+          onBack: () {
+            //选择地址
+            addressController.address.value = item;
+            Get.back();
+          },
+        );
+      }).toList();
+
+      return Column(children: children,);
+    });
   }
 
   @override
@@ -83,37 +112,7 @@ class AddressList extends BasicPage {
               //左对齐
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
-                Obx(
-                  () => Column(children: [
-                    ...addressController.addressList().map((item) {
-                      int e = addressController.addressList().indexOf(item);
-
-                      return AddressCard(
-                        No: e + 1,
-                        item: item,
-                        isBack: isBack,
-                        onChange: () {
-                          onChange(item.addressId);
-                        },
-                        onEdit: () {
-                          Get.offNamed('/addAddress', arguments: {
-                            'isBack': isBack,
-                            'id': item.addressId,
-                            'item': item.address.toString()
-                          });
-                        },
-                        onDelete: () {
-                          onDelete(item.addressId);
-                        },
-                        onBack: () {
-                          //选择地址
-                          addressController.address.value = item;
-                          Get.back();
-                        },
-                      );
-                    })
-                  ]),
-                ),
+                buildList(),
                 DefaultButton(
                   color: const Color(0xffffffff),
                   backColor: const Color(0xFFFF703B),

lib/pages/addressList/widget/AddressCard.dart

@@ -2,7 +2,7 @@ import 'package:farmer_client/models/entities/Address.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 
-class AddressCard extends StatefulWidget {
+class AddressCard extends StatelessWidget {
   final Address item;
   final int No;
   final bool isBack;
@@ -21,22 +21,6 @@ class AddressCard extends StatefulWidget {
       required this.onBack})
       : super(key: key);
 
-  @override
-  _AddressCard createState() =>
-      _AddressCard(item, No, onChange, onDelete, onEdit, isBack, onBack);
-}
-
-class _AddressCard extends State<AddressCard> {
-  final Address item;
-  final int No;
-  final bool isBack;
-  final GestureTapCallback onChange;
-  final GestureTapCallback onDelete;
-  final GestureTapCallback onEdit;
-  final GestureTapCallback onBack;
-  _AddressCard(this.item, this.No, this.onChange, this.onDelete, this.onEdit,
-      this.isBack, this.onBack);
-
   @override
   Widget build(BuildContext context) {
     return Container(
@@ -64,7 +48,7 @@ class _AddressCard extends State<AddressCard> {
                   Container(
                     margin: EdgeInsets.fromLTRB(0, 0, 5.w, 0),
                     padding:
-                        EdgeInsets.symmetric(vertical: 1.w, horizontal: 5.w),
+                    EdgeInsets.symmetric(vertical: 1.w, horizontal: 5.w),
                     decoration: BoxDecoration(
                       color: const Color(0xffff0000),
                       borderRadius: BorderRadius.all(Radius.circular(5.w)),
@@ -81,7 +65,7 @@ class _AddressCard extends State<AddressCard> {
                 Text(
                   '我的地址' + No.toString(),
                   style:
-                      TextStyle(fontSize: 15.sp, fontWeight: FontWeight.w700),
+                  TextStyle(fontSize: 15.sp, fontWeight: FontWeight.w700),
                 ),
               ],
             ),
@@ -137,7 +121,7 @@ class _AddressCard extends State<AddressCard> {
                 child: Text(
                   '选择此地址',
                   style:
-                      TextStyle(fontSize: 17.sp, fontWeight: FontWeight.w800),
+                  TextStyle(fontSize: 17.sp, fontWeight: FontWeight.w800),
                 ),
               ),
             ),
@@ -179,4 +163,5 @@ class _AddressCard extends State<AddressCard> {
       ),
     );
   }
+
 }