sort import && format code

4 years ago · e1998de41d
parent 0054c82027
commit e1998de41d
62 changed files with 460 additions and 414 deletions
--- a/lib/constants/application_objects.dart
+++ b/lib/constants/application_objects.dart
@ -80,7 +80,8 @@ List<AO> appObjects = [
  AO('投诉表扬', R.ASSETS_APPLICATIONS_COMPLAINT_PNG,
      () => AdvicePage(type: AdviceType.COMPLAIN)),
  AO('问卷调查', R.ASSETS_APPLICATIONS_QUESTION_PNG, () => QuestionnairePage()),
-  AO('装修管理', R.ASSETS_APPLICATIONS_DECORATION_PNG,()=> RenovationManagePage()),
+  AO('装修管理', R.ASSETS_APPLICATIONS_DECORATION_PNG,
+      () => RenovationManagePage()),
  AO('借还管理', R.ASSETS_APPLICATIONS_BORROW_PNG, () => SelectBorrowReturnPage()),
  AO('一键报警', R.ASSETS_APPLICATIONS_POLICE_PNG, () => AlarmPage()),
  AO('设施预约', R.ASSETS_ICONS_TOOL_FACILITY_PNG, () => FacilityAppointmentPage()),
--- a/lib/generated_plugin_registrant.dart
+++ b/lib/generated_plugin_registrant.dart
@ -6,13 +6,12 @@

 import 'package:device_info_plus_web/device_info_plus_web.dart';
 import 'package:firebase_core_web/firebase_core_web.dart';
+import 'package:flutter_web_plugins/flutter_web_plugins.dart';
 import 'package:image_picker_for_web/image_picker_for_web.dart';
 import 'package:package_info_plus_web/package_info_plus_web.dart';
 import 'package:shared_preferences_web/shared_preferences_web.dart';
 import 'package:url_launcher_web/url_launcher_web.dart';

-import 'package:flutter_web_plugins/flutter_web_plugins.dart';
-
 // ignore: public_member_api_docs
 void registerPlugins(Registrar registrar) {
  DeviceInfoPlusPlugin.registerWith(registrar);
--- a/lib/model/community/activity_item_model.dart
+++ b/lib/model/community/activity_item_model.dart
@ -1,8 +1,9 @@
-import 'package:aku_community/base/base_style.dart';
+import 'package:flutter/material.dart';
+
 import 'package:flustars/flustars.dart';

+import 'package:aku_community/base/base_style.dart';
 import 'package:aku_community/model/common/img_model.dart';
-import 'package:flutter/material.dart';

 class ActivityItemModel {
  int? id;
--- a/lib/models/community_introduce/community_introduce_model.dart
+++ b/lib/models/community_introduce/community_introduce_model.dart
@ -1,7 +1,8 @@
 import 'package:equatable/equatable.dart';
+import 'package:json_annotation/json_annotation.dart';

 import 'package:aku_community/model/common/img_model.dart';
-import 'package:json_annotation/json_annotation.dart';
+
 part 'community_introduce_model.g.dart';

@JsonSerializable()
--- a/lib/models/electronic_commerc/electronic_commerc_category_model.dart
+++ b/lib/models/electronic_commerc/electronic_commerc_category_model.dart
@ -1,5 +1,6 @@
 import 'package:equatable/equatable.dart';
 import 'package:json_annotation/json_annotation.dart';
+
 part 'electronic_commerc_category_model.g.dart';

@JsonSerializable()
--- a/lib/models/electronic_commerc/electronic_commerc_detail_model.dart
+++ b/lib/models/electronic_commerc/electronic_commerc_detail_model.dart
@ -1,5 +1,6 @@
 import 'package:equatable/equatable.dart';
 import 'package:json_annotation/json_annotation.dart';
+
 part 'electronic_commerc_detail_model.g.dart';

@JsonSerializable()
--- a/lib/models/electronic_commerc/electronic_commerc_list_model.dart
+++ b/lib/models/electronic_commerc/electronic_commerc_list_model.dart
@ -1,7 +1,8 @@
 import 'package:equatable/equatable.dart';
+import 'package:json_annotation/json_annotation.dart';

 import 'package:aku_community/model/common/img_model.dart';
-import 'package:json_annotation/json_annotation.dart';
+
 part 'electronic_commerc_list_model.g.dart';

@JsonSerializable()
--- a/lib/models/express_package/express_package_list_model.dart
+++ b/lib/models/express_package/express_package_list_model.dart
@ -28,10 +28,9 @@ class ExpressPackageListModel extends Equatable {
  });
  factory ExpressPackageListModel.fromJson(Map<String, dynamic> json) =>
      _$ExpressPackageListModelFromJson(json);
-  String get createDateString => DateUtil.formatDateStr(this.createDate,
-      format: 'yyyy-MM-dd HH:mm');
+  String get createDateString =>
+      DateUtil.formatDateStr(this.createDate, format: 'yyyy-MM-dd HH:mm');

  @override
  List<Object?> get props => throw UnimplementedError();
- 
 }
--- a/lib/models/facility/facility_order_date_list_model.dart
+++ b/lib/models/facility/facility_order_date_list_model.dart
@ -1,6 +1,7 @@
 import 'package:equatable/equatable.dart';
 import 'package:flustars/flustars.dart';
 import 'package:json_annotation/json_annotation.dart';
+
 part 'facility_order_date_list_model.g.dart';

@JsonSerializable()
--- a/lib/models/market/order/my_order_list_model.dart
+++ b/lib/models/market/order/my_order_list_model.dart
@ -1,6 +1,7 @@
+import 'package:flutter/material.dart';
+
 import 'package:equatable/equatable.dart';
 import 'package:flustars/flustars.dart';
-import 'package:flutter/material.dart';
 import 'package:json_annotation/json_annotation.dart';

 import 'package:aku_community/model/common/img_model.dart';
--- a/lib/models/news/news_detail_model.dart
+++ b/lib/models/news/news_detail_model.dart
@ -1,5 +1,6 @@
 import 'package:equatable/equatable.dart';
 import 'package:json_annotation/json_annotation.dart';
+
 part 'news_detail_model.g.dart';

@JsonSerializable()
--- a/lib/models/search/search_model.dart
+++ b/lib/models/search/search_model.dart
@ -1,8 +1,8 @@
 import 'package:equatable/equatable.dart';
+import 'package:json_annotation/json_annotation.dart';

 import 'package:aku_community/model/community/activity_item_model.dart';
 import 'package:aku_community/model/community/community_topic_model.dart';
-import 'package:json_annotation/json_annotation.dart';

 part 'search_model.g.dart';

--- a/lib/models/service_browse/service_browse_list_mode.dart
+++ b/lib/models/service_browse/service_browse_list_mode.dart
@ -1,5 +1,6 @@
 import 'package:equatable/equatable.dart';
 import 'package:json_annotation/json_annotation.dart';
+
 part 'service_browse_list_mode.g.dart';

@JsonSerializable()
--- a/lib/pages/community_introduce/community_introduce_page.dart
+++ b/lib/pages/community_introduce/community_introduce_page.dart
@ -1,15 +1,17 @@
+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 'package:aku_community/base/base_style.dart';
+import 'package:aku_community/const/resource.dart';
 import 'package:aku_community/constants/api.dart';
 import 'package:aku_community/model/common/img_model.dart';
 import 'package:aku_community/models/community_introduce/community_introduce_model.dart';
 import 'package:aku_community/utils/network/base_model.dart';
 import 'package:aku_community/utils/network/net_util.dart';
 import 'package:aku_community/widget/bee_scaffold.dart';
-import 'package:flutter/material.dart';
-import 'package:aku_community/const/resource.dart';
-import 'package:flutter_easyrefresh/easy_refresh.dart';
-import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:velocity_x/velocity_x.dart';

 class CommunityIntroducePage extends StatefulWidget {
  CommunityIntroducePage({Key? key}) : super(key: key);
--- a/lib/pages/electronic_commerc/electronic_commerc_card.dart
+++ b/lib/pages/electronic_commerc/electronic_commerc_card.dart
@ -1,15 +1,16 @@
-import 'package:aku_community/base/base_style.dart';
-import 'package:aku_community/constants/api.dart';
-import 'package:aku_community/model/common/img_model.dart';
-import 'package:aku_community/pages/electronic_commerc/electronic_commerc_detail_page.dart';
-import 'package:flustars/flustars.dart';
 import 'package:flutter/material.dart';

-import 'package:aku_community/models/electronic_commerc/electronic_commerc_list_model.dart';
+import 'package:flustars/flustars.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 import 'package:velocity_x/velocity_x.dart';
+
+import 'package:aku_community/base/base_style.dart';
 import 'package:aku_community/const/resource.dart';
+import 'package:aku_community/constants/api.dart';
+import 'package:aku_community/model/common/img_model.dart';
+import 'package:aku_community/models/electronic_commerc/electronic_commerc_list_model.dart';
+import 'package:aku_community/pages/electronic_commerc/electronic_commerc_detail_page.dart';

 class ElectronicCommercCard extends StatefulWidget {
  final ElectronicCommercListModel model;
--- a/lib/pages/electronic_commerc/electronic_commerc_detail_page.dart
+++ b/lib/pages/electronic_commerc/electronic_commerc_detail_page.dart
@ -1,25 +1,29 @@
-import 'package:aku_community/base/base_style.dart';
-import 'package:aku_community/constants/api.dart';
-import 'package:aku_community/utils/network/base_model.dart';
-import 'package:aku_community/utils/network/net_util.dart';
-import 'package:aku_community/widget/bee_scaffold.dart';
+import 'package:flutter/material.dart';
+
 import 'package:bot_toast/bot_toast.dart';
 import 'package:flustars/flustars.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_easyrefresh/easy_refresh.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:aku_community/models/electronic_commerc/electronic_commerc_detail_model.dart';
 import 'package:velocity_x/velocity_x.dart';
+
+import 'package:aku_community/base/base_style.dart';
+import 'package:aku_community/constants/api.dart';
+import 'package:aku_community/models/electronic_commerc/electronic_commerc_detail_model.dart';
+import 'package:aku_community/utils/network/base_model.dart';
+import 'package:aku_community/utils/network/net_util.dart';
+import 'package:aku_community/widget/bee_scaffold.dart';
+
 class ElectronicCommercDetailPage extends StatefulWidget {
  final int id;
  ElectronicCommercDetailPage({Key? key, required this.id}) : super(key: key);

  @override
-  _ElectronicCommercDetailPageState createState() => _ElectronicCommercDetailPageState();
+  _ElectronicCommercDetailPageState createState() =>
+      _ElectronicCommercDetailPageState();
 }

-class _ElectronicCommercDetailPageState extends State<ElectronicCommercDetailPage> {
-
+class _ElectronicCommercDetailPageState
+    extends State<ElectronicCommercDetailPage> {
  late EasyRefreshController _easyRefreshController;
  bool _onload = true;
  late ElectronicCommercDetailModel _detailModel;
@ -38,18 +42,19 @@ class _ElectronicCommercDetailPageState extends State<ElectronicCommercDetailPag
  @override
  Widget build(BuildContext context) {
    return BeeScaffold(
-      title: _onload?'':_detailModel.electronicCommerceCategoryName,
+      title: _onload ? '' : _detailModel.electronicCommerceCategoryName,
      bodyColor: Colors.white,
      body: EasyRefresh(
        firstRefresh: true,
        header: MaterialHeader(),
        onRefresh: () async {
-          BaseModel baseModel = await NetUtil()
-              .get(API.manager.electronicCommercDetail, params: {
+          BaseModel baseModel =
+              await NetUtil().get(API.manager.electronicCommercDetail, params: {
            "electronicCommerceId": widget.id,
          });
          if (baseModel.status! && baseModel.data != null) {
-            _detailModel = ElectronicCommercDetailModel.fromJson(baseModel.data);
+            _detailModel =
+                ElectronicCommercDetailModel.fromJson(baseModel.data);
          } else {
            BotToast.showText(text: '无法获取信息');
          }
@ -102,4 +107,4 @@ class _ElectronicCommercDetailPageState extends State<ElectronicCommercDetailPag
  Widget _emptyWidget() {
    return Container();
  }
-  }
+}
--- a/lib/pages/electronic_commerc/electronic_commerc_page.dart
+++ b/lib/pages/electronic_commerc/electronic_commerc_page.dart
@ -1,16 +1,18 @@
+import 'package:flutter/material.dart';
+
+import 'package:bot_toast/bot_toast.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:shimmer/shimmer.dart';
+import 'package:velocity_x/velocity_x.dart';
+
 import 'package:aku_community/constants/api.dart';
+import 'package:aku_community/extensions/num_ext.dart';
+import 'package:aku_community/models/electronic_commerc/electronic_commerc_category_model.dart';
 import 'package:aku_community/pages/electronic_commerc/electronic_commerc_view.dart';
 import 'package:aku_community/utils/network/base_model.dart';
 import 'package:aku_community/utils/network/net_util.dart';
 import 'package:aku_community/widget/bee_scaffold.dart';
 import 'package:aku_community/widget/tab_bar/bee_tab_bar.dart';
-import 'package:bot_toast/bot_toast.dart';
-import 'package:flutter/material.dart';
-import 'package:shimmer/shimmer.dart';
-import 'package:velocity_x/velocity_x.dart';
-import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:aku_community/extensions/num_ext.dart';
-import 'package:aku_community/models/electronic_commerc/electronic_commerc_category_model.dart';

 class ElectronicCommercPage extends StatefulWidget {
  ElectronicCommercPage({Key? key}) : super(key: key);
--- a/lib/pages/electronic_commerc/electronic_commerc_view.dart
+++ b/lib/pages/electronic_commerc/electronic_commerc_view.dart
@ -1,12 +1,14 @@
-import 'package:aku_community/constants/api.dart';
-import 'package:aku_community/pages/electronic_commerc/electronic_commerc_card.dart';
-import 'package:aku_community/pages/things_page/widget/bee_list_view.dart';
 import 'package:flutter/material.dart';
+
 import 'package:flutter_easyrefresh/easy_refresh.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:aku_community/models/electronic_commerc/electronic_commerc_list_model.dart';
 import 'package:velocity_x/velocity_x.dart';

+import 'package:aku_community/constants/api.dart';
+import 'package:aku_community/models/electronic_commerc/electronic_commerc_list_model.dart';
+import 'package:aku_community/pages/electronic_commerc/electronic_commerc_card.dart';
+import 'package:aku_community/pages/things_page/widget/bee_list_view.dart';
+
 class ElectronicCommercView extends StatefulWidget {
  final int id;
  ElectronicCommercView({Key? key, required this.id}) : super(key: key);
@ -40,9 +42,7 @@ class _ElectronicCommercViewState extends State<ElectronicCommercView> {
    return BeeListView(
        path: API.manager.electronicCommercList,
        controller: _refreshController,
-        extraParams: {
-          "electronicCommerceCategoryId":widget.id
-        },
+        extraParams: {"electronicCommerceCategoryId": widget.id},
        convert: (models) {
          return models.tableList!
              .map((e) => ElectronicCommercListModel.fromJson(e))
--- a/lib/pages/express_packages/express_package_card.dart
+++ b/lib/pages/express_packages/express_package_card.dart
@ -1,16 +1,16 @@
-import 'package:aku_community/constants/api.dart';
-import 'package:aku_community/models/express_package/express_package_list_model.dart';
-import 'package:aku_community/utils/network/base_model.dart';
-import 'package:aku_community/utils/network/net_util.dart';
-import 'package:bot_toast/bot_toast.dart';
 import 'package:flutter/material.dart';

+import 'package:bot_toast/bot_toast.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:velocity_x/velocity_x.dart';

 import 'package:aku_community/base/base_style.dart';
 import 'package:aku_community/const/resource.dart';
+import 'package:aku_community/constants/api.dart';
 import 'package:aku_community/extensions/widget_list_ext.dart';
+import 'package:aku_community/models/express_package/express_package_list_model.dart';
+import 'package:aku_community/utils/network/base_model.dart';
+import 'package:aku_community/utils/network/net_util.dart';
 import 'package:aku_community/widget/bee_divider.dart';

 class ExpressPackageCard extends StatefulWidget {
--- a/lib/pages/express_packages/express_package_view.dart
+++ b/lib/pages/express_packages/express_package_view.dart
@ -1,12 +1,14 @@
-import 'package:aku_community/constants/api.dart';
-import 'package:aku_community/models/express_package/express_package_list_model.dart';
-import 'package:aku_community/pages/express_packages/express_package_card.dart';
-import 'package:aku_community/pages/things_page/widget/bee_list_view.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 'package:aku_community/constants/api.dart';
+import 'package:aku_community/models/express_package/express_package_list_model.dart';
+import 'package:aku_community/pages/express_packages/express_package_card.dart';
+import 'package:aku_community/pages/things_page/widget/bee_list_view.dart';
+
 class ExpressPackageView extends StatefulWidget {
  final int index;
  ExpressPackageView({Key? key, required this.index}) : super(key: key);
--- a/lib/pages/goods_deto_page/widget/goods_info_card.dart
+++ b/lib/pages/goods_deto_page/widget/goods_info_card.dart
@ -37,10 +37,8 @@ class GoodsInfoCard extends StatelessWidget {
  Color _getColor(int? state) {
    switch (state) {
      case 1:
-
        return kDarkPrimaryColor;
      case 2:
-
        return ktextSubColor;
      default:
        return kDangerColor;
--- a/lib/pages/goods_manage_page/borrow/borrow_goods_detail_page.dart
+++ b/lib/pages/goods_manage_page/borrow/borrow_goods_detail_page.dart
@ -19,8 +19,7 @@ import 'package:aku_community/widget/buttons/radio_button.dart';
 class BorrowGoodsDetailPage extends StatefulWidget {
  final int articleId;
  final List<int>? receiveIds;
-  BorrowGoodsDetailPage(
-      {Key? key, required this.articleId,  this.receiveIds})
+  BorrowGoodsDetailPage({Key? key, required this.articleId, this.receiveIds})
      : super(key: key);

  @override
@ -67,8 +66,7 @@ class _BorrowGoodsDetailPageState extends State<BorrowGoodsDetailPage> {
            ? _empty()
            : ListView(
                padding: EdgeInsets.symmetric(vertical: 12.w),
-                children: [..._models.map((e) => _goodsCard(e)).toList()]
-              ),
+                children: [..._models.map((e) => _goodsCard(e)).toList()]),
      ),
      bottomNavi: _onload ? _empty() : _bottomButton(),
    );
--- a/lib/pages/goods_manage_page/borrow/borrow_goods_page.dart
+++ b/lib/pages/goods_manage_page/borrow/borrow_goods_page.dart
@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+
 import 'package:flutter_easyrefresh/easy_refresh.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
@ -74,9 +75,7 @@ class _BorrowGoodsPageState extends State<BorrowGoodsPage> {
            _receiveIds = List.generate(models.tableList?.length ?? 0,
                (index) => BorrowGoodsSubmitModel.init());
            print(_submitIds);
-            setState(() {
-              
-            });
+            setState(() {});
            return models.tableList!
                .map((e) => ArticleBorrowModel.fromJson(e))
                .toList();
--- a/lib/pages/home/home_page.dart
+++ b/lib/pages/home/home_page.dart
@ -1,14 +1,10 @@
 // Dart imports:

-import 'package:aku_community/constants/api.dart';
-import 'package:aku_community/models/news/news_category_model.dart';
-import 'package:aku_community/utils/network/base_model.dart';
-import 'package:aku_community/utils/network/net_util.dart';
-import 'package:bot_toast/bot_toast.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';

 import 'package:badges/badges.dart';
+import 'package:bot_toast/bot_toast.dart';
 import 'package:flutter_easyrefresh/easy_refresh.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
@ -16,8 +12,10 @@ import 'package:provider/provider.dart';
 import 'package:velocity_x/velocity_x.dart';

 import 'package:aku_community/const/resource.dart';
+import 'package:aku_community/constants/api.dart';
 import 'package:aku_community/model/community/activity_item_model.dart';
 import 'package:aku_community/model/community/board_model.dart';
+import 'package:aku_community/models/news/news_category_model.dart';
 import 'package:aku_community/pages/home/widget/animate_app_bar.dart';
 import 'package:aku_community/pages/message_center_page/message_center_page.dart';
 import 'package:aku_community/provider/app_provider.dart';
@ -29,6 +27,8 @@ import 'package:aku_community/ui/home/home_title.dart';
 import 'package:aku_community/ui/home/public_infomation/public_infomation_page.dart';
 import 'package:aku_community/utils/headers.dart';
 import 'package:aku_community/utils/login_util.dart';
+import 'package:aku_community/utils/network/base_model.dart';
+import 'package:aku_community/utils/network/net_util.dart';
 import 'package:aku_community/widget/buttons/column_action_button.dart';
 import 'package:aku_community/widget/views/application_box.dart';
 import 'package:aku_community/widget/views/application_view.dart';
--- a/lib/pages/life_pay/life_pay_page.dart
+++ b/lib/pages/life_pay/life_pay_page.dart
@ -1,6 +1,3 @@
-import 'package:aku_community/pages/life_pay/pay_finish_page.dart';
-import 'package:aku_community/utils/network/base_model.dart';
-import 'package:aku_community/utils/network/net_util.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';

@ -13,12 +10,15 @@ import 'package:aku_community/base/base_style.dart';
 import 'package:aku_community/constants/api.dart';
 import 'package:aku_community/model/manager/life_pay_model.dart';
 import 'package:aku_community/pages/life_pay/life_pay_record_page.dart';
+import 'package:aku_community/pages/life_pay/pay_finish_page.dart';
 import 'package:aku_community/pages/life_pay/widget/life_pay_detail_page.dart';
 import 'package:aku_community/pages/things_page/widget/bee_list_view.dart';
 import 'package:aku_community/provider/app_provider.dart';
 import 'package:aku_community/ui/profile/house/pick_my_house_page.dart';
 import 'package:aku_community/utils/bee_parse.dart';
 import 'package:aku_community/utils/headers.dart';
+import 'package:aku_community/utils/network/base_model.dart';
+import 'package:aku_community/utils/network/net_util.dart';
 import 'package:aku_community/widget/bee_divider.dart';
 import 'package:aku_community/widget/bee_scaffold.dart';
 import 'package:aku_community/widget/buttons/bee_check_radio.dart';
@ -396,11 +396,11 @@ class _LifePayPageState extends State<LifePayPage> {
              color: kPrimaryColor,
              padding: EdgeInsets.symmetric(horizontal: 50.w, vertical: 15.w),
              onPressed: () async {
-                BaseModel baseModel = await NetUtil()
-                    .post('/user/dailyPayment/pay', params: {
+                BaseModel baseModel =
+                    await NetUtil().post('/user/dailyPayment/pay', params: {
                  "ids": _ids,
-                  "payType":1,  //暂时写死 等待后续补充
-                  "payPrice":_totalCost
+                  "payType": 1, //暂时写死 等待后续补充
+                  "payPrice": _totalCost
                });
                if (baseModel.status ?? false) {
                  Get.off(() => PayFinishPage());
--- a/lib/pages/life_pay/pay_finish_page.dart
+++ b/lib/pages/life_pay/pay_finish_page.dart
@ -1,8 +1,9 @@
-import 'package:aku_community/utils/headers.dart';
-import 'package:aku_community/widget/bee_back_button.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';

+import 'package:aku_community/utils/headers.dart';
+import 'package:aku_community/widget/bee_back_button.dart';
+
 class PayFinishPage extends StatelessWidget {
  const PayFinishPage({Key? key}) : super(key: key);

@ -36,7 +37,11 @@ class PayFinishPage extends StatelessWidget {
                    end: Alignment.bottomCenter),
              ),
              alignment: Alignment.center,
-              child: Icon(CupertinoIcons.checkmark_alt,size:150.w ,color: Colors.white,),
+              child: Icon(
+                CupertinoIcons.checkmark_alt,
+                size: 150.w,
+                color: Colors.white,
+              ),
            ),
            70.w.heightBox,
            '支付成功'.text.size(48.sp).color(Colors.white).bold.make(),
--- a/lib/pages/life_pay/widget/life_pay_detail_page.dart
+++ b/lib/pages/life_pay/widget/life_pay_detail_page.dart
@ -253,7 +253,7 @@ class _LifePayDetailPageState extends State<LifePayDetailPage> {
              color: kPrimaryColor,
              padding: EdgeInsets.symmetric(horizontal: 50.w, vertical: 15.w),
              onPressed: () {
-                Get.back(result: [_payNum, _payTotal,_ids]);
+                Get.back(result: [_payNum, _payTotal, _ids]);
              },
              child: '选好了'.text.black.size(32.sp).bold.make(),
            ),
--- a/lib/pages/one_alarm/widget/alarm_page.dart
+++ b/lib/pages/one_alarm/widget/alarm_page.dart
@ -1,5 +1,3 @@
-import 'package:aku_community/constants/api.dart';
-import 'package:aku_community/utils/network/net_util.dart';
 import 'package:flutter/material.dart';

 import 'package:amap_flutter_base/amap_flutter_base.dart';
@ -12,9 +10,11 @@ import 'package:provider/provider.dart';
 import 'package:url_launcher/url_launcher.dart';
 import 'package:velocity_x/velocity_x.dart';

+import 'package:aku_community/constants/api.dart';
 import 'package:aku_community/pages/one_alarm/alarm_detail_page.dart';
 import 'package:aku_community/provider/app_provider.dart';
 import 'package:aku_community/utils/headers.dart';
+import 'package:aku_community/utils/network/net_util.dart';
 import 'package:aku_community/widget/bee_scaffold.dart';

 class PermissionUtil {
@ -221,18 +221,18 @@ class _AlarmPageState extends State<AlarmPage> {
                          child: MaterialButton(
                            shape: RoundedRectangleBorder(
                                borderRadius: BorderRadius.circular(172.w)),
-                            onPressed: () async{
-                            
+                            onPressed: () async {
                              setState(() {
                                _makephonenum('tel:110');
                              });

-                              if (appProvider.selectedHouse?.status==4) {
-                                await NetUtil().post(API.manager.recordAlarmInfo,params: {
-                                "estateId":appProvider.selectedHouse?.estateId,
+                              if (appProvider.selectedHouse?.status == 4) {
+                                await NetUtil()
+                                    .post(API.manager.recordAlarmInfo, params: {
+                                  "estateId":
+                                      appProvider.selectedHouse?.estateId,
                                });
                              }
-                              
                            },
                            child: Icon(
                              Feather.phone_call,
--- a/lib/pages/renovation_manage/renovation_manage_card.dart
+++ b/lib/pages/renovation_manage/renovation_manage_card.dart
@ -1,12 +1,14 @@
-import 'package:aku_community/base/base_style.dart';
-import 'package:aku_community/pages/renovation_manage/renovation_manage_detail_page.dart';
-import 'package:aku_community/pages/renovation_manage/renovation_map.dart';
-import 'package:flustars/flustars.dart';
 import 'package:flutter/material.dart';
+
+import 'package:flustars/flustars.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 import 'package:velocity_x/velocity_x.dart';
+
+import 'package:aku_community/base/base_style.dart';
 import 'package:aku_community/const/resource.dart';
+import 'package:aku_community/pages/renovation_manage/renovation_manage_detail_page.dart';
+import 'package:aku_community/pages/renovation_manage/renovation_map.dart';

 class RenovationManageCard extends StatefulWidget {
  final int index;
@ -21,7 +23,7 @@ class _RenovationManageCardState extends State<RenovationManageCard> {
  Widget build(BuildContext context) {
    return GestureDetector(
      onTap: () {
-        Get.to(()=>RenovationManageDetailPage());
+        Get.to(() => RenovationManageDetailPage());
      },
      child: Container(
        margin: EdgeInsets.only(top: 16.w),
--- a/lib/pages/renovation_manage/renovation_manage_detail_page.dart
+++ b/lib/pages/renovation_manage/renovation_manage_detail_page.dart
@ -1,13 +1,15 @@
 import 'dart:math';

-import 'package:aku_community/base/base_style.dart';
-import 'package:aku_community/pages/renovation_manage/renovation_map.dart';
-import 'package:aku_community/widget/bee_scaffold.dart';
-import 'package:flustars/flustars.dart';
 import 'package:flutter/material.dart';
-import 'package:velocity_x/velocity_x.dart';
+
+import 'package:flustars/flustars.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:velocity_x/velocity_x.dart';
+
+import 'package:aku_community/base/base_style.dart';
 import 'package:aku_community/const/resource.dart';
+import 'package:aku_community/pages/renovation_manage/renovation_map.dart';
+import 'package:aku_community/widget/bee_scaffold.dart';

 class RenovationManageDetailPage extends StatefulWidget {
  RenovationManageDetailPage({Key? key}) : super(key: key);
@ -25,7 +27,11 @@ class _RenovationManageDetailPageState
      title: '装修详情',
      body: ListView(
        padding: EdgeInsets.symmetric(vertical: 24.w),
-        children: [_buildInfo(), _buildFinishWorkCheck(),_buildCycleCheck(),],
+        children: [
+          _buildInfo(),
+          _buildFinishWorkCheck(),
+          _buildCycleCheck(),
+        ],
      ),
    );
  }
@ -213,7 +219,6 @@ class _RenovationManageDetailPageState
    );
  }

-
  _buildFinishWorkCheck() {
    return _akuTitleBox(
      '完工检查',
@ -246,7 +251,7 @@ class _RenovationManageDetailPageState
          child: Text(
            '检查内容',
            style: TextStyle(
-              color:ktextPrimary,
+              color: ktextPrimary,
              fontSize: 28.w,
            ),
          ),
@ -272,12 +277,7 @@ class _RenovationManageDetailPageState
            format: 'yyyy-MM-dd',
          ),
        ),
-        _buildRow(
-          title: '接受人',
-          subTitle: '黄鑫',
-          onTap: () {
-                }
-        ),
+        _buildRow(title: '接受人', subTitle: '黄鑫', onTap: () {}),
        _buildRow(title: '所属项目', subTitle: '装修管理'),
        _buildRow(
          title: '开始日期',
@ -285,7 +285,7 @@ class _RenovationManageDetailPageState
            '2020-10-23 10:24:56',
            format: 'yyyy-MM-dd',
          ),
-          onTap:() {
+          onTap: () {
            // showBottomSheet(
            //   child: Column(
            //     mainAxisSize: MainAxisSize.min,
@ -336,7 +336,7 @@ class _RenovationManageDetailPageState
        ),
        _buildRow(
            title: '检查周期',
-          subTitle:'2020-10-23 10:24:56',
+            subTitle: '2020-10-23 10:24:56',
            onTap: () {
              // showAkuSheet(
              //   child: Column(
@ -420,8 +420,7 @@ class _RenovationManageDetailPageState
              // ).then((value) {
              //   setState(() {});
              // });
-                }
-        ),
+            }),
        Padding(
          padding: EdgeInsets.symmetric(
            vertical: 28.w,
@ -451,8 +450,6 @@ class _RenovationManageDetailPageState
    );
  }

-  
-
  _buildRow({
    String? title,
    String? subTitle,
--- a/lib/pages/renovation_manage/renovation_manage_page.dart
+++ b/lib/pages/renovation_manage/renovation_manage_page.dart
@ -1,7 +1,8 @@
+import 'package:flutter/material.dart';
+
 import 'package:aku_community/pages/renovation_manage/renovation_manage_view.dart';
 import 'package:aku_community/widget/bee_scaffold.dart';
 import 'package:aku_community/widget/tab_bar/bee_tab_bar.dart';
-import 'package:flutter/material.dart';

 class RenovationManagePage extends StatefulWidget {
  RenovationManagePage({Key? key}) : super(key: key);
--- a/lib/pages/renovation_manage/renovation_manage_view.dart
+++ b/lib/pages/renovation_manage/renovation_manage_view.dart
@ -1,6 +1,7 @@
-import 'package:aku_community/pages/renovation_manage/renovation_manage_card.dart';
 import 'package:flutter/material.dart';

+import 'package:aku_community/pages/renovation_manage/renovation_manage_card.dart';
+
 class RenovationManageView extends StatefulWidget {
  final int index;
  RenovationManageView({Key? key, required this.index}) : super(key: key);
--- a/lib/pages/renovation_manage/renovation_map.dart
+++ b/lib/pages/renovation_manage/renovation_map.dart
@ -33,7 +33,7 @@ class RenovationMap {
    -1: '申请中',
    -2: '申请未通过',
    -3: '申请通过',
-    0:'待处理',
+    0: '待处理',
    1: '已付押金',
    2: '装修中',
    3: '完工检查申请中',
--- a/lib/pages/service_browse/service_browse_detail_page.dart
+++ b/lib/pages/service_browse/service_browse_detail_page.dart
@ -1,14 +1,16 @@
-import 'package:aku_community/base/base_style.dart';
-import 'package:aku_community/models/service_browse/service_browse_list_mode.dart';
-import 'package:aku_community/utils/link_text_parase.dart';
-import 'package:aku_community/widget/bee_scaffold.dart';
-import 'package:flustars/flustars.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
+
+import 'package:flustars/flustars.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:url_launcher/url_launcher.dart';
 import 'package:velocity_x/velocity_x.dart';

+import 'package:aku_community/base/base_style.dart';
+import 'package:aku_community/models/service_browse/service_browse_list_mode.dart';
+import 'package:aku_community/utils/link_text_parase.dart';
+import 'package:aku_community/widget/bee_scaffold.dart';
+
 class ServiceBrowseDetailPage extends StatefulWidget {
  final ServiceBrowseListModel model;
  ServiceBrowseDetailPage({Key? key, required this.model}) : super(key: key);
--- a/lib/pages/service_browse/service_browse_page.dart
+++ b/lib/pages/service_browse/service_browse_page.dart
@ -1,15 +1,17 @@
+import 'package:flutter/material.dart';
+
+import 'package:flustars/flustars.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:aku_community/base/base_style.dart';
 import 'package:aku_community/constants/api.dart';
 import 'package:aku_community/models/service_browse/service_browse_list_mode.dart';
 import 'package:aku_community/pages/service_browse/service_browse_detail_page.dart';
 import 'package:aku_community/pages/things_page/widget/bee_list_view.dart';
 import 'package:aku_community/widget/bee_scaffold.dart';
-import 'package:flustars/flustars.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';

 class ServiceBrowsePage extends StatefulWidget {
  ServiceBrowsePage({Key? key}) : super(key: key);
@ -60,7 +62,9 @@ class _ServiceBrowsePageState extends State<ServiceBrowsePage> {
  Widget _buildCard(ServiceBrowseListModel model) {
    return MaterialButton(
      onPressed: () {
-        Get.to(() => ServiceBrowseDetailPage(model: model,));
+        Get.to(() => ServiceBrowseDetailPage(
+              model: model,
+            ));
      },
      elevation: 0,
      color: Colors.white,
--- a/lib/provider/user_provider.dart
+++ b/lib/provider/user_provider.dart
@ -52,7 +52,7 @@ class UserProvider extends ChangeNotifier {
  Future updateProfile() async {
    _userInfoModel = await SignFunc.getUserInfo();
    if (_userInfoModel != null && !kIsWeb && !Platform.isMacOS) {
-      await JPush().setAlias(_userInfoModel?.id.toString()??'');
+      await JPush().setAlias(_userInfoModel?.id.toString() ?? '');
    }
    notifyListeners();
  }
--- a/lib/ui/community/facility/facility_appointment_page.dart
+++ b/lib/ui/community/facility/facility_appointment_page.dart
@ -38,7 +38,7 @@ class _FacilityAppointmentPageState extends State<FacilityAppointmentPage>
      actions: [
        IconButton(
          icon: Icon(CupertinoIcons.add_circled),
-          onPressed: () async{
+          onPressed: () async {
            await Get.to(() => PickFacilityPage());
            childKey.currentState!.callRefresh();
          },
@ -54,7 +54,9 @@ class _FacilityAppointmentPageState extends State<FacilityAppointmentPage>
            type: FacilityAppointmentType.MY,
            key: childKey,
          ),
-          FacilityAppointmentView(type: FacilityAppointmentType.HISTORY,),
+          FacilityAppointmentView(
+            type: FacilityAppointmentType.HISTORY,
+          ),
        ],
        controller: _tabController,
      ),
--- a/lib/ui/community/facility/facility_appointment_view.dart
+++ b/lib/ui/community/facility/facility_appointment_view.dart
@ -1,4 +1,3 @@
-
 import 'package:flutter/material.dart';

 import 'package:flutter_easyrefresh/easy_refresh.dart';
--- a/lib/ui/community/facility/facility_preorder_page.dart
+++ b/lib/ui/community/facility/facility_preorder_page.dart
@ -1,4 +1,3 @@
-import 'package:aku_community/ui/community/facility/fcility_order_date_list_page.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';

@ -13,6 +12,7 @@ import 'package:aku_community/constants/app_theme.dart';
 import 'package:aku_community/models/facility/facility_type_detail_model.dart';
 import 'package:aku_community/provider/app_provider.dart';
 import 'package:aku_community/ui/community/facility/facility_type_detail_page.dart';
+import 'package:aku_community/ui/community/facility/fcility_order_date_list_page.dart';
 import 'package:aku_community/ui/profile/house/pick_my_house_page.dart';
 import 'package:aku_community/utils/headers.dart';
 import 'package:aku_community/utils/network/net_util.dart';
@ -122,7 +122,6 @@ class _FacilityPreorderPageState extends State<FacilityPreorderPage> {
                  materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
                  height: 120.w,
                  onPressed: () async {
-
                    DateTime? date = await BeeDatePicker.pick(
                      startDate == null
                          ? DateTime.now().add(Duration(minutes: 90))
@ -209,19 +208,33 @@ class _FacilityPreorderPageState extends State<FacilityPreorderPage> {

  Widget _hasBeenOrder() {
    return CupertinoAlertDialog(
-      title: '此设施已被预约'.text.size(32.sp).bold.color(ktextPrimary).isIntrinsic.make(),
-      content: '是否查看此设施已被预约时段？'.text.size(28.sp).color(ktextPrimary).isIntrinsic.make(),
+      title: '此设施已被预约'
+          .text
+          .size(32.sp)
+          .bold
+          .color(ktextPrimary)
+          .isIntrinsic
+          .make(),
+      content: '是否查看此设施已被预约时段？'
+          .text
+          .size(28.sp)
+          .color(ktextPrimary)
+          .isIntrinsic
+          .make(),
      actions: [
        CupertinoActionSheetAction(
            onPressed: () {
              Get.back();
            },
-            child: '取消'.text.size(30.sp).color(ktextPrimary).isIntrinsic.make()),
+            child:
+                '取消'.text.size(30.sp).color(ktextPrimary).isIntrinsic.make()),
        CupertinoActionSheetAction(
            onPressed: () {
-              Get.off(() => FacilityOrderDateListPage(facilitiesId: typeModel!.id));
+              Get.off(
+                  () => FacilityOrderDateListPage(facilitiesId: typeModel!.id));
            },
-            child: '查看'.text.size(30.sp).color(kPrimaryColor).isIntrinsic.make()),
+            child:
+                '查看'.text.size(30.sp).color(kPrimaryColor).isIntrinsic.make()),
      ],
    );
  }
--- a/lib/ui/community/facility/fcility_order_date_list_page.dart
+++ b/lib/ui/community/facility/fcility_order_date_list_page.dart
@ -1,13 +1,15 @@
+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 'package:aku_community/base/base_style.dart';
 import 'package:aku_community/constants/api.dart';
 import 'package:aku_community/models/facility/facility_order_date_list_model.dart';
 import 'package:aku_community/pages/things_page/widget/bee_list_view.dart';
 import 'package:aku_community/widget/bee_divider.dart';
 import 'package:aku_community/widget/bee_scaffold.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_easyrefresh/easy_refresh.dart';
-import 'package:velocity_x/velocity_x.dart';
-import 'package:flutter_screenutil/flutter_screenutil.dart';

 class FacilityOrderDateListPage extends StatefulWidget {
  final int facilitiesId;
--- a/lib/ui/home/public_infomation/public_infomation_card.dart
+++ b/lib/ui/home/public_infomation/public_infomation_card.dart
@ -1,13 +1,14 @@
+import 'package:flutter/material.dart';
+
+import 'package:flustars/flustars.dart';
+import 'package:get/get.dart';
+
+import 'package:aku_community/base/base_style.dart';
 import 'package:aku_community/constants/api.dart';
 import 'package:aku_community/model/common/img_model.dart';
 import 'package:aku_community/models/news/news_item_model.dart';
 import 'package:aku_community/ui/home/public_infomation/public_information_detail_page.dart';
-import 'package:flustars/flustars.dart';
-import 'package:flutter/material.dart';
-
-import 'package:aku_community/base/base_style.dart';
 import 'package:aku_community/utils/headers.dart';
-import 'package:get/get.dart';

 class PublicInfomationCard extends StatelessWidget {
  final NewsItemModel model;
@ -20,7 +21,7 @@ class PublicInfomationCard extends StatelessWidget {
      elevation: 0,
      materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
      onPressed: () {
-        Get.to(() => PublicInformationDetailPage(id:this.model.id));
+        Get.to(() => PublicInformationDetailPage(id: this.model.id));
      },
      padding: EdgeInsets.zero,
      child: Container(
--- a/lib/ui/home/public_infomation/public_infomation_view.dart
+++ b/lib/ui/home/public_infomation/public_infomation_view.dart
@ -1,12 +1,13 @@
+import 'package:flutter/material.dart';
+
+import 'package:flutter_easyrefresh/easy_refresh.dart';
+
 import 'package:aku_community/constants/api.dart';
 import 'package:aku_community/models/news/news_category_model.dart';
 import 'package:aku_community/models/news/news_item_model.dart';
 import 'package:aku_community/pages/things_page/widget/bee_list_view.dart';
-import 'package:flutter/material.dart';
-
 import 'package:aku_community/ui/home/public_infomation/public_infomation_card.dart';
 import 'package:aku_community/utils/headers.dart';
-import 'package:flutter_easyrefresh/easy_refresh.dart';

 class PublicInfomationView extends StatefulWidget {
  final NewsCategoryModel model;
--- a/lib/ui/home/public_infomation/public_information_detail_page.dart
+++ b/lib/ui/home/public_infomation/public_information_detail_page.dart
@ -1,3 +1,13 @@
+import 'package:flutter/gestures.dart';
+import 'package:flutter/material.dart';
+
+import 'package:bot_toast/bot_toast.dart';
+import 'package:flustars/flustars.dart';
+import 'package:flutter_easyrefresh/easy_refresh.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:url_launcher/url_launcher.dart';
+import 'package:velocity_x/velocity_x.dart';
+
 import 'package:aku_community/base/base_style.dart';
 import 'package:aku_community/constants/api.dart';
 import 'package:aku_community/models/news/news_detail_model.dart';
@ -5,14 +15,6 @@ import 'package:aku_community/utils/link_text_parase.dart';
 import 'package:aku_community/utils/network/base_model.dart';
 import 'package:aku_community/utils/network/net_util.dart';
 import 'package:aku_community/widget/bee_scaffold.dart';
-import 'package:bot_toast/bot_toast.dart';
-import 'package:flustars/flustars.dart';
-import 'package:flutter/gestures.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_easyrefresh/easy_refresh.dart';
-import 'package:url_launcher/url_launcher.dart';
-import 'package:velocity_x/velocity_x.dart';
-import 'package:flutter_screenutil/flutter_screenutil.dart';

 class PublicInformationDetailPage extends StatefulWidget {
  final int id;
--- a/lib/ui/manager/advice/advice_detail_page.dart
+++ b/lib/ui/manager/advice/advice_detail_page.dart
@ -1,7 +1,6 @@
-import 'package:aku_community/utils/network/base_model.dart';
-import 'package:bot_toast/bot_toast.dart';
 import 'package:flutter/material.dart';

+import 'package:bot_toast/bot_toast.dart';
 import 'package:dio/dio.dart';
 import 'package:flustars/flustars.dart';
 import 'package:flutter_easyrefresh/easy_refresh.dart';
@ -17,6 +16,7 @@ import 'package:aku_community/model/manager/suggestion_or_complain_model.dart';
 import 'package:aku_community/ui/manager/advice/advice_add_comment_page.dart';
 import 'package:aku_community/ui/manager/advice/advice_evaluate_page.dart';
 import 'package:aku_community/utils/headers.dart';
+import 'package:aku_community/utils/network/base_model.dart';
 import 'package:aku_community/utils/network/net_util.dart';
 import 'package:aku_community/widget/bee_scaffold.dart';
 import 'package:aku_community/widget/buttons/bottom_button.dart';
--- a/lib/ui/market/goods/goods_card.dart
+++ b/lib/ui/market/goods/goods_card.dart
@ -1,10 +1,10 @@
-import 'package:aku_community/constants/api.dart';
-import 'package:aku_community/model/common/img_model.dart';
 import 'package:flutter/material.dart';

 import 'package:get/get.dart';

 import 'package:aku_community/base/base_style.dart';
+import 'package:aku_community/constants/api.dart';
+import 'package:aku_community/model/common/img_model.dart';
 import 'package:aku_community/models/market/goods_item.dart';
 import 'package:aku_community/ui/market/goods/goods_detail_page.dart';
 import 'package:aku_community/utils/headers.dart';
--- a/lib/ui/market/goods/goods_detail_page.dart
+++ b/lib/ui/market/goods/goods_detail_page.dart
@ -1,4 +1,3 @@
-import 'package:aku_community/widget/buttons/bottom_button.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';

@ -19,11 +18,12 @@ import 'package:aku_community/models/market/goods_item.dart';
 import 'package:aku_community/provider/user_provider.dart';
 import 'package:aku_community/ui/market/goods/goods_card.dart';
 import 'package:aku_community/ui/market/search/search_goods_page.dart';
+import 'package:aku_community/utils/headers.dart';
 import 'package:aku_community/utils/network/base_model.dart';
 import 'package:aku_community/utils/network/net_util.dart';
 import 'package:aku_community/widget/bee_back_button.dart';
 import 'package:aku_community/widget/bee_scaffold.dart';
-import 'package:aku_community/utils/headers.dart';
+import 'package:aku_community/widget/buttons/bottom_button.dart';

 ///商品详情页面
 class GoodsDetailPage extends StatefulWidget {
@ -128,7 +128,6 @@ class _GoodsDetailPageState extends State<GoodsDetailPage> {
                                  .size(36.sp)
                                  .bold
                                  .color(Colors.red)
-                                  
                                  .make(),
                              8.w.widthBox,
                              '¥${_goodsModel.markingPrice}'
--- a/lib/ui/market/market_page.dart
+++ b/lib/ui/market/market_page.dart
@ -1,6 +1,5 @@
 // import 'package:aku_community/base/base_style.dart';

-import 'package:aku_community/ui/market/order/my_order_page.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';

@ -16,6 +15,7 @@ import 'package:aku_community/models/market/market_category_model.dart';
 import 'package:aku_community/ui/market/category/category_card.dart';
 import 'package:aku_community/ui/market/category/category_page.dart';
 import 'package:aku_community/ui/market/goods/goods_card.dart';
+import 'package:aku_community/ui/market/order/my_order_page.dart';
 import 'package:aku_community/ui/market/search/search_goods_page.dart';
 import 'package:aku_community/utils/headers.dart';
 import 'package:aku_community/utils/network/base_model.dart';
--- a/lib/ui/market/order/my_order_card.dart
+++ b/lib/ui/market/order/my_order_card.dart
@ -1,19 +1,21 @@
+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:aku_community/base/base_style.dart';
+import 'package:aku_community/const/resource.dart';
 import 'package:aku_community/constants/api.dart';
+import 'package:aku_community/extensions/widget_list_ext.dart';
 import 'package:aku_community/model/common/img_model.dart';
 import 'package:aku_community/models/market/order/my_order_list_model.dart';
 import 'package:aku_community/ui/market/order/my_order_detail_page.dart';
 import 'package:aku_community/ui/market/order/my_order_evaluation_page.dart';
 import 'package:aku_community/ui/market/order/my_order_func.dart';
 import 'package:aku_community/ui/market/order/my_order_refund_page.dart';
-import 'package:aku_community/widget/buttons/card_bottom_button.dart';
 import 'package:aku_community/widget/bee_divider.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:aku_community/const/resource.dart';
-import 'package:aku_community/extensions/widget_list_ext.dart';
+import 'package:aku_community/widget/buttons/card_bottom_button.dart';

 class MyOrderCard extends StatefulWidget {
  final MyOrderListModel model;
@ -30,7 +32,9 @@ class _MyOrderCardState extends State<MyOrderCard> {
  Widget build(BuildContext context) {
    return GestureDetector(
      onTap: () {
-        Get.to(() => MyOrderDetailPage(model: widget.model,));
+        Get.to(() => MyOrderDetailPage(
+              model: widget.model,
+            ));
      },
      child: Container(
        width: double.infinity,
--- a/lib/ui/market/order/my_order_detail_page.dart
+++ b/lib/ui/market/order/my_order_detail_page.dart
@ -1,5 +1,15 @@
+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/velocity_x.dart';
+import 'package:waterfall_flow/waterfall_flow.dart';
+
 import 'package:aku_community/base/base_style.dart';
+import 'package:aku_community/const/resource.dart';
 import 'package:aku_community/constants/api.dart';
+import 'package:aku_community/extensions/widget_list_ext.dart';
 import 'package:aku_community/model/common/img_model.dart';
 import 'package:aku_community/models/market/goods_item.dart';
 import 'package:aku_community/models/market/order/my_order_list_model.dart';
@ -7,14 +17,6 @@ import 'package:aku_community/ui/market/goods/goods_card.dart';
 import 'package:aku_community/ui/market/order/my_order_func.dart';
 import 'package:aku_community/widget/bee_divider.dart';
 import 'package:aku_community/widget/bee_scaffold.dart';
-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/velocity_x.dart';
-import 'package:aku_community/const/resource.dart';
-import 'package:waterfall_flow/waterfall_flow.dart';
-import 'package:aku_community/extensions/widget_list_ext.dart';

 class MyOrderDetailPage extends StatefulWidget {
  final MyOrderListModel model;
--- a/lib/ui/market/order/my_order_evaluation_page.dart
+++ b/lib/ui/market/order/my_order_evaluation_page.dart
@ -1,4 +1,11 @@
+import 'package:flutter/material.dart';
+
+import 'package:flutter_rating_bar/flutter_rating_bar.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:velocity_x/velocity_x.dart';
+
 import 'package:aku_community/base/base_style.dart';
+import 'package:aku_community/const/resource.dart';
 import 'package:aku_community/constants/api.dart';
 import 'package:aku_community/model/common/img_model.dart';
 import 'package:aku_community/models/market/order/my_order_list_model.dart';
@ -7,11 +14,6 @@ import 'package:aku_community/widget/bee_divider.dart';
 import 'package:aku_community/widget/bee_scaffold.dart';
 import 'package:aku_community/widget/buttons/bottom_button.dart';
 import 'package:aku_community/widget/others/bee_text_field.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_rating_bar/flutter_rating_bar.dart';
-import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:velocity_x/velocity_x.dart';
-import 'package:aku_community/const/resource.dart';

 class MyOrderEvaluationPage extends StatefulWidget {
  final MyOrderListModel model;
@ -69,11 +71,7 @@ class _MyOrderEvaluationPageState extends State<MyOrderEvaluationPage> {
        children: [
          Row(
            children: [
-              '商品信息'.text
-                  .size(32.sp)
-                  .bold
-                  .color(ktextPrimary)
-                  .make(),
+              '商品信息'.text.size(32.sp).bold.color(ktextPrimary).make(),
              Spacer(),
              // widget.model.statusString.text
              //     .size(30.sp)
--- a/lib/ui/market/order/my_order_page.dart
+++ b/lib/ui/market/order/my_order_page.dart
@ -1,8 +1,10 @@
+import 'package:flutter/material.dart';
+
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+
 import 'package:aku_community/ui/market/order/my_order_view.dart';
 import 'package:aku_community/widget/bee_scaffold.dart';
 import 'package:aku_community/widget/tab_bar/bee_tab_bar.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_screenutil/flutter_screenutil.dart';

 class MyOrderPage extends StatefulWidget {
  MyOrderPage({Key? key}) : super(key: key);
--- a/lib/ui/market/order/my_order_refund_page.dart
+++ b/lib/ui/market/order/my_order_refund_page.dart
@ -1,4 +1,10 @@
+import 'package:flutter/material.dart';
+
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:velocity_x/velocity_x.dart';
+
 import 'package:aku_community/base/base_style.dart';
+import 'package:aku_community/const/resource.dart';
 import 'package:aku_community/constants/api.dart';
 import 'package:aku_community/model/common/img_model.dart';
 import 'package:aku_community/models/market/order/my_order_list_model.dart';
@ -8,15 +14,10 @@ import 'package:aku_community/widget/bee_scaffold.dart';
 import 'package:aku_community/widget/buttons/aku_single_check_button.dart';
 import 'package:aku_community/widget/buttons/bottom_button.dart';
 import 'package:aku_community/widget/others/bee_text_field.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:velocity_x/velocity_x.dart';
-import 'package:aku_community/const/resource.dart';

 class MyOrderRefundPage extends StatefulWidget {
  final MyOrderListModel model;
-  MyOrderRefundPage({Key? key, required this.model})
-      : super(key: key);
+  MyOrderRefundPage({Key? key, required this.model}) : super(key: key);

  @override
  _MyOrderRefundPageState createState() => _MyOrderRefundPageState();
@ -51,7 +52,8 @@ class _MyOrderRefundPageState extends State<MyOrderRefundPage> {
      ),
      bottomNavi: BottomButton(
          onPressed: () async {
-            await MyOrderFunc.refundOrder(widget.model.id, _editingController.text);
+            await MyOrderFunc.refundOrder(
+                widget.model.id, _editingController.text);
          },
          child: '确认提交'.text.size(32.sp).color(ktextPrimary).bold.make()),
    );
@ -69,11 +71,7 @@ class _MyOrderRefundPageState extends State<MyOrderRefundPage> {
        children: [
          Row(
            children: [
-              '商品信息'.text
-                  .size(32.sp)
-                  .bold
-                  .color(ktextPrimary)
-                  .make(),
+              '商品信息'.text.size(32.sp).bold.color(ktextPrimary).make(),
              Spacer(),
              // widget.model.statusString.text
              //     .size(30.sp)
--- a/lib/ui/market/order/my_order_view.dart
+++ b/lib/ui/market/order/my_order_view.dart
@ -1,12 +1,14 @@
-import 'package:aku_community/constants/api.dart';
-import 'package:aku_community/models/market/order/my_order_list_model.dart';
-import 'package:aku_community/pages/things_page/widget/bee_list_view.dart';
-import 'package:aku_community/ui/market/order/my_order_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 'package:aku_community/constants/api.dart';
+import 'package:aku_community/models/market/order/my_order_list_model.dart';
+import 'package:aku_community/pages/things_page/widget/bee_list_view.dart';
+import 'package:aku_community/ui/market/order/my_order_card.dart';
+
 class MyOrderView extends StatefulWidget {
  final int index;
  MyOrderView({Key? key, required this.index}) : super(key: key);
@ -34,9 +36,7 @@ class _MyOrderViewState extends State<MyOrderView> {
    return BeeListView(
        path: API.market.myOrderList,
        controller: _refreshController,
-        extraParams: {
-          "orderStart":widget.index
-        },
+        extraParams: {"orderStart": widget.index},
        convert: (models) {
          return models.tableList!
              .map((e) => MyOrderListModel.fromJson(e))
@ -44,7 +44,7 @@ class _MyOrderViewState extends State<MyOrderView> {
        },
        builder: (items) {
          return ListView.separated(
-            padding: EdgeInsets.symmetric(vertical: 24.w,horizontal: 32.w),
+              padding: EdgeInsets.symmetric(vertical: 24.w, horizontal: 32.w),
              itemBuilder: (context, index) {
                return MyOrderCard(
                  model: items[index],
--- a/lib/ui/market/second_hand/add_second_hand_goods_page.dart
+++ b/lib/ui/market/second_hand/add_second_hand_goods_page.dart
@ -1,12 +1,14 @@
 import 'dart:io';

+import 'package:flutter/material.dart';
+
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:velocity_x/velocity_x.dart';
+
 import 'package:aku_community/base/base_style.dart';
 import 'package:aku_community/widget/bee_scaffold.dart';
 import 'package:aku_community/widget/buttons/bottom_button.dart';
 import 'package:aku_community/widget/picker/grid_image_picker.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:velocity_x/velocity_x.dart';

 class AddSecondGoodsPage extends StatefulWidget {
  AddSecondGoodsPage({Key? key}) : super(key: key);
--- a/lib/ui/market/second_hand/second_hand_page.dart
+++ b/lib/ui/market/second_hand/second_hand_page.dart
@ -1,12 +1,14 @@
-import 'package:aku_community/models/market/goods_item.dart';
-import 'package:aku_community/ui/market/goods/goods_card.dart';
-import 'package:aku_community/ui/market/second_hand/add_second_hand_goods_page.dart';
-import 'package:aku_community/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:waterfall_flow/waterfall_flow.dart';
-import 'package:flutter_screenutil/flutter_screenutil.dart';
+
+import 'package:aku_community/models/market/goods_item.dart';
+import 'package:aku_community/ui/market/goods/goods_card.dart';
+import 'package:aku_community/ui/market/second_hand/add_second_hand_goods_page.dart';
+import 'package:aku_community/widget/bee_scaffold.dart';

 class SecondHandPage extends StatefulWidget {
  SecondHandPage({Key? key}) : super(key: key);
--- a/lib/ui/search/bee_search.dart
+++ b/lib/ui/search/bee_search.dart
@ -1,21 +1,21 @@
-import 'package:aku_community/base/base_style.dart';
-import 'package:aku_community/constants/api.dart';
-import 'package:aku_community/model/common/img_model.dart';
-import 'package:aku_community/model/community/activity_item_model.dart';
-import 'package:aku_community/model/community/community_topic_model.dart';
-import 'package:aku_community/models/search/search_model.dart';
-import 'package:aku_community/utils/network/base_model.dart';
-import 'package:aku_community/utils/network/net_util.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:aku_community/base/base_style.dart';
+import 'package:aku_community/constants/api.dart';
 import 'package:aku_community/constants/application_objects.dart';
+import 'package:aku_community/model/common/img_model.dart';
+import 'package:aku_community/model/community/activity_item_model.dart';
+import 'package:aku_community/model/community/community_topic_model.dart';
+import 'package:aku_community/models/search/search_model.dart';
 import 'package:aku_community/utils/headers.dart';
 import 'package:aku_community/utils/login_util.dart';
+import 'package:aku_community/utils/network/base_model.dart';
+import 'package:aku_community/utils/network/net_util.dart';
 import 'package:aku_community/widget/bee_back_button.dart';
-import 'package:velocity_x/velocity_x.dart';

 class BeeSearch extends StatefulWidget {
  BeeSearch({Key? key}) : super(key: key);
@ -167,7 +167,8 @@ class _BeeSearchState extends State<BeeSearch> {
                    .size(28.sp)
                    .color(ktextPrimary)
                    .maxLines(2)
-                    .bold.overflow(TextOverflow.ellipsis)
+                    .bold
+                    .overflow(TextOverflow.ellipsis)
                    .isIntrinsic
                    .make()
                    .expand(),
@ -189,11 +190,7 @@ class _BeeSearchState extends State<BeeSearch> {
                        width: 24.w,
                      ),
                      12.wb,
-                      '${model.activityNum}'
-                          .text
-                          .maxLines(1)
-                          .size(22.sp)
-                          .make()
+                      '${model.activityNum}'.text.maxLines(1).size(22.sp).make()
                    ],
                  ),
                )
@ -279,7 +276,7 @@ class _BeeSearchState extends State<BeeSearch> {
                child: GridView.count(
                  crossAxisCount: 1,
                  shrinkWrap: true,
-                  childAspectRatio: 4/1,
+                  childAspectRatio: 4 / 1,
                  mainAxisSpacing: 20.w,
                  physics: NeverScrollableScrollPhysics(),
                  children: _getNullSafeObjects(_searchModel.activityVoList)
@ -293,8 +290,7 @@ class _BeeSearchState extends State<BeeSearch> {
              child: GridView.count(
                crossAxisCount: 1,
                shrinkWrap: true,
-                childAspectRatio: 4/1,
-
+                childAspectRatio: 4 / 1,
                mainAxisSpacing: 20.w,
                physics: NeverScrollableScrollPhysics(),
                children: [
--- a/lib/utils/bee_map.dart
+++ b/lib/utils/bee_map.dart
@ -37,11 +37,7 @@ class BeeMap {
    1: '自己搬运',
    2: '搬家公司',
  };
-  static Map<int, String> goodsOutStatus = {
-    1:'审核中',
-    2:'审核通过',
-    3:'审核失败'
-  };
+  static Map<int, String> goodsOutStatus = {1: '审核中', 2: '审核通过', 3: '审核失败'};

  static Map<int, String> borrowStatus = {1: '出借中', 2: '已归还'};

--- a/lib/utils/link_text_parase.dart
+++ b/lib/utils/link_text_parase.dart
@ -1,5 +1,3 @@
-
-
 class LinkTextParase {
  static List<String> stringParase(String text, {Pattern? pattern}) {
    List<String> _listString = [];
--- a/lib/widget/buttons/aku_single_check_button.dart
+++ b/lib/widget/buttons/aku_single_check_button.dart
@ -1,7 +1,5 @@
-// Flutter imports:
 import 'package:flutter/material.dart';

-// Package imports:
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:velocity_x/velocity_x.dart';

--- a/lib/widget/buttons/card_bottom_button.dart
+++ b/lib/widget/buttons/card_bottom_button.dart
@ -1,8 +1,10 @@
-import 'package:aku_community/base/base_style.dart';
 import 'package:flutter/material.dart';
+
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:velocity_x/velocity_x.dart';

+import 'package:aku_community/base/base_style.dart';
+
 class CardBottomButton extends StatelessWidget {
  final String text;
  final Color textColor;
@ -17,16 +19,16 @@ class CardBottomButton extends StatelessWidget {
      this.hasBorder = false,
      required this.onPressed})
      : super(key: key);
-  CardBottomButton.white(
-    {Key? key, 
+  CardBottomButton.white({
+    Key? key,
    required this.text,
    required this.onPressed,
  })   : this.bgColor = Colors.white,
        this.textColor = ktextPrimary,
        this.hasBorder = true,
        super(key: key);
-  CardBottomButton.yellow(
-    {Key? key, 
+  CardBottomButton.yellow({
+    Key? key,
    required this.text,
    required this.onPressed,
  })   : this.bgColor = Color(0xFFFFC40C),
--- a/lib/widget/others/bee_text_field.dart
+++ b/lib/widget/others/bee_text_field.dart
@ -1,7 +1,9 @@
-import 'package:aku_community/base/base_style.dart';
 import 'package:flutter/material.dart';
+
 import 'package:flutter_screenutil/flutter_screenutil.dart';

+import 'package:aku_community/base/base_style.dart';
+
 class BeeTextField extends StatefulWidget {
  final TextEditingController controller;
  final VoidCallback? onChange;