目录结构调整

lib/constants/application_objects.dart

@@ -1,7 +1,5 @@
 // import 'package:aku_new_community/widget/bee_scaffold.dart';
 
-import 'package:flutter/material.dart';
-
 import 'package:aku_new_community/const/resource.dart';
 import 'package:aku_new_community/gen/assets.gen.dart';
 import 'package:aku_new_community/pages/community_introduce/community_introduce_page.dart';
@@ -26,6 +24,7 @@ import 'package:aku_new_community/pages/things_page/fixed_submit_page.dart';
 import 'package:aku_new_community/pages/visitor_access_page/visitor_access_page.dart';
 import 'package:aku_new_community/ui/community/activity/activity_list_page.dart';
 import 'package:aku_new_community/ui/community/facility/facility_appointment_page.dart';
+import 'package:aku_new_community/ui/function_and_service/task/task_page.dart';
 import 'package:aku_new_community/ui/home/application/all_application.dart';
 import 'package:aku_new_community/ui/manager/advice/advice_page.dart';
 import 'package:aku_new_community/ui/manager/house_keeping/house_keeping_page.dart';
@@ -33,7 +32,7 @@ import 'package:aku_new_community/ui/manager/questionnaire/questionnaire_page.da
 import 'package:aku_new_community/ui/profile/car/car_manage_page.dart';
 import 'package:aku_new_community/ui/profile/car_parking/car_parking_page.dart';
 import 'package:aku_new_community/ui/profile/house/house_owners_page.dart';
-import 'package:aku_new_community/ui/service/task_page.dart';
+import 'package:flutter/material.dart';
 
 ///应用对象
 ///Application Object

lib/pages/sign/sign_func.dart

@@ -1,12 +1,5 @@
-import 'package:bot_toast/bot_toast.dart';
-import 'package:dio/dio.dart';
-import 'package:get/get.dart' hide Response;
-import 'package:provider/provider.dart';
-
-import 'package:aku_new_community/constants/api.dart';
 import 'package:aku_new_community/constants/api.dart';
 import 'package:aku_new_community/constants/sars_api.dart';
-import 'package:aku_new_community/constants/sars_api.dart';
 import 'package:aku_new_community/model/user/pick_building_model.dart';
 import 'package:aku_new_community/models/user/my_house_model.dart';
 import 'package:aku_new_community/models/user/user_info_model.dart';
@@ -17,6 +10,10 @@ import 'package:aku_new_community/provider/user_provider.dart';
 import 'package:aku_new_community/utils/network/base_model.dart';
 import 'package:aku_new_community/utils/network/net_util.dart';
 import 'package:aku_new_community/widget/others/user_tool.dart';
+import 'package:bot_toast/bot_toast.dart';
+import 'package:dio/dio.dart';
+import 'package:get/get.dart' hide Response;
+import 'package:provider/provider.dart';
 
 class SignFunc {
   //发送手机号验证码

lib/ui/function_and_service/task/dialogs/task_cancel_dialog.dart

@@ -1,13 +1,14 @@
 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/ui/service/task_func.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/src/extensions/string_ext.dart';
 
+import '../task_func.dart';
+
 class TaskCancelDialog extends StatefulWidget {
   final int taskId;
 

lib/ui/function_and_service/task/hall/hall_card.dart

@@ -1,7 +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/ui/service/hall/hall_detail_page.dart';
-import 'package:aku_new_community/ui/service/task_map.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';
@@ -15,6 +13,8 @@ import 'package:get/get.dart';
 import 'package:velocity_x/velocity_x.dart';
 
 import '../task_func.dart';
+import '../task_map.dart';
+import 'hall_detail_page.dart';
 
 class HallCard extends StatelessWidget {
   final HallListModel model;

lib/ui/function_and_service/task/hall/hall_detail_page.dart

@@ -1,8 +1,6 @@
 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/ui/service/dialogs/task_cancel_dialog.dart';
+import 'package:aku_new_community/ui/function_and_service/task/dialogs/task_cancel_dialog.dart';
-import 'package:aku_new_community/ui/service/task_func.dart';
-import 'package:aku_new_community/ui/service/task_map.dart';
 import 'package:aku_new_community/widget/bee_divider.dart';
 import 'package:aku_new_community/widget/bee_scaffold.dart';
 import 'package:aku_new_community/widget/buttons/bee_long_button.dart';
@@ -18,6 +16,9 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 import 'package:velocity_x/velocity_x.dart';
 
+import '../task_func.dart';
+import '../task_map.dart';
+
 class HallDetailPage extends StatefulWidget {
   final HallListModel model;
 

lib/ui/function_and_service/task/my_take_task/my_take_task_card.dart

@@ -1,8 +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/ui/service/my_take_task/my_take_task_detail_page.dart';
-import 'package:aku_new_community/ui/service/task_map.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';
@@ -14,6 +12,8 @@ import 'package:get/get.dart';
 import 'package:velocity_x/velocity_x.dart';
 
 import '../task_func.dart';
+import '../task_map.dart';
+import 'my_take_task_detail_page.dart';
 
 class MyTakeTaskCard extends StatelessWidget {
   final MyTakeTaskListModel model;

lib/ui/function_and_service/task/my_take_task/my_take_task_detail_page.dart

@@ -1,8 +1,7 @@
 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/ui/service/dialogs/task_cancel_dialog.dart';
+import 'package:aku_new_community/ui/function_and_service/task/dialogs/task_cancel_dialog.dart';
-import 'package:aku_new_community/ui/service/task_map.dart';
 import 'package:aku_new_community/widget/bee_divider.dart';
 import 'package:aku_new_community/widget/bee_scaffold.dart';
 import 'package:aku_new_community/widget/buttons/bee_long_button.dart';
@@ -17,6 +16,7 @@ import 'package:get/get.dart';
 import 'package:velocity_x/velocity_x.dart';
 
 import '../task_func.dart';
+import '../task_map.dart';
 
 class MyTakeTaskDetailPage extends StatefulWidget {
   final MyTakeTaskListModel model;

lib/ui/function_and_service/task/my_take_task/my_take_task_view.dart

@@ -1,12 +1,13 @@
 import 'package:aku_new_community/constants/sars_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/ui/service/my_take_task/my_take_task_card.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_easyrefresh/easy_refresh.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:velocity_x/velocity_x.dart';
 
+import 'my_take_task_card.dart';
+
 class MyTakeTaskView extends StatefulWidget {
   final EasyRefreshController refreshController;
   final int type;

lib/ui/function_and_service/task/my_task/my_task_card.dart

@@ -1,7 +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/ui/service/my_task/my_task_detail_page.dart';
-import 'package:aku_new_community/ui/service/task_map.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';
@@ -12,6 +10,8 @@ import 'package:get/get.dart';
 import 'package:velocity_x/velocity_x.dart';
 
 import '../task_func.dart';
+import '../task_map.dart';
+import 'my_task_detail_page.dart';
 
 class MyTaskCard extends StatelessWidget {
   final MyTaskListModel model;

lib/ui/function_and_service/task/my_task/my_task_detail_page.dart

@@ -1,9 +1,8 @@
 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/ui/service/dialogs/task_cancel_dialog.dart';
+import 'package:aku_new_community/ui/function_and_service/task/dialogs/task_cancel_dialog.dart';
-import 'package:aku_new_community/ui/service/dialogs/task_evaluation_dialog.dart';
+import 'package:aku_new_community/ui/function_and_service/task/dialogs/task_evaluation_dialog.dart';
-import 'package:aku_new_community/ui/service/task_map.dart';
 import 'package:aku_new_community/widget/bee_divider.dart';
 import 'package:aku_new_community/widget/bee_scaffold.dart';
 import 'package:aku_new_community/widget/buttons/bee_long_button.dart';
@@ -18,6 +17,7 @@ import 'package:get/get.dart';
 import 'package:velocity_x/velocity_x.dart';
 
 import '../task_func.dart';
+import '../task_map.dart';
 
 class MyTaskDetailPage extends StatefulWidget {
   final MyTaskListModel model;

lib/ui/function_and_service/task/my_task/my_task_view.dart

@@ -1,12 +1,13 @@
 import 'package:aku_new_community/constants/sars_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/ui/service/my_task/my_task_card.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_easyrefresh/easy_refresh.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:velocity_x/velocity_x.dart';
 
+import 'my_task_card.dart';
+
 class MyTaskView extends StatefulWidget {
   final EasyRefreshController refreshController;
   final int type;

lib/ui/function_and_service/task/publish_task_page.dart

@@ -3,10 +3,9 @@ import 'dart:io';
 import 'package:aku_new_community/base/base_style.dart';
 import 'package:aku_new_community/constants/sars_api.dart';
 import 'package:aku_new_community/gen/assets.gen.dart';
-import 'package:aku_new_community/ui/service/add_appointment_address_page.dart';
+import 'package:aku_new_community/ui/function_and_service/task/task_func.dart';
-import 'package:aku_new_community/ui/service/task_func.dart';
+import 'package:aku_new_community/ui/function_and_service/task/task_map.dart';
-import 'package:aku_new_community/ui/service/task_map.dart';
+import 'package:aku_new_community/ui/function_and_service/task/task_remark_page.dart';
-import 'package:aku_new_community/ui/service/task_remark_page.dart';
 import 'package:aku_new_community/utils/headers.dart';
 import 'package:aku_new_community/utils/network/net_util.dart';
 import 'package:aku_new_community/widget/bee_divider.dart';
@@ -26,6 +25,8 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 import 'package:velocity_x/velocity_x.dart';
 
+import 'add_appointment_address_page.dart';
+
 class PublishTaskPage extends StatefulWidget {
   const PublishTaskPage({Key? key}) : super(key: key);
 

lib/ui/function_and_service/task/task_page.dart

@@ -1,8 +1,5 @@
-import 'package:aku_new_community/ui/service/hall/hall_view.dart';
+import 'package:aku_new_community/ui/function_and_service/task/publish_task_page.dart';
-import 'package:aku_new_community/ui/service/my_take_task/my_take_task_view.dart';
+import 'package:aku_new_community/ui/function_and_service/task/task_map.dart';
-import 'package:aku_new_community/ui/service/my_task/my_task_view.dart';
-import 'package:aku_new_community/ui/service/publish_task_page.dart';
-import 'package:aku_new_community/ui/service/task_map.dart';
 import 'package:aku_new_community/widget/bee_scaffold.dart';
 import 'package:aku_new_community/widget/painter/tab_indicator.dart';
 import 'package:flutter/material.dart';
@@ -11,6 +8,10 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 import 'package:velocity_x/velocity_x.dart';
 
+import 'hall/hall_view.dart';
+import 'my_take_task/my_take_task_view.dart';
+import 'my_task/my_task_view.dart';
+
 class TaskPage extends StatefulWidget {
   const TaskPage({Key? key}) : super(key: key);
 

lib/ui/market/market_page.dart

@@ -2,18 +2,7 @@
 
 import 'dart:ui' as ui;
 
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
-
-import 'package:card_swiper/card_swiper.dart';
-import 'package:flutter_easyrefresh/easy_refresh.dart';
-import 'package:get/get.dart';
-import 'package:provider/provider.dart';
-
 import 'package:aku_new_community/base/base_style.dart';
-import 'package:aku_new_community/constants/api.dart';
-import 'package:aku_new_community/constants/api.dart';
-import 'package:aku_new_community/constants/sars_api.dart';
 import 'package:aku_new_community/constants/sars_api.dart';
 import 'package:aku_new_community/gen/assets.gen.dart';
 import 'package:aku_new_community/model/good/market_swiper_model.dart';
@@ -35,6 +24,13 @@ import 'package:aku_new_community/utils/network/base_list_model.dart';
 import 'package:aku_new_community/utils/network/net_util.dart';
 import 'package:aku_new_community/widget/home/home_sliver_app_bar.dart';
 import 'package:aku_new_community/widget/others/rectIndicator.dart';
+import 'package:card_swiper/card_swiper.dart';
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_easyrefresh/easy_refresh.dart';
+import 'package:get/get.dart';
+import 'package:provider/provider.dart';
+
 import 'category/new_category_page.dart';
 import 'market_home_goods_card.dart';
 import 'order/order_page.dart';

lib/ui/market/order/order_card.dart

@@ -1,15 +1,5 @@
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
-
-import 'package:bot_toast/bot_toast.dart';
-import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:get/get.dart';
-import 'package:velocity_x/velocity_x.dart';
-
 import 'package:aku_new_community/base/base_style.dart';
 import 'package:aku_new_community/constants/api.dart';
-import 'package:aku_new_community/constants/api.dart';
-import 'package:aku_new_community/constants/sars_api.dart';
 import 'package:aku_new_community/constants/sars_api.dart';
 import 'package:aku_new_community/model/order/order_list_model.dart';
 import 'package:aku_new_community/pages/life_pay/pay_finish_page.dart';
@@ -20,6 +10,13 @@ import 'package:aku_new_community/utils/headers.dart';
 import 'package:aku_new_community/utils/network/base_model.dart';
 import 'package:aku_new_community/utils/network/net_util.dart';
 import 'package:aku_new_community/widget/buttons/line_button.dart';
+import 'package:bot_toast/bot_toast.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 'order_detail_page.dart';
 
 class OrderCard extends StatefulWidget {

lib/ui/market/order/order_detail_page.dart

@@ -1,18 +1,8 @@
 import 'dart:async';
 
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
-
-import 'package:bot_toast/bot_toast.dart';
-import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:get/get.dart';
-import 'package:velocity_x/velocity_x.dart';
-
 import 'package:aku_new_community/base/base_style.dart';
 import 'package:aku_new_community/const/resource.dart';
 import 'package:aku_new_community/constants/api.dart';
-import 'package:aku_new_community/constants/api.dart';
-import 'package:aku_new_community/constants/sars_api.dart';
 import 'package:aku_new_community/constants/sars_api.dart';
 import 'package:aku_new_community/model/order/logistics_model.dart';
 import 'package:aku_new_community/model/order/order_list_model.dart';
@@ -23,6 +13,13 @@ import 'package:aku_new_community/utils/network/base_model.dart';
 import 'package:aku_new_community/utils/network/net_util.dart';
 import 'package:aku_new_community/widget/bee_scaffold.dart';
 import 'package:aku_new_community/widget/buttons/line_button.dart';
+import 'package:bot_toast/bot_toast.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 'logistics_page.dart';
 import 'order_page.dart';
 

lib/ui/market/search/search_func.dart

@@ -1,6 +1,4 @@
 import 'package:aku_new_community/constants/api.dart';
-import 'package:aku_new_community/constants/api.dart';
-import 'package:aku_new_community/constants/sars_api.dart';
 import 'package:aku_new_community/constants/sars_api.dart';
 import 'package:aku_new_community/models/market/good_detail_model.dart';
 import 'package:aku_new_community/models/market/order/order_detail_model.dart';

lib/ui/market/search/submit_order_page.dart

@@ -1,18 +1,6 @@
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-
-import 'package:bot_toast/bot_toast.dart';
-import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:get/get.dart';
-import 'package:provider/provider.dart';
-import 'package:velocity_x/velocity_x.dart';
-
 import 'package:aku_new_community/base/base_style.dart';
 import 'package:aku_new_community/const/resource.dart';
 import 'package:aku_new_community/constants/api.dart';
-import 'package:aku_new_community/constants/api.dart';
-import 'package:aku_new_community/constants/sars_api.dart';
 import 'package:aku_new_community/constants/sars_api.dart';
 import 'package:aku_new_community/model/order/create_order_model.dart';
 import 'package:aku_new_community/model/user/adress_model.dart';
@@ -28,6 +16,14 @@ import 'package:aku_new_community/utils/network/base_model.dart';
 import 'package:aku_new_community/utils/network/net_util.dart';
 import 'package:aku_new_community/widget/bee_scaffold.dart';
 import 'package:aku_new_community/widget/buttons/end_button.dart';
+import 'package:bot_toast/bot_toast.dart';
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:get/get.dart';
+import 'package:provider/provider.dart';
+import 'package:velocity_x/velocity_x.dart';
 
 class SubmitOrderPage extends StatefulWidget {
   final List<ShopCarListModel> models;

lib/ui/market/search/submit_order_page_normal.dart

@@ -1,15 +1,5 @@
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-
-import 'package:bot_toast/bot_toast.dart';
-import 'package:get/get.dart';
-import 'package:provider/provider.dart';
-
 import 'package:aku_new_community/base/base_style.dart';
 import 'package:aku_new_community/constants/api.dart';
-import 'package:aku_new_community/constants/api.dart';
-import 'package:aku_new_community/constants/sars_api.dart';
 import 'package:aku_new_community/constants/sars_api.dart';
 import 'package:aku_new_community/gen/assets.gen.dart';
 import 'package:aku_new_community/model/order/create_order_model.dart';
@@ -26,6 +16,12 @@ import 'package:aku_new_community/utils/network/base_model.dart';
 import 'package:aku_new_community/utils/network/net_util.dart';
 import 'package:aku_new_community/widget/bee_scaffold.dart';
 import 'package:aku_new_community/widget/buttons/end_button.dart';
+import 'package:bot_toast/bot_toast.dart';
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:get/get.dart';
+import 'package:provider/provider.dart';
 
 class SubmitOrderNormalPage extends StatefulWidget {
   final GoodDetailModel goodModel;