diff --git a/assets/icons/article_count.png b/assets/icons/article_count.png new file mode 100644 index 00000000..71a38411 Binary files /dev/null and b/assets/icons/article_count.png differ diff --git a/assets/icons/article_name.png b/assets/icons/article_name.png new file mode 100644 index 00000000..7cfe5384 Binary files /dev/null and b/assets/icons/article_name.png differ diff --git a/assets/icons/borrow_failure.png b/assets/icons/borrow_failure.png new file mode 100644 index 00000000..6f58b2f9 Binary files /dev/null and b/assets/icons/borrow_failure.png differ diff --git a/assets/icons/borrow_status.png b/assets/icons/borrow_status.png new file mode 100644 index 00000000..013eaa99 Binary files /dev/null and b/assets/icons/borrow_status.png differ diff --git a/assets/icons/borrow_success.png b/assets/icons/borrow_success.png new file mode 100644 index 00000000..db6074cc Binary files /dev/null and b/assets/icons/borrow_success.png differ diff --git a/assets/icons/goods_borrow.png b/assets/icons/goods_borrow.png new file mode 100644 index 00000000..cc9d5c7d Binary files /dev/null and b/assets/icons/goods_borrow.png differ diff --git a/assets/icons/goods_return.png b/assets/icons/goods_return.png new file mode 100644 index 00000000..5862dc4f Binary files /dev/null and b/assets/icons/goods_return.png differ diff --git a/lib/const/resource.dart b/lib/const/resource.dart index 758f2723..d728bd1b 100644 --- a/lib/const/resource.dart +++ b/lib/const/resource.dart @@ -3,492 +3,520 @@ class R { const R._(); - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/applications/advice.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/applications/advice.png) static const String ASSETS_APPLICATIONS_ADVICE_PNG = 'assets/applications/advice.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/applications/all_app.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/applications/all_app.png) static const String ASSETS_APPLICATIONS_ALL_APP_PNG = 'assets/applications/all_app.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/applications/borrow.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/applications/borrow.png) static const String ASSETS_APPLICATIONS_BORROW_PNG = 'assets/applications/borrow.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/applications/box.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/applications/box.png) static const String ASSETS_APPLICATIONS_BOX_PNG = 'assets/applications/box.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/applications/committee.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/applications/committee.png) static const String ASSETS_APPLICATIONS_COMMITTEE_PNG = 'assets/applications/committee.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/applications/community_phone.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/applications/community_phone.png) static const String ASSETS_APPLICATIONS_COMMUNITY_PHONE_PNG = 'assets/applications/community_phone.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/applications/complaint.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/applications/complaint.png) static const String ASSETS_APPLICATIONS_COMPLAINT_PNG = 'assets/applications/complaint.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/applications/decoration.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/applications/decoration.png) static const String ASSETS_APPLICATIONS_DECORATION_PNG = 'assets/applications/decoration.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/applications/digital.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/applications/digital.png) static const String ASSETS_APPLICATIONS_DIGITAL_PNG = 'assets/applications/digital.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/applications/door_code.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/applications/door_code.png) static const String ASSETS_APPLICATIONS_DOOR_CODE_PNG = 'assets/applications/door_code.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/applications/fix.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/applications/fix.png) static const String ASSETS_APPLICATIONS_FIX_PNG = 'assets/applications/fix.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/applications/goods_out.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/applications/goods_out.png) static const String ASSETS_APPLICATIONS_GOODS_OUT_PNG = 'assets/applications/goods_out.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/applications/home_live.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/applications/home_live.png) static const String ASSETS_APPLICATIONS_HOME_LIVE_PNG = 'assets/applications/home_live.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/applications/hospital.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/applications/hospital.png) static const String ASSETS_APPLICATIONS_HOSPITAL_PNG = 'assets/applications/hospital.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/applications/makeup.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/applications/makeup.png) static const String ASSETS_APPLICATIONS_MAKEUP_PNG = 'assets/applications/makeup.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/applications/oepn_door.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/applications/oepn_door.png) static const String ASSETS_APPLICATIONS_OEPN_DOOR_PNG = 'assets/applications/oepn_door.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/applications/payment.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/applications/payment.png) static const String ASSETS_APPLICATIONS_PAYMENT_PNG = 'assets/applications/payment.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/applications/police.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/applications/police.png) static const String ASSETS_APPLICATIONS_POLICE_PNG = 'assets/applications/police.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/applications/question.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/applications/question.png) static const String ASSETS_APPLICATIONS_QUESTION_PNG = 'assets/applications/question.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/applications/snack.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/applications/snack.png) static const String ASSETS_APPLICATIONS_SNACK_PNG = 'assets/applications/snack.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/applications/tool_bmts.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/applications/tool_bmts.png) static const String ASSETS_APPLICATIONS_TOOL_BMTS_PNG = 'assets/applications/tool_bmts.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/applications/toy.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/applications/toy.png) static const String ASSETS_APPLICATIONS_TOY_PNG = 'assets/applications/toy.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/applications/visitor_invite.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/applications/visitor_invite.png) static const String ASSETS_APPLICATIONS_VISITOR_INVITE_PNG = 'assets/applications/visitor_invite.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/applications/vote.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/applications/vote.png) static const String ASSETS_APPLICATIONS_VOTE_PNG = 'assets/applications/vote.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/applications/wine.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/applications/wine.png) static const String ASSETS_APPLICATIONS_WINE_PNG = 'assets/applications/wine.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/add.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/add.png) static const String ASSETS_ICONS_ADD_PNG = 'assets/icons/add.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/alarm.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/alarm.png) static const String ASSETS_ICONS_ALARM_PNG = 'assets/icons/alarm.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/app_add.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/app_add.png) static const String ASSETS_ICONS_APP_ADD_PNG = 'assets/icons/app_add.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/app_reduce.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/app_reduce.png) static const String ASSETS_ICONS_APP_REDUCE_PNG = 'assets/icons/app_reduce.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/comment_notice.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/article_count.png) + static const String ASSETS_ICONS_ARTICLE_COUNT_PNG = + 'assets/icons/article_count.png'; + + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/article_name.png) + static const String ASSETS_ICONS_ARTICLE_NAME_PNG = + 'assets/icons/article_name.png'; + + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/borrow_failure.png) + static const String ASSETS_ICONS_BORROW_FAILURE_PNG = + 'assets/icons/borrow_failure.png'; + + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/borrow_status.png) + static const String ASSETS_ICONS_BORROW_STATUS_PNG = + 'assets/icons/borrow_status.png'; + + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/borrow_success.png) + static const String ASSETS_ICONS_BORROW_SUCCESS_PNG = + 'assets/icons/borrow_success.png'; + + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/comment_notice.png) static const String ASSETS_ICONS_COMMENT_NOTICE_PNG = 'assets/icons/comment_notice.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/complaint.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/complaint.png) static const String ASSETS_ICONS_COMPLAINT_PNG = 'assets/icons/complaint.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/consult.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/consult.png) static const String ASSETS_ICONS_CONSULT_PNG = 'assets/icons/consult.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/file.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/file.png) static const String ASSETS_ICONS_FILE_PNG = 'assets/icons/file.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/groupbuy_tab_selected.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/goods_borrow.png) + static const String ASSETS_ICONS_GOODS_BORROW_PNG = + 'assets/icons/goods_borrow.png'; + + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/goods_return.png) + static const String ASSETS_ICONS_GOODS_RETURN_PNG = + 'assets/icons/goods_return.png'; + + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/groupbuy_tab_selected.png) static const String ASSETS_ICONS_GROUPBUY_TAB_SELECTED_PNG = 'assets/icons/groupbuy_tab_selected.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/groupbuy_tab_unselected.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/groupbuy_tab_unselected.png) static const String ASSETS_ICONS_GROUPBUY_TAB_UNSELECTED_PNG = 'assets/icons/groupbuy_tab_unselected.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/hot_fire.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/hot_fire.png) static const String ASSETS_ICONS_HOT_FIRE_PNG = 'assets/icons/hot_fire.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/house.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/house.png) static const String ASSETS_ICONS_HOUSE_PNG = 'assets/icons/house.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/icon_notification.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/icon_notification.png) static const String ASSETS_ICONS_ICON_NOTIFICATION_PNG = 'assets/icons/icon_notification.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/img_add.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/img_add.png) static const String ASSETS_ICONS_IMG_ADD_PNG = 'assets/icons/img_add.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/like.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/like.png) static const String ASSETS_ICONS_LIKE_PNG = 'assets/icons/like.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/location.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/location.png) static const String ASSETS_ICONS_LOCATION_PNG = 'assets/icons/location.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/manager_order_cancel.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/manager_order_cancel.png) static const String ASSETS_ICONS_MANAGER_ORDER_CANCEL_PNG = 'assets/icons/manager_order_cancel.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/manager_phone_call.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/manager_phone_call.png) static const String ASSETS_ICONS_MANAGER_PHONE_CALL_PNG = 'assets/icons/manager_phone_call.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/market_tab_selected.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/market_tab_selected.png) static const String ASSETS_ICONS_MARKET_TAB_SELECTED_PNG = 'assets/icons/market_tab_selected.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/market_tab_unselected.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/market_tab_unselected.png) static const String ASSETS_ICONS_MARKET_TAB_UNSELECTED_PNG = 'assets/icons/market_tab_unselected.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/phone.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/phone.png) static const String ASSETS_ICONS_PHONE_PNG = 'assets/icons/phone.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/property.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/property.png) static const String ASSETS_ICONS_PROPERTY_PNG = 'assets/icons/property.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/proposal.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/proposal.png) static const String ASSETS_ICONS_PROPOSAL_PNG = 'assets/icons/proposal.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/report.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/report.png) static const String ASSETS_ICONS_REPORT_PNG = 'assets/icons/report.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/shield_content.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/shield_content.png) static const String ASSETS_ICONS_SHIELD_CONTENT_PNG = 'assets/icons/shield_content.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/shield_user.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/shield_user.png) static const String ASSETS_ICONS_SHIELD_USER_PNG = 'assets/icons/shield_user.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/shop_notice.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/shop_notice.png) static const String ASSETS_ICONS_SHOP_NOTICE_PNG = 'assets/icons/shop_notice.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/system_notice.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/system_notice.png) static const String ASSETS_ICONS_SYSTEM_NOTICE_PNG = 'assets/icons/system_notice.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/tabbar_home.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/tabbar_home.png) static const String ASSETS_ICONS_TABBAR_HOME_PNG = 'assets/icons/tabbar_home.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/tabbar_home_no.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/tabbar_home_no.png) static const String ASSETS_ICONS_TABBAR_HOME_NO_PNG = 'assets/icons/tabbar_home_no.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/tabbar_house.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/tabbar_house.png) static const String ASSETS_ICONS_TABBAR_HOUSE_PNG = 'assets/icons/tabbar_house.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/tabbar_house_no.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/tabbar_house_no.png) static const String ASSETS_ICONS_TABBAR_HOUSE_NO_PNG = 'assets/icons/tabbar_house_no.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/tabbar_market.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/tabbar_market.png) static const String ASSETS_ICONS_TABBAR_MARKET_PNG = 'assets/icons/tabbar_market.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/tabbar_market_no.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/tabbar_market_no.png) static const String ASSETS_ICONS_TABBAR_MARKET_NO_PNG = 'assets/icons/tabbar_market_no.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/tabbar_message.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/tabbar_message.png) static const String ASSETS_ICONS_TABBAR_MESSAGE_PNG = 'assets/icons/tabbar_message.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/tabbar_message_no.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/tabbar_message_no.png) static const String ASSETS_ICONS_TABBAR_MESSAGE_NO_PNG = 'assets/icons/tabbar_message_no.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/tabbar_user.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/tabbar_user.png) static const String ASSETS_ICONS_TABBAR_USER_PNG = 'assets/icons/tabbar_user.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/tabbar_user_no.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/tabbar_user_no.png) static const String ASSETS_ICONS_TABBAR_USER_NO_PNG = 'assets/icons/tabbar_user_no.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/tool_bmdh.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/tool_bmdh.png) static const String ASSETS_ICONS_TOOL_BMDH_PNG = 'assets/icons/tool_bmdh.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/tool_bmts.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/tool_bmts.png) static const String ASSETS_ICONS_TOOL_BMTS_PNG = 'assets/icons/tool_bmts.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/tool_bsbx.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/tool_bsbx.png) static const String ASSETS_ICONS_TOOL_BSBX_PNG = 'assets/icons/tool_bsbx.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/tool_czxs.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/tool_czxs.png) static const String ASSETS_ICONS_TOOL_CZXS_PNG = 'assets/icons/tool_czxs.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/tool_fkyq.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/tool_fkyq.png) static const String ASSETS_ICONS_TOOL_FKYQ_PNG = 'assets/icons/tool_fkyq.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/tool_fsxb.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/tool_fsxb.png) static const String ASSETS_ICONS_TOOL_FSXB_PNG = 'assets/icons/tool_fsxb.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/tool_hdtp.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/tool_hdtp.png) static const String ASSETS_ICONS_TOOL_HDTP_PNG = 'assets/icons/tool_hdtp.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/tool_jhgl.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/tool_jhgl.png) static const String ASSETS_ICONS_TOOL_JHGL_PNG = 'assets/icons/tool_jhgl.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/tool_jjsh.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/tool_jjsh.png) static const String ASSETS_ICONS_TOOL_JJSH_PNG = 'assets/icons/tool_jjsh.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/tool_jyts.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/tool_jyts.png) static const String ASSETS_ICONS_TOOL_JYTS_PNG = 'assets/icons/tool_jyts.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/tool_kmm.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/tool_kmm.png) static const String ASSETS_ICONS_TOOL_KMM_PNG = 'assets/icons/tool_kmm.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/tool_mywj.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/tool_mywj.png) static const String ASSETS_ICONS_TOOL_MYWJ_PNG = 'assets/icons/tool_mywj.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/tool_qbyy.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/tool_qbyy.png) static const String ASSETS_ICONS_TOOL_QBYY_PNG = 'assets/icons/tool_qbyy.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/tool_shjf.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/tool_shjf.png) static const String ASSETS_ICONS_TOOL_SHJF_PNG = 'assets/icons/tool_shjf.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/tool_smjd.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/tool_smjd.png) static const String ASSETS_ICONS_TOOL_SMJD_PNG = 'assets/icons/tool_smjd.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/tool_tsby.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/tool_tsby.png) static const String ASSETS_ICONS_TOOL_TSBY_PNG = 'assets/icons/tool_tsby.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/tool_wjdc.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/tool_wjdc.png) static const String ASSETS_ICONS_TOOL_WJDC_PNG = 'assets/icons/tool_wjdc.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/tool_wpcm.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/tool_wpcm.png) static const String ASSETS_ICONS_TOOL_WPCM_PNG = 'assets/icons/tool_wpcm.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/tool_xxfs.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/tool_xxfs.png) static const String ASSETS_ICONS_TOOL_XXFS_PNG = 'assets/icons/tool_xxfs.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/tool_yjbj.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/tool_yjbj.png) static const String ASSETS_ICONS_TOOL_YJBJ_PNG = 'assets/icons/tool_yjbj.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/tool_yjkm.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/tool_yjkm.png) static const String ASSETS_ICONS_TOOL_YJKM_PNG = 'assets/icons/tool_yjkm.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/tool_yljs.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/tool_yljs.png) static const String ASSETS_ICONS_TOOL_YLJS_PNG = 'assets/icons/tool_yljs.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/tool_ywh.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/tool_ywh.png) static const String ASSETS_ICONS_TOOL_YWH_PNG = 'assets/icons/tool_ywh.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/tool_zbbj.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/tool_zbbj.png) static const String ASSETS_ICONS_TOOL_ZBBJ_PNG = 'assets/icons/tool_zbbj.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/tool_zxgl.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/tool_zxgl.png) static const String ASSETS_ICONS_TOOL_ZXGL_PNG = 'assets/icons/tool_zxgl.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/user_icon_dfh.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/user_icon_dfh.png) static const String ASSETS_ICONS_USER_ICON_DFH_PNG = 'assets/icons/user_icon_dfh.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/user_icon_dfk.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/user_icon_dfk.png) static const String ASSETS_ICONS_USER_ICON_DFK_PNG = 'assets/icons/user_icon_dfk.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/user_icon_dpj.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/user_icon_dpj.png) static const String ASSETS_ICONS_USER_ICON_DPJ_PNG = 'assets/icons/user_icon_dpj.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/user_icon_dsh.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/user_icon_dsh.png) static const String ASSETS_ICONS_USER_ICON_DSH_PNG = 'assets/icons/user_icon_dsh.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/user_icon_sh.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/user_icon_sh.png) static const String ASSETS_ICONS_USER_ICON_SH_PNG = 'assets/icons/user_icon_sh.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/user_icon_sz.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/user_icon_sz.png) static const String ASSETS_ICONS_USER_ICON_SZ_PNG = 'assets/icons/user_icon_sz.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/user_icon_vip.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/user_icon_vip.png) static const String ASSETS_ICONS_USER_ICON_VIP_PNG = 'assets/icons/user_icon_vip.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/user_icon_wdbx.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/user_icon_wdbx.png) static const String ASSETS_ICONS_USER_ICON_WDBX_PNG = 'assets/icons/user_icon_wdbx.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/user_icon_wdc.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/user_icon_wdc.png) static const String ASSETS_ICONS_USER_ICON_WDC_PNG = 'assets/icons/user_icon_wdc.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/user_icon_wdcw.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/user_icon_wdcw.png) static const String ASSETS_ICONS_USER_ICON_WDCW_PNG = 'assets/icons/user_icon_wdcw.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/user_icon_wddz.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/user_icon_wddz.png) static const String ASSETS_ICONS_USER_ICON_WDDZ_PNG = 'assets/icons/user_icon_wddz.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/user_icon_wdfk.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/user_icon_wdfk.png) static const String ASSETS_ICONS_USER_ICON_WDFK_PNG = 'assets/icons/user_icon_wdfk.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/user_icon_wdfw.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/user_icon_wdfw.png) static const String ASSETS_ICONS_USER_ICON_WDFW_PNG = 'assets/icons/user_icon_wdfw.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/user_icon_wdgj.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/user_icon_wdgj.png) static const String ASSETS_ICONS_USER_ICON_WDGJ_PNG = 'assets/icons/user_icon_wdgj.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/user_icon_wdjf.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/user_icon_wdjf.png) static const String ASSETS_ICONS_USER_ICON_WDJF_PNG = 'assets/icons/user_icon_wdjf.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/user_icon_wdsqhd.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/user_icon_wdsqhd.png) static const String ASSETS_ICONS_USER_ICON_WDSQHD_PNG = 'assets/icons/user_icon_wdsqhd.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/images/application.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/images/application.png) static const String ASSETS_IMAGES_APPLICATION_PNG = 'assets/images/application.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/images/car_header.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/images/car_header.png) static const String ASSETS_IMAGES_CAR_HEADER_PNG = 'assets/images/car_header.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/images/code_logo.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/images/code_logo.png) static const String ASSETS_IMAGES_CODE_LOGO_PNG = 'assets/images/code_logo.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/images/commitment.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/images/commitment.png) static const String ASSETS_IMAGES_COMMITMENT_PNG = 'assets/images/commitment.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/images/drawings.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/images/drawings.png) static const String ASSETS_IMAGES_DRAWINGS_PNG = 'assets/images/drawings.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/images/house_attestation.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/images/house_attestation.png) static const String ASSETS_IMAGES_HOUSE_ATTESTATION_PNG = 'assets/images/house_attestation.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/images/house_header.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/images/house_header.png) static const String ASSETS_IMAGES_HOUSE_HEADER_PNG = 'assets/images/house_header.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/images/license.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/images/license.png) static const String ASSETS_IMAGES_LICENSE_PNG = 'assets/images/license.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/images/license_back.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/images/license_back.png) static const String ASSETS_IMAGES_LICENSE_BACK_PNG = 'assets/images/license_back.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/images/lock.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/images/lock.png) static const String ASSETS_IMAGES_LOCK_PNG = 'assets/images/lock.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/images/logo.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/images/logo.png) static const String ASSETS_IMAGES_LOGO_PNG = 'assets/images/logo.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/images/member_bg.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/images/member_bg.png) static const String ASSETS_IMAGES_MEMBER_BG_PNG = 'assets/images/member_bg.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/images/mine_bg.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/images/mine_bg.png) static const String ASSETS_IMAGES_MINE_BG_PNG = 'assets/images/mine_bg.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/images/open_door.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/images/open_door.png) static const String ASSETS_IMAGES_OPEN_DOOR_PNG = 'assets/images/open_door.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/images/phone_logo.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/images/phone_logo.png) static const String ASSETS_IMAGES_PHONE_LOGO_PNG = 'assets/images/phone_logo.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/images/placeholder.webp) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/images/placeholder.webp) static const String ASSETS_IMAGES_PLACEHOLDER_WEBP = 'assets/images/placeholder.webp'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/images/white.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/images/white.png) static const String ASSETS_IMAGES_WHITE_PNG = 'assets/images/white.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/images/wxpay.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/images/wxpay.png) static const String ASSETS_IMAGES_WXPAY_PNG = 'assets/images/wxpay.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/static/car_card_grey.webp) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/static/car_card_grey.webp) static const String ASSETS_STATIC_CAR_CARD_GREY_WEBP = 'assets/static/car_card_grey.webp'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/static/car_card_yellow.webp) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/static/car_card_yellow.webp) static const String ASSETS_STATIC_CAR_CARD_YELLOW_WEBP = 'assets/static/car_card_yellow.webp'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/static/car_park_empty.webp) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/static/car_park_empty.webp) static const String ASSETS_STATIC_CAR_PARK_EMPTY_WEBP = 'assets/static/car_park_empty.webp'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/static/house_auth_fail.webp) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/static/house_auth_fail.webp) static const String ASSETS_STATIC_HOUSE_AUTH_FAIL_WEBP = 'assets/static/house_auth_fail.webp'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/static/house_auth_success.webp) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/static/house_auth_success.webp) static const String ASSETS_STATIC_HOUSE_AUTH_SUCCESS_WEBP = 'assets/static/house_auth_success.webp'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/static/parking_grey.webp) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/static/parking_grey.webp) static const String ASSETS_STATIC_PARKING_GREY_WEBP = 'assets/static/parking_grey.webp'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/static/parking_yellow.webp) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/static/parking_yellow.webp) static const String ASSETS_STATIC_PARKING_YELLOW_WEBP = 'assets/static/parking_yellow.webp'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/static/review_fail.webp) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/static/review_fail.webp) static const String ASSETS_STATIC_REVIEW_FAIL_WEBP = 'assets/static/review_fail.webp'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/static/reviewing.webp) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/static/reviewing.webp) static const String ASSETS_STATIC_REVIEWING_WEBP = 'assets/static/reviewing.webp'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/tab/bkjh.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/tab/bkjh.png) static const String ASSETS_TAB_BKJH_PNG = 'assets/tab/bkjh.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/tab/kbhw.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/tab/kbhw.png) static const String ASSETS_TAB_KBHW_PNG = 'assets/tab/kbhw.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/tab/nanz.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/tab/nanz.png) static const String ASSETS_TAB_NANZ_PNG = 'assets/tab/nanz.png'; - /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/tab/nvz.png) + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/tab/nvz.png) static const String ASSETS_TAB_NVZ_PNG = 'assets/tab/nvz.png'; } diff --git a/lib/constants/api.dart b/lib/constants/api.dart index b8c9aad6..f091151e 100644 --- a/lib/constants/api.dart +++ b/lib/constants/api.dart @@ -77,6 +77,9 @@ class _User { ///我的房屋：假删除审核信息 String get deleteHouse => '/user/myHouse/falseDelete'; + ///我的房屋：修改选中的房产审核id + String get changeSelectExanmineId => '/user/myHouse/changeSelectExamineId'; + ///我的车位：查询所有的车位信息 String get carParkingList => '/user/myParkingSpace/list'; @@ -162,6 +165,18 @@ class _Manager { ///借还管理：报损 String get fromLoss => '/user/articleBorrow/frmLoss'; + ///借还管理：根据物品总类主键id查询未借出的物品明细(出借状态恒为未出借)【借取页面】 + String get articleBorrowFindDetail => '/user/articleBorrow/findDetailById'; + + ///借还管理：借取物品 + String get articleBorrowGoods => '/user/articleBorrow/borrow'; + + ///借还管理：归还物品 + String get articleReturnGoods => '/user/articleBorrow/articleReturn'; + + ///借还管理：根据用户主键id查询需要归还物品信息（归还界面） + String get articleReturnList => '/articleBorrow/findBorrowByUserId'; + ///生活缴费：查询生活缴费信息list String get dailyPaymentList => '/user/dailyPayment/list'; diff --git a/lib/constants/application_objects.dart b/lib/constants/application_objects.dart index cf8704d7..eb8f475d 100644 --- a/lib/constants/application_objects.dart +++ b/lib/constants/application_objects.dart @@ -1,10 +1,10 @@ +import 'package:akuCommunity/pages/goods_manage_page/select_borrow_return_page.dart'; import 'package:flutter/material.dart'; import 'package:akuCommunity/const/resource.dart'; import 'package:akuCommunity/pages/convenient_phone/convenient_phone_page.dart'; import 'package:akuCommunity/pages/event_activity/event_voting_page.dart'; import 'package:akuCommunity/pages/goods_deto_page/goods_deto_page.dart'; -import 'package:akuCommunity/pages/goods_manage_page/goods_manage_page.dart'; import 'package:akuCommunity/pages/industry_committee/industry_committee_page.dart'; import 'package:akuCommunity/pages/life_pay/life_pay_page.dart'; import 'package:akuCommunity/pages/one_alarm/widget/alarm_page.dart'; @@ -70,7 +70,7 @@ List appObjects = [ () => AdvicePage(type: AdviceType.COMPLAIN)), AO('问卷调查', R.ASSETS_APPLICATIONS_QUESTION_PNG, () => QuestionnairePage()), // AO('装修管理', R.ASSETS_APPLICATIONS_DECORATION_PNG, FitupManagePage()), - AO('借还管理', R.ASSETS_APPLICATIONS_BORROW_PNG, () => GoodsManagePage()), + AO('借还管理', R.ASSETS_APPLICATIONS_BORROW_PNG, () => SelectBorrowReturnPage()), AO('一键报警', R.ASSETS_APPLICATIONS_POLICE_PNG, () => AlarmPage()), ]; diff --git a/lib/model/manager/article_borrow_detail_model.dart b/lib/model/manager/article_borrow_detail_model.dart new file mode 100644 index 00000000..f8c2f9c3 --- /dev/null +++ b/lib/model/manager/article_borrow_detail_model.dart @@ -0,0 +1,50 @@ +import 'package:akuCommunity/model/common/img_model.dart'; + +class ArticleBorrowDetailModel { + int id; + String name; + String code; + int status; + List imgList; + String get borrowStatus { + switch (this.status) { + case 1: + return '正常'; + break; + case 2: + return '破损'; + case 3: + return '丢失'; + default: + return ''; + } + } + + ArticleBorrowDetailModel( + {this.id, this.name, this.code, this.status, this.imgList}); + + ArticleBorrowDetailModel.fromJson(Map json) { + id = json['id']; + name = json['name']; + code = json['code']; + status = json['status']; + if (json['imgList'] != null) { + imgList = new List(); + json['imgList'].forEach((v) { + imgList.add(new ImgModel.fromJson(v)); + }); + } + } + + Map toJson() { + final Map data = new Map(); + data['id'] = this.id; + data['name'] = this.name; + data['code'] = this.code; + data['status'] = this.status; + if (this.imgList != null) { + data['imgList'] = this.imgList.map((v) => v.toJson()).toList(); + } + return data; + } +} diff --git a/lib/model/manager/article_return_list_model.dart b/lib/model/manager/article_return_list_model.dart new file mode 100644 index 00000000..09bd393b --- /dev/null +++ b/lib/model/manager/article_return_list_model.dart @@ -0,0 +1,80 @@ +import 'package:akuCommunity/model/common/img_model.dart'; + +class ArticleReturnListModel { + int id; + String name; + String code; + String beginDate; + int borrowTime; + List imgList; + String get paraseBorrowTime { + if (this.borrowTime > 24) { + return '${this.borrowTime ~/ 24}天${this.borrowTime % 24}小时'; + } else { + return '${this.borrowTime}小时'; + } + } + + ArticleReturnListModel( + {this.id, + this.name, + this.code, + this.beginDate, + this.borrowTime, + this.imgList}); + + ArticleReturnListModel.fromJson(Map json) { + id = json['id']; + name = json['name']; + code = json['code']; + beginDate = json['beginDate']; + borrowTime = json['borrowTime']; + if (json['imgList'] != null) { + imgList = new List(); + json['imgList'].forEach((v) { + imgList.add(new ImgModel.fromJson(v)); + }); + } + } + + Map toJson() { + final Map data = new Map(); + data['id'] = this.id; + data['name'] = this.name; + data['code'] = this.code; + data['beginDate'] = this.beginDate; + data['borrowTime'] = this.borrowTime; + if (this.imgList != null) { + data['imgList'] = this.imgList.map((v) => v.toJson()).toList(); + } + return data; + } +} + +class ImgList { + String url; + String size; + int longs; + int paragraph; + int sort; + + ImgList({this.url, this.size, this.longs, this.paragraph, this.sort}); + + ImgList.fromJson(Map json) { + url = json['url']; + size = json['size']; + longs = json['longs']; + paragraph = json['paragraph']; + sort = json['sort']; + } + + Map toJson() { + final Map data = new Map(); + data['url'] = this.url; + data['size'] = this.size; + data['longs'] = this.longs; + data['paragraph'] = this.paragraph; + data['sort'] = this.sort; + return data; + } +} diff --git a/lib/model/manager/article_return_model.dart b/lib/model/manager/article_return_model.dart new file mode 100644 index 00000000..ec27ebe7 --- /dev/null +++ b/lib/model/manager/article_return_model.dart @@ -0,0 +1,73 @@ +import 'package:akuCommunity/model/common/img_model.dart'; + +class ArticleReturnModel { + int id; + String name; + String code; + String beginDate; + int borrowTime; + List imgList; + + ArticleReturnModel( + {this.id, + this.name, + this.code, + this.beginDate, + this.borrowTime, + this.imgList}); + + ArticleReturnModel.fromJson(Map json) { + id = json['id']; + name = json['name']; + code = json['code']; + beginDate = json['beginDate']; + borrowTime = json['borrowTime']; + if (json['imgList'] != null) { + imgList = new List(); + json['imgList'].forEach((v) { + imgList.add(new ImgModel.fromJson(v)); + }); + } + } + + Map toJson() { + final Map data = new Map(); + data['id'] = this.id; + data['name'] = this.name; + data['code'] = this.code; + data['beginDate'] = this.beginDate; + data['borrowTime'] = this.borrowTime; + if (this.imgList != null) { + data['imgList'] = this.imgList.map((v) => v.toJson()).toList(); + } + return data; + } +} + +class ImgList { + String url; + String size; + int longs; + int paragraph; + int sort; + + ImgList({this.url, this.size, this.longs, this.paragraph, this.sort}); + + ImgList.fromJson(Map json) { + url = json['url']; + size = json['size']; + longs = json['longs']; + paragraph = json['paragraph']; + sort = json['sort']; + } + + Map toJson() { + final Map data = new Map(); + data['url'] = this.url; + data['size'] = this.size; + data['longs'] = this.longs; + data['paragraph'] = this.paragraph; + data['sort'] = this.sort; + return data; + } +} diff --git a/lib/pages/event_activity/voting_detail_page.dart b/lib/pages/event_activity/voting_detail_page.dart index af3203aa..aecaeca4 100644 --- a/lib/pages/event_activity/voting_detail_page.dart +++ b/lib/pages/event_activity/voting_detail_page.dart @@ -266,22 +266,29 @@ class _VotingDetailPageState extends State { ), ), bottomNavi: BottomButton( - onPressed: () async { - if (_selectId == null) { - BotToast.showText(text: '请先选择候选人！'); - } else { - BaseModel baseModel = - await ManagerFunc.vote(widget.id, _selectId); - if (baseModel.status) { - await Get.dialog(_shouwVoteDialog()); - _hasVoted = true; - setState(() {}); - } else { - BotToast.showText(text: '${baseModel.message}'); - } - } - }, - child: '投票'.text.black.size(28.sp).bold.make()), + onPressed: _model.status != 2 + ? () {} + : () async { + if (_selectId == null) { + BotToast.showText(text: '请先选择候选人！'); + } else { + BaseModel baseModel = + await ManagerFunc.vote(widget.id, _selectId); + if (baseModel.status) { + await Get.dialog(_shouwVoteDialog()); + _hasVoted = true; + setState(() {}); + } else { + BotToast.showText(text: '${baseModel.message}'); + } + } + }, + child: '投票' + .text + .color(_model.status != 2 ? ktextSubColor : ktextPrimary) + .size(28.sp) + .bold + .make()), ); } } diff --git a/lib/pages/goods_manage_page/borrow/borrow_finsh_page.dart b/lib/pages/goods_manage_page/borrow/borrow_finsh_page.dart new file mode 100644 index 00000000..2a102913 --- /dev/null +++ b/lib/pages/goods_manage_page/borrow/borrow_finsh_page.dart @@ -0,0 +1,81 @@ +import 'package:akuCommunity/base/base_style.dart'; +import 'package:akuCommunity/pages/home/home_page.dart'; +import 'package:akuCommunity/pages/tab_navigator.dart'; +import 'package:akuCommunity/widget/bee_scaffold.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:get/get.dart'; +import 'package:velocity_x/velocity_x.dart'; +import 'package:akuCommunity/const/resource.dart'; + +class BorrowFinshPage extends StatefulWidget { + final bool isSuccess; + final String failText; + BorrowFinshPage({Key key, this.isSuccess, this.failText}) : super(key: key); + + @override + _BorrowFinshPageState createState() => _BorrowFinshPageState(); +} + +class _BorrowFinshPageState extends State { + @override + Widget build(BuildContext context) { + return BeeScaffold( + title: '出借结果', + body: Center( + child: Column( + children: [ + 75.w.heightBox, + SizedBox( + width: 110.w, + height: 110.w, + child: Image.asset(widget.isSuccess + ? R.ASSETS_ICONS_BORROW_SUCCESS_PNG + : R.ASSETS_ICONS_BORROW_FAILURE_PNG), + ), + 48.w.heightBox, + '${widget.isSuccess ? '出借成功' : '出借失败'}' + .text + .color(ktextPrimary) + .size(36.sp) + .bold + .make(), + 16.w.heightBox, + '${widget.isSuccess ? '使用后请记得归还' : widget.failText}' + .text + .color(ktextSubColor) + .size(26.sp) + .make(), + 95.w.heightBox, + MaterialButton( + color: kPrimaryColor, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(8.w)), + elevation: 0, + hoverElevation: 0, + highlightElevation: 0, + focusElevation: 0, + disabledElevation: 0, + padding: EdgeInsets.symmetric(vertical: 24.w), + minWidth: double.infinity, + onPressed: widget.isSuccess + ? () { + Get.offAll(TabNavigator()); + } + : () { + Get.back(); + }, + child: '${widget.isSuccess ? '返回首页' : '重新提交'}' + .text + .color(widget.isSuccess ? ktextPrimary : Colors.white) + .size(36.sp) + .make(), + ) + ], + ), + ).pSymmetric( + h: 24.w, + ), + ); + } +} diff --git a/lib/pages/goods_manage_page/borrow/borrow_goods_detail_page.dart b/lib/pages/goods_manage_page/borrow/borrow_goods_detail_page.dart new file mode 100644 index 00000000..fe5ed43c --- /dev/null +++ b/lib/pages/goods_manage_page/borrow/borrow_goods_detail_page.dart @@ -0,0 +1,256 @@ +import 'package:akuCommunity/base/base_style.dart'; +import 'package:akuCommunity/constants/api.dart'; +import 'package:akuCommunity/model/common/img_model.dart'; +import 'package:akuCommunity/model/manager/article_borrow_detail_model.dart'; +import 'package:akuCommunity/utils/network/base_model.dart'; +import 'package:akuCommunity/utils/network/net_util.dart'; +import 'package:akuCommunity/widget/animated/animated_scale.dart'; +import 'package:akuCommunity/widget/bee_scaffold.dart'; +import 'package:akuCommunity/widget/buttons/radio_button.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_easyrefresh/easy_refresh.dart'; +import 'package:get/get.dart'; +import 'package:velocity_x/velocity_x.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:akuCommunity/const/resource.dart'; + +class BorrowGoodsDetailPage extends StatefulWidget { + final int articleId; + final List receiveIds; + BorrowGoodsDetailPage({Key key, this.articleId, this.receiveIds}) + : super(key: key); + + @override + _BorrowGoodsDetailPageState createState() => _BorrowGoodsDetailPageState(); +} + +class _BorrowGoodsDetailPageState extends State { + EasyRefreshController _easyRefreshController; + List _models; + bool _onload = true; + List _selectItems = []; + bool get allSelect => _selectItems.length == _models.length; + @override + void initState() { + super.initState(); + _easyRefreshController = EasyRefreshController(); + if (widget.receiveIds != null && widget.receiveIds.isNotEmpty) { + _selectItems = widget.receiveIds; + } + } + + @override + void dispose() { + _easyRefreshController?.dispose(); + super.dispose(); + } + + @override + Widget build(BuildContext context) { + return BeeScaffold( + title: '选择物品', + body: EasyRefresh( + firstRefresh: true, + header: MaterialHeader(), + onRefresh: () async { + List models = await getModels(); + _models = + models.map((e) => ArticleBorrowDetailModel.fromJson(e)).toList(); + _onload = false; + setState(() {}); + }, + child: _onload + ? _empty() + : ListView( + children: [..._models.map((e) => _goodsCard(e)).toList()], + ), + ), + bottomNavi: _onload ? _empty() : _bottomButton(), + ); + } + + Widget _allSelectButton() { + return GestureDetector( + onTap: () { + if (allSelect) { + _selectItems.clear(); + } else { + _selectItems.clear(); + _models.forEach((element) { + _selectItems.add(element.id); + }); + } + setState(() {}); + }, + child: AnimatedContainer( + height: 40.w, + width: 40.w, + decoration: BoxDecoration( + border: Border.all( + color: allSelect ? kPrimaryColor : Color(0xFF979797), + width: 3.w, + ), + borderRadius: BorderRadius.circular(20.w), + ), + duration: Duration(milliseconds: 300), + curve: Curves.easeInOutCubic, + alignment: Alignment.center, + child: AnimatedOpacity( + duration: Duration(milliseconds: 300), + curve: Curves.easeInOutCubic, + opacity: allSelect ? 1 : 0, + child: AnimatedScale( + scale: allSelect ? 1 : 0, + child: Container( + height: 24.w, + width: 24.w, + decoration: BoxDecoration( + color: kPrimaryColor, + borderRadius: BorderRadius.circular(12.w), + ), + ), + ), + ), + ), + ); + } + + Widget _bottomButton() { + return Row( + children: [ + _allSelectButton(), + 16.w.widthBox, + '全选'.text.color(ktextSubColor).size(24.sp).make(), + Spacer(), + '已选择 '.richText.color(ktextPrimary).size(24.sp).withTextSpanChildren([ + '${_selectItems.length}' + .textSpan + .size(32.sp) + .color(ktextPrimary) + .make(), + ' 项'.textSpan.size(24.sp).color(ktextPrimary).make(), + ]).make(), + 32.w.widthBox, + MaterialButton( + elevation: 0, + shape: + RoundedRectangleBorder(borderRadius: BorderRadius.circular(37.w)), + color: kPrimaryColor, + padding: EdgeInsets.symmetric(horizontal: 50.w, vertical: 15.w), + onPressed: () { + Get.back(result: _selectItems); + }, + child: '确定'.text.black.size(32.sp).bold.make(), + ), + ], + ) + .pSymmetric(v: 22.w, h: 32.w) + .box + .color(Colors.white) + .width(double.infinity) + .padding(EdgeInsets.only(bottom: MediaQuery.of(context).padding.bottom)) + .make(); + } + + Widget _empty() { + return Container(); + } + + Future getModels() async { + BaseModel baseModel = + await NetUtil().get(API.manager.articleBorrowFindDetail, params: { + "articleId": widget.articleId, + }); + return baseModel.data as List; + } + + Widget _goodsCard(ArticleBorrowDetailModel model) { + return Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + GestureDetector( + onTap: () { + if (_selectItems.contains(model.id)) { + _selectItems.remove(model.id); + } else { + _selectItems.add(model.id); + } + setState(() {}); + }, + child: Container( + height: 232.w - 48.w, + alignment: Alignment.center, + child: BeeRadio( + value: model.id, + groupValues: _selectItems, + ), + ), + ).material(color: Colors.transparent), + 24.w.widthBox, + SizedBox( + width: 184.w, + height: 184.w, + child: ClipRRect( + child: FadeInImage.assetNetwork( + placeholder: R.ASSETS_IMAGES_PLACEHOLDER_WEBP, + image: API.image(ImgModel.first(model.imgList)), + ), + ), + ), + 24.w.widthBox, + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + Image.asset( + R.ASSETS_ICONS_ARTICLE_NAME_PNG, + width: 40.w, + height: 40.w, + ), + 4.w.widthBox, + '物品名称：'.text.color(ktextSubColor).size(28.sp).make(), + '${model.name}'.text.color(ktextPrimary).size(28.sp).make(), + ], + ), + 12.w.heightBox, + Row( + children: [ + Image.asset( + R.ASSETS_ICONS_ARTICLE_COUNT_PNG, + width: 40.w, + height: 40.w, + ), + 4.w.widthBox, + '物品单号：'.text.color(ktextSubColor).size(28.sp).make(), + '${model.code}'.text.color(ktextPrimary).size(28.sp).make(), + ], + ), + 12.w.heightBox, + Row( + children: [ + Image.asset( + R.ASSETS_ICONS_BORROW_STATUS_PNG, + width: 40.w, + height: 40.w, + ), + 4.w.widthBox, + '出借状态：'.text.color(ktextSubColor).size(28.sp).make(), + '${model.borrowStatus}' + .text + .color(ktextPrimary) + .size(28.sp) + .make(), + ], + ), + ], + ) + ], + ) + .box + .color(Colors.white) + .padding(EdgeInsets.symmetric(vertical: 24.w, horizontal: 24.w)) + .withRounded(value: 6.w) + .make(); + } +} diff --git a/lib/pages/goods_manage_page/borrow/borrow_goods_page.dart b/lib/pages/goods_manage_page/borrow/borrow_goods_page.dart new file mode 100644 index 00000000..c067720e --- /dev/null +++ b/lib/pages/goods_manage_page/borrow/borrow_goods_page.dart @@ -0,0 +1,209 @@ +import 'package:akuCommunity/base/base_style.dart'; +import 'package:akuCommunity/constants/api.dart'; +import 'package:akuCommunity/model/common/img_model.dart'; +import 'package:akuCommunity/model/manager/article_borrow_model.dart'; +import 'package:akuCommunity/pages/goods_manage_page/borrow/borrow_finsh_page.dart'; +import 'package:akuCommunity/pages/goods_manage_page/borrow/borrow_goods_detail_page.dart'; +import 'package:akuCommunity/pages/things_page/widget/bee_list_view.dart'; +import 'package:akuCommunity/utils/network/base_model.dart'; +import 'package:akuCommunity/utils/network/net_util.dart'; +import 'package:akuCommunity/widget/bee_scaffold.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_easyrefresh/easy_refresh.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:get/get.dart'; +import 'package:velocity_x/velocity_x.dart'; +import 'package:akuCommunity/const/resource.dart'; + +class BorrowGoodsPage extends StatefulWidget { + BorrowGoodsPage({Key key}) : super(key: key); + + @override + _BorrowGoodsPageState createState() => _BorrowGoodsPageState(); +} + +class _BorrowGoodsPageState extends State { + EasyRefreshController _easyRefreshController; + List _receiveIds = []; + List _submitIds = []; + List _counts = []; + @override + void initState() { + super.initState(); + _easyRefreshController = EasyRefreshController(); + } + + @override + void dispose() { + _easyRefreshController?.dispose(); + super.dispose(); + } + + @override + Widget build(BuildContext context) { + return BeeScaffold( + title: '全部物品', + actions: [ + MaterialButton( + onPressed: () { + // Get.to(() => MineGoodsPage()); + }, + child: '我的借还物品'.text.black.size(28.sp).make(), + padding: EdgeInsets.symmetric(horizontal: 32.w), + ), + ], + body: BeeListView( + path: API.manager.articleBorrow, + controller: _easyRefreshController, + convert: (models) { + return models.tableList + .map((e) => ArticleBorrowModel.fromJson(e)) + .toList(); + }, + builder: (items) { + if (_counts.isEmpty) { + _counts = List.filled(items.length, 0); + } + return ListView.separated( + padding: EdgeInsets.symmetric(vertical: 16.w, horizontal: 32.w), + itemBuilder: (context, index) { + return _goodsCard(items[index], index); + }, + separatorBuilder: (_, __) { + return 16.w.heightBox; + }, + itemCount: items.length); + }), + bottomNavi: Row( + children: [ + '已选择 '.richText.color(ktextPrimary).size(24.sp).withTextSpanChildren([ + '${_submitIds.length}' + .textSpan + .size(32.sp) + .color(ktextPrimary) + .make(), + ' 项'.textSpan.size(24.sp).color(ktextPrimary).make(), + ]).make(), + Spacer(), + MaterialButton( + elevation: 0, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(37.w)), + color: kPrimaryColor, + padding: EdgeInsets.symmetric(horizontal: 50.w, vertical: 15.w), + onPressed: () async { + BaseModel baseModel = await NetUtil().post( + API.manager.articleBorrowGoods, + params: {"ids": _submitIds}, + showMessage: false); + Get.to(BorrowFinshPage( + isSuccess: baseModel.status, + failText: baseModel.message, + )); + }, + child: '借出'.text.black.size(32.sp).bold.make(), + ), + ], + ) + .pSymmetric(v: 22.w, h: 32.w) + .box + .color(Colors.white) + .width(double.infinity) + .padding( + EdgeInsets.only(bottom: MediaQuery.of(context).padding.bottom)) + .make(), + ); + } + + Widget _goodsCard(ArticleBorrowModel model, int index) { + return Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + SizedBox( + width: 184.w, + height: 184.w, + child: ClipRRect( + child: FadeInImage.assetNetwork( + placeholder: R.ASSETS_IMAGES_PLACEHOLDER_WEBP, + image: API.image(ImgModel.first(model.imgUrls)), + ), + ), + ), + 24.w.widthBox, + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + Image.asset( + R.ASSETS_ICONS_ARTICLE_NAME_PNG, + width: 40.w, + height: 40.w, + ), + 4.w.widthBox, + '物品名称:'.text.color(ktextSubColor).size(28.sp).make(), + '${model.name}'.text.color(ktextPrimary).size(28.sp).make(), + ], + ), + 12.w.heightBox, + Row( + children: [ + Image.asset( + R.ASSETS_ICONS_ARTICLE_COUNT_PNG, + width: 40.w, + height: 40.w, + ), + 4.w.widthBox, + '剩余数量:'.text.color(ktextSubColor).size(28.sp).make(), + '${model.quantity}'.text.color(ktextPrimary).size(28.sp).make(), + ], + ), + ], + ), + _counts[index] == 0 + ? SizedBox() + : Column( + crossAxisAlignment: CrossAxisAlignment.end, + children: [ + Container( + alignment: Alignment.center, + width: 40.w, + height: 40.w, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(20.w), + color: kPrimaryColor, + ), + child: '${_counts[index]}' + .text + .color(ktextPrimary) + .size(24.sp) + .bold + .make(), + ), + ], + ).expand() + ], + ) + .box + .color(Colors.white) + .height(232.w) + .width(686.w) + .padding(EdgeInsets.symmetric(vertical: 24.w, horizontal: 24.w)) + .withRounded(value: 6.w) + .make() + .onInkTap(() async { + _receiveIds.forEach((element) { + _submitIds.remove(element); + }); + await Get.to(() => BorrowGoodsDetailPage( + articleId: model.id, + receiveIds: _receiveIds, + )).then((value) { + _receiveIds = value; + }); + _counts[index] = _receiveIds.length; + _submitIds.addAll(_receiveIds); + setState(() {}); + }); + } +} diff --git a/lib/pages/goods_manage_page/goods_manage_page.dart b/lib/pages/goods_manage_page/goods_manage_page.dart index f8e08ccd..ae7f4d24 100644 --- a/lib/pages/goods_manage_page/goods_manage_page.dart +++ b/lib/pages/goods_manage_page/goods_manage_page.dart @@ -1,3 +1,5 @@ +import 'package:akuCommunity/pages/goods_manage_page/borrow/borrow_goods_page.dart'; +import 'package:akuCommunity/pages/goods_manage_page/retrun/return_goods_detail_page.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; @@ -16,7 +18,8 @@ import 'package:akuCommunity/widget/bee_scaffold.dart'; import 'package:akuCommunity/widget/buttons/bottom_button.dart'; class GoodsManagePage extends StatefulWidget { - GoodsManagePage({Key key}) : super(key: key); + final bool isBorrow; + GoodsManagePage({Key key, this.isBorrow = true}) : super(key: key); @override _GoodsManagePageState createState() => _GoodsManagePageState(); @@ -115,8 +118,14 @@ class _GoodsManagePageState extends State { itemCount: items.length); }), bottomNavi: BottomButton( - child: '扫一扫出借'.text.black.size(32.sp).bold.make(), - onPressed: () {}, + child: '扫一扫'.text.black.size(32.sp).bold.make(), + onPressed: widget.isBorrow + ? () { + Get.to(() => BorrowGoodsPage()); + } + : () { + Get.to(() => ReturnGoodsDetailPage()); + }, ), ); } diff --git a/lib/pages/goods_manage_page/retrun/return_goods_detail_page.dart b/lib/pages/goods_manage_page/retrun/return_goods_detail_page.dart new file mode 100644 index 00000000..a1fc0ef7 --- /dev/null +++ b/lib/pages/goods_manage_page/retrun/return_goods_detail_page.dart @@ -0,0 +1,255 @@ +import 'package:akuCommunity/base/base_style.dart'; +import 'package:akuCommunity/constants/api.dart'; +import 'package:akuCommunity/model/common/img_model.dart'; +import 'package:akuCommunity/model/manager/article_return_list_model.dart'; +import 'package:akuCommunity/utils/network/base_model.dart'; +import 'package:akuCommunity/utils/network/net_util.dart'; +import 'package:akuCommunity/widget/animated/animated_scale.dart'; +import 'package:akuCommunity/widget/bee_scaffold.dart'; +import 'package:akuCommunity/widget/buttons/radio_button.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_easyrefresh/easy_refresh.dart'; +import 'package:get/get.dart'; +import 'package:velocity_x/velocity_x.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:akuCommunity/const/resource.dart'; + +class ReturnGoodsDetailPage extends StatefulWidget { + ReturnGoodsDetailPage({Key key}) : super(key: key); + + @override + _ReturnGoodsDetailPageState createState() => _ReturnGoodsDetailPageState(); +} + +class _ReturnGoodsDetailPageState extends State { + EasyRefreshController _easyRefreshController; + List _models; + bool _onload = true; + List _selectItems = []; + bool get allSelect => _selectItems.length == _models.length; + @override + void initState() { + super.initState(); + _easyRefreshController = EasyRefreshController(); + } + + @override + void dispose() { + _easyRefreshController?.dispose(); + super.dispose(); + } + + @override + Widget build(BuildContext context) { + return BeeScaffold( + title: '选择物品', + body: EasyRefresh( + firstRefresh: true, + header: MaterialHeader(), + onRefresh: () async { + List models = await getModels(); + _models = + models.map((e) => ArticleReturnListModel.fromJson(e)).toList(); + _onload = false; + setState(() {}); + }, + child: _onload + ? _empty() + : ListView( + children: [..._models.map((e) => _goodsCard(e)).toList()], + ), + ), + bottomNavi: _onload ? _empty() : _bottomButton(), + ); + } + + Widget _allSelectButton() { + return GestureDetector( + onTap: () { + if (allSelect) { + _selectItems.clear(); + } else { + _selectItems.clear(); + _models.forEach((element) { + _selectItems.add(element.id); + }); + } + setState(() {}); + }, + child: AnimatedContainer( + height: 40.w, + width: 40.w, + decoration: BoxDecoration( + border: Border.all( + color: allSelect ? kPrimaryColor : Color(0xFF979797), + width: 3.w, + ), + borderRadius: BorderRadius.circular(20.w), + ), + duration: Duration(milliseconds: 300), + curve: Curves.easeInOutCubic, + alignment: Alignment.center, + child: AnimatedOpacity( + duration: Duration(milliseconds: 300), + curve: Curves.easeInOutCubic, + opacity: allSelect ? 1 : 0, + child: AnimatedScale( + scale: allSelect ? 1 : 0, + child: Container( + height: 24.w, + width: 24.w, + decoration: BoxDecoration( + color: kPrimaryColor, + borderRadius: BorderRadius.circular(12.w), + ), + ), + ), + ), + ), + ); + } + + Widget _bottomButton() { + return Row( + children: [ + _allSelectButton(), + 16.w.widthBox, + '全选'.text.color(ktextSubColor).size(24.sp).make(), + Spacer(), + '已选择 '.richText.color(ktextPrimary).size(24.sp).withTextSpanChildren([ + '${_selectItems.length}' + .textSpan + .size(32.sp) + .color(ktextPrimary) + .make(), + ' 项'.textSpan.size(24.sp).color(ktextPrimary).make(), + ]).make(), + 32.w.widthBox, + MaterialButton( + elevation: 0, + shape: + RoundedRectangleBorder(borderRadius: BorderRadius.circular(37.w)), + color: kPrimaryColor, + padding: EdgeInsets.symmetric(horizontal: 50.w, vertical: 15.w), + onPressed: () async { + BaseModel baseModel = + await NetUtil().post(API.manager.articleReturnGoods, + params: { + 'ids': _selectItems, + }, + showMessage: true); + if (baseModel.status) { + Get.back(); + } + }, + child: '归还'.text.black.size(32.sp).bold.make(), + ), + ], + ) + .pSymmetric(v: 22.w, h: 32.w) + .box + .color(Colors.white) + .width(double.infinity) + .padding(EdgeInsets.only(bottom: MediaQuery.of(context).padding.bottom)) + .make(); + } + + Widget _empty() { + return Container(); + } + + Future getModels() async { + BaseModel baseModel = await NetUtil().get(API.manager.articleReturnList); + return baseModel.data as List; + } + + Widget _goodsCard(ArticleReturnListModel model) { + return Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + GestureDetector( + onTap: () { + if (_selectItems.contains(model.id)) { + _selectItems.remove(model.id); + } else { + _selectItems.add(model.id); + } + setState(() {}); + }, + child: Container( + height: 232.w - 48.w, + alignment: Alignment.center, + child: BeeRadio( + value: model.id, + groupValues: _selectItems, + ), + ), + ).material(color: Colors.transparent), + 24.w.widthBox, + SizedBox( + width: 184.w, + height: 184.w, + child: ClipRRect( + child: FadeInImage.assetNetwork( + placeholder: R.ASSETS_IMAGES_PLACEHOLDER_WEBP, + image: API.image(ImgModel.first(model.imgList)), + ), + ), + ), + 24.w.widthBox, + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + Image.asset( + R.ASSETS_ICONS_ARTICLE_NAME_PNG, + width: 40.w, + height: 40.w, + ), + 4.w.widthBox, + '物品名称：'.text.color(ktextSubColor).size(28.sp).make(), + '${model.name}'.text.color(ktextPrimary).size(28.sp).make(), + ], + ), + 12.w.heightBox, + Row( + children: [ + Image.asset( + R.ASSETS_ICONS_ARTICLE_COUNT_PNG, + width: 40.w, + height: 40.w, + ), + 4.w.widthBox, + '物品单号：'.text.color(ktextSubColor).size(28.sp).make(), + '${model.code}'.text.color(ktextPrimary).size(28.sp).make(), + ], + ), + 12.w.heightBox, + Row( + children: [ + Image.asset( + R.ASSETS_ICONS_BORROW_STATUS_PNG, + width: 40.w, + height: 40.w, + ), + 4.w.widthBox, + '出借时间'.text.color(ktextSubColor).size(28.sp).make(), + '${model.paraseBorrowTime}' + .text + .color(ktextPrimary) + .size(28.sp) + .make(), + ], + ), + ], + ) + ], + ) + .box + .color(Colors.white) + .padding(EdgeInsets.symmetric(vertical: 24.w, horizontal: 24.w)) + .withRounded(value: 6.w) + .make(); + } +} diff --git a/lib/pages/goods_manage_page/select_borrow_return_page.dart b/lib/pages/goods_manage_page/select_borrow_return_page.dart new file mode 100644 index 00000000..f22b129a --- /dev/null +++ b/lib/pages/goods_manage_page/select_borrow_return_page.dart @@ -0,0 +1,63 @@ +import 'package:akuCommunity/pages/goods_manage_page/goods_manage_page.dart'; +import 'package:akuCommunity/widget/bee_scaffold.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:get/get.dart'; +import 'package:velocity_x/velocity_x.dart'; +import 'package:akuCommunity/const/resource.dart'; +import 'package:akuCommunity/extensions/widget_list_ext.dart'; + +class SelectBorrowReturnPage extends StatefulWidget { + SelectBorrowReturnPage({Key key}) : super(key: key); + + @override + _SelectBorrowReturnPageState createState() => _SelectBorrowReturnPageState(); +} + +class _SelectBorrowReturnPageState extends State { + @override + Widget build(BuildContext context) { + return BeeScaffold( + title: '借还管理', + body: ListView( + padding: EdgeInsets.symmetric(vertical: 40.w, horizontal: 36.w), + children: [ + _buidTile(R.ASSETS_ICONS_GOODS_BORROW_PNG, '物品出借', true), + _buidTile(R.ASSETS_ICONS_GOODS_RETURN_PNG, '物品归还', false), + ].sepWidget(separate: 20.w.heightBox), + ), + ); + } + + Widget _buidTile(String iconPath, String text, bool isBorrow) { + return Row( + children: [ + SizedBox( + width: 32.w, + height: 32.w, + child: Image.asset(iconPath), + ), + 28.w.widthBox, + text.text.black.size(30.sp).make(), + Spacer(), + Icon( + CupertinoIcons.chevron_forward, + size: 32.w, + ), + ], + ) + .box + .color(Colors.white) + .padding(EdgeInsets.symmetric(vertical: 40.w, horizontal: 32.w)) + .withRounded(value: 8.w) + .make() + .onInkTap(() { + Get.to( + () => GoodsManagePage( + isBorrow: isBorrow, + ), + ); + }); + } +} diff --git a/lib/ui/manager/questionnaire/questionnaire_detail_page.dart b/lib/ui/manager/questionnaire/questionnaire_detail_page.dart index 4df63701..94d4dace 100644 --- a/lib/ui/manager/questionnaire/questionnaire_detail_page.dart +++ b/lib/ui/manager/questionnaire/questionnaire_detail_page.dart @@ -23,7 +23,8 @@ import 'package:akuCommunity/widget/buttons/bottom_button.dart'; class QuestionnaireDetailPage extends StatefulWidget { final int id; - QuestionnaireDetailPage({Key key, this.id}) : super(key: key); + final int status; + QuestionnaireDetailPage({Key key, this.id, this.status}) : super(key: key); @override _QuestionnaireDetailPageState createState() => @@ -255,15 +256,22 @@ class _QuestionnaireDetailPageState extends State { ), ), bottomNavi: BottomButton( - child: '确认提交'.text.black.size(32.sp).bold.make(), - onPressed: () async { - BaseModel baseModel = - await ManagerFunc.questionnaireSubmit(widget.id, _submitModels); - Get.to(() => SubmitComplishPage( - status: baseModel.status, - message: baseModel.message, - )); - }, + child: '确认提交' + .text + .color(widget.status != 2 ? ktextSubColor : ktextPrimary) + .size(32.sp) + .bold + .make(), + onPressed: widget.status != 2 + ? () {} + : () async { + BaseModel baseModel = await ManagerFunc.questionnaireSubmit( + widget.id, _submitModels); + Get.to(() => SubmitComplishPage( + status: baseModel.status, + message: baseModel.message, + )); + }, ), ); } diff --git a/lib/ui/manager/questionnaire/questionnaire_page.dart b/lib/ui/manager/questionnaire/questionnaire_page.dart index b99cdb5f..3cbbe36b 100644 --- a/lib/ui/manager/questionnaire/questionnaire_page.dart +++ b/lib/ui/manager/questionnaire/questionnaire_page.dart @@ -47,6 +47,7 @@ class _QuestionnairePageState extends State { onTap: () { Get.to(() => QuestionnaireDetailPage( id: model.id, + status: model.status, )); }, child: Container( diff --git a/lib/ui/profile/house/pick_my_house_page.dart b/lib/ui/profile/house/pick_my_house_page.dart index 44c62b11..70446dec 100644 --- a/lib/ui/profile/house/pick_my_house_page.dart +++ b/lib/ui/profile/house/pick_my_house_page.dart @@ -229,9 +229,11 @@ class _HouseCard extends StatelessWidget { ), ], ), - onPressed: () { + onPressed: () async { final appProvider = Provider.of(context, listen: false); appProvider.setCurrentHouse(model); + //我的房屋：修改选中的房产审核id + await NetUtil().get(API.user.changeSelectExanmineId,params: {"examineId":model.estateId}); Get.back(); }, ),