From 416e9c96fb445545eed6c16a3a4ef36896116c03 Mon Sep 17 00:00:00 2001
From: zhang <494089941@qq.com>
Date: Mon, 8 Feb 2021 14:58:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=88=BF=E5=B1=8B=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BF=AE=E5=A4=8D=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E6=90=AC=E5=AE=B6=E5=85=AC=E5=8F=B8=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E4=B8=BA=E8=87=AA=E5=B7=B1=E6=90=AC=E8=BF=90=EF=BC=8C=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E7=82=B9=E5=87=BB=E5=8C=BA=E5=9F=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../deto_create_page/deto_create_page.dart    |  2 +-
 .../select_move_company_page.dart             |  7 +-
 lib/pages/life_pay/widget/my_house_page.dart  | 68 +++++++++----------
 3 files changed, 39 insertions(+), 38 deletions(-)

diff --git a/lib/pages/goods_deto_page/deto_create_page/deto_create_page.dart b/lib/pages/goods_deto_page/deto_create_page/deto_create_page.dart
index c2c9218a..25527269 100644
--- a/lib/pages/goods_deto_page/deto_create_page/deto_create_page.dart
+++ b/lib/pages/goods_deto_page/deto_create_page/deto_create_page.dart
@@ -54,7 +54,7 @@ class _DetoCreatePageState extends State<DetoCreatePage> {
     '50kg-100kg',
     '> 100kg',
   ];
-  int _selectApproach;
+  int _selectApproach=0;
   List<String> _listMode = [
     '自己搬运',
     '搬家公司',
diff --git a/lib/pages/goods_deto_page/select_move_company_page.dart b/lib/pages/goods_deto_page/select_move_company_page.dart
index ff8c1821..4a346e7f 100644
--- a/lib/pages/goods_deto_page/select_move_company_page.dart
+++ b/lib/pages/goods_deto_page/select_move_company_page.dart
@@ -31,7 +31,7 @@ class _SelectMoveCompanyPageState extends State<SelectMoveCompanyPage> {
   bool _onloading = true;
   String get result {
     if (_selected == _companyModel.appMovingCompanyVoList.length) {
-      return null;
+      return '已选择自己联系';
     } else {
       return _companyModel.appMovingCompanyVoList[_selected].tel;
     }
@@ -92,7 +92,7 @@ class _SelectMoveCompanyPageState extends State<SelectMoveCompanyPage> {
               ],
             ).expand(),
           ],
-        ),
+        ).material(color: Colors.transparent),
       ),
     );
   }
@@ -104,6 +104,7 @@ class _SelectMoveCompanyPageState extends State<SelectMoveCompanyPage> {
         setState(() {});
       },
       child: Container(
+        width: double.infinity,
         padding: EdgeInsets.symmetric(vertical: 28.w),
         child: Row(
           crossAxisAlignment: CrossAxisAlignment.center,
@@ -119,7 +120,7 @@ class _SelectMoveCompanyPageState extends State<SelectMoveCompanyPage> {
             '自己联系'.text.color(ktextPrimary).size(28.sp).bold.make()
           ],
         ),
-      ),
+      ).material(color: Colors.transparent),
     );
   }
 
diff --git a/lib/pages/life_pay/widget/my_house_page.dart b/lib/pages/life_pay/widget/my_house_page.dart
index 46202211..1f4b040a 100644
--- a/lib/pages/life_pay/widget/my_house_page.dart
+++ b/lib/pages/life_pay/widget/my_house_page.dart
@@ -49,8 +49,9 @@ Widget _unPaidTag() {
 
 class _MyHousePageState extends State<MyHousePage> {
   int _select;
-  List<EstatePaymentModel> _list;
-  List<EstatePaymentModel> get _unPaidList => _list.where((element) => element.status == 1).toList();
+  List<EstatePaymentModel> _list = [];
+  List<EstatePaymentModel> get _unPaidList =>
+      _list.where((element) => element.status == 1).toList();
   @override
   void initState() {
     super.initState();
@@ -59,7 +60,6 @@ class _MyHousePageState extends State<MyHousePage> {
         _list = value.data;
         return _list;
       });
-      
     }
   }
 
@@ -67,41 +67,41 @@ class _MyHousePageState extends State<MyHousePage> {
       {bool paid = false}) {
     return Container(
       padding: EdgeInsets.symmetric(horizontal: 32.w, vertical: 32.w),
-      child: Row(
-        children: [
-          GestureDetector(
-            onTap: () {
-              _select = index;
-              setState(() {});
-            },
-            child: CommonRadio(
+      child: GestureDetector(
+        onTap: () {
+          _select = index;
+          setState(() {});
+        },
+        child: Row(
+          children: [
+            CommonRadio(
               value: index,
               groupValue: _select,
               size: 32.w,
             ),
-          ),
-          24.w.widthBox,
-          Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            mainAxisSize: MainAxisSize.min,
-            children: [
-              kEstateName.text.size(24.sp).color(ktextSubColor).bold.make(),
-              16.w.heightBox,
-              BeeParse.getEstateName(estateName)
-                  .text
-                  .color(ktextPrimary)
-                  .size(28.sp)
-                  .bold
-                  .make(),
-            ],
-          ),
-          Spacer(),
-          currentHouse == estateName
-              ? _currentHouseTag()
-              : paid
-                  ? _unPaidTag()
-                  : SizedBox()
-        ],
+            24.w.widthBox,
+            Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                kEstateName.text.size(24.sp).color(ktextSubColor).bold.make(),
+                16.w.heightBox,
+                BeeParse.getEstateName(estateName)
+                    .text
+                    .color(ktextPrimary)
+                    .size(28.sp)
+                    .bold
+                    .make(),
+              ],
+            ),
+            Spacer(),
+            currentHouse == estateName
+                ? _currentHouseTag()
+                : paid
+                    ? _unPaidTag()
+                    : SizedBox()
+          ],
+        ).material(color: Colors.transparent),
       ),
     );
   }