diff --git a/assets/newIcon/normal.png b/assets/newIcon/normal.png new file mode 100644 index 00000000..2a82ec1f Binary files /dev/null and b/assets/newIcon/normal.png differ diff --git a/assets/newIcon/normal_unselect.png b/assets/newIcon/normal_unselect.png new file mode 100644 index 00000000..1f23439c Binary files /dev/null and b/assets/newIcon/normal_unselect.png differ diff --git a/assets/newIcon/satisfied.png b/assets/newIcon/satisfied.png new file mode 100644 index 00000000..a9da171e Binary files /dev/null and b/assets/newIcon/satisfied.png differ diff --git a/assets/newIcon/satisfied_unselect.png b/assets/newIcon/satisfied_unselect.png new file mode 100644 index 00000000..4ab15f87 Binary files /dev/null and b/assets/newIcon/satisfied_unselect.png differ diff --git a/assets/newIcon/unsatisfied.png b/assets/newIcon/unsatisfied.png new file mode 100644 index 00000000..7653ab2a Binary files /dev/null and b/assets/newIcon/unsatisfied.png differ diff --git a/assets/newIcon/unsatisfied_unselect.png b/assets/newIcon/unsatisfied_unselect.png new file mode 100644 index 00000000..1ccae120 Binary files /dev/null and b/assets/newIcon/unsatisfied_unselect.png differ diff --git a/lib/gen/assets.gen.dart b/lib/gen/assets.gen.dart index 70ed76dd..99c95b26 100644 --- a/lib/gen/assets.gen.dart +++ b/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'); diff --git a/lib/pages/life_pay/life_pay_choose_page.dart b/lib/pages/life_pay/life_pay_choose_page.dart index 60628726..3b215fde 100644 --- a/lib/pages/life_pay/life_pay_choose_page.dart +++ b/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); diff --git a/lib/ui/function_and_service/task/dialogs/task_evaluation_dialog.dart b/lib/ui/function_and_service/task/dialogs/task_evaluation_dialog.dart index 15f7ba1b..80e24d54 100644 --- a/lib/ui/function_and_service/task/dialogs/task_evaluation_dialog.dart +++ b/lib/ui/function_and_service/task/dialogs/task_evaluation_dialog.dart @@ -51,7 +51,9 @@ class _TaskEvaluationDialogState extends State { .make(), Spacer(), IconButton( - onPressed: () {}, + onPressed: () { + Get.back(); + }, icon: Icon( CupertinoIcons.xmark, size: 24.w, @@ -62,9 +64,28 @@ class _TaskEvaluationDialogState extends State { 40.hb, Row( children: [ - _evaluationIcon(2, '不满意', Assets.icons.dissatisfied.path), - _evaluationIcon(6, '一般', Assets.icons.normal.path), - _evaluationIcon(10, '满意', Assets.icons.satisfied.path), + 32.wb, + _evaluationIcon( + 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 { 80.hb, BottomPluralButtonWidget( leftTitle: '暂不评价', - onLeftTap: () {}, + onLeftTap: () { + Get.back(); + }, rightTitle: '确认提交', onRightTap: () async { if (_currentIndex == null) { @@ -114,18 +137,15 @@ class _TaskEvaluationDialogState extends State { _currentIndex = index; setState(() {}); }, - child: AnimatedContainer( - duration: Duration(milliseconds: 300), - width: _currentIndex == index ? 120.w : 80.w, - height: _currentIndex == index ? 120.w : 80.w, - child: Column( - children: [ - Image.asset(iconPath, - width: double.infinity, height: double.infinity), - 10.hb, - text.text.size(32.sp).color(Colors.black.withOpacity(0.65)).make(), - ], - ), + child: Column( + children: [ + Image.asset(iconPath,width: 120.w,height: 120.w,), + 10.hb, + text.text + .size(32.sp) + .color(Colors.black.withOpacity(0.65)) + .make(), + ], ), ); } diff --git a/lib/ui/function_and_service/task/task_page.dart b/lib/ui/function_and_service/task/task_page.dart index 15a1b165..ddc6f701 100644 --- a/lib/ui/function_and_service/task/task_page.dart +++ b/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 with TickerProviderStateMixin { children: [ ...TaskMap.taskMode.values .mapIndexed((currentValue, index) => - _tabCard(currentValue, index)) + _tabCard(currentValue, index)) .toList(), ], ), @@ -80,7 +81,7 @@ class _TaskPageState extends State with TickerProviderStateMixin { child: Row( children: ['全部', ...TaskMap.taskType.values] .mapIndexed((currentValue, index) => - _typeBar(currentValue, index)) + _typeBar(currentValue, index)) .toList(), ), ) @@ -88,19 +89,19 @@ class _TaskPageState extends State with TickerProviderStateMixin { )), body: SafeArea( child: TabBarView(controller: _tabController, children: [ - HallView( - refreshController: _refreshControllers[0], - type: _currentType, - ), - MyTakeTaskView( - refreshController: _refreshControllers[1], - type: _currentType, - ), - MyTaskView( - refreshController: _refreshControllers[2], - type: _currentType, - ), - ])), + HallView( + refreshController: _refreshControllers[0], + type: _currentType, + ), + MyTakeTaskView( + refreshController: _refreshControllers[1], + type: _currentType, + ), + MyTaskView( + refreshController: _refreshControllers[2], + type: _currentType, + ), + ])), ); } @@ -143,23 +144,23 @@ class _TaskPageState extends State with TickerProviderStateMixin { color: Colors.transparent, child: _currentType == index ? Container( - padding: EdgeInsets.symmetric(vertical: 8.w, horizontal: 24.w), - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(30.w), - color: Color(0xFFFAC058).withOpacity(0.5), - ), - child: text.text - .size(24.sp) - .color(Colors.black.withOpacity(0.65)) - .make(), - ) + padding: EdgeInsets.symmetric(vertical: 8.w, horizontal: 24.w), + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(30.w), + color: Color(0xFFFAC058).withOpacity(0.5), + ), + child: text.text + .size(24.sp) + .color(Colors.black.withOpacity(0.65)) + .make(), + ) : Container( - padding: EdgeInsets.symmetric(vertical: 8.w, horizontal: 24.w), - child: text.text - .size(24.sp) - .color(Colors.black.withOpacity(0.45)) - .make(), - ), + padding: EdgeInsets.symmetric(vertical: 8.w, horizontal: 24.w), + child: text.text + .size(24.sp) + .color(Colors.black.withOpacity(0.45)) + .make(), + ), ), ); } diff --git a/lib/ui/profile/new_house/add_house_page.dart b/lib/ui/profile/new_house/add_house_page.dart index 5a7b3103..336dd71f 100644 --- a/lib/ui/profile/new_house/add_house_page.dart +++ b/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 { 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 { children: [ 32.w.heightBox, Container( + key: UniqueKey(), width: double.infinity, height: 60.w, alignment: Alignment.centerLeft, @@ -472,11 +474,28 @@ class _AddHousePageState extends State { decoration: BoxDecoration( borderRadius: BorderRadius.circular(8.w), color: Colors.black.withOpacity(0.06)), - child: '产权信息${(index + 1).toChinese}' - .text - .size(26.sp) - .color(Colors.black.withOpacity(0.45)) - .make(), + child: Row( + children: [ + '产权信息${(index + 1).toChinese}' + .text + .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 { diff --git a/lib/widget/others/house_head_card.dart b/lib/widget/others/house_head_card.dart index 3c27b224..96cfd49c 100644 --- a/lib/widget/others/house_head_card.dart +++ b/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: () { - Get.to(() => MyHousePage()); + onTap: () async { + await Get.to(() => MyHousePage()); if (onChanged != null) onChanged!(); }, child: Row(