From 0b3566cc5d176f09c3802a31f391f804d9b38bca Mon Sep 17 00:00:00 2001 From: zhangmeng <494089941@qq.com> Date: Thu, 7 Apr 2022 10:35:47 +0800 Subject: [PATCH] fix bugs --- lib/gen/assets.gen.dart | 786 ++++++++++++++++++ lib/models/home/activity_detail_model.g.dart | 2 +- lib/models/life_pay/life_pay_model.dart | 29 +- lib/models/life_pay/life_pay_model.g.dart | 2 +- lib/models/message/reply_list_model.g.dart | 2 +- lib/models/user/user_info_model.dart | 5 +- lib/models/user/user_info_model.g.dart | 1 + lib/pages/home/home_page.dart | 28 +- lib/pages/life_pay/life_pay_page_new.dart | 240 +++--- .../widget/life_pay_detail_page_new.dart | 154 ++-- lib/widget/beeImageNetwork.dart | 2 +- 11 files changed, 1001 insertions(+), 250 deletions(-) diff --git a/lib/gen/assets.gen.dart b/lib/gen/assets.gen.dart index 6aa32d97..30424e80 100644 --- a/lib/gen/assets.gen.dart +++ b/lib/gen/assets.gen.dart @@ -3,65 +3,123 @@ /// FlutterGen /// ***************************************************** +// ignore_for_file: directives_ordering,unnecessary_import + import 'package:flutter/widgets.dart'; class $AssetsApplicationsGen { const $AssetsApplicationsGen(); + /// File path: assets/applications/advice.png AssetGenImage get advice => const AssetGenImage('assets/applications/advice.png'); + + /// File path: assets/applications/all_app.png AssetGenImage get allApp => const AssetGenImage('assets/applications/all_app.png'); + + /// File path: assets/applications/borrow.png AssetGenImage get borrow => const AssetGenImage('assets/applications/borrow.png'); + + /// File path: assets/applications/box.png AssetGenImage get box => const AssetGenImage('assets/applications/box.png'); + + /// File path: assets/applications/committee.png AssetGenImage get committee => const AssetGenImage('assets/applications/committee.png'); + + /// File path: assets/applications/community_phone.png AssetGenImage get communityPhone => const AssetGenImage('assets/applications/community_phone.png'); + + /// File path: assets/applications/complaint.png AssetGenImage get complaint => const AssetGenImage('assets/applications/complaint.png'); + + /// File path: assets/applications/decoration.png AssetGenImage get decoration => const AssetGenImage('assets/applications/decoration.png'); + + /// File path: assets/applications/digital.png AssetGenImage get digital => const AssetGenImage('assets/applications/digital.png'); + + /// File path: assets/applications/door_code.png AssetGenImage get doorCode => const AssetGenImage('assets/applications/door_code.png'); + + /// File path: assets/applications/fix.png AssetGenImage get fix => const AssetGenImage('assets/applications/fix.png'); + + /// File path: assets/applications/goods_out.png AssetGenImage get goodsOut => const AssetGenImage('assets/applications/goods_out.png'); + + /// File path: assets/applications/home_live.png AssetGenImage get homeLive => const AssetGenImage('assets/applications/home_live.png'); + + /// File path: assets/applications/hospital.png AssetGenImage get hospital => const AssetGenImage('assets/applications/hospital.png'); + + /// File path: assets/applications/makeup.png AssetGenImage get makeup => const AssetGenImage('assets/applications/makeup.png'); + + /// File path: assets/applications/oepn_door.png AssetGenImage get oepnDoor => const AssetGenImage('assets/applications/oepn_door.png'); + + /// File path: assets/applications/payment.png AssetGenImage get payment => const AssetGenImage('assets/applications/payment.png'); + + /// File path: assets/applications/police.png AssetGenImage get police => const AssetGenImage('assets/applications/police.png'); + + /// File path: assets/applications/question.png AssetGenImage get question => const AssetGenImage('assets/applications/question.png'); + + /// File path: assets/applications/snack.png AssetGenImage get snack => const AssetGenImage('assets/applications/snack.png'); + + /// File path: assets/applications/tool_bmts.png AssetGenImage get toolBmts => const AssetGenImage('assets/applications/tool_bmts.png'); + + /// File path: assets/applications/toy.png AssetGenImage get toy => const AssetGenImage('assets/applications/toy.png'); + + /// File path: assets/applications/transfer.png AssetGenImage get transfer => const AssetGenImage('assets/applications/transfer.png'); + + /// File path: assets/applications/visitor_invite.png AssetGenImage get visitorInvite => const AssetGenImage('assets/applications/visitor_invite.png'); + + /// File path: assets/applications/vote.png AssetGenImage get vote => const AssetGenImage('assets/applications/vote.png'); + + /// File path: assets/applications/wine.png AssetGenImage get wine => const AssetGenImage('assets/applications/wine.png'); } class $AssetsBraceletGen { const $AssetsBraceletGen(); + /// File path: assets/bracelet/x5.png AssetGenImage get x5 => const AssetGenImage('assets/bracelet/x5.png'); + + /// File path: assets/bracelet/x8.png AssetGenImage get x8 => const AssetGenImage('assets/bracelet/x8.png'); + + /// File path: assets/bracelet/xiaomi6.png AssetGenImage get xiaomi6 => const AssetGenImage('assets/bracelet/xiaomi6.png'); } @@ -69,562 +127,1173 @@ class $AssetsBraceletGen { class $AssetsHomeGen { const $AssetsHomeGen(); + /// File path: assets/home/ic_bsbx.png AssetGenImage get icBsbx => const AssetGenImage('assets/home/ic_bsbx.png'); + + /// File path: assets/home/ic_gonggao.png AssetGenImage get icGonggao => const AssetGenImage('assets/home/ic_gonggao.png'); + + /// File path: assets/home/ic_kaimen.png AssetGenImage get icKaimen => const AssetGenImage('assets/home/ic_kaimen.png'); + + /// File path: assets/home/ic_ljcw.png AssetGenImage get icLjcw => const AssetGenImage('assets/home/ic_ljcw.png'); + + /// File path: assets/home/ic_location.png AssetGenImage get icLocation => const AssetGenImage('assets/home/ic_location.png'); + + /// File path: assets/home/ic_message.png AssetGenImage get icMessage => const AssetGenImage('assets/home/ic_message.png'); + + /// File path: assets/home/ic_qbyy.png AssetGenImage get icQbyy => const AssetGenImage('assets/home/ic_qbyy.png'); + + /// File path: assets/home/ic_rwfb.png AssetGenImage get icRwfb => const AssetGenImage('assets/home/ic_rwfb.png'); + + /// File path: assets/home/ic_search.png AssetGenImage get icSearch => const AssetGenImage('assets/home/ic_search.png'); + + /// File path: assets/home/ic_shangc_nor.png AssetGenImage get icShangcNor => const AssetGenImage('assets/home/ic_shangc_nor.png'); + + /// File path: assets/home/ic_shangc_sel.png AssetGenImage get icShangcSel => const AssetGenImage('assets/home/ic_shangc_sel.png'); + + /// File path: assets/home/ic_shequ_nor.png AssetGenImage get icShequNor => const AssetGenImage('assets/home/ic_shequ_nor.png'); + + /// File path: assets/home/ic_shequ_sel.png AssetGenImage get icShequSel => const AssetGenImage('assets/home/ic_shequ_sel.png'); + + /// File path: assets/home/ic_shjf.png AssetGenImage get icShjf => const AssetGenImage('assets/home/ic_shjf.png'); + + /// File path: assets/home/ic_shouye_nor.png AssetGenImage get icShouyeNor => const AssetGenImage('assets/home/ic_shouye_nor.png'); + + /// File path: assets/home/ic_shouye_sel.png AssetGenImage get icShouyeSel => const AssetGenImage('assets/home/ic_shouye_sel.png'); + + /// File path: assets/home/ic_ssyy.png AssetGenImage get icSsyy => const AssetGenImage('assets/home/ic_ssyy.png'); + + /// File path: assets/home/ic_wode_nor.png AssetGenImage get icWodeNor => const AssetGenImage('assets/home/ic_wode_nor.png'); + + /// File path: assets/home/ic_wode_sel.png AssetGenImage get icWodeSel => const AssetGenImage('assets/home/ic_wode_sel.png'); + + /// File path: assets/home/ic_zbfw.png AssetGenImage get icZbfw => const AssetGenImage('assets/home/ic_zbfw.png'); + + /// File path: assets/home/ic_zhyl.png AssetGenImage get icZhyl => const AssetGenImage('assets/home/ic_zhyl.png'); + + /// File path: assets/home/img_fkyq.png AssetGenImage get imgFkyq => const AssetGenImage('assets/home/img_fkyq.png'); + + /// File path: assets/home/img_jyzx.png AssetGenImage get imgJyzx => const AssetGenImage('assets/home/img_jyzx.png'); + + /// File path: assets/home/img_tabdi.png AssetGenImage get imgTabdi => const AssetGenImage('assets/home/img_tabdi.png'); + + /// File path: assets/home/img_yjbj.png AssetGenImage get imgYjbj => const AssetGenImage('assets/home/img_yjbj.png'); } class $AssetsIconsGen { const $AssetsIconsGen(); + /// File path: assets/icons/add.png AssetGenImage get add => const AssetGenImage('assets/icons/add.png'); + + /// File path: assets/icons/alarm.png AssetGenImage get alarm => const AssetGenImage('assets/icons/alarm.png'); + + /// File path: assets/icons/alarm_clock.png AssetGenImage get alarmClock => const AssetGenImage('assets/icons/alarm_clock.png'); + + /// File path: assets/icons/alipay_round.png AssetGenImage get alipayRound => const AssetGenImage('assets/icons/alipay_round.png'); + + /// File path: assets/icons/app_add.png AssetGenImage get appAdd => const AssetGenImage('assets/icons/app_add.png'); + + /// File path: assets/icons/app_alarm.png AssetGenImage get appAlarm => const AssetGenImage('assets/icons/app_alarm.png'); + + /// File path: assets/icons/app_reduce.png AssetGenImage get appReduce => const AssetGenImage('assets/icons/app_reduce.png'); + + /// File path: assets/icons/appointment-address.png AssetGenImage get appointmentAddress => const AssetGenImage('assets/icons/appointment-address.png'); + + /// File path: assets/icons/appointment-code.png AssetGenImage get appointmentCode => const AssetGenImage('assets/icons/appointment-code.png'); + + /// File path: assets/icons/appointment_date.png AssetGenImage get appointmentDate => const AssetGenImage('assets/icons/appointment_date.png'); + + /// File path: assets/icons/article_count.png AssetGenImage get articleCount => const AssetGenImage('assets/icons/article_count.png'); + + /// File path: assets/icons/article_name.png AssetGenImage get articleName => const AssetGenImage('assets/icons/article_name.png'); + + /// File path: assets/icons/bee_task.png AssetGenImage get beeTask => const AssetGenImage('assets/icons/bee_task.png'); + + /// File path: assets/icons/blood_ressure.png AssetGenImage get bloodRessure => const AssetGenImage('assets/icons/blood_ressure.png'); + + /// File path: assets/icons/borrow_failure.png AssetGenImage get borrowFailure => const AssetGenImage('assets/icons/borrow_failure.png'); + + /// File path: assets/icons/borrow_status.png AssetGenImage get borrowStatus => const AssetGenImage('assets/icons/borrow_status.png'); + + /// File path: assets/icons/borrow_success.png AssetGenImage get borrowSuccess => const AssetGenImage('assets/icons/borrow_success.png'); + + /// File path: assets/icons/camera.png AssetGenImage get camera => const AssetGenImage('assets/icons/camera.png'); + + /// File path: assets/icons/cancel_task.png AssetGenImage get cancelTask => const AssetGenImage('assets/icons/cancel_task.png'); + + /// File path: assets/icons/change.png AssetGenImage get change => const AssetGenImage('assets/icons/change.png'); + + /// File path: assets/icons/clock_circle.png AssetGenImage get clockCircle => const AssetGenImage('assets/icons/clock_circle.png'); + + /// File path: assets/icons/clock_success.png AssetGenImage get clockSuccess => const AssetGenImage('assets/icons/clock_success.png'); + + /// File path: assets/icons/collect.png AssetGenImage get collect => const AssetGenImage('assets/icons/collect.png'); + + /// File path: assets/icons/collection_setting.png AssetGenImage get collectionSetting => const AssetGenImage('assets/icons/collection_setting.png'); + + /// File path: assets/icons/collection_share.png AssetGenImage get collectionShare => const AssetGenImage('assets/icons/collection_share.png'); + + /// File path: assets/icons/comment_notice.png AssetGenImage get commentNotice => const AssetGenImage('assets/icons/comment_notice.png'); + + /// File path: assets/icons/commerc.png AssetGenImage get commerc => const AssetGenImage('assets/icons/commerc.png'); + + /// File path: assets/icons/community_comment.png AssetGenImage get communityComment => const AssetGenImage('assets/icons/community_comment.png'); + + /// File path: assets/icons/community_comment_is.png AssetGenImage get communityCommentIs => const AssetGenImage('assets/icons/community_comment_is.png'); + + /// File path: assets/icons/community_like.png AssetGenImage get communityLike => const AssetGenImage('assets/icons/community_like.png'); + + /// File path: assets/icons/community_like_is.png AssetGenImage get communityLikeIs => const AssetGenImage('assets/icons/community_like_is.png'); + + /// File path: assets/icons/complaint.png AssetGenImage get complaint => const AssetGenImage('assets/icons/complaint.png'); + + /// File path: assets/icons/connect.png AssetGenImage get connect => const AssetGenImage('assets/icons/connect.png'); + + /// File path: assets/icons/consult.png AssetGenImage get consult => const AssetGenImage('assets/icons/consult.png'); + + /// File path: assets/icons/contract.png AssetGenImage get contract => const AssetGenImage('assets/icons/contract.png'); + + /// File path: assets/icons/copy.png AssetGenImage get copy => const AssetGenImage('assets/icons/copy.png'); + + /// File path: assets/icons/delete.png AssetGenImage get delete => const AssetGenImage('assets/icons/delete.png'); + + /// File path: assets/icons/device_alarm.png AssetGenImage get deviceAlarm => const AssetGenImage('assets/icons/device_alarm.png'); + + /// File path: assets/icons/dissatisfied.png AssetGenImage get dissatisfied => const AssetGenImage('assets/icons/dissatisfied.png'); + + /// File path: assets/icons/edit.png AssetGenImage get edit => const AssetGenImage('assets/icons/edit.png'); + + /// File path: assets/icons/environment.png AssetGenImage get environment => const AssetGenImage('assets/icons/environment.png'); + + /// File path: assets/icons/examine.png AssetGenImage get examine => const AssetGenImage('assets/icons/examine.png'); + + /// File path: assets/icons/examining.png AssetGenImage get examining => const AssetGenImage('assets/icons/examining.png'); + + /// File path: assets/icons/eye_close.png AssetGenImage get eyeClose => const AssetGenImage('assets/icons/eye_close.png'); + + /// File path: assets/icons/facility.png AssetGenImage get facility => const AssetGenImage('assets/icons/facility.png'); + + /// File path: assets/icons/falldown.png AssetGenImage get falldown => const AssetGenImage('assets/icons/falldown.png'); + + /// File path: assets/icons/file.png AssetGenImage get file => const AssetGenImage('assets/icons/file.png'); + + /// File path: assets/icons/filter.png AssetGenImage get filter => const AssetGenImage('assets/icons/filter.png'); + + /// File path: assets/icons/finish.png AssetGenImage get finish => const AssetGenImage('assets/icons/finish.png'); + + /// File path: assets/icons/finish_order.png AssetGenImage get finishOrder => const AssetGenImage('assets/icons/finish_order.png'); + + /// File path: assets/icons/fire_alarm.png AssetGenImage get fireAlarm => const AssetGenImage('assets/icons/fire_alarm.png'); + + /// File path: assets/icons/foot.png AssetGenImage get foot => const AssetGenImage('assets/icons/foot.png'); + + /// File path: assets/icons/func_all.png AssetGenImage get funcAll => const AssetGenImage('assets/icons/func_all.png'); + + /// File path: assets/icons/func_bmdh.png AssetGenImage get funcBmdh => const AssetGenImage('assets/icons/func_bmdh.png'); + + /// File path: assets/icons/func_bsbx.png AssetGenImage get funcBsbx => const AssetGenImage('assets/icons/func_bsbx.png'); + + /// File path: assets/icons/func_dlxx.png AssetGenImage get funcDlxx => const AssetGenImage('assets/icons/func_dlxx.png'); + + /// File path: assets/icons/func_dzsw.png AssetGenImage get funcDzsw => const AssetGenImage('assets/icons/func_dzsw.png'); + + /// File path: assets/icons/func_fkyq.png AssetGenImage get funcFkyq => const AssetGenImage('assets/icons/func_fkyq.png'); + + /// File path: assets/icons/func_fwll.png AssetGenImage get funcFwll => const AssetGenImage('assets/icons/func_fwll.png'); + + /// File path: assets/icons/func_gife.png AssetGenImage get funcGife => const AssetGenImage('assets/icons/func_gife.png'); + + /// File path: assets/icons/func_hdtp.png AssetGenImage get funcHdtp => const AssetGenImage('assets/icons/func_hdtp.png'); + + /// File path: assets/icons/func_jhgl.png AssetGenImage get funcJhgl => const AssetGenImage('assets/icons/func_jhgl.png'); + + /// File path: assets/icons/func_jyzx.png AssetGenImage get funcJyzx => const AssetGenImage('assets/icons/func_jyzx.png'); + + /// File path: assets/icons/func_jzfw.png AssetGenImage get funcJzfw => const AssetGenImage('assets/icons/func_jzfw.png'); + + /// File path: assets/icons/func_kdbg.png AssetGenImage get funcKdbg => const AssetGenImage('assets/icons/func_kdbg.png'); + + /// File path: assets/icons/func_kmm.png AssetGenImage get funcKmm => const AssetGenImage('assets/icons/func_kmm.png'); + + /// File path: assets/icons/func_shjf.png AssetGenImage get funcShjf => const AssetGenImage('assets/icons/func_shjf.png'); + + /// File path: assets/icons/func_sqjs.png AssetGenImage get funcSqjs => const AssetGenImage('assets/icons/func_sqjs.png'); + + /// File path: assets/icons/func_ssyy.png AssetGenImage get funcSsyy => const AssetGenImage('assets/icons/func_ssyy.png'); + + /// File path: assets/icons/func_tsby.png AssetGenImage get funcTsby => const AssetGenImage('assets/icons/func_tsby.png'); + + /// File path: assets/icons/func_wjdc.png AssetGenImage get funcWjdc => const AssetGenImage('assets/icons/func_wjdc.png'); + + /// File path: assets/icons/func_wpch.png AssetGenImage get funcWpch => const AssetGenImage('assets/icons/func_wpch.png'); + + /// File path: assets/icons/func_yjbj.png AssetGenImage get funcYjbj => const AssetGenImage('assets/icons/func_yjbj.png'); + + /// File path: assets/icons/func_ywh.png AssetGenImage get funcYwh => const AssetGenImage('assets/icons/func_ywh.png'); + + /// File path: assets/icons/func_zbqy.png AssetGenImage get funcZbqy => const AssetGenImage('assets/icons/func_zbqy.png'); + + /// File path: assets/icons/func_zfsm.png AssetGenImage get funcZfsm => const AssetGenImage('assets/icons/func_zfsm.png'); + + /// File path: assets/icons/func_zxgl.png AssetGenImage get funcZxgl => const AssetGenImage('assets/icons/func_zxgl.png'); + + /// File path: assets/icons/goods_borrow.png AssetGenImage get goodsBorrow => const AssetGenImage('assets/icons/goods_borrow.png'); + + /// File path: assets/icons/goods_return.png AssetGenImage get goodsReturn => const AssetGenImage('assets/icons/goods_return.png'); + + /// File path: assets/icons/groupbuy_tab_selected.png AssetGenImage get groupbuyTabSelected => const AssetGenImage('assets/icons/groupbuy_tab_selected.png'); + + /// File path: assets/icons/groupbuy_tab_unselected.png AssetGenImage get groupbuyTabUnselected => const AssetGenImage('assets/icons/groupbuy_tab_unselected.png'); + + /// File path: assets/icons/heartbeat.png AssetGenImage get heartbeat => const AssetGenImage('assets/icons/heartbeat.png'); + + /// File path: assets/icons/hot_fire.png AssetGenImage get hotFire => const AssetGenImage('assets/icons/hot_fire.png'); + + /// File path: assets/icons/house.png AssetGenImage get house => const AssetGenImage('assets/icons/house.png'); + + /// File path: assets/icons/house_keeping.png AssetGenImage get houseKeeping => const AssetGenImage('assets/icons/house_keeping.png'); + + /// File path: assets/icons/icon_address_edit.png AssetGenImage get iconAddressEdit => const AssetGenImage('assets/icons/icon_address_edit.png'); + + /// File path: assets/icons/icon_address_isdefault.png AssetGenImage get iconAddressIsdefault => const AssetGenImage('assets/icons/icon_address_isdefault.png'); + + /// File path: assets/icons/icon_address_not.png AssetGenImage get iconAddressNot => const AssetGenImage('assets/icons/icon_address_not.png'); + + /// File path: assets/icons/icon_back.png AssetGenImage get iconBack => const AssetGenImage('assets/icons/icon_back.png'); + + /// File path: assets/icons/icon_change_grid.png AssetGenImage get iconChangeGrid => const AssetGenImage('assets/icons/icon_change_grid.png'); + + /// File path: assets/icons/icon_change_list.png AssetGenImage get iconChangeList => const AssetGenImage('assets/icons/icon_change_list.png'); + + /// File path: assets/icons/icon_comment.png AssetGenImage get iconComment => const AssetGenImage('assets/icons/icon_comment.png'); + + /// File path: assets/icons/icon_community_push.png AssetGenImage get iconCommunityPush => const AssetGenImage('assets/icons/icon_community_push.png'); + + /// File path: assets/icons/icon_favor_choose.png AssetGenImage get iconFavorChoose => const AssetGenImage('assets/icons/icon_favor_choose.png'); + + /// File path: assets/icons/icon_good_car.png AssetGenImage get iconGoodCar => const AssetGenImage('assets/icons/icon_good_car.png'); + + /// File path: assets/icons/icon_good_favor.png AssetGenImage get iconGoodFavor => const AssetGenImage('assets/icons/icon_good_favor.png'); + + /// File path: assets/icons/icon_good_location.png AssetGenImage get iconGoodLocation => const AssetGenImage('assets/icons/icon_good_location.png'); + + /// File path: assets/icons/icon_good_my.png AssetGenImage get iconGoodMy => const AssetGenImage('assets/icons/icon_good_my.png'); + + /// File path: assets/icons/icon_logistics.png AssetGenImage get iconLogistics => const AssetGenImage('assets/icons/icon_logistics.png'); + + /// File path: assets/icons/icon_main_all.png AssetGenImage get iconMainAll => const AssetGenImage('assets/icons/icon_main_all.png'); + + /// File path: assets/icons/icon_main_consult.png AssetGenImage get iconMainConsult => const AssetGenImage('assets/icons/icon_main_consult.png'); + + /// File path: assets/icons/icon_main_find.png AssetGenImage get iconMainFind => const AssetGenImage('assets/icons/icon_main_find.png'); + + /// File path: assets/icons/icon_main_fix.png AssetGenImage get iconMainFix => const AssetGenImage('assets/icons/icon_main_fix.png'); + + /// File path: assets/icons/icon_main_invite.png AssetGenImage get iconMainInvite => const AssetGenImage('assets/icons/icon_main_invite.png'); + + /// File path: assets/icons/icon_main_location.png AssetGenImage get iconMainLocation => const AssetGenImage('assets/icons/icon_main_location.png'); + + /// File path: assets/icons/icon_main_message.png AssetGenImage get iconMainMessage => const AssetGenImage('assets/icons/icon_main_message.png'); + + /// File path: assets/icons/icon_main_open.png AssetGenImage get iconMainOpen => const AssetGenImage('assets/icons/icon_main_open.png'); + + /// File path: assets/icons/icon_main_pay.png AssetGenImage get iconMainPay => const AssetGenImage('assets/icons/icon_main_pay.png'); + + /// File path: assets/icons/icon_main_police.png AssetGenImage get iconMainPolice => const AssetGenImage('assets/icons/icon_main_police.png'); + + /// File path: assets/icons/icon_main_subscribe.png AssetGenImage get iconMainSubscribe => const AssetGenImage('assets/icons/icon_main_subscribe.png'); + + /// File path: assets/icons/icon_market_success.png AssetGenImage get iconMarketSuccess => const AssetGenImage('assets/icons/icon_market_success.png'); + + /// File path: assets/icons/icon_more.png AssetGenImage get iconMore => const AssetGenImage('assets/icons/icon_more.png'); + + /// File path: assets/icons/icon_more_black.png AssetGenImage get iconMoreBlack => const AssetGenImage('assets/icons/icon_more_black.png'); + + /// File path: assets/icons/icon_my_car.png AssetGenImage get iconMyCar => const AssetGenImage('assets/icons/icon_my_car.png'); + + /// File path: assets/icons/icon_my_carSeat.png AssetGenImage get iconMyCarSeat => const AssetGenImage('assets/icons/icon_my_carSeat.png'); + + /// File path: assets/icons/icon_my_edit.png AssetGenImage get iconMyEdit => const AssetGenImage('assets/icons/icon_my_edit.png'); + + /// File path: assets/icons/icon_my_house.png AssetGenImage get iconMyHouse => const AssetGenImage('assets/icons/icon_my_house.png'); + + /// File path: assets/icons/icon_my_location.png AssetGenImage get iconMyLocation => const AssetGenImage('assets/icons/icon_my_location.png'); + + /// File path: assets/icons/icon_my_setting.png AssetGenImage get iconMySetting => const AssetGenImage('assets/icons/icon_my_setting.png'); + + /// File path: assets/icons/icon_my_visitor.png AssetGenImage get iconMyVisitor => const AssetGenImage('assets/icons/icon_my_visitor.png'); + + /// File path: assets/icons/icon_notification.png AssetGenImage get iconNotification => const AssetGenImage('assets/icons/icon_notification.png'); + + /// File path: assets/icons/icon_price.png AssetGenImage get iconPrice => const AssetGenImage('assets/icons/icon_price.png'); + + /// File path: assets/icons/icon_price_bottom.png AssetGenImage get iconPriceBottom => const AssetGenImage('assets/icons/icon_price_bottom.png'); + + /// File path: assets/icons/icon_price_normal.png AssetGenImage get iconPriceNormal => const AssetGenImage('assets/icons/icon_price_normal.png'); + + /// File path: assets/icons/icon_price_top.png AssetGenImage get iconPriceTop => const AssetGenImage('assets/icons/icon_price_top.png'); + + /// File path: assets/icons/icon_property_location.png AssetGenImage get iconPropertyLocation => const AssetGenImage('assets/icons/icon_property_location.png'); + + /// File path: assets/icons/icon_property_message.png AssetGenImage get iconPropertyMessage => const AssetGenImage('assets/icons/icon_property_message.png'); + + /// File path: assets/icons/icon_property_search.png AssetGenImage get iconPropertySearch => const AssetGenImage('assets/icons/icon_property_search.png'); + + /// File path: assets/icons/icon_setting.png AssetGenImage get iconSetting => const AssetGenImage('assets/icons/icon_setting.png'); + + /// File path: assets/icons/icon_sort.png AssetGenImage get iconSort => const AssetGenImage('assets/icons/icon_sort.png'); + + /// File path: assets/icons/icon_thumbsUp.png AssetGenImage get iconThumbsUp => const AssetGenImage('assets/icons/icon_thumbsUp.png'); + + /// File path: assets/icons/icon_toTop.png AssetGenImage get iconToTop => const AssetGenImage('assets/icons/icon_toTop.png'); + + /// File path: assets/icons/icon_topic_first.png AssetGenImage get iconTopicFirst => const AssetGenImage('assets/icons/icon_topic_first.png'); + + /// File path: assets/icons/icon_topic_second.png AssetGenImage get iconTopicSecond => const AssetGenImage('assets/icons/icon_topic_second.png'); + + /// File path: assets/icons/icon_topic_third.png AssetGenImage get iconTopicThird => const AssetGenImage('assets/icons/icon_topic_third.png'); + + /// File path: assets/icons/identify.png AssetGenImage get identify => const AssetGenImage('assets/icons/identify.png'); + + /// File path: assets/icons/img_add.png AssetGenImage get imgAdd => const AssetGenImage('assets/icons/img_add.png'); + + /// File path: assets/icons/img_qiandao.png AssetGenImage get imgQiandao => const AssetGenImage('assets/icons/img_qiandao.png'); + + /// File path: assets/icons/img_shezhi.png AssetGenImage get imgShezhi => const AssetGenImage('assets/icons/img_shezhi.png'); + + /// File path: assets/icons/intergral.png AssetGenImage get intergral => const AssetGenImage('assets/icons/intergral.png'); + + /// File path: assets/icons/introduce.png AssetGenImage get introduce => const AssetGenImage('assets/icons/introduce.png'); + + /// File path: assets/icons/lease_house.png AssetGenImage get leaseHouse => const AssetGenImage('assets/icons/lease_house.png'); + + /// File path: assets/icons/life_pay_record.png AssetGenImage get lifePayRecord => const AssetGenImage('assets/icons/life_pay_record.png'); + + /// File path: assets/icons/like.png AssetGenImage get like => const AssetGenImage('assets/icons/like.png'); + + /// File path: assets/icons/location.png AssetGenImage get location => const AssetGenImage('assets/icons/location.png'); + + /// File path: assets/icons/manager_order_cancel.png AssetGenImage get managerOrderCancel => const AssetGenImage('assets/icons/manager_order_cancel.png'); + + /// File path: assets/icons/manager_phone_call.png AssetGenImage get managerPhoneCall => const AssetGenImage('assets/icons/manager_phone_call.png'); + + /// File path: assets/icons/market_tab_selected.png AssetGenImage get marketTabSelected => const AssetGenImage('assets/icons/market_tab_selected.png'); + + /// File path: assets/icons/market_tab_unselected.png AssetGenImage get marketTabUnselected => const AssetGenImage('assets/icons/market_tab_unselected.png'); + + /// File path: assets/icons/nearby_pet.png AssetGenImage get nearbyPet => const AssetGenImage('assets/icons/nearby_pet.png'); + + /// File path: assets/icons/nearby_service.png AssetGenImage get nearbyService => const AssetGenImage('assets/icons/nearby_service.png'); + + /// File path: assets/icons/normal.png AssetGenImage get normal => const AssetGenImage('assets/icons/normal.png'); + + /// File path: assets/icons/oxygen.png AssetGenImage get oxygen => const AssetGenImage('assets/icons/oxygen.png'); + + /// File path: assets/icons/pass.png AssetGenImage get pass => const AssetGenImage('assets/icons/pass.png'); + + /// File path: assets/icons/pay.png AssetGenImage get pay => const AssetGenImage('assets/icons/pay.png'); + + /// File path: assets/icons/phone.png AssetGenImage get phone => const AssetGenImage('assets/icons/phone.png'); + + /// File path: assets/icons/phone_circle.png AssetGenImage get phoneCircle => const AssetGenImage('assets/icons/phone_circle.png'); + + /// File path: assets/icons/projection_screen.png AssetGenImage get projectionScreen => const AssetGenImage('assets/icons/projection_screen.png'); + + /// File path: assets/icons/property.png AssetGenImage get property => const AssetGenImage('assets/icons/property.png'); + + /// File path: assets/icons/proposal.png AssetGenImage get proposal => const AssetGenImage('assets/icons/proposal.png'); + + /// File path: assets/icons/provide_aged.png AssetGenImage get provideAged => const AssetGenImage('assets/icons/provide_aged.png'); + + /// File path: assets/icons/record.png AssetGenImage get record => const AssetGenImage('assets/icons/record.png'); + + /// File path: assets/icons/reject.png AssetGenImage get reject => const AssetGenImage('assets/icons/reject.png'); + + /// File path: assets/icons/report.png AssetGenImage get report => const AssetGenImage('assets/icons/report.png'); + + /// File path: assets/icons/reward.png AssetGenImage get reward => const AssetGenImage('assets/icons/reward.png'); + + /// File path: assets/icons/satisfied.png AssetGenImage get satisfied => const AssetGenImage('assets/icons/satisfied.png'); + + /// File path: assets/icons/second_hand.png AssetGenImage get secondHand => const AssetGenImage('assets/icons/second_hand.png'); + + /// File path: assets/icons/second_hand_market.png AssetGenImage get secondHandMarket => const AssetGenImage('assets/icons/second_hand_market.png'); + + /// File path: assets/icons/service.png AssetGenImage get service => const AssetGenImage('assets/icons/service.png'); + + /// File path: assets/icons/share_park.png AssetGenImage get sharePark => const AssetGenImage('assets/icons/share_park.png'); + + /// File path: assets/icons/shield_content.png AssetGenImage get shieldContent => const AssetGenImage('assets/icons/shield_content.png'); + + /// File path: assets/icons/shield_user.png AssetGenImage get shieldUser => const AssetGenImage('assets/icons/shield_user.png'); + + /// File path: assets/icons/shop_car.png AssetGenImage get shopCar => const AssetGenImage('assets/icons/shop_car.png'); + + /// File path: assets/icons/shop_close.png AssetGenImage get shopClose => const AssetGenImage('assets/icons/shop_close.png'); + + /// File path: assets/icons/shop_favorfill.png AssetGenImage get shopFavorfill => const AssetGenImage('assets/icons/shop_favorfill.png'); + + /// File path: assets/icons/shop_laba.png AssetGenImage get shopLaba => const AssetGenImage('assets/icons/shop_laba.png'); + + /// File path: assets/icons/shop_location.png AssetGenImage get shopLocation => const AssetGenImage('assets/icons/shop_location.png'); + + /// File path: assets/icons/shop_notice.png AssetGenImage get shopNotice => const AssetGenImage('assets/icons/shop_notice.png'); + + /// File path: assets/icons/shop_order.png AssetGenImage get shopOrder => const AssetGenImage('assets/icons/shop_order.png'); + + /// File path: assets/icons/shop_search.png AssetGenImage get shopSearch => const AssetGenImage('assets/icons/shop_search.png'); + + /// File path: assets/icons/shop_torb.png AssetGenImage get shopTorb => const AssetGenImage('assets/icons/shop_torb.png'); + + /// File path: assets/icons/shopping_mall.png AssetGenImage get shoppingMall => const AssetGenImage('assets/icons/shopping_mall.png'); + + /// File path: assets/icons/sos.png AssetGenImage get sos => const AssetGenImage('assets/icons/sos.png'); + + /// File path: assets/icons/system_notice.png AssetGenImage get systemNotice => const AssetGenImage('assets/icons/system_notice.png'); + + /// File path: assets/icons/tabbar_home.png AssetGenImage get tabbarHome => const AssetGenImage('assets/icons/tabbar_home.png'); + + /// File path: assets/icons/tabbar_home_no.png AssetGenImage get tabbarHomeNo => const AssetGenImage('assets/icons/tabbar_home_no.png'); + + /// File path: assets/icons/tabbar_house.png AssetGenImage get tabbarHouse => const AssetGenImage('assets/icons/tabbar_house.png'); + + /// File path: assets/icons/tabbar_house_no.png AssetGenImage get tabbarHouseNo => const AssetGenImage('assets/icons/tabbar_house_no.png'); + + /// File path: assets/icons/tabbar_market.png AssetGenImage get tabbarMarket => const AssetGenImage('assets/icons/tabbar_market.png'); + + /// File path: assets/icons/tabbar_market_no.png AssetGenImage get tabbarMarketNo => const AssetGenImage('assets/icons/tabbar_market_no.png'); + + /// File path: assets/icons/tabbar_message.png AssetGenImage get tabbarMessage => const AssetGenImage('assets/icons/tabbar_message.png'); + + /// File path: assets/icons/tabbar_message_no.png AssetGenImage get tabbarMessageNo => const AssetGenImage('assets/icons/tabbar_message_no.png'); + + /// File path: assets/icons/tabbar_user.png AssetGenImage get tabbarUser => const AssetGenImage('assets/icons/tabbar_user.png'); + + /// File path: assets/icons/tabbar_user_no.png AssetGenImage get tabbarUserNo => const AssetGenImage('assets/icons/tabbar_user_no.png'); + + /// File path: assets/icons/tag.png AssetGenImage get tag => const AssetGenImage('assets/icons/tag.png'); + + /// File path: assets/icons/task_location.png AssetGenImage get taskLocation => const AssetGenImage('assets/icons/task_location.png'); + + /// File path: assets/icons/test_kingcion.png AssetGenImage get testKingcion => const AssetGenImage('assets/icons/test_kingcion.png'); + + /// File path: assets/icons/tool_bmdh.png AssetGenImage get toolBmdh => const AssetGenImage('assets/icons/tool_bmdh.png'); + + /// File path: assets/icons/tool_bmts.png AssetGenImage get toolBmts => const AssetGenImage('assets/icons/tool_bmts.png'); + + /// File path: assets/icons/tool_bsbx.png AssetGenImage get toolBsbx => const AssetGenImage('assets/icons/tool_bsbx.png'); + + /// File path: assets/icons/tool_czxs.png AssetGenImage get toolCzxs => const AssetGenImage('assets/icons/tool_czxs.png'); + + /// File path: assets/icons/tool_facility.png AssetGenImage get toolFacility => const AssetGenImage('assets/icons/tool_facility.png'); + + /// File path: assets/icons/tool_fkyq.png AssetGenImage get toolFkyq => const AssetGenImage('assets/icons/tool_fkyq.png'); + + /// File path: assets/icons/tool_fsxb.png AssetGenImage get toolFsxb => const AssetGenImage('assets/icons/tool_fsxb.png'); + + /// File path: assets/icons/tool_hdtp.png AssetGenImage get toolHdtp => const AssetGenImage('assets/icons/tool_hdtp.png'); + + /// File path: assets/icons/tool_jhgl.png AssetGenImage get toolJhgl => const AssetGenImage('assets/icons/tool_jhgl.png'); + + /// File path: assets/icons/tool_jjsh.png AssetGenImage get toolJjsh => const AssetGenImage('assets/icons/tool_jjsh.png'); + + /// File path: assets/icons/tool_jyts.png AssetGenImage get toolJyts => const AssetGenImage('assets/icons/tool_jyts.png'); + + /// File path: assets/icons/tool_kmm.png AssetGenImage get toolKmm => const AssetGenImage('assets/icons/tool_kmm.png'); + + /// File path: assets/icons/tool_mywj.png AssetGenImage get toolMywj => const AssetGenImage('assets/icons/tool_mywj.png'); + + /// File path: assets/icons/tool_qbyy.png AssetGenImage get toolQbyy => const AssetGenImage('assets/icons/tool_qbyy.png'); + + /// File path: assets/icons/tool_shjf.png AssetGenImage get toolShjf => const AssetGenImage('assets/icons/tool_shjf.png'); + + /// File path: assets/icons/tool_smjd.png AssetGenImage get toolSmjd => const AssetGenImage('assets/icons/tool_smjd.png'); + + /// File path: assets/icons/tool_tsby.png AssetGenImage get toolTsby => const AssetGenImage('assets/icons/tool_tsby.png'); + + /// File path: assets/icons/tool_wjdc.png AssetGenImage get toolWjdc => const AssetGenImage('assets/icons/tool_wjdc.png'); + + /// File path: assets/icons/tool_wpcm.png AssetGenImage get toolWpcm => const AssetGenImage('assets/icons/tool_wpcm.png'); + + /// File path: assets/icons/tool_xxfs.png AssetGenImage get toolXxfs => const AssetGenImage('assets/icons/tool_xxfs.png'); + + /// File path: assets/icons/tool_yjbj.png AssetGenImage get toolYjbj => const AssetGenImage('assets/icons/tool_yjbj.png'); + + /// File path: assets/icons/tool_yjkm.png AssetGenImage get toolYjkm => const AssetGenImage('assets/icons/tool_yjkm.png'); + + /// File path: assets/icons/tool_yljs.png AssetGenImage get toolYljs => const AssetGenImage('assets/icons/tool_yljs.png'); + + /// File path: assets/icons/tool_ywh.png AssetGenImage get toolYwh => const AssetGenImage('assets/icons/tool_ywh.png'); + + /// File path: assets/icons/tool_zbbj.png AssetGenImage get toolZbbj => const AssetGenImage('assets/icons/tool_zbbj.png'); + + /// File path: assets/icons/tool_zxgl.png AssetGenImage get toolZxgl => const AssetGenImage('assets/icons/tool_zxgl.png'); + + /// File path: assets/icons/user_icon_dfh.png AssetGenImage get userIconDfh => const AssetGenImage('assets/icons/user_icon_dfh.png'); + + /// File path: assets/icons/user_icon_dfk.png AssetGenImage get userIconDfk => const AssetGenImage('assets/icons/user_icon_dfk.png'); + + /// File path: assets/icons/user_icon_dpj.png AssetGenImage get userIconDpj => const AssetGenImage('assets/icons/user_icon_dpj.png'); + + /// File path: assets/icons/user_icon_dsh.png AssetGenImage get userIconDsh => const AssetGenImage('assets/icons/user_icon_dsh.png'); + + /// File path: assets/icons/user_icon_sh.png AssetGenImage get userIconSh => const AssetGenImage('assets/icons/user_icon_sh.png'); + + /// File path: assets/icons/user_icon_sz.png AssetGenImage get userIconSz => const AssetGenImage('assets/icons/user_icon_sz.png'); + + /// File path: assets/icons/user_icon_vip.png AssetGenImage get userIconVip => const AssetGenImage('assets/icons/user_icon_vip.png'); + + /// File path: assets/icons/user_icon_wdbx.png AssetGenImage get userIconWdbx => const AssetGenImage('assets/icons/user_icon_wdbx.png'); + + /// File path: assets/icons/user_icon_wdc.png AssetGenImage get userIconWdc => const AssetGenImage('assets/icons/user_icon_wdc.png'); + + /// File path: assets/icons/user_icon_wdcw.png AssetGenImage get userIconWdcw => const AssetGenImage('assets/icons/user_icon_wdcw.png'); + + /// File path: assets/icons/user_icon_wddz.png AssetGenImage get userIconWddz => const AssetGenImage('assets/icons/user_icon_wddz.png'); + + /// File path: assets/icons/user_icon_wdfk.png AssetGenImage get userIconWdfk => const AssetGenImage('assets/icons/user_icon_wdfk.png'); + + /// File path: assets/icons/user_icon_wdfw.png AssetGenImage get userIconWdfw => const AssetGenImage('assets/icons/user_icon_wdfw.png'); + + /// File path: assets/icons/user_icon_wdgj.png AssetGenImage get userIconWdgj => const AssetGenImage('assets/icons/user_icon_wdgj.png'); + + /// File path: assets/icons/user_icon_wdjf.png AssetGenImage get userIconWdjf => const AssetGenImage('assets/icons/user_icon_wdjf.png'); + + /// File path: assets/icons/user_icon_wdsqhd.png AssetGenImage get userIconWdsqhd => const AssetGenImage('assets/icons/user_icon_wdsqhd.png'); + + /// File path: assets/icons/vip1.png AssetGenImage get vip1 => const AssetGenImage('assets/icons/vip1.png'); + + /// File path: assets/icons/vip2.png AssetGenImage get vip2 => const AssetGenImage('assets/icons/vip2.png'); + + /// File path: assets/icons/vip3.png AssetGenImage get vip3 => const AssetGenImage('assets/icons/vip3.png'); + + /// File path: assets/icons/vip4.png AssetGenImage get vip4 => const AssetGenImage('assets/icons/vip4.png'); + + /// File path: assets/icons/vip_font.png AssetGenImage get vipFont => const AssetGenImage('assets/icons/vip_font.png'); + + /// File path: assets/icons/watch.png AssetGenImage get watch => const AssetGenImage('assets/icons/watch.png'); + + /// File path: assets/icons/xianshi.png AssetGenImage get xianshi => const AssetGenImage('assets/icons/xianshi.png'); } class $AssetsImagesGen { const $AssetsImagesGen(); + /// File path: assets/images/application.png AssetGenImage get application => const AssetGenImage('assets/images/application.png'); + + /// File path: assets/images/car_header.png AssetGenImage get carHeader => const AssetGenImage('assets/images/car_header.png'); + + /// File path: assets/images/card_blue.png AssetGenImage get cardBlue => const AssetGenImage('assets/images/card_blue.png'); + + /// File path: assets/images/card_pink.png AssetGenImage get cardPink => const AssetGenImage('assets/images/card_pink.png'); + + /// File path: assets/images/card_yellow.png AssetGenImage get cardYellow => const AssetGenImage('assets/images/card_yellow.png'); + + /// File path: assets/images/certification.png AssetGenImage get certification => const AssetGenImage('assets/images/certification.png'); + + /// File path: assets/images/circle_left_bottom.png AssetGenImage get circleLeftBottom => const AssetGenImage('assets/images/circle_left_bottom.png'); + + /// File path: assets/images/circle_right_bottom.png AssetGenImage get circleRightBottom => const AssetGenImage('assets/images/circle_right_bottom.png'); + + /// File path: assets/images/circle_right_top.png AssetGenImage get circleRightTop => const AssetGenImage('assets/images/circle_right_top.png'); + + /// File path: assets/images/circle_text.png AssetGenImage get circleText => const AssetGenImage('assets/images/circle_text.png'); + + /// File path: assets/images/code_logo.png AssetGenImage get codeLogo => const AssetGenImage('assets/images/code_logo.png'); + + /// File path: assets/images/commitment.png AssetGenImage get commitment => const AssetGenImage('assets/images/commitment.png'); + + /// File path: assets/images/community_my_bg.png AssetGenImage get communityMyBg => const AssetGenImage('assets/images/community_my_bg.png'); + + /// File path: assets/images/contact_manager.png AssetGenImage get contactManager => const AssetGenImage('assets/images/contact_manager.png'); + + /// File path: assets/images/drawings.png AssetGenImage get drawings => const AssetGenImage('assets/images/drawings.png'); + + /// File path: assets/images/equipment_empty.png AssetGenImage get equipmentEmpty => const AssetGenImage('assets/images/equipment_empty.png'); + + /// File path: assets/images/good_detail_integral_back.png AssetGenImage get goodDetailIntegralBack => const AssetGenImage('assets/images/good_detail_integral_back.png'); + + /// File path: assets/images/house_attestation.png AssetGenImage get houseAttestation => const AssetGenImage('assets/images/house_attestation.png'); + + /// File path: assets/images/house_empty.png AssetGenImage get houseEmpty => const AssetGenImage('assets/images/house_empty.png'); + + /// File path: assets/images/house_header.png AssetGenImage get houseHeader => const AssetGenImage('assets/images/house_header.png'); + + /// File path: assets/images/license.png AssetGenImage get license => const AssetGenImage('assets/images/license.png'); + + /// File path: assets/images/license_back.png AssetGenImage get licenseBack => const AssetGenImage('assets/images/license_back.png'); + + /// File path: assets/images/lock.png AssetGenImage get lock => const AssetGenImage('assets/images/lock.png'); + + /// File path: assets/images/logo.png AssetGenImage get logo => const AssetGenImage('assets/images/logo.png'); + + /// File path: assets/images/member_bg.png AssetGenImage get memberBg => const AssetGenImage('assets/images/member_bg.png'); + + /// File path: assets/images/mine_bg.png AssetGenImage get mineBg => const AssetGenImage('assets/images/mine_bg.png'); + + /// File path: assets/images/my_bg.png AssetGenImage get myBg => const AssetGenImage('assets/images/my_bg.png'); + + /// File path: assets/images/notice.png AssetGenImage get notice => const AssetGenImage('assets/images/notice.png'); + + /// File path: assets/images/open_door.png AssetGenImage get openDoor => const AssetGenImage('assets/images/open_door.png'); + + /// File path: assets/images/phone_logo.png AssetGenImage get phoneLogo => const AssetGenImage('assets/images/phone_logo.png'); + + /// File path: assets/images/placeholder.webp AssetGenImage get placeholder => const AssetGenImage('assets/images/placeholder.webp'); + + /// File path: assets/images/property_bg.png AssetGenImage get propertyBg => const AssetGenImage('assets/images/property_bg.png'); + + /// File path: assets/images/shop_car_empty.png AssetGenImage get shopCarEmpty => const AssetGenImage('assets/images/shop_car_empty.png'); + + /// File path: assets/images/success.png AssetGenImage get success => const AssetGenImage('assets/images/success.png'); + + /// File path: assets/images/white.png AssetGenImage get white => const AssetGenImage('assets/images/white.png'); + + /// File path: assets/images/wxpay.png AssetGenImage get wxpay => const AssetGenImage('assets/images/wxpay.png'); } @@ -635,57 +1304,132 @@ class $AssetsJsonGen { class $AssetsNewIconGen { const $AssetsNewIconGen(); + /// File path: assets/newIcon/avatar_placeholder.png AssetGenImage get avatarPlaceholder => const AssetGenImage('assets/newIcon/avatar_placeholder.png'); + + /// File path: assets/newIcon/ic_daifuk.png AssetGenImage get icDaifuk => const AssetGenImage('assets/newIcon/ic_daifuk.png'); + + /// File path: assets/newIcon/ic_daishouh.png AssetGenImage get icDaishouh => const AssetGenImage('assets/newIcon/ic_daishouh.png'); + + /// File path: assets/newIcon/ic_dlxx.png AssetGenImage get icDlxx => const AssetGenImage('assets/newIcon/ic_dlxx.png'); + + /// File path: assets/newIcon/ic_dzsw.png AssetGenImage get icDzsw => const AssetGenImage('assets/newIcon/ic_dzsw.png'); + + /// File path: assets/newIcon/ic_essc.png AssetGenImage get icEssc => const AssetGenImage('assets/newIcon/ic_essc.png'); + + /// File path: assets/newIcon/ic_fwll.png AssetGenImage get icFwll => const AssetGenImage('assets/newIcon/ic_fwll.png'); + + /// File path: assets/newIcon/ic_gxtc.png AssetGenImage get icGxtc => const AssetGenImage('assets/newIcon/ic_gxtc.png'); + + /// File path: assets/newIcon/ic_gxtp.png AssetGenImage get icGxtp => const AssetGenImage('assets/newIcon/ic_gxtp.png'); + + /// File path: assets/newIcon/ic_hdtp.png AssetGenImage get icHdtp => const AssetGenImage('assets/newIcon/ic_hdtp.png'); + + /// File path: assets/newIcon/ic_jhgl.png AssetGenImage get icJhgl => const AssetGenImage('assets/newIcon/ic_jhgl.png'); + + /// File path: assets/newIcon/ic_jifen.png AssetGenImage get icJifen => const AssetGenImage('assets/newIcon/ic_jifen.png'); + + /// File path: assets/newIcon/ic_kdbg.png AssetGenImage get icKdbg => const AssetGenImage('assets/newIcon/ic_kdbg.png'); + + /// File path: assets/newIcon/ic_kmm.png AssetGenImage get icKmm => const AssetGenImage('assets/newIcon/ic_kmm.png'); + + /// File path: assets/newIcon/ic_rwsm.png AssetGenImage get icRwsm => const AssetGenImage('assets/newIcon/ic_rwsm.png'); + + /// File path: assets/newIcon/ic_shdz.png AssetGenImage get icShdz => const AssetGenImage('assets/newIcon/ic_shdz.png'); + + /// File path: assets/newIcon/ic_sqjs.png AssetGenImage get icSqjs => const AssetGenImage('assets/newIcon/ic_sqjs.png'); + + /// File path: assets/newIcon/ic_tsby.png AssetGenImage get icTsby => const AssetGenImage('assets/newIcon/ic_tsby.png'); + + /// File path: assets/newIcon/ic_wdfk.png AssetGenImage get icWdfk => const AssetGenImage('assets/newIcon/ic_wdfk.png'); + + /// File path: assets/newIcon/ic_wdfw.png AssetGenImage get icWdfw => const AssetGenImage('assets/newIcon/ic_wdfw.png'); + + /// File path: assets/newIcon/ic_wdjt.png AssetGenImage get icWdjt => const AssetGenImage('assets/newIcon/ic_wdjt.png'); + + /// File path: assets/newIcon/ic_wjdc.png AssetGenImage get icWjdc => const AssetGenImage('assets/newIcon/ic_wjdc.png'); + + /// File path: assets/newIcon/ic_xmfrw.png AssetGenImage get icXmfrw => const AssetGenImage('assets/newIcon/ic_xmfrw.png'); + + /// File path: assets/newIcon/ic_ywh.png AssetGenImage get icYwh => const AssetGenImage('assets/newIcon/ic_ywh.png'); + + /// File path: assets/newIcon/ic_zbqy.png AssetGenImage get icZbqy => const AssetGenImage('assets/newIcon/ic_zbqy.png'); + + /// File path: assets/newIcon/ic_zysc.png AssetGenImage get icZysc => const AssetGenImage('assets/newIcon/ic_zysc.png'); + + /// File path: assets/newIcon/img_bg.png AssetGenImage get imgBg => const AssetGenImage('assets/newIcon/img_bg.png'); + + /// File path: assets/newIcon/img_bmdh.png AssetGenImage get imgBmdh => const AssetGenImage('assets/newIcon/img_bmdh.png'); + + /// File path: assets/newIcon/img_daifah.png AssetGenImage get imgDaifah => const AssetGenImage('assets/newIcon/img_daifah.png'); + + /// File path: assets/newIcon/img_daipingj.png AssetGenImage get imgDaipingj => const AssetGenImage('assets/newIcon/img_daipingj.png'); + + /// File path: assets/newIcon/img_dengji.png AssetGenImage get imgDengji => const AssetGenImage('assets/newIcon/img_dengji.png'); + + /// File path: assets/newIcon/img_qiandao.png AssetGenImage get imgQiandao => const AssetGenImage('assets/newIcon/img_qiandao.png'); + + /// File path: assets/newIcon/img_shezhi.png AssetGenImage get imgShezhi => const AssetGenImage('assets/newIcon/img_shezhi.png'); + + /// File path: assets/newIcon/img_txmr.png AssetGenImage get imgTxmr => const AssetGenImage('assets/newIcon/img_txmr.png'); + + /// File path: assets/newIcon/img_vip.png AssetGenImage get imgVip => const AssetGenImage('assets/newIcon/img_vip.png'); + + /// File path: assets/newIcon/img_vipbg.png AssetGenImage get imgVipbg => const AssetGenImage('assets/newIcon/img_vipbg.png'); + + /// File path: assets/newIcon/img_wpcm.png AssetGenImage get imgWpcm => const AssetGenImage('assets/newIcon/img_wpcm.png'); + + /// File path: assets/newIcon/img_zxgl.png AssetGenImage get imgZxgl => const AssetGenImage('assets/newIcon/img_zxgl.png'); } @@ -693,39 +1437,74 @@ class $AssetsNewIconGen { class $AssetsStaticGen { const $AssetsStaticGen(); + /// File path: assets/static/bracelet_header.png AssetGenImage get braceletHeader => const AssetGenImage('assets/static/bracelet_header.png'); + + /// File path: assets/static/car_card_grey.webp AssetGenImage get carCardGrey => const AssetGenImage('assets/static/car_card_grey.webp'); + + /// File path: assets/static/car_card_yellow.webp AssetGenImage get carCardYellow => const AssetGenImage('assets/static/car_card_yellow.webp'); + + /// File path: assets/static/car_park_empty.webp AssetGenImage get carParkEmpty => const AssetGenImage('assets/static/car_park_empty.webp'); + + /// File path: assets/static/family.png AssetGenImage get family => const AssetGenImage('assets/static/family.png'); + + /// File path: assets/static/house_auth_fail.webp AssetGenImage get houseAuthFail => const AssetGenImage('assets/static/house_auth_fail.webp'); + + /// File path: assets/static/house_auth_success.webp AssetGenImage get houseAuthSuccess => const AssetGenImage('assets/static/house_auth_success.webp'); + + /// File path: assets/static/id_card_back.png AssetGenImage get idCardBack => const AssetGenImage('assets/static/id_card_back.png'); + + /// File path: assets/static/id_card_front.png AssetGenImage get idCardFront => const AssetGenImage('assets/static/id_card_front.png'); + + /// File path: assets/static/integral_background.png AssetGenImage get integralBackground => const AssetGenImage('assets/static/integral_background.png'); + + /// File path: assets/static/old_age_back.png AssetGenImage get oldAgeBack => const AssetGenImage('assets/static/old_age_back.png'); + + /// File path: assets/static/parking_grey.webp AssetGenImage get parkingGrey => const AssetGenImage('assets/static/parking_grey.webp'); + + /// File path: assets/static/parking_yellow.webp AssetGenImage get parkingYellow => const AssetGenImage('assets/static/parking_yellow.webp'); + + /// File path: assets/static/review_fail.webp AssetGenImage get reviewFail => const AssetGenImage('assets/static/review_fail.webp'); + + /// File path: assets/static/reviewing.webp AssetGenImage get reviewing => const AssetGenImage('assets/static/reviewing.webp'); + + /// File path: assets/static/rule_explain.png AssetGenImage get ruleExplain => const AssetGenImage('assets/static/rule_explain.png'); + + /// File path: assets/static/sign_in_background.png AssetGenImage get signInBackground => const AssetGenImage('assets/static/sign_in_background.png'); + + /// File path: assets/static/vip_background.png AssetGenImage get vipBackground => const AssetGenImage('assets/static/vip_background.png'); } @@ -733,9 +1512,16 @@ class $AssetsStaticGen { class $AssetsTabGen { const $AssetsTabGen(); + /// File path: assets/tab/bkjh.png AssetGenImage get bkjh => const AssetGenImage('assets/tab/bkjh.png'); + + /// File path: assets/tab/kbhw.png AssetGenImage get kbhw => const AssetGenImage('assets/tab/kbhw.png'); + + /// File path: assets/tab/nanz.png AssetGenImage get nanz => const AssetGenImage('assets/tab/nanz.png'); + + /// File path: assets/tab/nvz.png AssetGenImage get nvz => const AssetGenImage('assets/tab/nvz.png'); } diff --git a/lib/models/home/activity_detail_model.g.dart b/lib/models/home/activity_detail_model.g.dart index bc2cfa26..fed5d1b4 100644 --- a/lib/models/home/activity_detail_model.g.dart +++ b/lib/models/home/activity_detail_model.g.dart @@ -34,7 +34,7 @@ ActivityDetailModel _$ActivityDetailModelFromJson(Map json) => organizerImgList: (json['organizerImgList'] as List) .map((e) => ImgModel.fromJson(e as Map)) .toList(), - isRegistration:json['isRegistration'] as int + isRegistration: json['isRegistration'] as int, ); Registration _$RegistrationFromJson(Map json) => Registration( diff --git a/lib/models/life_pay/life_pay_model.dart b/lib/models/life_pay/life_pay_model.dart index 60210c6a..5000272c 100644 --- a/lib/models/life_pay/life_pay_model.dart +++ b/lib/models/life_pay/life_pay_model.dart @@ -1,33 +1,40 @@ import 'package:equatable/equatable.dart'; import 'package:json_annotation/json_annotation.dart'; -part 'life_pay_model.g.dart'; +part 'life_pay_model.g.dart'; @JsonSerializable(createToJson: true, explicitToJson: true) class LifePayModel extends Equatable { final int id; - final String chargesName; + final String? chargesName; final String billDateStart; final String billDateEnd; final String createDate; final double payPrincipal; final double defaultAmount; + factory LifePayModel.fromJson(Map json) => + _$LifePayModelFromJson(json); + Map toJson() => _$LifePayModelToJson(this); + @override + List get props => [ + id, + chargesName, + billDateStart, + billDateEnd, + createDate, + payPrincipal, + defaultAmount + ]; - factory LifePayModel.fromJson(Map json) =>_$LifePayModelFromJson(json); - Map toJson()=> _$LifePayModelToJson(this); - - LifePayModel({ + const LifePayModel({ required this.id, - required this.chargesName, + this.chargesName, required this.billDateStart, required this.billDateEnd, required this.createDate, required this.payPrincipal, required this.defaultAmount, }); - - @override - List get props => [id, chargesName, billDateStart,billDateEnd,createDate,payPrincipal,defaultAmount]; -} \ No newline at end of file +} diff --git a/lib/models/life_pay/life_pay_model.g.dart b/lib/models/life_pay/life_pay_model.g.dart index b56edc6a..ee3b3040 100644 --- a/lib/models/life_pay/life_pay_model.g.dart +++ b/lib/models/life_pay/life_pay_model.g.dart @@ -8,7 +8,7 @@ part of 'life_pay_model.dart'; LifePayModel _$LifePayModelFromJson(Map json) => LifePayModel( id: json['id'] as int, - chargesName: json['chargesName'] as String, + chargesName: json['chargesName'] as String?, billDateStart: json['billDateStart'] as String, billDateEnd: json['billDateEnd'] as String, createDate: json['createDate'] as String, diff --git a/lib/models/message/reply_list_model.g.dart b/lib/models/message/reply_list_model.g.dart index 821f888c..279b79a2 100644 --- a/lib/models/message/reply_list_model.g.dart +++ b/lib/models/message/reply_list_model.g.dart @@ -20,5 +20,5 @@ ReplyListModel _$ReplyListModelFromJson(Map json) => dynamicImgList: (json['dynamicImgList'] as List) .map((e) => ImgModel.fromJson(e as Map)) .toList(), - jumpId:json['jumpId'] as int + jumpId: json['jumpId'] as int, ); diff --git a/lib/models/user/user_info_model.dart b/lib/models/user/user_info_model.dart index 944a1c68..3889df5a 100644 --- a/lib/models/user/user_info_model.dart +++ b/lib/models/user/user_info_model.dart @@ -1,6 +1,5 @@ -import 'package:json_annotation/json_annotation.dart'; - import 'package:aku_new_community/model/common/img_model.dart'; +import 'package:json_annotation/json_annotation.dart'; part 'user_info_model.g.dart'; @@ -8,6 +7,7 @@ part 'user_info_model.g.dart'; class UserInfoModel { final int id; final int communityId; + final String communityName; final String communityCode; final String? name; final String? idCard; @@ -44,6 +44,7 @@ class UserInfoModel { const UserInfoModel({ required this.id, required this.communityId, + required this.communityName, required this.communityCode, this.name, this.idCard, diff --git a/lib/models/user/user_info_model.g.dart b/lib/models/user/user_info_model.g.dart index dc460248..5140e033 100644 --- a/lib/models/user/user_info_model.g.dart +++ b/lib/models/user/user_info_model.g.dart @@ -10,6 +10,7 @@ UserInfoModel _$UserInfoModelFromJson(Map json) => UserInfoModel( id: json['id'] as int, communityId: json['communityId'] as int, + communityName: json['communityName'] as String, communityCode: json['communityCode'] as String, name: json['name'] as String?, idCard: json['idCard'] as String?, diff --git a/lib/pages/home/home_page.dart b/lib/pages/home/home_page.dart index 87f13136..d7b309d3 100644 --- a/lib/pages/home/home_page.dart +++ b/lib/pages/home/home_page.dart @@ -18,10 +18,8 @@ import 'package:aku_new_community/ui/community/notice/notice_detail_page.dart'; import 'package:aku_new_community/ui/home/home_notification.dart'; import 'package:aku_new_community/ui/home/home_title.dart'; import 'package:aku_new_community/ui/home/public_infomation/public_information_detail_page.dart'; -import 'package:aku_new_community/ui/manager/advice/advice_page.dart'; import 'package:aku_new_community/ui/market/search/good_detail_page.dart'; import 'package:aku_new_community/utils/headers.dart'; -import 'package:aku_new_community/utils/hive_store.dart'; import 'package:aku_new_community/utils/login_util.dart'; import 'package:aku_new_community/utils/websocket/tips_dialog.dart'; import 'package:aku_new_community/widget/beeImageNetwork.dart'; @@ -112,17 +110,18 @@ class _HomePageState extends State left: 32.w, bottom: 20.w), child: Row(crossAxisAlignment: CrossAxisAlignment.center, children: [ - if (appProvider.location != null) - Image.asset( - Assets.home.icLocation.path, - width: 48.w, - height: 48.w, - ), + // if (appProvider.location != null) + Image.asset( + Assets.home.icLocation.path, + width: 48.w, + height: 48.w, + ), 16.wb, Text( - appProvider.location?['city'] == null - ? '' - : appProvider.location?['city'] as String? ?? '', + '${UserTool.userProvider.userInfoModel?.communityName ?? ""}', + // appProvider.location?['city'] == null + // ? '' + // : appProvider.location?['city'] as String? ?? '', style: TextStyle( fontWeight: FontWeight.w600, fontSize: 28.sp, @@ -356,12 +355,7 @@ class _HomePageState extends State ), ), onTap: () async { - var agreement = await HiveStore.appBox?.get('AdvicePage') ?? false; - if (!agreement) { - await TipsDialog.tipsDialog(); - HiveStore.appBox!.put('AdvicePage', true); - } - + await TipsDialog.tipsDialog(); // Get.to(AdvicePage( // type: AdviceType.SUGGESTION)); }, diff --git a/lib/pages/life_pay/life_pay_page_new.dart b/lib/pages/life_pay/life_pay_page_new.dart index a122b896..21d72511 100644 --- a/lib/pages/life_pay/life_pay_page_new.dart +++ b/lib/pages/life_pay/life_pay_page_new.dart @@ -1,22 +1,15 @@ -import 'dart:convert'; - import 'package:aku_new_community/base/base_style.dart'; -import 'package:aku_new_community/constants/api.dart'; import 'package:aku_new_community/constants/saas_api.dart'; import 'package:aku_new_community/gen/assets.gen.dart'; -import 'package:aku_new_community/models/life_pay/life_pay_list_model.dart'; import 'package:aku_new_community/models/life_pay/life_pay_model.dart'; import 'package:aku_new_community/pages/life_pay/life_pay_record_page.dart'; import 'package:aku_new_community/pages/life_pay/life_pre_pay_page.dart'; import 'package:aku_new_community/pages/life_pay/pay_finish_page.dart'; import 'package:aku_new_community/pages/life_pay/pay_util.dart'; -import 'package:aku_new_community/pages/life_pay/widget/life_pay_detail_page.dart'; import 'package:aku_new_community/pages/life_pay/widget/life_pay_detail_page_new.dart'; import 'package:aku_new_community/provider/app_provider.dart'; import 'package:aku_new_community/ui/profile/new_house/my_house_page.dart'; -import 'package:aku_new_community/utils/bee_parse.dart'; import 'package:aku_new_community/utils/headers.dart'; -import 'package:aku_new_community/utils/network/base_list_model.dart'; import 'package:aku_new_community/utils/network/base_model.dart'; import 'package:aku_new_community/utils/network/net_util.dart'; import 'package:aku_new_community/widget/bee_divider.dart'; @@ -42,7 +35,7 @@ class LifePayPageNew extends StatefulWidget { class MonthPay { double payTotal; //费用 List selectIds; //存储选中的主键id数组 - List ids;//存储原先全部主键id数组 + List ids; //存储原先全部主键id数组 String itemNames; //选择的费用名称 String timeTitle; //月份 @@ -50,7 +43,7 @@ class MonthPay { {required this.payTotal, required this.ids, required this.itemNames, - required this.selectIds, + required this.selectIds, required this.timeTitle}); } @@ -64,12 +57,10 @@ class _LifePayPageNewState extends State { List _selectModelIndex = []; //选择的月份model，存储其数组下标 - bool get allSelect => - ((_selectMonths.length == _selectModelIndex.length) && (_selectMonths.length != 0)); - + bool get allSelect => ((_selectMonths.length == _selectModelIndex.length) && + (_selectMonths.length != 0)); MonthPay get total { - double price = 0; List ids = []; for (var i in _selectModelIndex) { @@ -78,7 +69,8 @@ class _LifePayPageNewState extends State { price += model.payTotal; ids.addAll(model.selectIds); } - return MonthPay( payTotal: price, ids: [], selectIds: ids, itemNames: '', timeTitle: ''); + return MonthPay( + payTotal: price, ids: [], selectIds: ids, itemNames: '', timeTitle: ''); } @override @@ -86,12 +78,11 @@ class _LifePayPageNewState extends State { super.initState(); _controller = EasyRefreshController(); - Future.delayed(Duration.zero,(){ - if( UserTool.userProvider.defaultHouse==null){ - Get.off(()=>MyHousePage()); - BotToast.showText(text: '请先选择您的房屋'); + Future.delayed(Duration.zero, () { + if (UserTool.userProvider.defaultHouse == null) { + Get.off(() => MyHousePage()); + BotToast.showText(text: '请先选择您的房屋'); } - }); _models = [ @@ -163,7 +154,7 @@ class _LifePayPageNewState extends State { Widget _buildCard(MonthPay model, int index) { return Container( - padding: EdgeInsets.symmetric(vertical: 32.w,horizontal: 32.w), + padding: EdgeInsets.symmetric(vertical: 32.w, horizontal: 32.w), decoration: BoxDecoration( borderRadius: BorderRadius.circular(8.w), color: kForeGroundColor), child: Row( @@ -183,7 +174,8 @@ class _LifePayPageNewState extends State { }); }, child: Container( - padding: EdgeInsets.only(left: 10.w,right: 10.w,bottom: 50.w), + padding: + EdgeInsets.only(left: 10.w, right: 10.w, bottom: 50.w), color: Colors.transparent, child: BeeCheckRadio( value: index, @@ -198,7 +190,11 @@ class _LifePayPageNewState extends State { crossAxisAlignment: CrossAxisAlignment.start, mainAxisSize: MainAxisSize.min, children: [ - model.timeTitle.text.color(Colors.black.withOpacity(0.8)).bold.size(32.sp).make(), + model.timeTitle.text + .color(Colors.black.withOpacity(0.8)) + .bold + .size(32.sp) + .make(), 13.w.heightBox, '已选择：' .richText @@ -209,18 +205,17 @@ class _LifePayPageNewState extends State { .size(32.sp) .bold .make(), - ' / ${model.ids.length}' - .textSpan - .color(Colors.black.withOpacity(0.25)) - .size(32.sp) - .bold - .make(), + ' / ${model.ids.length}' + .textSpan + .color(Colors.black.withOpacity(0.25)) + .size(32.sp) + .bold + .make(), ]) .color(Colors.black.withOpacity(0.65)) .size(26.sp) .make(), 13.w.heightBox, - SizedBox( width: 400.w, child: Text( @@ -230,11 +225,9 @@ class _LifePayPageNewState extends State { style: TextStyle( color: ktextSubColor, fontSize: 28.sp, - ), ), ), - 13.w.heightBox, RichText( text: TextSpan( @@ -244,12 +237,12 @@ class _LifePayPageNewState extends State { fontSize: 24.sp, fontWeight: FontWeight.bold), children: [ - TextSpan( - text: '¥ ', - style: TextStyle( - color: kDangerColor, - fontSize: 24.sp, - fontWeight: FontWeight.bold)), + TextSpan( + text: '¥ ', + style: TextStyle( + color: kDangerColor, + fontSize: 24.sp, + fontWeight: FontWeight.bold)), TextSpan( text: '${model.payTotal.toStringAsFixed(2)}', style: TextStyle( @@ -265,22 +258,18 @@ class _LifePayPageNewState extends State { children: [ GestureDetector( onTap: () async { - - - dynamic back = await Get.to(()=>LifePayDetailPageNew(model: model,)); - if(back){ - - for(int i=0;i<_selectMonths.length;i++){ - if(_selectMonths[i].selectIds.isEmpty){ - _selectModelIndex.remove(_selectMonths.indexOf(_selectMonths[i])); - - } + dynamic back = await Get.to(() => LifePayDetailPageNew( + model: model, + )); + if (back) { + for (int i = 0; i < _selectMonths.length; i++) { + if (_selectMonths[i].selectIds.isEmpty) { + _selectModelIndex + .remove(_selectMonths.indexOf(_selectMonths[i])); } - setState(() { - - }); } - + setState(() {}); + } }, child: Container( decoration: BoxDecoration( @@ -289,11 +278,14 @@ class _LifePayPageNewState extends State { ), padding: EdgeInsets.symmetric(horizontal: 20.w, vertical: 8.w), - child: '选择明细'.text.color(Colors.black.withOpacity(0.85)).size(22.sp).bold.make(), + child: '选择明细' + .text + .color(Colors.black.withOpacity(0.85)) + .size(22.sp) + .bold + .make(), ), ), - - ], ), ], @@ -309,14 +301,13 @@ class _LifePayPageNewState extends State { padding: EdgeInsets.symmetric(horizontal: 50.w, vertical: 15.w), onPressed: () async { Function cancel = BotToast.showLoading(); - BaseModel baseModel = - await NetUtil().post(SAASAPI.pay.createLivingExpensesOrder, params: { + BaseModel baseModel = await NetUtil() + .post(SAASAPI.pay.createLivingExpensesOrder, params: { "chargesBillId": total.ids, "paymentAmount": total.payTotal }); if (baseModel.success) { - bool result = await PayUtil().callAliPay( - (baseModel.data as String), + bool result = await PayUtil().callAliPay((baseModel.data as String), SAASAPI.pay.livingExpensesOrderCheckAlipay); if (result) { Get.off(() => PayFinishPage()); @@ -370,10 +361,8 @@ class _LifePayPageNewState extends State { } Future _dailyPaymentPrePay() async { - BaseModel baseModel = - await NetUtil().get(SAASAPI.lifePay.findEstateBalance, params: { - "estateId": UserTool.userProvider.defaultHouse!.id - }); + BaseModel baseModel = await NetUtil().get(SAASAPI.lifePay.findEstateBalance, + params: {"estateId": UserTool.userProvider.defaultHouse!.id}); if (baseModel.success) { return (baseModel.data as num).toDouble(); } else { @@ -392,10 +381,13 @@ class _LifePayPageNewState extends State { Get.to(() => LifePayRecordPage()); }, child: Container( - padding: EdgeInsets.fromLTRB(32.w, 28.w, 32.w, 20.w), - alignment: Alignment.center, - child: Image.asset(Assets.icons.lifePayRecord.path,width:48.w ,height: 48.w,) - ), + padding: EdgeInsets.fromLTRB(32.w, 28.w, 32.w, 20.w), + alignment: Alignment.center, + child: Image.asset( + Assets.icons.lifePayRecord.path, + width: 48.w, + height: 48.w, + )), ), ], body: EasyRefresh( @@ -403,66 +395,60 @@ class _LifePayPageNewState extends State { header: MaterialHeader(), controller: _controller, onRefresh: () async { - _prePrice = await _dailyPaymentPrePay(); _selectMonths.clear(); - BaseModel model = await NetUtil() - .get(SAASAPI.lifePay.livingExpensesList, params: { - 'estateId': UserTool.userProvider.defaultHouse!.id - }); - if(model.success){ - if(model.data!=null) - - - _models = ( model.data as List) + BaseModel model = await NetUtil().get( + SAASAPI.lifePay.livingExpensesList, + params: {'estateId': UserTool.userProvider.defaultHouse!.id}); + if (model.success) { + if (model.data != null) + _models = (model.data as List) .map((e) => LifePayModel.fromJson(e)) - .toList() ; + .toList(); } - - - ///先按月份分好 - if(_models.isNotEmpty) - _models.forEach((element) { - if (_selectMonths.isEmpty) { - _selectMonths.add(MonthPay( + if (_models.isNotEmpty) + _models.forEach((element) { + if (_selectMonths.isEmpty) { + _selectMonths.add(MonthPay( payTotal: element.payPrincipal + element.defaultAmount, ids: [element], - itemNames: element.chargesName, + itemNames: element.chargesName ?? '', timeTitle: DateUtil.formatDate( DateTime.parse(element.billDateStart), - format: 'yyyy-MM'), selectIds: [element],)); - } else { - bool same = false; - for(int i=0;i<_selectMonths.length;i++){ - - if (DateUtil.formatDate(DateTime.parse(element.billDateStart), - format: 'yyyy-MM') == - _selectMonths[i].timeTitle) { - _selectMonths[i].payTotal += - element.defaultAmount + element.payPrincipal; - _selectMonths[i].ids.add(element); - _selectMonths[i].itemNames += '、'+element.chargesName; - - _selectMonths[i].selectIds.add(element); - same = true; + format: 'yyyy-MM'), + selectIds: [element], + )); + } else { + bool same = false; + for (int i = 0; i < _selectMonths.length; i++) { + if (DateUtil.formatDate(DateTime.parse(element.billDateStart), + format: 'yyyy-MM') == + _selectMonths[i].timeTitle) { + _selectMonths[i].payTotal += + element.defaultAmount + element.payPrincipal; + _selectMonths[i].ids.add(element); + _selectMonths[i].itemNames += + '、' + (element.chargesName ?? ''); + + _selectMonths[i].selectIds.add(element); + same = true; + } + } + if (!same) { + _selectMonths.add(MonthPay( + payTotal: element.payPrincipal + element.defaultAmount, + ids: [element], + selectIds: [element], + itemNames: element.chargesName ?? '', + timeTitle: DateUtil.formatDate( + DateTime.parse(element.billDateStart), + format: 'yyyy-MM'))); } } - if(!same){ - _selectMonths.add(MonthPay( - payTotal: element.payPrincipal + element.defaultAmount, - ids: [element], - selectIds: [element], - itemNames: element.chargesName, - timeTitle: DateUtil.formatDate( - DateTime.parse(element.billDateStart), - format: 'yyyy-MM'))); - } - - } - }); + }); if (mounted) setState(() {}); }, child: Column( @@ -483,9 +469,11 @@ class _LifePayPageNewState extends State { child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - Padding(padding: EdgeInsets.symmetric(vertical: 24.w,horizontal: 32.w), - child: '当前账单'.text.color(ktextPrimary).size(28.sp).make(),), - + Padding( + padding: + EdgeInsets.symmetric(vertical: 24.w, horizontal: 32.w), + child: '当前账单'.text.color(ktextPrimary).size(28.sp).make(), + ), BeeDivider.horizontal(), ...List.generate(_selectMonths.length, (index) => _buildCard(_selectMonths[index], index)) @@ -508,7 +496,6 @@ class _LifePayPageNewState extends State { _selectModelIndex.clear(); setState(() {}); } else { - _selectModelIndex.clear(); for (var i = 0; i < _selectMonths.length; i++) { _selectModelIndex.add(i); @@ -537,12 +524,7 @@ class _LifePayPageNewState extends State { ).material(color: Colors.transparent), ), 16.wb, - '全选' - .text - .color(ktextSubColor) - .size(28.sp) - .bold - .make(), + '全选'.text.color(ktextSubColor).size(28.sp).bold.make(), Spacer(), Column( crossAxisAlignment: CrossAxisAlignment.end, @@ -556,12 +538,12 @@ class _LifePayPageNewState extends State { fontSize: 24.sp, fontWeight: FontWeight.bold), children: [ - TextSpan( - text: ' ¥', - style: TextStyle( - color: kDangerColor, - fontSize: 24.sp, - fontWeight: FontWeight.bold)), + TextSpan( + text: ' ¥', + style: TextStyle( + color: kDangerColor, + fontSize: 24.sp, + fontWeight: FontWeight.bold)), TextSpan( text: '${total.payTotal.toStringAsFixed(2)}', style: TextStyle( diff --git a/lib/pages/life_pay/widget/life_pay_detail_page_new.dart b/lib/pages/life_pay/widget/life_pay_detail_page_new.dart index 5a99f528..d3e59fc8 100644 --- a/lib/pages/life_pay/widget/life_pay_detail_page_new.dart +++ b/lib/pages/life_pay/widget/life_pay_detail_page_new.dart @@ -1,22 +1,15 @@ +import 'package:aku_new_community/base/base_style.dart'; import 'package:aku_new_community/models/life_pay/life_pay_model.dart'; +import 'package:aku_new_community/pages/life_pay/life_pay_page.dart'; import 'package:aku_new_community/pages/life_pay/life_pay_page_new.dart'; +import 'package:aku_new_community/utils/headers.dart'; import 'package:aku_new_community/widget/bee_divider.dart'; +import 'package:aku_new_community/widget/bee_scaffold.dart'; +import 'package:aku_new_community/widget/buttons/bee_check_radio.dart'; import 'package:common_utils/common_utils.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; - -import 'package:expandable/expandable.dart'; import 'package:get/get.dart'; -import 'package:provider/provider.dart'; - -import 'package:aku_new_community/base/base_style.dart'; -import 'package:aku_new_community/models/life_pay/life_pay_list_model.dart'; -import 'package:aku_new_community/pages/life_pay/life_pay_page.dart'; -import 'package:aku_new_community/provider/app_provider.dart'; -import 'package:aku_new_community/utils/bee_parse.dart'; -import 'package:aku_new_community/utils/headers.dart'; -import 'package:aku_new_community/widget/bee_scaffold.dart'; -import 'package:aku_new_community/widget/buttons/bee_check_radio.dart'; class LifePayDetailPageNew extends StatefulWidget { final MonthPay model; @@ -31,51 +24,45 @@ class LifePayDetailPageNew extends StatefulWidget { } class _LifePayDetailPageNewState extends State { - //已选择的model + //已选择的model List _selectModelIndex = []; //选择的月份model，存储其数组下标 List _list = []; - SelectPay get total { int count = 0; double price = 0; List ids = []; widget.model.selectIds.forEach((element) { - count++; - price += (element.defaultAmount + element.payPrincipal); - ids.add(element.id); + count++; + price += (element.defaultAmount + element.payPrincipal); + ids.add(element.id); }); widget.model.payTotal = price; return SelectPay(payCount: count, payTotal: price, ids: ids); } bool get isAllSelect { - return _selectModelIndex.length == widget.model.ids.length && _selectModelIndex != 0; + return _selectModelIndex.length == widget.model.ids.length && + _selectModelIndex != 0; } @override void initState() { super.initState(); - for(int i=0;i { GestureDetector( onTap: () { setState(() { - - - if (_selectModelIndex.contains(index)) { _selectModelIndex.remove(index); widget.model.selectIds.remove(model); @@ -102,7 +86,8 @@ class _LifePayDetailPageNewState extends State { }); }, child: Container( - padding: EdgeInsets.only(left: 10.w,right: 10.w,top: 5.w,bottom: 50.w), + padding: EdgeInsets.only( + left: 10.w, right: 10.w, top: 5.w, bottom: 50.w), color: Colors.transparent, child: BeeCheckRadio( value: index, @@ -117,33 +102,33 @@ class _LifePayDetailPageNewState extends State { crossAxisAlignment: CrossAxisAlignment.start, mainAxisSize: MainAxisSize.min, children: [ - model.chargesName.text.color(ktextSubColor).size(28.sp).make(), + (model.chargesName ?? '') + .text + .color(ktextSubColor) + .size(28.sp) + .make(), 24.w.heightBox, DateUtil.formatDate(DateTime.parse(model.billDateStart), - format: 'yyyy/MM/dd') + format: 'yyyy/MM/dd') .richText .withTextSpanChildren([ - ' - ' - .textSpan - .color(Colors.black.withOpacity(0.45)) - .size(24.sp) - - .make(), - DateUtil.formatDate(DateTime.parse(model.billDateEnd), - format: 'yyyy/MM/dd') - .textSpan - .color(Colors.black.withOpacity(0.45)) - .size(24.sp) - - .make(), - ]) + ' - ' + .textSpan + .color(Colors.black.withOpacity(0.45)) + .size(24.sp) + .make(), + DateUtil.formatDate(DateTime.parse(model.billDateEnd), + format: 'yyyy/MM/dd') + .textSpan + .color(Colors.black.withOpacity(0.45)) + .size(24.sp) + .make(), + ]) .color(Colors.black.withOpacity(0.45)) .size(24.sp) .make(), - ], ).expand(), - RichText( text: TextSpan( text: '¥ ', @@ -152,19 +137,18 @@ class _LifePayDetailPageNewState extends State { fontSize: 24.sp, fontWeight: FontWeight.bold), children: [ - TextSpan( - text: '${model.payPrincipal+model.defaultAmount}', - style: TextStyle( - color: kDangerColor, - fontSize: 30.sp, - fontWeight: FontWeight.bold)), - ])), + TextSpan( + text: '${model.payPrincipal + model.defaultAmount}', + style: TextStyle( + color: kDangerColor, + fontSize: 30.sp, + fontWeight: FontWeight.bold)), + ])), ], ), ); } - @override Widget build(BuildContext context) { var animatedContainer = AnimatedContainer( @@ -199,17 +183,22 @@ class _LifePayDetailPageNewState extends State { ), title: widget.model.timeTitle, body: WillPopScope( - - onWillPop: () async{ + onWillPop: () async { ///返回按钮不会改变数据 widget.model.selectIds = _list; Get.back(result: false); return false; }, child: ListView( - padding: EdgeInsets.only(top: 16.w), - children: List.generate(widget.model.ids.length, - (index) => _buildCard(widget.model.ids[index], index)).sepWidget(separate: BeeDivider.horizontal(indent: 100.w,)),), + padding: EdgeInsets.only(top: 16.w), + children: + List.generate(widget.model.ids.length, + (index) => _buildCard(widget.model.ids[index], index)) + .sepWidget( + separate: BeeDivider.horizontal( + indent: 100.w, + )), + ), ), bottomNavi: Container( color: Colors.white, @@ -217,7 +206,6 @@ class _LifePayDetailPageNewState extends State { 32.w, 16.w, 32.w, 12.w + MediaQuery.of(context).padding.bottom), child: Row( children: [ - GestureDetector( onTap: () { if (isAllSelect) { @@ -225,7 +213,6 @@ class _LifePayDetailPageNewState extends State { widget.model.selectIds.clear(); setState(() {}); } else { - _selectModelIndex.clear(); for (var i = 0; i < widget.model.ids.length; i++) { _selectModelIndex.add(i); @@ -233,17 +220,11 @@ class _LifePayDetailPageNewState extends State { } setState(() {}); } - }, child: animatedContainer, ), 16.wb, - '全选' - .text - .color(ktextSubColor) - .size(28.sp) - .bold - .make(), + '全选'.text.color(ktextSubColor).size(28.sp).bold.make(), Spacer(), Column( crossAxisAlignment: CrossAxisAlignment.end, @@ -257,20 +238,19 @@ class _LifePayDetailPageNewState extends State { fontSize: 24.sp, fontWeight: FontWeight.bold), children: [ - TextSpan( - text: ' ¥', - style: TextStyle( - color: kDangerColor, - fontSize: 24.sp, - fontWeight: FontWeight.bold)), - TextSpan( - text: '${total.payTotal.toStringAsFixed(2)}', - style: TextStyle( - color: kDangerColor, - fontSize: 32.sp, - fontWeight: FontWeight.bold)), - ])), - + TextSpan( + text: ' ¥', + style: TextStyle( + color: kDangerColor, + fontSize: 24.sp, + fontWeight: FontWeight.bold)), + TextSpan( + text: '${total.payTotal.toStringAsFixed(2)}', + style: TextStyle( + color: kDangerColor, + fontSize: 32.sp, + fontWeight: FontWeight.bold)), + ])), '已选${total.payCount}项' .text .color(ktextSubColor) diff --git a/lib/widget/beeImageNetwork.dart b/lib/widget/beeImageNetwork.dart index 019b0bd3..50b36fa7 100644 --- a/lib/widget/beeImageNetwork.dart +++ b/lib/widget/beeImageNetwork.dart @@ -33,7 +33,7 @@ class BeeImageNetwork extends StatelessWidget { Assets.images.placeholder.path, width: width ?? 160.w, height: height ?? 160.w, - fit: BoxFit.fill, + fit: BoxFit.cover, ); }, height: height ?? 160.w,