修复评价图片不显示的问题

lib/gen/assets.gen.dart

@@ -1450,12 +1450,35 @@ class $AssetsNewIconGen {
   /// File path: assets/newIcon/jfjs.png
   AssetGenImage get jfjs => const AssetGenImage('assets/newIcon/jfjs.png');
 
+  /// File path: assets/newIcon/normal.png
+  AssetGenImage get normal => const AssetGenImage('assets/newIcon/normal.png');
+
+  /// File path: assets/newIcon/normal_unselect.png
+  AssetGenImage get normalUnselect =>
+      const AssetGenImage('assets/newIcon/normal_unselect.png');
+
+  /// File path: assets/newIcon/satisfied.png
+  AssetGenImage get satisfied =>
+      const AssetGenImage('assets/newIcon/satisfied.png');
+
+  /// File path: assets/newIcon/satisfied_unselect.png
+  AssetGenImage get satisfiedUnselect =>
+      const AssetGenImage('assets/newIcon/satisfied_unselect.png');
+
   /// File path: assets/newIcon/sfbs.png
   AssetGenImage get sfbs => const AssetGenImage('assets/newIcon/sfbs.png');
 
   /// File path: assets/newIcon/srzf.png
   AssetGenImage get srzf => const AssetGenImage('assets/newIcon/srzf.png');
 
+  /// File path: assets/newIcon/unsatisfied.png
+  AssetGenImage get unsatisfied =>
+      const AssetGenImage('assets/newIcon/unsatisfied.png');
+
+  /// File path: assets/newIcon/unsatisfied_unselect.png
+  AssetGenImage get unsatisfiedUnselect =>
+      const AssetGenImage('assets/newIcon/unsatisfied_unselect.png');
+
   /// File path: assets/newIcon/wallet_balance.png
   AssetGenImage get walletBalance =>
       const AssetGenImage('assets/newIcon/wallet_balance.png');

lib/pages/life_pay/life_pay_choose_page.dart

@@ -10,7 +10,7 @@ import 'package:aku_new_community/extensions/widget_list_ext.dart';
 import 'package:aku_new_community/pages/life_pay/life_pay_page.dart';
 import 'package:aku_new_community/pages/share_pay_page/share_pay_page.dart';
 import 'package:aku_new_community/widget/bee_scaffold.dart';
-
+@Deprecated('弃用')
 class LifePayChoosePage extends StatefulWidget {
   const LifePayChoosePage({Key? key}) : super(key: key);
 

lib/ui/function_and_service/task/dialogs/task_evaluation_dialog.dart

@@ -51,7 +51,9 @@ class _TaskEvaluationDialogState extends State<TaskEvaluationDialog> {
                   .make(),
               Spacer(),
               IconButton(
-                  onPressed: () {},
+                  onPressed: () {
+                    Get.back();
+                  },
                   icon: Icon(
                     CupertinoIcons.xmark,
                     size: 24.w,
@@ -62,9 +64,28 @@ class _TaskEvaluationDialogState extends State<TaskEvaluationDialog> {
           40.hb,
           Row(
             children: [
-              _evaluationIcon(2, '不满意', Assets.icons.dissatisfied.path),
+              32.wb,
-              _evaluationIcon(6, '一般', Assets.icons.normal.path),
+              _evaluationIcon(
-              _evaluationIcon(10, '满意', Assets.icons.satisfied.path),
+                  2,
+                  '不满意',
+                  _currentIndex == 2
+                      ? Assets.newIcon.unsatisfied.path
+                      : Assets.newIcon.unsatisfiedUnselect.path),
+              Spacer(),
+              _evaluationIcon(
+                  6,
+                  '一般',
+                  _currentIndex == 6
+                      ? Assets.newIcon.normal.path
+                      : Assets.newIcon.normalUnselect.path),
+              Spacer(),
+              _evaluationIcon(
+                  10,
+                  '满意',
+                  _currentIndex == 10
+                      ? Assets.newIcon.satisfied.path
+                      : Assets.newIcon.satisfiedUnselect.path),
+              32.wb,
             ],
           ),
           56.hb,
@@ -84,7 +105,9 @@ class _TaskEvaluationDialogState extends State<TaskEvaluationDialog> {
           80.hb,
           BottomPluralButtonWidget(
             leftTitle: '暂不评价',
-            onLeftTap: () {},
+            onLeftTap: () {
+              Get.back();
+            },
             rightTitle: '确认提交',
             onRightTap: () async {
               if (_currentIndex == null) {
@@ -114,18 +137,15 @@ class _TaskEvaluationDialogState extends State<TaskEvaluationDialog> {
         _currentIndex = index;
         setState(() {});
       },
-      child: AnimatedContainer(
+      child: Column(
-        duration: Duration(milliseconds: 300),
+        children: [
-        width: _currentIndex == index ? 120.w : 80.w,
+          Image.asset(iconPath,width: 120.w,height: 120.w,),
-        height: _currentIndex == index ? 120.w : 80.w,
+          10.hb,
-        child: Column(
+          text.text
-          children: [
+              .size(32.sp)
-            Image.asset(iconPath,
+              .color(Colors.black.withOpacity(0.65))
-                width: double.infinity, height: double.infinity),
+              .make(),
-            10.hb,
+        ],
-            text.text.size(32.sp).color(Colors.black.withOpacity(0.65)).make(),
-          ],
-        ),
       ),
     );
   }

lib/ui/function_and_service/task/task_page.dart

@@ -1,3 +1,4 @@
+import 'package:aku_new_community/ui/function_and_service/task/dialogs/task_evaluation_dialog.dart';
 import 'package:flutter/material.dart';
 
 import 'package:flutter_easyrefresh/easy_refresh.dart';
@@ -70,7 +71,7 @@ class _TaskPageState extends State<TaskPage> with TickerProviderStateMixin {
                   children: [
                     ...TaskMap.taskMode.values
                         .mapIndexed((currentValue, index) =>
-                            _tabCard(currentValue, index))
+                        _tabCard(currentValue, index))
                         .toList(),
                   ],
                 ),
@@ -80,7 +81,7 @@ class _TaskPageState extends State<TaskPage> with TickerProviderStateMixin {
                 child: Row(
                   children: <String>['全部', ...TaskMap.taskType.values]
                       .mapIndexed((currentValue, index) =>
-                          _typeBar(currentValue, index))
+                      _typeBar(currentValue, index))
                       .toList(),
                 ),
               )
@@ -88,19 +89,19 @@ class _TaskPageState extends State<TaskPage> with TickerProviderStateMixin {
           )),
       body: SafeArea(
           child: TabBarView(controller: _tabController, children: [
-        HallView(
+            HallView(
-          refreshController: _refreshControllers[0],
+              refreshController: _refreshControllers[0],
-          type: _currentType,
+              type: _currentType,
-        ),
+            ),
-        MyTakeTaskView(
+            MyTakeTaskView(
-          refreshController: _refreshControllers[1],
+              refreshController: _refreshControllers[1],
-          type: _currentType,
+              type: _currentType,
-        ),
+            ),
-        MyTaskView(
+            MyTaskView(
-          refreshController: _refreshControllers[2],
+              refreshController: _refreshControllers[2],
-          type: _currentType,
+              type: _currentType,
-        ),
+            ),
-      ])),
+          ])),
     );
   }
 
@@ -143,23 +144,23 @@ class _TaskPageState extends State<TaskPage> with TickerProviderStateMixin {
         color: Colors.transparent,
         child: _currentType == index
             ? Container(
-                padding: EdgeInsets.symmetric(vertical: 8.w, horizontal: 24.w),
+          padding: EdgeInsets.symmetric(vertical: 8.w, horizontal: 24.w),
-                decoration: BoxDecoration(
+          decoration: BoxDecoration(
-                  borderRadius: BorderRadius.circular(30.w),
+            borderRadius: BorderRadius.circular(30.w),
-                  color: Color(0xFFFAC058).withOpacity(0.5),
+            color: Color(0xFFFAC058).withOpacity(0.5),
-                ),
+          ),
-                child: text.text
+          child: text.text
-                    .size(24.sp)
+              .size(24.sp)
-                    .color(Colors.black.withOpacity(0.65))
+              .color(Colors.black.withOpacity(0.65))
-                    .make(),
+              .make(),
-              )
+        )
             : Container(
-                padding: EdgeInsets.symmetric(vertical: 8.w, horizontal: 24.w),
+          padding: EdgeInsets.symmetric(vertical: 8.w, horizontal: 24.w),
-                child: text.text
+          child: text.text
-                    .size(24.sp)
+              .size(24.sp)
-                    .color(Colors.black.withOpacity(0.45))
+              .color(Colors.black.withOpacity(0.45))
-                    .make(),
+              .make(),
-              ),
+        ),
       ),
     );
   }

lib/ui/profile/new_house/add_house_page.dart

@@ -1,3 +1,4 @@
+import 'package:aku_new_community/extensions/num_ext.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
@@ -298,7 +299,7 @@ class _AddHousePageState extends State<AddHousePage> {
               mainAxisSize: MainAxisSize.min,
               children: _pickedHouses
                   .mapIndexed((currentValue, index) =>
-                      _propertyOwnerTile(currentValue, index))
+                      _propertyOwnerTile(currentValue, index,))
                   .toList()
                   .sepWidget(separate: BeeDivider.horizontal()),
             ),
@@ -465,6 +466,7 @@ class _AddHousePageState extends State<AddHousePage> {
       children: [
         32.w.heightBox,
         Container(
+          key: UniqueKey(),
           width: double.infinity,
           height: 60.w,
           alignment: Alignment.centerLeft,
@@ -472,11 +474,28 @@ class _AddHousePageState extends State<AddHousePage> {
           decoration: BoxDecoration(
               borderRadius: BorderRadius.circular(8.w),
               color: Colors.black.withOpacity(0.06)),
-          child: '产权信息${(index + 1).toChinese}'
+          child: Row(
-              .text
+            children: [
-              .size(26.sp)
+              '产权信息${(index + 1).toChinese}'
-              .color(Colors.black.withOpacity(0.45))
+                  .text
-              .make(),
+                  .size(26.sp)
+                  .color(Colors.black.withOpacity(0.45))
+                  .make(),
+              Spacer(),
+              IconButton(
+                padding: EdgeInsets.zero,
+                constraints: BoxConstraints(minWidth: 20.w, minHeight: 20.w),
+                onPressed: () {
+                  _pickedHouses.removeAt(index);
+                  setState(() {});
+                },
+                icon: Icon(
+                  CupertinoIcons.minus,
+                  size: 30.w,
+                ),
+              ),10.wb,
+            ],
+          ),
         ),
         GestureDetector(
           onTap: () async {

lib/widget/others/house_head_card.dart

@@ -33,8 +33,8 @@ class HouseHeadCard extends StatelessWidget {
             '当前房屋'.text.black.size(28.sp).make(),
             32.w.heightBox,
             GestureDetector(
-              onTap: () {
+              onTap: () async {
-                Get.to(() => MyHousePage());
+                await Get.to(() => MyHousePage());
                 if (onChanged != null) onChanged!();
               },
               child: Row(