From ce6165d9c31baffe2d00666014d5cd9ee2ce98b0 Mon Sep 17 00:00:00 2001 From: zhangmeng <494089941@qq.com> Date: Fri, 16 Jul 2021 09:55:45 +0800 Subject: [PATCH] format&sort code --- lib/constants/application_objects.dart | 2 +- lib/generated_plugin_registrant.dart | 3 +-- lib/models/house/lease_fee_list_model.dart | 1 + .../house_keeping_list_model.dart | 10 ++++++---- .../house_keeping_process_model.dart | 1 + lib/pages/life_pay/life_pay_page.dart | 8 +++++--- lib/pages/life_pay/life_pre_pay_page.dart | 18 ++++++++++-------- .../life_pay/widget/life_pay_detail_page.dart | 6 +++--- .../widget/add_fixed_submit_page.dart | 4 ++-- .../house_keeping/add_house_keeping_page.dart | 16 +++++++++------- .../manager/house_keeping/evaluate_page.dart | 10 ++++++---- .../house_keeping/house_keeping_card.dart | 14 ++++++++------ .../house_keeping_detail_page.dart | 9 +++++---- .../house_keeping/house_keeping_func.dart | 3 ++- .../house_keeping/house_keeping_page.dart | 10 ++++++---- .../house_keeping_submit_page.dart | 10 ++++++---- .../house_keeping/house_keeping_view.dart | 10 ++++++---- .../house/contract_stop/refund_bond_page.dart | 2 +- .../contract_stop/refund_bond_result_page.dart | 3 +-- .../contract_stop/upload_empty_list_page.dart | 4 ++-- lib/ui/profile/house/house_owners_page.dart | 10 ++++++---- .../lease_pay_query_detail_page.dart | 14 ++++++++------ .../lease_pay_query/lease_pay_query_page.dart | 16 +++++++++------- .../lease_relevation/contract_pay_page.dart | 2 +- .../bottom_sheets/pay_mothod_bottom_sheet.dart | 2 +- lib/widget/buttons/bee_check_button.dart | 6 +++++- lib/widget/others/aku_chip_box.dart | 1 + lib/widget/picker/bee_house_picker.dart | 1 + 28 files changed, 114 insertions(+), 82 deletions(-) diff --git a/lib/constants/application_objects.dart b/lib/constants/application_objects.dart index 0088910f..d265a379 100644 --- a/lib/constants/application_objects.dart +++ b/lib/constants/application_objects.dart @@ -1,6 +1,5 @@ // import 'package:aku_community/widget/bee_scaffold.dart'; -import 'package:aku_community/ui/manager/house_keeping/house_keeping_page.dart'; import 'package:flutter/material.dart'; import 'package:aku_community/const/resource.dart'; @@ -24,6 +23,7 @@ import 'package:aku_community/ui/community/activity/activity_list_page.dart'; import 'package:aku_community/ui/community/facility/facility_appointment_page.dart'; import 'package:aku_community/ui/home/application/all_application.dart'; import 'package:aku_community/ui/manager/advice/advice_page.dart'; +import 'package:aku_community/ui/manager/house_keeping/house_keeping_page.dart'; import 'package:aku_community/ui/manager/questionnaire/questionnaire_page.dart'; import 'package:aku_community/ui/profile/car/car_manage_page.dart'; import 'package:aku_community/ui/profile/car_parking/car_parking_page.dart'; diff --git a/lib/generated_plugin_registrant.dart b/lib/generated_plugin_registrant.dart index 222a4e7a..8e0b1cb0 100644 --- 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); diff --git a/lib/models/house/lease_fee_list_model.dart b/lib/models/house/lease_fee_list_model.dart index b01ba06c..08605538 100644 --- a/lib/models/house/lease_fee_list_model.dart +++ b/lib/models/house/lease_fee_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 'lease_fee_list_model.g.dart'; @JsonSerializable() diff --git a/lib/models/house_keeping/house_keeping_list_model.dart b/lib/models/house_keeping/house_keeping_list_model.dart index ed7da8fd..e7e3feb0 100644 --- a/lib/models/house_keeping/house_keeping_list_model.dart +++ b/lib/models/house_keeping/house_keeping_list_model.dart @@ -1,8 +1,10 @@ +import 'package:flutter/material.dart'; + import 'package:equatable/equatable.dart'; +import 'package:json_annotation/json_annotation.dart'; import 'package:aku_community/model/common/img_model.dart'; -import 'package:flutter/material.dart'; -import 'package:json_annotation/json_annotation.dart'; + part 'house_keeping_list_model.g.dart'; @JsonSerializable() @@ -101,9 +103,9 @@ class HouseKeepingListModel extends Equatable { case 1: return '未完成'; case 2: - return '已完成'; + return '已完成'; default: - return '未知'; + return '未知'; } } diff --git a/lib/models/house_keeping/house_keeping_process_model.dart b/lib/models/house_keeping/house_keeping_process_model.dart index 5f8338f4..bb8eaff7 100644 --- a/lib/models/house_keeping/house_keeping_process_model.dart +++ b/lib/models/house_keeping/house_keeping_process_model.dart @@ -1,5 +1,6 @@ import 'package:equatable/equatable.dart'; import 'package:json_annotation/json_annotation.dart'; + part 'house_keeping_process_model.g.dart'; @JsonSerializable() diff --git a/lib/pages/life_pay/life_pay_page.dart b/lib/pages/life_pay/life_pay_page.dart index dc52832f..419c11a5 100644 --- a/lib/pages/life_pay/life_pay_page.dart +++ b/lib/pages/life_pay/life_pay_page.dart @@ -1,5 +1,3 @@ -import 'package:aku_community/pages/life_pay/life_pre_pay_page.dart'; -import 'package:aku_community/widget/others/user_tool.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; @@ -13,6 +11,7 @@ import 'package:aku_community/base/base_style.dart'; import 'package:aku_community/constants/api.dart'; import 'package:aku_community/models/life_pay/life_pay_list_model.dart'; import 'package:aku_community/pages/life_pay/life_pay_record_page.dart'; +import 'package:aku_community/pages/life_pay/life_pre_pay_page.dart'; import 'package:aku_community/pages/life_pay/pay_finish_page.dart'; import 'package:aku_community/pages/life_pay/pay_util.dart'; import 'package:aku_community/pages/life_pay/widget/life_pay_detail_page.dart'; @@ -26,6 +25,7 @@ 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'; import 'package:aku_community/widget/others/house_head_card.dart'; +import 'package:aku_community/widget/others/user_tool.dart'; class LifePayPage extends StatefulWidget { LifePayPage({Key? key}) : super(key: key); @@ -245,7 +245,9 @@ class _LifePayPageState extends State { side: BorderSide(color: Color(0xFF979797), width: 1.w)), color: Colors.white, onPressed: () { - Get.to(() => LifePrePayPage(prePay: _prePrice,)); + Get.to(() => LifePrePayPage( + prePay: _prePrice, + )); }, child: '预缴充值'.text.size(28.sp).black.make(), ) diff --git a/lib/pages/life_pay/life_pre_pay_page.dart b/lib/pages/life_pay/life_pre_pay_page.dart index de2277b6..335a70ad 100644 --- a/lib/pages/life_pay/life_pre_pay_page.dart +++ b/lib/pages/life_pay/life_pre_pay_page.dart @@ -1,7 +1,16 @@ +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:power_logger/power_logger.dart'; + import 'package:aku_community/base/base_style.dart'; import 'package:aku_community/constants/api.dart'; import 'package:aku_community/pages/life_pay/pay_finish_page.dart'; import 'package:aku_community/pages/life_pay/pay_util.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'; @@ -10,13 +19,6 @@ import 'package:aku_community/widget/bottom_sheets/pay_mothod_bottom_sheet.dart' import 'package:aku_community/widget/buttons/bottom_button.dart'; import 'package:aku_community/widget/others/house_head_card.dart'; import 'package:aku_community/widget/others/user_tool.dart'; -import 'package:bot_toast/bot_toast.dart'; -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; -import 'package:aku_community/utils/headers.dart'; -import 'package:flutter/services.dart'; -import 'package:get/get.dart'; -import 'package:power_logger/power_logger.dart'; class LifePrePayPage extends StatefulWidget { final double prePay; @@ -166,7 +168,7 @@ class _LifePrePayPageState extends State { Get.off(() => PayFinishPage()); } } else { - BotToast.showText(text: baseModel.message??""); + BotToast.showText(text: baseModel.message ?? ""); } } catch (e) { LoggerData.addData(e); diff --git a/lib/pages/life_pay/widget/life_pay_detail_page.dart b/lib/pages/life_pay/widget/life_pay_detail_page.dart index 24b0d76b..63424e3e 100644 --- a/lib/pages/life_pay/widget/life_pay_detail_page.dart +++ b/lib/pages/life_pay/widget/life_pay_detail_page.dart @@ -40,7 +40,7 @@ class _LifePayDetailPageState extends State { element.detailedVoList.forEach((element) { element.detailsVoList.forEach((element) { count++; - price += (element.paymentPrice+element.overdueFine); + price += (element.paymentPrice + element.overdueFine); ids.add(element.id); }); }); @@ -74,7 +74,7 @@ class _LifePayDetailPageState extends State { ? '${widget.year}上半年'.text.black.size(28.sp).make() : '${widget.year}下半年'.text.black.size(28.sp).make(), Spacer(), - '¥${(model.paymentPrice+model.overdueFine).toStringAsFixed(2)}' + '¥${(model.paymentPrice + model.overdueFine).toStringAsFixed(2)}' .text .color(kDangerColor) .size(28.sp) @@ -119,7 +119,7 @@ class _LifePayDetailPageState extends State { 12.w.widthBox, model.month.toString().text.size(26.sp).black.make(), Spacer(), - '¥${(model.paymentPrice+model.overdueFine).toStringAsFixed(2)}' + '¥${(model.paymentPrice + model.overdueFine).toStringAsFixed(2)}' .text .size(26.sp) .black diff --git a/lib/pages/things_page/widget/add_fixed_submit_page.dart b/lib/pages/things_page/widget/add_fixed_submit_page.dart index 90d7debc..90579d9c 100644 --- a/lib/pages/things_page/widget/add_fixed_submit_page.dart +++ b/lib/pages/things_page/widget/add_fixed_submit_page.dart @@ -1,7 +1,5 @@ import 'dart:io'; -import 'package:aku_community/widget/buttons/bee_check_button.dart'; -import 'package:aku_community/widget/others/house_head_card.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; @@ -22,7 +20,9 @@ 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/bee_check_button.dart'; import 'package:aku_community/widget/buttons/bottom_button.dart'; +import 'package:aku_community/widget/others/house_head_card.dart'; import 'package:aku_community/widget/picker/grid_image_picker.dart'; class AddFixedSubmitPage extends StatefulWidget { diff --git a/lib/ui/manager/house_keeping/add_house_keeping_page.dart b/lib/ui/manager/house_keeping/add_house_keeping_page.dart index 72a0c9cd..fe6f3056 100644 --- a/lib/ui/manager/house_keeping/add_house_keeping_page.dart +++ b/lib/ui/manager/house_keeping/add_house_keeping_page.dart @@ -1,7 +1,16 @@ import 'dart:io'; +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:power_logger/power_logger.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/extensions/widget_list_ext.dart'; import 'package:aku_community/ui/manager/house_keeping/house_keeping_func.dart'; import 'package:aku_community/ui/manager/house_keeping/house_keeping_submit_page.dart'; import 'package:aku_community/utils/network/net_util.dart'; @@ -11,13 +20,6 @@ import 'package:aku_community/widget/buttons/bottom_button.dart'; import 'package:aku_community/widget/others/house_head_card.dart'; import 'package:aku_community/widget/others/user_tool.dart'; import 'package:aku_community/widget/picker/grid_image_picker.dart'; -import 'package:bot_toast/bot_toast.dart'; -import 'package:flutter/material.dart'; -import 'package:get/get.dart'; -import 'package:power_logger/power_logger.dart'; -import 'package:velocity_x/velocity_x.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:aku_community/extensions/widget_list_ext.dart'; class AddHouseKeepingPage extends StatefulWidget { AddHouseKeepingPage({Key? key}) : super(key: key); diff --git a/lib/ui/manager/house_keeping/evaluate_page.dart b/lib/ui/manager/house_keeping/evaluate_page.dart index adcb4086..7a56fe90 100644 --- a/lib/ui/manager/house_keeping/evaluate_page.dart +++ b/lib/ui/manager/house_keeping/evaluate_page.dart @@ -1,13 +1,15 @@ import 'dart:io'; -import 'package:aku_community/base/base_style.dart'; -import 'package:aku_community/widget/bee_scaffold.dart'; -import 'package:aku_community/widget/picker/grid_image_picker.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import 'package:aku_community/utils/headers.dart'; + import 'package:flutter_rating_bar/flutter_rating_bar.dart'; +import 'package:aku_community/base/base_style.dart'; +import 'package:aku_community/utils/headers.dart'; +import 'package:aku_community/widget/bee_scaffold.dart'; +import 'package:aku_community/widget/picker/grid_image_picker.dart'; + class EvaluatePage extends StatefulWidget { EvaluatePage({Key? key}) : super(key: key); diff --git a/lib/ui/manager/house_keeping/house_keeping_card.dart b/lib/ui/manager/house_keeping/house_keeping_card.dart index 377ce16a..7389d6dd 100644 --- a/lib/ui/manager/house_keeping/house_keeping_card.dart +++ b/lib/ui/manager/house_keeping/house_keeping_card.dart @@ -1,3 +1,11 @@ +import 'package:flutter/material.dart'; + +import 'package:bot_toast/bot_toast.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'; @@ -8,12 +16,6 @@ import 'package:aku_community/ui/manager/house_keeping/house_keeping_func.dart'; import 'package:aku_community/utils/headers.dart'; import 'package:aku_community/widget/buttons/card_bottom_button.dart'; import 'package:aku_community/widget/others/aku_chip_box.dart'; -import 'package:bot_toast/bot_toast.dart'; -import 'package:flustars/flustars.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'; class HouseKeepingCard extends StatelessWidget { final HouseKeepingListModel model; diff --git a/lib/ui/manager/house_keeping/house_keeping_detail_page.dart b/lib/ui/manager/house_keeping/house_keeping_detail_page.dart index 395241ba..2d9fdf86 100644 --- a/lib/ui/manager/house_keeping/house_keeping_detail_page.dart +++ b/lib/ui/manager/house_keeping/house_keeping_detail_page.dart @@ -1,9 +1,7 @@ -import 'package:aku_community/ui/manager/house_keeping/evaluate_page.dart'; -import 'package:aku_community/widget/bee_divider.dart'; -import 'package:aku_community/widget/buttons/bottom_button.dart'; -import 'package:flustars/flustars.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; + +import 'package:flustars/flustars.dart'; import 'package:flutter_rating_bar/flutter_rating_bar.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; @@ -13,8 +11,11 @@ import 'package:aku_community/base/base_style.dart'; import 'package:aku_community/const/resource.dart'; import 'package:aku_community/models/house_keeping/house_keeping_list_model.dart'; import 'package:aku_community/models/house_keeping/house_keeping_process_model.dart'; +import 'package:aku_community/ui/manager/house_keeping/evaluate_page.dart'; import 'package:aku_community/utils/headers.dart'; +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/views/bee_grid_image_view.dart'; class HouseKeepingDetailPage extends StatefulWidget { diff --git a/lib/ui/manager/house_keeping/house_keeping_func.dart b/lib/ui/manager/house_keeping/house_keeping_func.dart index d47814b8..4eb6c02d 100644 --- a/lib/ui/manager/house_keeping/house_keeping_func.dart +++ b/lib/ui/manager/house_keeping/house_keeping_func.dart @@ -1,8 +1,9 @@ +import 'package:bot_toast/bot_toast.dart'; + import 'package:aku_community/constants/api.dart'; import 'package:aku_community/models/house_keeping/house_keeping_process_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'; class HouseKeepingFunc { ///提交新增家政服务 diff --git a/lib/ui/manager/house_keeping/house_keeping_page.dart b/lib/ui/manager/house_keeping/house_keeping_page.dart index 3d16c500..4ea70543 100644 --- a/lib/ui/manager/house_keeping/house_keeping_page.dart +++ b/lib/ui/manager/house_keeping/house_keeping_page.dart @@ -1,12 +1,14 @@ +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/ui/manager/house_keeping/add_house_keeping_page.dart'; import 'package:aku_community/ui/manager/house_keeping/house_keeping_view.dart'; import 'package:aku_community/widget/bee_scaffold.dart'; import 'package:aku_community/widget/buttons/bottom_button.dart'; import 'package:aku_community/widget/tab_bar/bee_tab_bar.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'; class HouseKeepingPage extends StatefulWidget { HouseKeepingPage({Key? key}) : super(key: key); diff --git a/lib/ui/manager/house_keeping/house_keeping_submit_page.dart b/lib/ui/manager/house_keeping/house_keeping_submit_page.dart index 0b5caa8b..7c3a84bc 100644 --- a/lib/ui/manager/house_keeping/house_keeping_submit_page.dart +++ b/lib/ui/manager/house_keeping/house_keeping_submit_page.dart @@ -1,10 +1,12 @@ -import 'package:aku_community/base/base_style.dart'; -import 'package:aku_community/widget/bee_scaffold.dart'; -import 'package:aku_community/widget/others/finish_result_image.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'; +import 'package:aku_community/widget/bee_scaffold.dart'; +import 'package:aku_community/widget/others/finish_result_image.dart'; + class HouseKeepingSubmitPage extends StatefulWidget { HouseKeepingSubmitPage({Key? key}) : super(key: key); @@ -37,4 +39,4 @@ class _HouseKeepingSubmitPageState extends State { ), ); } -} \ No newline at end of file +} diff --git a/lib/ui/manager/house_keeping/house_keeping_view.dart b/lib/ui/manager/house_keeping/house_keeping_view.dart index af89b1e3..67e7f57c 100644 --- a/lib/ui/manager/house_keeping/house_keeping_view.dart +++ b/lib/ui/manager/house_keeping/house_keeping_view.dart @@ -1,12 +1,14 @@ -import 'package:aku_community/constants/api.dart'; -import 'package:aku_community/models/house_keeping/house_keeping_list_model.dart'; -import 'package:aku_community/pages/things_page/widget/bee_list_view.dart'; -import 'package:aku_community/ui/manager/house_keeping/house_keeping_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/house_keeping/house_keeping_list_model.dart'; +import 'package:aku_community/pages/things_page/widget/bee_list_view.dart'; +import 'package:aku_community/ui/manager/house_keeping/house_keeping_card.dart'; + class HouseKeepingView extends StatefulWidget { final int index; HouseKeepingView({Key? key, required this.index}) : super(key: key); diff --git a/lib/ui/profile/house/contract_stop/refund_bond_page.dart b/lib/ui/profile/house/contract_stop/refund_bond_page.dart index aed9db5c..b9523599 100644 --- a/lib/ui/profile/house/contract_stop/refund_bond_page.dart +++ b/lib/ui/profile/house/contract_stop/refund_bond_page.dart @@ -6,12 +6,12 @@ import 'package:get/get.dart'; import 'package:velocity_x/velocity_x.dart'; import 'package:aku_community/base/base_style.dart'; +import 'package:aku_community/extensions/widget_list_ext.dart'; import 'package:aku_community/ui/profile/house/house_func.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_input_row.dart'; import 'package:aku_community/widget/others/house_head_card.dart'; -import 'package:aku_community/extensions/widget_list_ext.dart'; class RefundBondPage extends StatefulWidget { final String name; diff --git a/lib/ui/profile/house/contract_stop/refund_bond_result_page.dart b/lib/ui/profile/house/contract_stop/refund_bond_result_page.dart index df6c0eee..7badf060 100644 --- a/lib/ui/profile/house/contract_stop/refund_bond_result_page.dart +++ b/lib/ui/profile/house/contract_stop/refund_bond_result_page.dart @@ -73,8 +73,7 @@ class _RefundBondResultPageState extends State { date: widget.date, id: widget.id)); }, - child: - '重新申请'.text.color(ktextPrimary).size(36.sp).make(), + child: '重新申请'.text.color(ktextPrimary).size(36.sp).make(), ) : SizedBox(), ], diff --git a/lib/ui/profile/house/contract_stop/upload_empty_list_page.dart b/lib/ui/profile/house/contract_stop/upload_empty_list_page.dart index 6aba3a3b..236f3afa 100644 --- a/lib/ui/profile/house/contract_stop/upload_empty_list_page.dart +++ b/lib/ui/profile/house/contract_stop/upload_empty_list_page.dart @@ -1,6 +1,5 @@ import 'dart:io'; -import 'package:aku_community/widget/views/doc_view.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; @@ -12,6 +11,7 @@ import 'package:open_file/open_file.dart'; import 'package:velocity_x/velocity_x.dart'; import 'package:aku_community/base/base_style.dart'; +import 'package:aku_community/extensions/widget_list_ext.dart'; import 'package:aku_community/ui/profile/house/house_func.dart'; import 'package:aku_community/widget/bee_scaffold.dart'; import 'package:aku_community/widget/buttons/bottom_button.dart'; @@ -20,7 +20,7 @@ import 'package:aku_community/widget/others/house_head_card.dart'; import 'package:aku_community/widget/others/upload_widget.dart'; import 'package:aku_community/widget/others/user_tool.dart'; import 'package:aku_community/widget/picker/bee_date_picker.dart'; -import 'package:aku_community/extensions/widget_list_ext.dart'; +import 'package:aku_community/widget/views/doc_view.dart'; class UploadEmptyListPage extends StatefulWidget { UploadEmptyListPage({Key? key}) : super(key: key); diff --git a/lib/ui/profile/house/house_owners_page.dart b/lib/ui/profile/house/house_owners_page.dart index 15eb1fa1..ac1e6c35 100644 --- a/lib/ui/profile/house/house_owners_page.dart +++ b/lib/ui/profile/house/house_owners_page.dart @@ -1,4 +1,3 @@ -import 'package:aku_community/ui/profile/house/lease_pay_query/lease_pay_query_page.dart'; import 'package:flutter/material.dart'; import 'package:bot_toast/bot_toast.dart'; @@ -21,6 +20,7 @@ import 'package:aku_community/ui/profile/house/contract_stop/submit_finish_page. import 'package:aku_community/ui/profile/house/house_card.dart'; import 'package:aku_community/ui/profile/house/house_func.dart'; import 'package:aku_community/ui/profile/house/identify_selection_page.dart'; +import 'package:aku_community/ui/profile/house/lease_pay_query/lease_pay_query_page.dart'; import 'package:aku_community/ui/profile/house/lease_relevation/tenant_house_list_page.dart'; import 'package:aku_community/ui/profile/house/my_house_list.dart'; import 'package:aku_community/utils/headers.dart'; @@ -208,7 +208,9 @@ class _HouseOwnersPageState extends State { crossAxisSpacing: 32.w, children: [ _cardBuild(R.ASSETS_ICONS_PAY_PNG, '缴费查询', '查看租金及保证金情况', () { - Get.to(() => LeasePayQueryPage(id:UserTool.appProveider.selectedHouse!.sysLeaseId!,)); + Get.to(() => LeasePayQueryPage( + id: UserTool.appProveider.selectedHouse!.sysLeaseId!, + )); }), _cardBuild(R.ASSETS_ICONS_CHANGE_PNG, '合同变更', '变更合同信息、重新签约', () {}), _cardBuild(R.ASSETS_ICONS_CONTRACT_PNG, '合同续签', '到期前线上办理续签手续', () {}), @@ -243,7 +245,7 @@ class _HouseOwnersPageState extends State { Get.to(() => PayResultPage( name: model.name, bond: model.margin.toDouble(), - date: DateUtil.formatDateStr(model.marginPayDate??''), + date: DateUtil.formatDateStr(model.marginPayDate ?? ''), id: model.id, )); break; @@ -254,7 +256,7 @@ class _HouseOwnersPageState extends State { status: model.status, name: model.name, bond: model.margin.toDouble(), - date: DateUtil.formatDateStr(model.marginPayDate??''), + date: DateUtil.formatDateStr(model.marginPayDate ?? ''), id: model.id, )); break; diff --git a/lib/ui/profile/house/lease_pay_query/lease_pay_query_detail_page.dart b/lib/ui/profile/house/lease_pay_query/lease_pay_query_detail_page.dart index ad4257fe..f1052b0b 100644 --- a/lib/ui/profile/house/lease_pay_query/lease_pay_query_detail_page.dart +++ b/lib/ui/profile/house/lease_pay_query/lease_pay_query_detail_page.dart @@ -1,19 +1,21 @@ +import 'package:flutter/material.dart'; + +import 'package:bot_toast/bot_toast.dart'; +import 'package:flustars/flustars.dart'; +import 'package:get/get.dart'; +import 'package:power_logger/power_logger.dart'; + import 'package:aku_community/base/base_style.dart'; import 'package:aku_community/constants/api.dart'; import 'package:aku_community/models/house/lease_fee_list_model.dart'; import 'package:aku_community/pages/life_pay/pay_finish_page.dart'; import 'package:aku_community/pages/life_pay/pay_util.dart'; import 'package:aku_community/ui/profile/house/house_func.dart'; +import 'package:aku_community/utils/headers.dart'; 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/user_tool.dart'; -import 'package:bot_toast/bot_toast.dart'; -import 'package:flustars/flustars.dart'; -import 'package:flutter/material.dart'; -import 'package:aku_community/utils/headers.dart'; -import 'package:get/get.dart'; -import 'package:power_logger/power_logger.dart'; class LeasePayQueryDetailPage extends StatefulWidget { final LeaseFeeListModel model; diff --git a/lib/ui/profile/house/lease_pay_query/lease_pay_query_page.dart b/lib/ui/profile/house/lease_pay_query/lease_pay_query_page.dart index bdc80e56..b3591b3f 100644 --- a/lib/ui/profile/house/lease_pay_query/lease_pay_query_page.dart +++ b/lib/ui/profile/house/lease_pay_query/lease_pay_query_page.dart @@ -1,3 +1,12 @@ +import 'package:flutter/cupertino.dart'; +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/house/lease_fee_list_model.dart'; @@ -8,13 +17,6 @@ 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/others/user_tool.dart'; -import 'package:flustars/flustars.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:get/get.dart'; -import 'package:velocity_x/velocity_x.dart'; class LeasePayQueryPage extends StatefulWidget { final int id; diff --git a/lib/ui/profile/house/lease_relevation/contract_pay_page.dart b/lib/ui/profile/house/lease_relevation/contract_pay_page.dart index 433aff6c..003afbb5 100644 --- a/lib/ui/profile/house/lease_relevation/contract_pay_page.dart +++ b/lib/ui/profile/house/lease_relevation/contract_pay_page.dart @@ -1,7 +1,7 @@ -import 'package:bot_toast/bot_toast.dart'; 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:power_logger/power_logger.dart'; diff --git a/lib/widget/bottom_sheets/pay_mothod_bottom_sheet.dart b/lib/widget/bottom_sheets/pay_mothod_bottom_sheet.dart index 127392b8..7f3320fb 100644 --- a/lib/widget/bottom_sheets/pay_mothod_bottom_sheet.dart +++ b/lib/widget/bottom_sheets/pay_mothod_bottom_sheet.dart @@ -18,7 +18,7 @@ class PayMethodBottomSheet extends StatelessWidget { '支付方式'.text.size(32.sp).bold.color(ktextPrimary).isIntrinsic.make(), actions: [ CupertinoActionSheetAction( - onPressed:()=> onChoose('支付宝'), + onPressed: () => onChoose('支付宝'), child: '支付宝'.text.size(32.sp).color(ktextPrimary).isIntrinsic.make()) ], diff --git a/lib/widget/buttons/bee_check_button.dart b/lib/widget/buttons/bee_check_button.dart index d38bfef1..47be659e 100644 --- a/lib/widget/buttons/bee_check_button.dart +++ b/lib/widget/buttons/bee_check_button.dart @@ -9,7 +9,11 @@ class BeeCheckButton extends StatefulWidget { final T groupValue; final String title; BeeCheckButton( - {Key? key, required this.onChange, required this.value, required this.groupValue, required this.title}) + {Key? key, + required this.onChange, + required this.value, + required this.groupValue, + required this.title}) : super(key: key); @override diff --git a/lib/widget/others/aku_chip_box.dart b/lib/widget/others/aku_chip_box.dart index d62dee7d..e6f869d1 100644 --- a/lib/widget/others/aku_chip_box.dart +++ b/lib/widget/others/aku_chip_box.dart @@ -1,4 +1,5 @@ import 'package:flutter/material.dart'; + import 'package:flutter_screenutil/flutter_screenutil.dart'; class AkuChipBox extends StatelessWidget { diff --git a/lib/widget/picker/bee_house_picker.dart b/lib/widget/picker/bee_house_picker.dart index 910a7f66..732cb90a 100644 --- a/lib/widget/picker/bee_house_picker.dart +++ b/lib/widget/picker/bee_house_picker.dart @@ -8,6 +8,7 @@ import 'package:velocity_x/velocity_x.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/headers.dart'; + @Deprecated('use HouseHeadCard instead') class BeeHousePicker extends StatelessWidget { const BeeHousePicker({Key? key}) : super(key: key);