diff --git a/lib/constants/saas_api.dart b/lib/constants/saas_api.dart index d54872a9..92ab59ba 100644 --- a/lib/constants/saas_api.dart +++ b/lib/constants/saas_api.dart @@ -204,6 +204,9 @@ class _Announce { } class _Information { + ///app根据资讯主键id查询资讯信息 + String get findById => '/app/user/information/findById'; + ///查询app资讯推荐阅读列表信息 String get recommendList => '/app/user/information/recommendList'; diff --git a/lib/pages/sign/login/select_community_page.dart b/lib/pages/sign/login/select_community_page.dart index 2dde58ab..2ae1425b 100644 --- a/lib/pages/sign/login/select_community_page.dart +++ b/lib/pages/sign/login/select_community_page.dart @@ -1,6 +1,6 @@ import 'package:aku_new_community/constants/saas_api.dart'; -import 'package:aku_new_community/models/login/community_model.dart'; -import 'package:aku_new_community/models/login/history_login_model.dart'; +import 'package:aku_new_community/saas_model/login/community_model.dart'; +import 'package:aku_new_community/saas_model/login/history_login_model.dart'; import 'package:aku_new_community/utils/network/net_util.dart'; import 'package:aku_new_community/widget/bee_scaffold.dart'; import 'package:aku_new_community/widget/others/user_tool.dart'; diff --git a/lib/provider/app_provider.dart b/lib/provider/app_provider.dart index 7b95162a..b0c33e12 100644 --- a/lib/provider/app_provider.dart +++ b/lib/provider/app_provider.dart @@ -9,10 +9,10 @@ import 'package:aku_new_community/model/common/real_time_weather_model.dart'; import 'package:aku_new_community/model/message/message_center_model.dart'; import 'package:aku_new_community/model/user/adress_model.dart'; import 'package:aku_new_community/model/user/car_parking_model.dart'; -import 'package:aku_new_community/models/login/community_model.dart'; -import 'package:aku_new_community/models/login/history_login_model.dart'; -import 'package:aku_new_community/models/login/picked_city_model.dart'; import 'package:aku_new_community/models/user/passed_house_list_model.dart'; +import 'package:aku_new_community/saas_model/login/community_model.dart'; +import 'package:aku_new_community/saas_model/login/history_login_model.dart'; +import 'package:aku_new_community/saas_model/login/picked_city_model.dart'; import 'package:aku_new_community/utils/hive_store.dart'; import 'package:aku_new_community/utils/network/base_model.dart'; import 'package:aku_new_community/utils/network/net_util.dart'; diff --git a/lib/provider/data_provider.dart b/lib/provider/data_provider.dart index 987eda48..4eeec073 100644 --- a/lib/provider/data_provider.dart +++ b/lib/provider/data_provider.dart @@ -1,6 +1,6 @@ import 'package:aku_new_community/constants/saas_api.dart'; -import 'package:aku_new_community/models/login/china_region_model.dart'; -import 'package:aku_new_community/models/login/history_login_model.dart'; +import 'package:aku_new_community/saas_model/login/china_region_model.dart'; +import 'package:aku_new_community/saas_model/login/history_login_model.dart'; import 'package:aku_new_community/utils/hive_store.dart'; import 'package:aku_new_community/utils/network/net_util.dart'; import 'package:aku_new_community/widget/others/user_tool.dart'; diff --git a/lib/models/login/china_region_model.dart b/lib/saas_model/login/china_region_model.dart similarity index 100% rename from lib/models/login/china_region_model.dart rename to lib/saas_model/login/china_region_model.dart diff --git a/lib/models/login/china_region_model.g.dart b/lib/saas_model/login/china_region_model.g.dart similarity index 100% rename from lib/models/login/china_region_model.g.dart rename to lib/saas_model/login/china_region_model.g.dart diff --git a/lib/models/login/community_model.dart b/lib/saas_model/login/community_model.dart similarity index 100% rename from lib/models/login/community_model.dart rename to lib/saas_model/login/community_model.dart diff --git a/lib/models/login/community_model.g.dart b/lib/saas_model/login/community_model.g.dart similarity index 100% rename from lib/models/login/community_model.g.dart rename to lib/saas_model/login/community_model.g.dart diff --git a/lib/models/login/history_login_model.dart b/lib/saas_model/login/history_login_model.dart similarity index 77% rename from lib/models/login/history_login_model.dart rename to lib/saas_model/login/history_login_model.dart index e60f2877..3dee5349 100644 --- a/lib/models/login/history_login_model.dart +++ b/lib/saas_model/login/history_login_model.dart @@ -1,8 +1,8 @@ +import 'package:aku_new_community/saas_model/login/picked_city_model.dart'; import 'package:hive/hive.dart'; import 'package:json_annotation/json_annotation.dart'; -import 'package:aku_new_community/models/login/community_model.dart'; -import 'package:aku_new_community/models/login/picked_city_model.dart'; +import 'community_model.dart'; part 'history_login_model.g.dart'; diff --git a/lib/models/login/history_login_model.g.dart b/lib/saas_model/login/history_login_model.g.dart similarity index 100% rename from lib/models/login/history_login_model.g.dart rename to lib/saas_model/login/history_login_model.g.dart diff --git a/lib/models/login/picked_city_model.dart b/lib/saas_model/login/picked_city_model.dart similarity index 100% rename from lib/models/login/picked_city_model.dart rename to lib/saas_model/login/picked_city_model.dart diff --git a/lib/models/login/picked_city_model.g.dart b/lib/saas_model/login/picked_city_model.g.dart similarity index 100% rename from lib/models/login/picked_city_model.g.dart rename to lib/saas_model/login/picked_city_model.g.dart diff --git a/lib/models/sars_model/my_house/estate_cascade_model.dart b/lib/saas_model/my_house/estate_cascade_model.dart similarity index 100% rename from lib/models/sars_model/my_house/estate_cascade_model.dart rename to lib/saas_model/my_house/estate_cascade_model.dart diff --git a/lib/models/sars_model/my_house/estate_cascade_model.g.dart b/lib/saas_model/my_house/estate_cascade_model.g.dart similarity index 100% rename from lib/models/sars_model/my_house/estate_cascade_model.g.dart rename to lib/saas_model/my_house/estate_cascade_model.g.dart diff --git a/lib/models/sars_model/my_house/my_family_examine_list_model.dart b/lib/saas_model/my_house/my_family_examine_list_model.dart similarity index 100% rename from lib/models/sars_model/my_house/my_family_examine_list_model.dart rename to lib/saas_model/my_house/my_family_examine_list_model.dart diff --git a/lib/models/sars_model/my_house/my_family_examine_list_model.g.dart b/lib/saas_model/my_house/my_family_examine_list_model.g.dart similarity index 100% rename from lib/models/sars_model/my_house/my_family_examine_list_model.g.dart rename to lib/saas_model/my_house/my_family_examine_list_model.g.dart diff --git a/lib/models/sars_model/my_house/my_family_member_list_model.dart b/lib/saas_model/my_house/my_family_member_list_model.dart similarity index 100% rename from lib/models/sars_model/my_house/my_family_member_list_model.dart rename to lib/saas_model/my_house/my_family_member_list_model.dart diff --git a/lib/models/sars_model/my_house/my_family_member_list_model.g.dart b/lib/saas_model/my_house/my_family_member_list_model.g.dart similarity index 100% rename from lib/models/sars_model/my_house/my_family_member_list_model.g.dart rename to lib/saas_model/my_house/my_family_member_list_model.g.dart diff --git a/lib/models/sars_model/my_house/my_house_apply_record_list_model.dart b/lib/saas_model/my_house/my_house_apply_record_list_model.dart similarity index 100% rename from lib/models/sars_model/my_house/my_house_apply_record_list_model.dart rename to lib/saas_model/my_house/my_house_apply_record_list_model.dart diff --git a/lib/models/sars_model/my_house/my_house_apply_record_list_model.g.dart b/lib/saas_model/my_house/my_house_apply_record_list_model.g.dart similarity index 100% rename from lib/models/sars_model/my_house/my_house_apply_record_list_model.g.dart rename to lib/saas_model/my_house/my_house_apply_record_list_model.g.dart diff --git a/lib/models/sars_model/my_house/picked_house.dart b/lib/saas_model/my_house/picked_house.dart similarity index 72% rename from lib/models/sars_model/my_house/picked_house.dart rename to lib/saas_model/my_house/picked_house.dart index 74e34a2f..08a557df 100644 --- a/lib/models/sars_model/my_house/picked_house.dart +++ b/lib/saas_model/my_house/picked_house.dart @@ -1,4 +1,4 @@ -import 'package:aku_new_community/models/sars_model/my_house/estate_cascade_model.dart'; +import 'estate_cascade_model.dart'; class PickedHouseModel { final EstateCascadeModel? building; diff --git a/lib/models/task/hall_list_model.dart b/lib/saas_model/task/hall_list_model.dart similarity index 100% rename from lib/models/task/hall_list_model.dart rename to lib/saas_model/task/hall_list_model.dart diff --git a/lib/models/task/hall_list_model.g.dart b/lib/saas_model/task/hall_list_model.g.dart similarity index 100% rename from lib/models/task/hall_list_model.g.dart rename to lib/saas_model/task/hall_list_model.g.dart diff --git a/lib/models/task/my_take_task_list_model.dart b/lib/saas_model/task/my_take_task_list_model.dart similarity index 100% rename from lib/models/task/my_take_task_list_model.dart rename to lib/saas_model/task/my_take_task_list_model.dart diff --git a/lib/models/task/my_take_task_list_model.g.dart b/lib/saas_model/task/my_take_task_list_model.g.dart similarity index 100% rename from lib/models/task/my_take_task_list_model.g.dart rename to lib/saas_model/task/my_take_task_list_model.g.dart diff --git a/lib/models/task/my_task_list_model.dart b/lib/saas_model/task/my_task_list_model.dart similarity index 100% rename from lib/models/task/my_task_list_model.dart rename to lib/saas_model/task/my_task_list_model.dart diff --git a/lib/models/task/my_task_list_model.g.dart b/lib/saas_model/task/my_task_list_model.g.dart similarity index 100% rename from lib/models/task/my_task_list_model.g.dart rename to lib/saas_model/task/my_task_list_model.g.dart diff --git a/lib/models/work_order/team_list_model.dart b/lib/saas_model/work_order/team_list_model.dart similarity index 100% rename from lib/models/work_order/team_list_model.dart rename to lib/saas_model/work_order/team_list_model.dart diff --git a/lib/models/work_order/team_list_model.g.dart b/lib/saas_model/work_order/team_list_model.g.dart similarity index 100% rename from lib/models/work_order/team_list_model.g.dart rename to lib/saas_model/work_order/team_list_model.g.dart diff --git a/lib/models/work_order/work_order_bill_model.dart b/lib/saas_model/work_order/work_order_bill_model.dart similarity index 100% rename from lib/models/work_order/work_order_bill_model.dart rename to lib/saas_model/work_order/work_order_bill_model.dart diff --git a/lib/models/work_order/work_order_bill_model.g.dart b/lib/saas_model/work_order/work_order_bill_model.g.dart similarity index 100% rename from lib/models/work_order/work_order_bill_model.g.dart rename to lib/saas_model/work_order/work_order_bill_model.g.dart diff --git a/lib/models/work_order/work_order_detail_model.dart b/lib/saas_model/work_order/work_order_detail_model.dart similarity index 100% rename from lib/models/work_order/work_order_detail_model.dart rename to lib/saas_model/work_order/work_order_detail_model.dart diff --git a/lib/models/work_order/work_order_detail_model.g.dart b/lib/saas_model/work_order/work_order_detail_model.g.dart similarity index 100% rename from lib/models/work_order/work_order_detail_model.g.dart rename to lib/saas_model/work_order/work_order_detail_model.g.dart diff --git a/lib/models/work_order/work_order_list_model.dart b/lib/saas_model/work_order/work_order_list_model.dart similarity index 100% rename from lib/models/work_order/work_order_list_model.dart rename to lib/saas_model/work_order/work_order_list_model.dart diff --git a/lib/models/work_order/work_order_list_model.g.dart b/lib/saas_model/work_order/work_order_list_model.g.dart similarity index 100% rename from lib/models/work_order/work_order_list_model.g.dart rename to lib/saas_model/work_order/work_order_list_model.g.dart diff --git a/lib/models/work_order/work_order_progress_model.dart b/lib/saas_model/work_order/work_order_progress_model.dart similarity index 100% rename from lib/models/work_order/work_order_progress_model.dart rename to lib/saas_model/work_order/work_order_progress_model.dart diff --git a/lib/models/work_order/work_order_progress_model.g.dart b/lib/saas_model/work_order/work_order_progress_model.g.dart similarity index 100% rename from lib/models/work_order/work_order_progress_model.g.dart rename to lib/saas_model/work_order/work_order_progress_model.g.dart diff --git a/lib/models/work_order/work_order_report_model.dart b/lib/saas_model/work_order/work_order_report_model.dart similarity index 100% rename from lib/models/work_order/work_order_report_model.dart rename to lib/saas_model/work_order/work_order_report_model.dart diff --git a/lib/models/work_order/work_order_report_model.g.dart b/lib/saas_model/work_order/work_order_report_model.g.dart similarity index 100% rename from lib/models/work_order/work_order_report_model.g.dart rename to lib/saas_model/work_order/work_order_report_model.g.dart diff --git a/lib/models/work_order/work_order_type_model.dart b/lib/saas_model/work_order/work_order_type_model.dart similarity index 100% rename from lib/models/work_order/work_order_type_model.dart rename to lib/saas_model/work_order/work_order_type_model.dart diff --git a/lib/models/work_order/work_order_type_model.g.dart b/lib/saas_model/work_order/work_order_type_model.g.dart similarity index 100% rename from lib/models/work_order/work_order_type_model.g.dart rename to lib/saas_model/work_order/work_order_type_model.g.dart diff --git a/lib/ui/function_and_service/task/hall/hall_card.dart b/lib/ui/function_and_service/task/hall/hall_card.dart index b7484b15..b0732b5e 100644 --- a/lib/ui/function_and_service/task/hall/hall_card.dart +++ b/lib/ui/function_and_service/task/hall/hall_card.dart @@ -1,5 +1,5 @@ import 'package:aku_new_community/gen/assets.gen.dart'; -import 'package:aku_new_community/models/task/hall_list_model.dart'; +import 'package:aku_new_community/saas_model/task/hall_list_model.dart'; import 'package:aku_new_community/widget/bee_divider.dart'; import 'package:aku_new_community/widget/buttons/card_bottom_button.dart'; import 'package:aku_new_community/widget/others/user_tool.dart'; diff --git a/lib/ui/function_and_service/task/hall/hall_detail_page.dart b/lib/ui/function_and_service/task/hall/hall_detail_page.dart index db5c9f0e..a4f92187 100644 --- a/lib/ui/function_and_service/task/hall/hall_detail_page.dart +++ b/lib/ui/function_and_service/task/hall/hall_detail_page.dart @@ -1,5 +1,5 @@ import 'package:aku_new_community/gen/assets.gen.dart'; -import 'package:aku_new_community/models/task/hall_list_model.dart'; +import 'package:aku_new_community/saas_model/task/hall_list_model.dart'; import 'package:aku_new_community/ui/function_and_service/task/dialogs/task_cancel_dialog.dart'; import 'package:aku_new_community/widget/bee_divider.dart'; import 'package:aku_new_community/widget/bee_scaffold.dart'; diff --git a/lib/ui/function_and_service/task/hall/hall_view.dart b/lib/ui/function_and_service/task/hall/hall_view.dart index ac70d562..227c6d85 100644 --- a/lib/ui/function_and_service/task/hall/hall_view.dart +++ b/lib/ui/function_and_service/task/hall/hall_view.dart @@ -1,6 +1,6 @@ import 'package:aku_new_community/constants/saas_api.dart'; -import 'package:aku_new_community/models/task/hall_list_model.dart'; import 'package:aku_new_community/pages/things_page/widget/bee_list_view.dart'; +import 'package:aku_new_community/saas_model/task/hall_list_model.dart'; import 'package:flutter/material.dart'; import 'package:flutter_easyrefresh/easy_refresh.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; diff --git a/lib/ui/function_and_service/task/my_take_task/my_take_task_card.dart b/lib/ui/function_and_service/task/my_take_task/my_take_task_card.dart index b82bdd05..5d336015 100644 --- a/lib/ui/function_and_service/task/my_take_task/my_take_task_card.dart +++ b/lib/ui/function_and_service/task/my_take_task/my_take_task_card.dart @@ -1,6 +1,6 @@ import 'package:aku_new_community/extensions/widget_list_ext.dart'; import 'package:aku_new_community/gen/assets.gen.dart'; -import 'package:aku_new_community/models/task/my_take_task_list_model.dart'; +import 'package:aku_new_community/saas_model/task/my_take_task_list_model.dart'; import 'package:aku_new_community/widget/bee_divider.dart'; import 'package:aku_new_community/widget/buttons/card_bottom_button.dart'; import 'package:aku_new_community/widget/views/bee_hor_image_view.dart'; diff --git a/lib/ui/function_and_service/task/my_take_task/my_take_task_detail_page.dart b/lib/ui/function_and_service/task/my_take_task/my_take_task_detail_page.dart index 6ef5fca1..e460ebe8 100644 --- a/lib/ui/function_and_service/task/my_take_task/my_take_task_detail_page.dart +++ b/lib/ui/function_and_service/task/my_take_task/my_take_task_detail_page.dart @@ -1,6 +1,6 @@ import 'package:aku_new_community/base/base_style.dart'; import 'package:aku_new_community/gen/assets.gen.dart'; -import 'package:aku_new_community/models/task/my_take_task_list_model.dart'; +import 'package:aku_new_community/saas_model/task/my_take_task_list_model.dart'; import 'package:aku_new_community/ui/function_and_service/task/dialogs/task_cancel_dialog.dart'; import 'package:aku_new_community/widget/bee_divider.dart'; import 'package:aku_new_community/widget/bee_scaffold.dart'; diff --git a/lib/ui/function_and_service/task/my_take_task/my_take_task_view.dart b/lib/ui/function_and_service/task/my_take_task/my_take_task_view.dart index 669c374c..8e46a082 100644 --- a/lib/ui/function_and_service/task/my_take_task/my_take_task_view.dart +++ b/lib/ui/function_and_service/task/my_take_task/my_take_task_view.dart @@ -1,6 +1,6 @@ import 'package:aku_new_community/constants/saas_api.dart'; -import 'package:aku_new_community/models/task/my_take_task_list_model.dart'; import 'package:aku_new_community/pages/things_page/widget/bee_list_view.dart'; +import 'package:aku_new_community/saas_model/task/my_take_task_list_model.dart'; import 'package:flutter/material.dart'; import 'package:flutter_easyrefresh/easy_refresh.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; diff --git a/lib/ui/function_and_service/task/my_task/my_task_card.dart b/lib/ui/function_and_service/task/my_task/my_task_card.dart index c1b79e2a..ce65e070 100644 --- a/lib/ui/function_and_service/task/my_task/my_task_card.dart +++ b/lib/ui/function_and_service/task/my_task/my_task_card.dart @@ -1,5 +1,5 @@ import 'package:aku_new_community/gen/assets.gen.dart'; -import 'package:aku_new_community/models/task/my_task_list_model.dart'; +import 'package:aku_new_community/saas_model/task/my_task_list_model.dart'; import 'package:aku_new_community/widget/buttons/card_bottom_button.dart'; import 'package:aku_new_community/widget/views/bee_hor_image_view.dart'; import 'package:aku_new_community/widget/voice_player.dart'; diff --git a/lib/ui/function_and_service/task/my_task/my_task_detail_page.dart b/lib/ui/function_and_service/task/my_task/my_task_detail_page.dart index ac8a8097..9e7c7ce3 100644 --- a/lib/ui/function_and_service/task/my_task/my_task_detail_page.dart +++ b/lib/ui/function_and_service/task/my_task/my_task_detail_page.dart @@ -1,6 +1,6 @@ import 'package:aku_new_community/base/base_style.dart'; import 'package:aku_new_community/gen/assets.gen.dart'; -import 'package:aku_new_community/models/task/my_task_list_model.dart'; +import 'package:aku_new_community/saas_model/task/my_task_list_model.dart'; import 'package:aku_new_community/ui/function_and_service/task/dialogs/task_cancel_dialog.dart'; import 'package:aku_new_community/ui/function_and_service/task/dialogs/task_evaluation_dialog.dart'; import 'package:aku_new_community/widget/bee_divider.dart'; diff --git a/lib/ui/function_and_service/task/my_task/my_task_view.dart b/lib/ui/function_and_service/task/my_task/my_task_view.dart index f15108cc..2c0138da 100644 --- a/lib/ui/function_and_service/task/my_task/my_task_view.dart +++ b/lib/ui/function_and_service/task/my_task/my_task_view.dart @@ -1,6 +1,6 @@ import 'package:aku_new_community/constants/saas_api.dart'; -import 'package:aku_new_community/models/task/my_task_list_model.dart'; import 'package:aku_new_community/pages/things_page/widget/bee_list_view.dart'; +import 'package:aku_new_community/saas_model/task/my_task_list_model.dart'; import 'package:flutter/material.dart'; import 'package:flutter_easyrefresh/easy_refresh.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; diff --git a/lib/ui/function_and_service/work_order/dialogs/work_order_bill_dialog.dart b/lib/ui/function_and_service/work_order/dialogs/work_order_bill_dialog.dart index 655375c7..97753c2d 100644 --- a/lib/ui/function_and_service/work_order/dialogs/work_order_bill_dialog.dart +++ b/lib/ui/function_and_service/work_order/dialogs/work_order_bill_dialog.dart @@ -1,6 +1,6 @@ import 'package:aku_new_community/extensions/num_ext.dart'; import 'package:aku_new_community/extensions/widget_list_ext.dart'; -import 'package:aku_new_community/models/work_order/work_order_bill_model.dart'; +import 'package:aku_new_community/saas_model/work_order/work_order_bill_model.dart'; import 'package:aku_new_community/widget/bee_divider.dart'; import 'package:aku_new_community/widget/buttons/bee_long_button.dart'; import 'package:flutter/material.dart'; diff --git a/lib/ui/function_and_service/work_order/dialogs/work_order_progress_dialog.dart b/lib/ui/function_and_service/work_order/dialogs/work_order_progress_dialog.dart index 486345e8..ca20aa36 100644 --- a/lib/ui/function_and_service/work_order/dialogs/work_order_progress_dialog.dart +++ b/lib/ui/function_and_service/work_order/dialogs/work_order_progress_dialog.dart @@ -1,5 +1,5 @@ import 'package:aku_new_community/extensions/num_ext.dart'; -import 'package:aku_new_community/models/work_order/work_order_progress_model.dart'; +import 'package:aku_new_community/saas_model/work_order/work_order_progress_model.dart'; import 'package:aku_new_community/widget/bee_divider.dart'; import 'package:common_utils/common_utils.dart'; import 'package:flutter/material.dart'; diff --git a/lib/ui/function_and_service/work_order/history_report_page.dart b/lib/ui/function_and_service/work_order/history_report_page.dart index a73ac7a2..a31cff62 100644 --- a/lib/ui/function_and_service/work_order/history_report_page.dart +++ b/lib/ui/function_and_service/work_order/history_report_page.dart @@ -1,7 +1,7 @@ import 'package:aku_new_community/constants/saas_api.dart'; import 'package:aku_new_community/extensions/num_ext.dart'; import 'package:aku_new_community/extensions/widget_list_ext.dart'; -import 'package:aku_new_community/models/work_order/work_order_report_model.dart'; +import 'package:aku_new_community/saas_model/work_order/work_order_report_model.dart'; import 'package:aku_new_community/utils/network/net_util.dart'; import 'package:aku_new_community/widget/bee_divider.dart'; import 'package:aku_new_community/widget/bee_scaffold.dart'; @@ -12,7 +12,6 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_easyrefresh/easy_refresh.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:velocity_x/src/extensions/string_ext.dart'; import 'package:velocity_x/velocity_x.dart'; class HistoryReportPage extends StatefulWidget { diff --git a/lib/ui/function_and_service/work_order/publish_work_order_page.dart b/lib/ui/function_and_service/work_order/publish_work_order_page.dart index cdfd5548..22479aef 100644 --- a/lib/ui/function_and_service/work_order/publish_work_order_page.dart +++ b/lib/ui/function_and_service/work_order/publish_work_order_page.dart @@ -2,7 +2,7 @@ import 'dart:io'; import 'package:aku_new_community/constants/saas_api.dart'; import 'package:aku_new_community/extensions/num_ext.dart'; -import 'package:aku_new_community/models/work_order/work_order_type_model.dart'; +import 'package:aku_new_community/saas_model/work_order/work_order_type_model.dart'; import 'package:aku_new_community/ui/function_and_service/work_order/work_order_func.dart'; import 'package:aku_new_community/ui/function_and_service/work_order/work_order_remark_page.dart'; import 'package:aku_new_community/utils/network/net_util.dart'; diff --git a/lib/ui/function_and_service/work_order/team_list_page.dart b/lib/ui/function_and_service/work_order/team_list_page.dart index e88f95dc..f8d0b425 100644 --- a/lib/ui/function_and_service/work_order/team_list_page.dart +++ b/lib/ui/function_and_service/work_order/team_list_page.dart @@ -1,7 +1,7 @@ import 'package:aku_new_community/constants/saas_api.dart'; import 'package:aku_new_community/extensions/num_ext.dart'; import 'package:aku_new_community/gen/assets.gen.dart'; -import 'package:aku_new_community/models/work_order/team_list_model.dart'; +import 'package:aku_new_community/saas_model/work_order/team_list_model.dart'; import 'package:aku_new_community/utils/network/net_util.dart'; import 'package:aku_new_community/widget/bee_scaffold.dart'; import 'package:flutter/material.dart'; diff --git a/lib/ui/function_and_service/work_order/work_order_card.dart b/lib/ui/function_and_service/work_order/work_order_card.dart index 63d662fe..a8bb0b7b 100644 --- a/lib/ui/function_and_service/work_order/work_order_card.dart +++ b/lib/ui/function_and_service/work_order/work_order_card.dart @@ -1,7 +1,7 @@ import 'package:aku_new_community/base/base_style.dart'; import 'package:aku_new_community/extensions/num_ext.dart'; import 'package:aku_new_community/gen/assets.gen.dart'; -import 'package:aku_new_community/models/work_order/work_order_list_model.dart'; +import 'package:aku_new_community/saas_model/work_order/work_order_list_model.dart'; import 'package:aku_new_community/ui/function_and_service/work_order/work_order_detail_page.dart'; import 'package:aku_new_community/ui/function_and_service/work_order/work_order_func.dart'; import 'package:aku_new_community/ui/function_and_service/work_order/work_order_map.dart'; @@ -9,7 +9,6 @@ import 'package:aku_new_community/utils/bee_date_util.dart'; import 'package:aku_new_community/widget/buttons/card_bottom_button.dart'; import 'package:aku_new_community/widget/views/bee_hor_image_view.dart'; import 'package:common_utils/common_utils.dart'; -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; diff --git a/lib/ui/function_and_service/work_order/work_order_detail_page.dart b/lib/ui/function_and_service/work_order/work_order_detail_page.dart index a9d363b4..6f23a934 100644 --- a/lib/ui/function_and_service/work_order/work_order_detail_page.dart +++ b/lib/ui/function_and_service/work_order/work_order_detail_page.dart @@ -1,8 +1,8 @@ import 'package:aku_new_community/constants/saas_api.dart'; import 'package:aku_new_community/extensions/num_ext.dart'; import 'package:aku_new_community/gen/assets.gen.dart'; -import 'package:aku_new_community/models/work_order/work_order_detail_model.dart'; -import 'package:aku_new_community/models/work_order/work_order_progress_model.dart'; +import 'package:aku_new_community/saas_model/work_order/work_order_detail_model.dart'; +import 'package:aku_new_community/saas_model/work_order/work_order_progress_model.dart'; import 'package:aku_new_community/ui/function_and_service/task/dialogs/task_evaluation_dialog.dart'; import 'package:aku_new_community/ui/function_and_service/work_order/dialogs/urge_dialog.dart'; import 'package:aku_new_community/ui/function_and_service/work_order/dialogs/work_order_bill_dialog.dart'; diff --git a/lib/ui/function_and_service/work_order/work_order_func.dart b/lib/ui/function_and_service/work_order/work_order_func.dart index 5dc053b0..4898b334 100644 --- a/lib/ui/function_and_service/work_order/work_order_func.dart +++ b/lib/ui/function_and_service/work_order/work_order_func.dart @@ -1,5 +1,5 @@ import 'package:aku_new_community/constants/saas_api.dart'; -import 'package:aku_new_community/models/work_order/work_order_bill_model.dart'; +import 'package:aku_new_community/saas_model/work_order/work_order_bill_model.dart'; import 'package:aku_new_community/utils/network/base_model.dart'; import 'package:aku_new_community/utils/network/net_util.dart'; diff --git a/lib/ui/function_and_service/work_order/work_order_page.dart b/lib/ui/function_and_service/work_order/work_order_page.dart index a5d3a79c..aec48667 100644 --- a/lib/ui/function_and_service/work_order/work_order_page.dart +++ b/lib/ui/function_and_service/work_order/work_order_page.dart @@ -1,5 +1,5 @@ import 'package:aku_new_community/constants/saas_api.dart'; -import 'package:aku_new_community/models/work_order/work_order_list_model.dart'; +import 'package:aku_new_community/saas_model/work_order/work_order_list_model.dart'; import 'package:aku_new_community/ui/function_and_service/work_order/publish_work_order_page.dart'; import 'package:aku_new_community/ui/function_and_service/work_order/work_order_card.dart'; import 'package:aku_new_community/utils/network/net_util.dart'; diff --git a/lib/ui/home/public_infomation/public_information_detail_page.dart b/lib/ui/home/public_infomation/public_information_detail_page.dart index b7c1dfc5..017b124c 100644 --- a/lib/ui/home/public_infomation/public_information_detail_page.dart +++ b/lib/ui/home/public_infomation/public_information_detail_page.dart @@ -1,5 +1,5 @@ import 'package:aku_new_community/base/base_style.dart'; -import 'package:aku_new_community/constants/api.dart'; +import 'package:aku_new_community/constants/saas_api.dart'; import 'package:aku_new_community/models/community/recommend_read_model.dart'; import 'package:aku_new_community/models/news/news_detail_model.dart'; import 'package:aku_new_community/utils/bee_date_util.dart'; @@ -68,17 +68,17 @@ class _PublicInformationDetailPageState firstRefresh: true, header: MaterialHeader(), onRefresh: () async { - BaseModel baseModel = await NetUtil() - .get(API.manager.getPublicInformationDetail, params: { - "newsId": widget.id, + BaseModel baseModel = + await NetUtil().get(SAASAPI.information.findById, params: { + "informationId": widget.id, }); if (baseModel.success && baseModel.data != null) { _detailModel = NewsDetailModel.fromJson(baseModel.data); _parasedText = LinkTextParase.stringParase(_detailModel.content); + _onload = false; } else { - BotToast.showText(text: '无法获取信息'); + BotToast.showText(text: '无法获取资讯信息'); } - _onload = false; setState(() {}); }, child: _onload diff --git a/lib/ui/profile/new_house/add_house_page.dart b/lib/ui/profile/new_house/add_house_page.dart index 525440f8..c740c265 100644 --- a/lib/ui/profile/new_house/add_house_page.dart +++ b/lib/ui/profile/new_house/add_house_page.dart @@ -1,8 +1,8 @@ import 'package:aku_new_community/constants/saas_api.dart'; import 'package:aku_new_community/extensions/int_ext.dart'; import 'package:aku_new_community/extensions/widget_list_ext.dart'; -import 'package:aku_new_community/models/sars_model/my_house/estate_cascade_model.dart'; -import 'package:aku_new_community/models/sars_model/my_house/picked_house.dart'; +import 'package:aku_new_community/saas_model/my_house/estate_cascade_model.dart'; +import 'package:aku_new_community/saas_model/my_house/picked_house.dart'; import 'package:aku_new_community/ui/profile/new_house/widgets/add_house_button.dart'; import 'package:aku_new_community/utils/bee_map.dart'; import 'package:aku_new_community/utils/enum/identify.dart'; diff --git a/lib/ui/profile/new_house/apply_record_page.dart b/lib/ui/profile/new_house/apply_record_page.dart index 67124c4b..f4c363d0 100644 --- a/lib/ui/profile/new_house/apply_record_page.dart +++ b/lib/ui/profile/new_house/apply_record_page.dart @@ -1,7 +1,7 @@ import 'package:aku_new_community/constants/saas_api.dart'; import 'package:aku_new_community/extensions/widget_list_ext.dart'; import 'package:aku_new_community/gen/assets.gen.dart'; -import 'package:aku_new_community/models/sars_model/my_house/my_house_apply_record_list_model.dart'; +import 'package:aku_new_community/saas_model/my_house/my_house_apply_record_list_model.dart'; import 'package:aku_new_community/utils/network/net_util.dart'; import 'package:aku_new_community/widget/bee_divider.dart'; import 'package:aku_new_community/widget/bee_scaffold.dart'; diff --git a/lib/ui/profile/new_house/examine_view.dart b/lib/ui/profile/new_house/examine_view.dart index c97af2b9..2c27aca7 100644 --- a/lib/ui/profile/new_house/examine_view.dart +++ b/lib/ui/profile/new_house/examine_view.dart @@ -1,7 +1,7 @@ import 'package:aku_new_community/constants/saas_api.dart'; import 'package:aku_new_community/extensions/widget_list_ext.dart'; import 'package:aku_new_community/gen/assets.gen.dart'; -import 'package:aku_new_community/models/sars_model/my_house/my_family_examine_list_model.dart'; +import 'package:aku_new_community/saas_model/my_house/my_family_examine_list_model.dart'; import 'package:aku_new_community/utils/bee_map.dart'; import 'package:aku_new_community/utils/enum/identify.dart'; import 'package:aku_new_community/utils/network/net_util.dart'; diff --git a/lib/ui/profile/new_house/member_view.dart b/lib/ui/profile/new_house/member_view.dart index 935b19c0..897a9108 100644 --- a/lib/ui/profile/new_house/member_view.dart +++ b/lib/ui/profile/new_house/member_view.dart @@ -1,7 +1,7 @@ import 'package:aku_new_community/base/base_style.dart'; import 'package:aku_new_community/constants/saas_api.dart'; import 'package:aku_new_community/gen/assets.gen.dart'; -import 'package:aku_new_community/models/sars_model/my_house/my_family_member_list_model.dart'; +import 'package:aku_new_community/saas_model/my_house/my_family_member_list_model.dart'; import 'package:aku_new_community/ui/profile/new_house/my_house_page.dart'; import 'package:aku_new_community/utils/bee_map.dart'; import 'package:aku_new_community/utils/enum/identify.dart'; diff --git a/lib/utils/hive_store.dart b/lib/utils/hive_store.dart index 77bea7bb..08ff7056 100644 --- a/lib/utils/hive_store.dart +++ b/lib/utils/hive_store.dart @@ -1,9 +1,9 @@ import 'package:aku_new_community/model/user/province_model.dart'; -import 'package:aku_new_community/models/login/china_region_model.dart'; -import 'package:aku_new_community/models/login/community_model.dart'; -import 'package:aku_new_community/models/login/history_login_model.dart'; -import 'package:aku_new_community/models/login/picked_city_model.dart'; import 'package:aku_new_community/models/user/user_config_model.dart'; +import 'package:aku_new_community/saas_model/login/china_region_model.dart'; +import 'package:aku_new_community/saas_model/login/community_model.dart'; +import 'package:aku_new_community/saas_model/login/history_login_model.dart'; +import 'package:aku_new_community/saas_model/login/picked_city_model.dart'; import 'package:flutter/foundation.dart'; import 'package:hive/hive.dart'; import 'package:path_provider/path_provider.dart'; diff --git a/lib/widget/picker/bee_city_picker.dart b/lib/widget/picker/bee_city_picker.dart index fe58c7f1..c649fa9d 100644 --- a/lib/widget/picker/bee_city_picker.dart +++ b/lib/widget/picker/bee_city_picker.dart @@ -1,11 +1,10 @@ +import 'package:aku_new_community/saas_model/login/china_region_model.dart'; +import 'package:aku_new_community/saas_model/login/picked_city_model.dart'; +import 'package:aku_new_community/utils/hive_store.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; - import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:aku_new_community/models/login/china_region_model.dart'; -import 'package:aku_new_community/models/login/picked_city_model.dart'; -import 'package:aku_new_community/utils/hive_store.dart'; import 'bee_picker_box.dart'; class BeeCityPicker extends StatefulWidget { diff --git a/lib/widget/picker/bee_community_picker.dart b/lib/widget/picker/bee_community_picker.dart index 08f897d5..cccefb20 100644 --- a/lib/widget/picker/bee_community_picker.dart +++ b/lib/widget/picker/bee_community_picker.dart @@ -1,12 +1,10 @@ +import 'package:aku_new_community/saas_model/login/community_model.dart'; +import 'package:aku_new_community/widget/others/bee_search_text_field.dart'; +import 'package:aku_new_community/widget/picker/bee_picker_box.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; - import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:aku_new_community/models/login/community_model.dart'; -import 'package:aku_new_community/widget/others/bee_search_text_field.dart'; -import 'package:aku_new_community/widget/picker/bee_picker_box.dart'; - class BeeCommunityPicker extends StatefulWidget { static Future pick( BuildContext context, List communities) async { diff --git a/lib/widget/picker/bee_house_cascade_picker.dart b/lib/widget/picker/bee_house_cascade_picker.dart index cede1fec..dc9eab58 100644 --- a/lib/widget/picker/bee_house_cascade_picker.dart +++ b/lib/widget/picker/bee_house_cascade_picker.dart @@ -1,13 +1,11 @@ +import 'package:aku_new_community/saas_model/my_house/estate_cascade_model.dart'; +import 'package:aku_new_community/saas_model/my_house/picked_house.dart'; +import 'package:aku_new_community/widget/picker/bee_picker_box.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:aku_new_community/models/sars_model/my_house/estate_cascade_model.dart'; -import 'package:aku_new_community/models/sars_model/my_house/picked_house.dart'; -import 'package:aku_new_community/widget/picker/bee_picker_box.dart'; - class BeeHouseCascadePicker extends StatefulWidget { final List buildings;