From a9822f6833a7f04b5589373313bbb08bf9edd622 Mon Sep 17 00:00:00 2001 From: zhangmeng <494089941@qq.com> Date: Fri, 8 Apr 2022 20:18:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=9F=8E=E8=AE=A2=E5=8D=95=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/constants/application_objects.dart | 4 +- lib/gen/assets.gen.dart | 804 ++++++++++++++++++ .../market/shop_car/shop_car_list_model.dart | 5 +- .../shop_car/shop_car_list_model.g.dart | 2 +- lib/pages/personal/item_my_address.dart | 10 +- lib/provider/app_provider.dart | 27 +- .../home/application/all_application_new.dart | 114 +++ lib/ui/market/search/good_detail_page.dart | 64 +- lib/ui/market/search/search_func.dart | 9 +- lib/ui/market/search/submit_order_page.dart | 4 +- .../search/submit_order_page_normal.dart | 4 +- lib/ui/market/shop_car/shop_car_page.dart | 17 +- lib/utils/application_utils.dart | 308 +++++++ .../picker/bee_house_cascade_picker.dart | 12 +- pubspec.yaml | 2 +- 15 files changed, 1316 insertions(+), 70 deletions(-) create mode 100644 lib/ui/home/application/all_application_new.dart create mode 100644 lib/utils/application_utils.dart diff --git a/lib/constants/application_objects.dart b/lib/constants/application_objects.dart index 0fd2f54d..0fb421d9 100644 --- a/lib/constants/application_objects.dart +++ b/lib/constants/application_objects.dart @@ -25,6 +25,7 @@ import 'package:aku_new_community/ui/community/facility/facility_appointment_pag import 'package:aku_new_community/ui/function_and_service/task/task_page.dart'; import 'package:aku_new_community/ui/function_and_service/work_order/work_order_page.dart'; import 'package:aku_new_community/ui/home/application/all_application.dart'; +import 'package:aku_new_community/ui/home/application/all_application_new.dart'; import 'package:aku_new_community/ui/manager/advice/advice_page.dart'; import 'package:aku_new_community/ui/manager/questionnaire/questionnaire_page.dart'; import 'package:aku_new_community/ui/profile/car/car_manage_page.dart'; @@ -123,7 +124,8 @@ List appObjects = [ AO('共享停车', Assets.icons.sharePark.path, null), AO('二手市场', Assets.icons.secondHandMarket.path, null), AO('共享投屏', Assets.icons.projectionScreen.path, null), - AO('全部应用', Assets.home.icQbyy.path, () => Get.to(() => AllApplicationPage())), + AO('全部应用', Assets.home.icQbyy.path, + () => Get.to(() => AllApplicationNewPage())), // AO( // '小区教育', diff --git a/lib/gen/assets.gen.dart b/lib/gen/assets.gen.dart index 27a6cada..6db5805b 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,109 +1304,237 @@ class $AssetsJsonGen { class $AssetsNewIconGen { const $AssetsNewIconGen(); + /// File path: assets/newIcon/all_classes.png AssetGenImage get allClasses => const AssetGenImage('assets/newIcon/all_classes.png'); + + /// File path: assets/newIcon/avatar_placeholder.png AssetGenImage get avatarPlaceholder => const AssetGenImage('assets/newIcon/avatar_placeholder.png'); + + /// File path: assets/newIcon/hyhd.png AssetGenImage get hyhd => const AssetGenImage('assets/newIcon/hyhd.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_dingdan.png AssetGenImage get icDingdan => const AssetGenImage('assets/newIcon/ic_dingdan.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_gouwuc.png AssetGenImage get icGouwuc => const AssetGenImage('assets/newIcon/ic_gouwuc.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'); + + /// File path: assets/newIcon/jfjs.png AssetGenImage get jfjs => const AssetGenImage('assets/newIcon/jfjs.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/xcyhm.png AssetGenImage get xcyhm => const AssetGenImage('assets/newIcon/xcyhm.png'); + + /// File path: assets/newIcon/zfyh.png AssetGenImage get zfyh => const AssetGenImage('assets/newIcon/zfyh.png'); } 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'); } @@ -745,9 +1542,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/market/shop_car/shop_car_list_model.dart b/lib/models/market/shop_car/shop_car_list_model.dart index e14c86c1..32d7c39c 100644 --- a/lib/models/market/shop_car/shop_car_list_model.dart +++ b/lib/models/market/shop_car/shop_car_list_model.dart @@ -1,6 +1,5 @@ -import 'package:json_annotation/json_annotation.dart'; - import 'package:aku_new_community/ui/market/shop_car/shop_car_func.dart'; +import 'package:json_annotation/json_annotation.dart'; part 'shop_car_list_model.g.dart'; @@ -18,7 +17,7 @@ class ShopCarListModel { final double? sellPrice; final double? discountPrice; // 库存状态(1.有货，0.无货) - final int stockStatus; + final int? stockStatus; final String? unit; // 0=未知 1=自营 2=其 他,商品类别 diff --git a/lib/models/market/shop_car/shop_car_list_model.g.dart b/lib/models/market/shop_car/shop_car_list_model.g.dart index c727fecb..b3bc2b2f 100644 --- a/lib/models/market/shop_car/shop_car_list_model.g.dart +++ b/lib/models/market/shop_car/shop_car_list_model.g.dart @@ -15,7 +15,7 @@ ShopCarListModel _$ShopCarListModelFromJson(Map json) => shopStatus: json['shopStatus'] as int?, sellPrice: (json['sellPrice'] as num?)?.toDouble(), discountPrice: (json['discountPrice'] as num?)?.toDouble(), - stockStatus: json['stockStatus'] as int, + stockStatus: json['stockStatus'] as int?, unit: json['unit'] as String?, kind: json['kind'] as int?, weight: (json['weight'] as num?)?.toDouble(), diff --git a/lib/pages/personal/item_my_address.dart b/lib/pages/personal/item_my_address.dart index 403ebb28..7d2f6524 100644 --- a/lib/pages/personal/item_my_address.dart +++ b/lib/pages/personal/item_my_address.dart @@ -63,13 +63,11 @@ class _MyAddressItemState extends State { children: [ GestureDetector( onTap: () async { - bool? result = await Userfunc.setIsDefaultAddress( + bool result = await Userfunc.setIsDefaultAddress( widget.addressModel.id!); - if (result != null) { - if (result) { - await appProvider.getMyAddress(); - widget.refreshController!.callRefresh(); - } + if (result) { + await appProvider.getMyAddress(); + widget.refreshController!.callRefresh(); } }, child: Container( diff --git a/lib/provider/app_provider.dart b/lib/provider/app_provider.dart index b0c33e12..6be5cc64 100644 --- a/lib/provider/app_provider.dart +++ b/lib/provider/app_provider.dart @@ -302,29 +302,34 @@ class AppProvider extends ChangeNotifier { List get addressModels => _addressModels; - AddressModel? _addressModel; + ///默认收货地址 + AddressModel? _defaultAddressModel; - AddressModel? get addressModel => _addressModel; - - ///设置当前选中的房屋 + AddressModel? get defaultAddressModel => _defaultAddressModel; ///保存默认收货地址 Future getMyAddress() async { BaseModel model = await NetUtil().get(SAASAPI.market.address.myAddress); - if (model.data?.length == 0) - return []; - else { + if ((model.data as List).length == 0) { + _addressModels.clear(); + _defaultAddressModel=null; + notifyListeners(); + return ; + } else { _addressModels = (model.data as List).map((e) => AddressModel.fromJson(e)).toList(); if (_addressModels.isEmpty) { - _addressModel = null; + _defaultAddressModel = null; } else { - _addressModels.forEach((element) { + for (var element in _addressModels) { if (element.isDefault == 1) { - _addressModel = element; + _defaultAddressModel = element; + notifyListeners(); + return; } - }); + } + _defaultAddressModel = null; } } notifyListeners(); diff --git a/lib/ui/home/application/all_application_new.dart b/lib/ui/home/application/all_application_new.dart new file mode 100644 index 00000000..b243a94e --- /dev/null +++ b/lib/ui/home/application/all_application_new.dart @@ -0,0 +1,114 @@ +import 'package:aku_new_community/extensions/num_ext.dart'; +import 'package:aku_new_community/extensions/widget_list_ext.dart'; +import 'package:aku_new_community/utils/application_utils.dart'; +import 'package:aku_new_community/widget/bee_scaffold.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:velocity_x/src/extensions/iterable_ext.dart'; +import 'package:velocity_x/src/extensions/string_ext.dart'; + +class AllApplicationNewPage extends StatefulWidget { + const AllApplicationNewPage({Key? key}) : super(key: key); + + @override + _AllApplicationNewPageState createState() => _AllApplicationNewPageState(); +} + +class _AllApplicationNewPageState extends State { + List rootTypes = ['物业服务', '出行安全', '居民生活', '关于社区', '智慧服务', '附近市场']; + + List getApplications(int index) { + switch (index) { + case 0: + return ['报事报修', '设施预约', '生活缴费', '装修管理']; + case 1: + return [ + '开门码', + '物品出门', + '地理信息', + '小蜜蜂任务', + ]; + case 2: + return ['便民电话', '问卷调查', '活动投票', '快递包裹', '投诉表扬', '业委会', '社区介绍', '借还管理']; + case 3: + return ['服务浏览', '周边企业', '住房说明', '电子商务']; + case 4: + return ['智慧养老', '任务发布', '周边服务', '共享投屏']; + case 5: + return ['自营商城', '邻家宠物', '共享停车', '二手市场']; + default: + return []; + } + } + + @override + Widget build(BuildContext context) { + return BeeScaffold( + title: '全部应用', + body: ListView( + padding: EdgeInsets.symmetric(horizontal: 32.w, vertical: 32.w), + children: rootTypes + .mapIndexed((e, index) => _applicationTile(index)) + .toList() + .sepWidget(separate: 16.hb), + )); + } + + Container _applicationTile(int index) { + return Container( + width: 686.w, + padding: EdgeInsets.symmetric( + vertical: 32.w, + ), + decoration: BoxDecoration( + color: Colors.white, borderRadius: BorderRadius.circular(16.w)), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + Padding( + padding: EdgeInsets.only(left: 32.w, bottom: 24.w), + child: rootTypes[index] + .text + .size(32.sp) + .color(Color(0xFF2B2B2B)) + .bold + .make(), + ), + ConstrainedBox( + constraints: BoxConstraints( + maxHeight: getApplications(index).length ~/ 4 * 140.w + + ((getApplications(index).length - 4) ~/ 4 * 30.w)), + child: GridView.count( + shrinkWrap: true, + crossAxisCount: 4, + physics: NeverScrollableScrollPhysics(), + children: ApplicationUtil(getApplications(index)) + .elements + .map((e) => applicationItem(e)) + .toList(), + ), + ), + ], + ), + ); + } + + Widget applicationItem(AppElement appElement) { + return GestureDetector( + onTap: appElement.onTap, + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + Image.asset( + appElement.imgPath, + width: 96.w, + height: 96.w, + ), + 8.hb, + appElement.title.text.size(24.sp).color(Color(0xFF333333)).make(), + ], + ), + ); + } +} diff --git a/lib/ui/market/search/good_detail_page.dart b/lib/ui/market/search/good_detail_page.dart index 965e3cd4..ce5c7b55 100644 --- a/lib/ui/market/search/good_detail_page.dart +++ b/lib/ui/market/search/good_detail_page.dart @@ -6,7 +6,6 @@ import 'package:aku_new_community/model/user/adress_model.dart'; import 'package:aku_new_community/models/market/good_detail_model.dart'; import 'package:aku_new_community/pages/personal/address/address_list_page.dart'; import 'package:aku_new_community/provider/app_provider.dart'; -import 'package:aku_new_community/ui/market/collection/collection_func.dart'; import 'package:aku_new_community/ui/market/search/search_func.dart'; import 'package:aku_new_community/ui/market/search/submit_order_page_normal.dart'; import 'package:aku_new_community/ui/market/shop_car/shop_car_page.dart'; @@ -69,9 +68,15 @@ class _GoodDetailPageState extends State { Timer? _timer; String get receiveAddress { + final appProvider = Provider.of(Get.context!); if (_addressModel == null) { - return (_goodDetail!.defaultLocation ?? '') + - (_goodDetail!.defaultAddressDetail ?? ''); + print(appProvider.defaultAddressModel?.locationName); + if (appProvider.defaultAddressModel == null) { + return '选择收货地址'; + } else { + return (appProvider.defaultAddressModel!.locationName ?? '') + + (appProvider.defaultAddressModel!.addressDetail ?? ''); + } } else { return (_addressModel!.locationName ?? '') + (_addressModel!.addressDetail ?? ''); @@ -80,16 +85,15 @@ class _GoodDetailPageState extends State { @override void initState() { - final appProvider = Provider.of(Get.context!); super.initState(); _pageController = PageController(); _sliverListController = ScrollController(); _refreshController = EasyRefreshController(); - if (appProvider.addressModel != null) { - _addressModel = appProvider.addressModel!; - } else { - _addressModel = null; - } + // if (appProvider.defaultAddressModel != null) { + // _addressModel = appProvider.defaultAddressModel!; + // } else { + // _addressModel = null; + // } if (widget.integralGood) { _timer = Timer.periodic(Duration(seconds: 1), (timer) { setState(() {}); @@ -413,10 +417,7 @@ class _GoodDetailPageState extends State { Container( width: 430.w, child: Text( - _addressModel == null - ? '请先选择地址' - : (_addressModel!.locationName ?? '') + - (_addressModel!.addressDetail ?? ''), + receiveAddress, style: TextStyle(fontSize: 24.sp, color: ktextPrimary), maxLines: 1, @@ -436,17 +437,21 @@ class _GoodDetailPageState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ 120.wb, - _goodDetail!.stockStatus == 1 - ? '有货' - .text - .color(Color(0xFFE52E2E)) - .size(28.sp) - .make() - : '无货' - .text - .color(Color(0xFFE52E2E)) - .size(28.sp) - .make(), + 20.hb, + Offstage( + offstage: receiveAddress == '选择收货地址', + child: (_goodDetail!.stockStatus == 1) + ? '有货' + .text + .color(Color(0xFFE52E2E)) + .size(28.sp) + .make() + : '无货' + .text + .color(Color(0xFFE52E2E)) + .size(28.sp) + .make(), + ) ], ), ], @@ -661,7 +666,10 @@ class _GoodDetailPageState extends State { children: [ GestureDetector( onTap: () async { - await SearchFunc.addGoodsCar(_goodDetail!.id); + var re = await SearchFunc.addGoodsCar(_goodDetail!.id); + if (re) { + Get.back(); + } }, child: Container( width: 230.w, @@ -684,7 +692,11 @@ class _GoodDetailPageState extends State { GestureDetector( onTap: () { if (_goodDetail!.stockStatus == 0) { - BotToast.showText(text: '商品库存不足'); + if (receiveAddress == '选择收货地址') { + BotToast.showText(text: '请添加收货地址'); + } else { + BotToast.showText(text: '商品库存不足'); + } } else { Get.to(() => SubmitOrderNormalPage( goodModel: _goodDetail!, diff --git a/lib/ui/market/search/search_func.dart b/lib/ui/market/search/search_func.dart index 909655ce..a2925ed3 100644 --- a/lib/ui/market/search/search_func.dart +++ b/lib/ui/market/search/search_func.dart @@ -78,13 +78,8 @@ class SearchFunc { ///加入购物车 static Future addGoodsCar(int jcookGoodsId) async { - BaseModel model = await NetUtil().get( - SAASAPI.market.shopCart.insert, - params: {'appGoodsPushId': jcookGoodsId}, - ); - if (!model.success) { - BotToast.showText(text: model.msg); - } + BaseModel model = await NetUtil().get(SAASAPI.market.shopCart.insert, + params: {'appGoodsPushId': jcookGoodsId}, showMessage: true); return model.success; } diff --git a/lib/ui/market/search/submit_order_page.dart b/lib/ui/market/search/submit_order_page.dart index e49c2afa..0ac75b72 100644 --- a/lib/ui/market/search/submit_order_page.dart +++ b/lib/ui/market/search/submit_order_page.dart @@ -57,8 +57,8 @@ class _SubmitOrderPageState extends State { SettlementGoodsDTO(appGoodsPushId: element.id, num: element.num)); }); - if (appProvider.addressModel != null) { - _addressModel = appProvider.addressModel!; + if (appProvider.defaultAddressModel != null) { + _addressModel = appProvider.defaultAddressModel!; createOrder(_addressModel!.id!, _goodsList); } else { _addressModel = null; diff --git a/lib/ui/market/search/submit_order_page_normal.dart b/lib/ui/market/search/submit_order_page_normal.dart index ac554f60..f037f56b 100644 --- a/lib/ui/market/search/submit_order_page_normal.dart +++ b/lib/ui/market/search/submit_order_page_normal.dart @@ -59,8 +59,8 @@ class _SubmitOrderNormalPageState extends State { _goodsList .add(SettlementGoodsDTO(appGoodsPushId: widget.goodModel.id, num: 1)); - if (appProvider.addressModel != null) { - _addressModel = appProvider.addressModel!; + if (appProvider.defaultAddressModel != null) { + _addressModel = appProvider.defaultAddressModel!; createOrder(_addressModel!.id!, _goodsList); } else { _addressModel = null; diff --git a/lib/ui/market/shop_car/shop_car_page.dart b/lib/ui/market/shop_car/shop_car_page.dart index 65390060..9f2f5f7a 100644 --- a/lib/ui/market/shop_car/shop_car_page.dart +++ b/lib/ui/market/shop_car/shop_car_page.dart @@ -11,6 +11,7 @@ import 'package:aku_new_community/widget/bee_scaffold.dart'; import 'package:aku_new_community/widget/buttons/bee_check_radio.dart'; import 'package:aku_new_community/widget/buttons/end_button.dart'; import 'package:bot_toast/bot_toast.dart'; +import 'package:common_utils/common_utils.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; @@ -293,7 +294,7 @@ class _ShopCarPageState extends State { '¥' .richText .withTextSpanChildren([ - sellPrice + NumUtil.add(sellPrice, 0) .toInt() .toString() .textSpan @@ -326,6 +327,9 @@ class _ShopCarPageState extends State { children: [ GestureDetector( onTap: () { + if (model.goodStatus == GoodStatus.unSell) { + return; + } if (_selectIndex.contains(index)) { _selectIndex.remove(index); _chooseModels.remove(model); @@ -409,6 +413,8 @@ class _ShopCarPageState extends State { ), ), Positioned( + top: 0, + left: 0, child: _getGoodsStatusImg(model.goodStatus) ?? SizedBox()) ], ), @@ -470,9 +476,12 @@ class _ShopCarPageState extends State { switch (status) { case GoodStatus.unSell: return Container( - width: double.infinity, - height: double.infinity, - color: Color(0xFF000000).withOpacity(0.5), + width: 220.w, + height: 220.w, + decoration: BoxDecoration( + color: Color(0xFF000000).withOpacity(0.5), + borderRadius: BorderRadius.circular(16.w), + ), alignment: Alignment.center, child: Text( '已下架', diff --git a/lib/utils/application_utils.dart b/lib/utils/application_utils.dart new file mode 100644 index 00000000..92dd6e52 --- /dev/null +++ b/lib/utils/application_utils.dart @@ -0,0 +1,308 @@ +import 'dart:ui'; + +import 'package:aku_new_community/gen/assets.gen.dart'; +import 'package:aku_new_community/pages/community_introduce/community_introduce_page.dart'; +import 'package:aku_new_community/pages/convenient_phone/convenient_phone_page.dart'; +import 'package:aku_new_community/pages/electronic_commerc/electronic_commerc_page.dart'; +import 'package:aku_new_community/pages/event_activity/event_voting_page.dart'; +import 'package:aku_new_community/pages/express_packages/express_package_page.dart'; +import 'package:aku_new_community/pages/geographic_information/geograhic_information.dart'; +import 'package:aku_new_community/pages/goods_deto_page/goods_deto_page.dart'; +import 'package:aku_new_community/pages/goods_manage_page/select_borrow_return_page.dart'; +import 'package:aku_new_community/pages/house_introduce/house_introduce.dart'; +import 'package:aku_new_community/pages/industry_committee/industry_committee_page.dart'; +import 'package:aku_new_community/pages/life_pay/life_pay_page_new.dart'; +import 'package:aku_new_community/pages/opening_code_page/opening_code_page.dart'; +import 'package:aku_new_community/pages/renovation_manage/new_renovation/new_renovation_page.dart'; +import 'package:aku_new_community/pages/service_browse/service_browse_page.dart'; +import 'package:aku_new_community/pages/services/old_age/old_age_support_page_simple.dart'; +import 'package:aku_new_community/pages/surrounding_enterprises/surrounding_enterprises_page.dart'; +import 'package:aku_new_community/ui/community/facility/facility_appointment_page.dart'; +import 'package:aku_new_community/ui/function_and_service/task/task_page.dart'; +import 'package:aku_new_community/ui/function_and_service/work_order/work_order_page.dart'; +import 'package:aku_new_community/ui/home/application/all_application.dart'; +import 'package:aku_new_community/ui/manager/advice/advice_page.dart'; +import 'package:aku_new_community/ui/manager/questionnaire/questionnaire_page.dart'; +import 'package:bot_toast/bot_toast.dart'; +import 'package:equatable/equatable.dart'; +import 'package:get/get.dart'; + +class ApplicationUtil { + ApplicationUtil(this.titles); + + List titles = []; + + List get elements { + var list = []; + this.titles.forEach((element) { + var re = _findByTitle(element); + if (re != null) { + list.add(re); + } + }); + return list; + } + + AppElement? _findByTitle(String title) { + for (var item in allApplications) { + if (title == item.title) { + return item; + } else if (item.nickTitles.contains(title)) { + return item; + } + } + } + + List get allApplications => [ + AppElement( + title: '开门码', + imgPath: Assets.newIcon.icKmm.path, + onTap: () => Get.to(() => OpeningCodePage())), + // AppElement('访客邀请', R.ASSETS_ICONS_FUNC_FKYQ_PNG, () => Get.to(()=>VisitorAccessPage()), + AppElement( + title: '报事报修', + imgPath: Assets.home.icBsbx.path, + onTap: () => Get.to(() => WorkOrderPage())), + AppElement( + title: '生活缴费', + imgPath: Assets.home.icShjf.path, + onTap: () => Get.to(() => LifePayPageNew())), + AppElement( + title: '业委会', + imgPath: Assets.newIcon.icYwh.path, + onTap: () { + BotToast.showText(text: '此功能暂未上线'); + return; + Get.to(() => IndustryCommitteePage()); + }), + // AppElement('建议咨询', R.ASSETS_ICONS_FUNC_JYZX_PNG, + // () => AdvicePage(type: AdviceType.SUGGESTION)), + AppElement( + title: '便民电话', + imgPath: Assets.newIcon.imgBmdh.path, + onTap: () { + BotToast.showText(text: '此功能暂未上线'); + return; + Get.to(() => ConvenientPhonePage()); + }), + AppElement( + title: '活动投票', + imgPath: Assets.newIcon.icHdtp.path, + onTap: () { + BotToast.showText(text: '此功能暂未上线'); + return; + Get.to(() => EventVotingPage()); + }), + AppElement( + title: '物品出门', + imgPath: Assets.newIcon.imgWpcm.path, + onTap: () { + BotToast.showText(text: '此功能暂未上线'); + return; + Get.to(() => GoodsDetoPage()); + }), + AppElement( + title: '投诉表扬', + imgPath: Assets.newIcon.icTsby.path, + onTap: () { + BotToast.showText(text: '此功能暂未上线'); + return; + Get.to(() => AdvicePage(type: AdviceType.COMPLAIN)); + }), + AppElement( + title: '问卷调查', + imgPath: Assets.newIcon.icWjdc.path, + onTap: () { + BotToast.showText(text: '此功能暂未上线'); + return; + Get.to(() => QuestionnairePage()); + }), + AppElement( + title: '装修管理', + imgPath: Assets.newIcon.imgZxgl.path, + onTap: () { + BotToast.showText(text: '此功能升级中，敬请期待'); + return; + Get.to(() => NewRenovationPage()); + }), + AppElement( + title: '借还管理', + imgPath: Assets.newIcon.icJhgl.path, + onTap: () { + BotToast.showText(text: '此功能暂未上线'); + return; + Get.to(SelectBorrowReturnPage()); + }), + // AppElement('一键报警', Assets.newIcon.yj, () => AlarmPage()), + AppElement( + title: '设施预约', + imgPath: Assets.home.icSsyy.path, + onTap: () { + BotToast.showText(text: '此功能升级中，敬请期待'); + return; + Get.to(() => FacilityAppointmentPage()); + }), + AppElement( + title: '快递包裹', + imgPath: Assets.newIcon.icKdbg.path, + onTap: () { + BotToast.showText(text: '此功能升级中，敬请期待'); + return; + Get.to(() => ExpressPackagePage()); + }), + AppElement( + title: '电子商务', + imgPath: Assets.newIcon.icDzsw.path, + onTap: () { + BotToast.showText(text: '此功能升级中，敬请期待'); + return; + Get.to(() => ElectronicCommercPage()); + }), + AppElement( + title: '服务浏览', + imgPath: Assets.newIcon.icFwll.path, + onTap: () { + BotToast.showText(text: '此功能升级中，敬请期待'); + return; + Get.to(() => ServiceBrowsePage()); + }), + AppElement( + title: '社区介绍', + imgPath: Assets.newIcon.icSqjs.path, + onTap: () { + BotToast.showText(text: '此功能升级中，敬请期待'); + return; + Get.to(() => CommunityIntroducePage()); + }), + // AppElement('家政服务', R.ASSETS_ICONS_FUNC_JZFW_PNG, () => HouseKeepingPage()), + + AppElement( + title: '地理信息', + imgPath: Assets.newIcon.icDlxx.path, + onTap: () { + BotToast.showText(text: '此功能升级中，敬请期待'); + return; + Get.to(() => GeographicInformationPage()); + }), + AppElement( + title: '周边企业', + imgPath: Assets.newIcon.icZbqy.path, + onTap: () { + BotToast.showText(text: '此功能升级中，敬请期待'); + return; + Get.to(() => SurroundingEnterprisesPage()); + }), + AppElement( + title: '住房说明', + imgPath: Assets.newIcon.icRwsm.path, + onTap: () { + BotToast.showText(text: '此功能升级中，敬请期待'); + return; + Get.to(() => HouseIntroducePage()); + }), + AppElement( + title: '智慧养老', + imgPath: Assets.home.icZhyl.path, + onTap: () { + Get.to(() => OldAgeSupportPageSimple()); + }), + AppElement( + title: '周边服务', + imgPath: Assets.home.icZbfw.path, + onTap: () { + BotToast.showText(text: '此功能暂未上线'); + return; + }), + AppElement( + title: '任务发布', + imgPath: Assets.home.icRwfb.path, + onTap: () => Get.to(() => TaskPage()), + nickTitles: ['小蜜蜂任务']), + AppElement( + title: '自营商城', + imgPath: Assets.icons.shoppingMall.path, + onTap: () { + BotToast.showText(text: '此功能暂未上线'); + return; + }), + AppElement( + title: '邻家宠物', + imgPath: Assets.home.icLjcw.path, + onTap: () { + BotToast.showText(text: '此功能暂未上线'); + return; + }), + AppElement( + title: '共享停车', + imgPath: Assets.icons.sharePark.path, + onTap: () { + BotToast.showText(text: '此功能暂未上线'); + return; + }), + AppElement( + title: '二手市场', + imgPath: Assets.icons.secondHandMarket.path, + onTap: () { + BotToast.showText(text: '此功能暂未上线'); + return; + }), + AppElement( + title: '共享投屏', + imgPath: Assets.icons.projectionScreen.path, + onTap: () { + BotToast.showText(text: '此功能暂未上线'); + return; + }), + AppElement( + title: '全部应用', + imgPath: Assets.home.icQbyy.path, + onTap: () => Get.to(() => AllApplicationPage())), + + // AppElement( + // '小区教育', + // R.ASSETS_IMAGES_PLACEHOLDER_WEBP, + // () => BeeScaffold(title: '小区教育'), + // ), + // AppElement( + // '健康运动', + // R.ASSETS_IMAGES_PLACEHOLDER_WEBP, + // () => BeeScaffold(title: '健康运动'), + // ), + // AppElement( + // '家政服务', + // R.ASSETS_IMAGES_PLACEHOLDER_WEBP, + // () => BeeScaffold(title: '家政服务'), + // ), + // AppElement( + // '居家养老', + // R.ASSETS_IMAGES_PLACEHOLDER_WEBP, + // () => BeeScaffold(title: '居家养老'), + // ), + // AppElement( + // '物业租赁', + // R.ASSETS_IMAGES_PLACEHOLDER_WEBP, + // () => BeeScaffold(title: '物业租赁'), + // ), + ]; +} + +class AppElement extends Equatable { + final String title; + final String imgPath; + final VoidCallback onTap; + final List nickTitles; + + const AppElement({ + required this.title, + required this.imgPath, + required this.onTap, + this.nickTitles = const [], + }); + + @override + List get props => [ + title, + imgPath, + onTap, + ]; +} diff --git a/lib/widget/picker/bee_house_cascade_picker.dart b/lib/widget/picker/bee_house_cascade_picker.dart index dc9eab58..c3dfc950 100644 --- a/lib/widget/picker/bee_house_cascade_picker.dart +++ b/lib/widget/picker/bee_house_cascade_picker.dart @@ -88,9 +88,9 @@ class _BeeHouseCascadePickerState extends State { child: CupertinoPicker( onSelectedItemChanged: (int value) { _pickBuildingIndex = value; - // _pickUnitIndex = 0; - // _pickFloorIndex = 0; - // _pickHouseIndex = 0; + _pickUnitIndex = 0; + _pickFloorIndex = 0; + _pickHouseIndex = 0; _unitController.jumpToItem(0); _floorController.jumpToItem(0); _houseController.jumpToItem(0); @@ -111,8 +111,8 @@ class _BeeHouseCascadePickerState extends State { child: CupertinoPicker( onSelectedItemChanged: (int value) { _pickUnitIndex = value; - // _pickFloorIndex = 0; - // _pickHouseIndex = 0; + _pickFloorIndex = 0; + _pickHouseIndex = 0; _floorController.jumpToItem(0); _houseController.jumpToItem(0); setState(() {}); @@ -132,7 +132,7 @@ class _BeeHouseCascadePickerState extends State { child: CupertinoPicker( onSelectedItemChanged: (int value) { _pickFloorIndex = value; - // _pickHouseIndex = 0; + _pickHouseIndex = 0; _houseController.jumpToItem(0); setState(() {}); }, diff --git a/pubspec.yaml b/pubspec.yaml index 2c98c8ea..2e493812 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -20,7 +20,7 @@ dependencies: #状态管理 provider: ^6.0.0 #屏幕适配 - flutter_screenutil: ^5.0.0+2 + flutter_screenutil: ^5.3.1 #图标集合 cupertino_icons: ^1.0.3 #超链接 跳转拨号等