From cf107a46d0d0fbafbe13f2c9120237cae2bc703f Mon Sep 17 00:00:00 2001 From: zhangmeng <494089941@qq.com> Date: Thu, 8 Jul 2021 11:55:37 +0800 Subject: [PATCH] format/sort codes --- lib/generated_plugin_registrant.dart | 3 +- lib/models/life_pay/life_pay_list_model.dart | 1 + lib/models/user/passed_house_list_model.dart | 3 +- lib/pages/life_pay/life_pay_page.dart | 102 +-------- lib/pages/life_pay/life_pay_record_page.dart | 2 +- lib/pages/life_pay/shar_life_pay_model.dart | 21 -- .../life_pay/widget/life_pay_detail_page.dart | 212 ++++-------------- lib/painters/contact_manager_painter.dart | 4 +- .../contract_stop/contract_stop_page.dart | 13 +- .../house/contract_stop/pay_result_page.dart | 10 +- .../contract_stop/pay_surplus_rent_page.dart | 20 +- .../house/contract_stop/refund_bond_page.dart | 12 +- .../refund_bond_result_page.dart | 10 +- .../contract_stop/submit_finish_page.dart | 12 +- .../contract_stop/upload_empty_list_page.dart | 14 +- lib/ui/profile/house/house_owners_page.dart | 14 +- .../house/identify_selection_page.dart | 2 +- .../lease_relevation/contract_pay_page.dart | 2 +- .../contract_preview_page.dart | 2 +- .../house_information_check_page.dart | 2 +- .../identify_selection_page.dart | 2 +- .../supplement_information_page.dart | 2 +- .../lease_relevation/user_identify_page.dart | 2 +- .../pay_mothod_bottom_sheet.dart | 4 +- .../bottom_sheets/sex_bottom_sheet.dart | 6 +- 25 files changed, 130 insertions(+), 347 deletions(-) delete mode 100644 lib/pages/life_pay/shar_life_pay_model.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/life_pay/life_pay_list_model.dart b/lib/models/life_pay/life_pay_list_model.dart index 7945b697..c783df19 100644 --- a/lib/models/life_pay/life_pay_list_model.dart +++ b/lib/models/life_pay/life_pay_list_model.dart @@ -1,5 +1,6 @@ import 'package:equatable/equatable.dart'; import 'package:json_annotation/json_annotation.dart'; + part 'life_pay_list_model.g.dart'; @JsonSerializable(createToJson: true, explicitToJson: true) diff --git a/lib/models/user/passed_house_list_model.dart b/lib/models/user/passed_house_list_model.dart index f0f66d57..2a5e8df4 100644 --- a/lib/models/user/passed_house_list_model.dart +++ b/lib/models/user/passed_house_list_model.dart @@ -1,5 +1,6 @@ -import 'package:equatable/equatable.dart'; import 'package:flutter/material.dart'; + +import 'package:equatable/equatable.dart'; import 'package:json_annotation/json_annotation.dart'; part 'passed_house_list_model.g.dart'; diff --git a/lib/pages/life_pay/life_pay_page.dart b/lib/pages/life_pay/life_pay_page.dart index 9a386995..06adf7cf 100644 --- 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/models/life_pay/life_pay_list_model.dart'; -import 'package:aku_community/utils/network/base_list_model.dart'; -import 'package:aku_community/widget/bee_divider.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; @@ -12,6 +9,7 @@ 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/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/pay_finish_page.dart'; import 'package:aku_community/pages/life_pay/pay_util.dart'; @@ -19,8 +17,10 @@ import 'package:aku_community/pages/life_pay/widget/life_pay_detail_page.dart'; import 'package:aku_community/provider/app_provider.dart'; import 'package:aku_community/utils/bee_parse.dart'; import 'package:aku_community/utils/headers.dart'; +import 'package:aku_community/utils/network/base_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'; 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'; @@ -43,11 +43,7 @@ class SelectPay { class _LifePayPageState extends State { EasyRefreshController? _controller; List _selectYears = []; //选择的年份，存储其数组下标 - List _models = []; - // List _selectPay = []; //辅助计算总费用数组 储存下级页面传递出来的已选费用参数 - // double _totalCost = 0; //总费用 - // // int _count = 0; //费用项数 - // List _ids = []; //存储选中的主键id数组 + List _models = []; //原model,禁止修改 int _page = 0; int _size = 10; @@ -114,17 +110,8 @@ class _LifePayPageState extends State { setState(() { if (_selectYears.contains(index)) { _selectYears.remove(index); - // _totalCost -= (_selectPay[index].payTotal); - // _count -= (_selectPay[index].payCount); - // _selectPay[index].ids.forEach((element) { - // _ids.remove(element); - // }); - } else { _selectYears.add(index); - // _totalCost += (_selectPay[index].payTotal); - // _count += (_selectPay[index].payCount); - // _ids.addAll(_selectPay[index].ids); } }); }, @@ -175,13 +162,7 @@ class _LifePayPageState extends State { children: [ GestureDetector( onTap: () async { - if (_selectYears.contains(index)) { - // _totalCost -= _selectPay[index].payTotal; - // _count -= _selectPay[index].payCount; - // _selectPay[index].ids.forEach((element) { - // _ids.remove(element); - // }); - } + if (_selectYears.contains(index)) {} dynamic payMent = await (Get.to(() => LifePayDetailPage( model: _models[index], @@ -191,13 +172,6 @@ class _LifePayPageState extends State { if (payMent.runtimeType == LifePayListModel) { _selectModels[index] = payMent; } - // _selectPay[index].payCount = payMent[0]; - // _selectPay[index].payTotal = payMent[1]; - // _selectPay[index].ids = payMent[2]; - // if (_selectYears.contains(index)) { - // _totalCost += _selectPay[index].payTotal; - // _count += _selectPay[index].payCount; - // } setState(() {}); }, child: Container( @@ -217,63 +191,6 @@ class _LifePayPageState extends State { ); } - // double getPayTotal(LifePayListModel list) { - // num total = 0; - // if (list.dailyPaymentTypeVos != null) { - // for (var item in list.dailyPaymentTypeVos!) { - // for (var v in item.detailedVoList!) { - // total += v.paymentPrice ?? 0; - // } - // } - // } - // return total as double; - // } - - // List getIds(LifePayListModel list) { - // List _list = []; - // if (list.dailyPaymentTypeVos != null) { - // for (var item in list.dailyPaymentTypeVos!) { - // for (var v in item.detailedVoList!) { - // _list.addAll(_findIds(v.detailsVoList ?? [])); - // } - // } - // } - // return _list; - // } - - // List _findIds(List list) { - // List _list = []; - // list.forEach((element) { - // _list.add(element.id!); - // }); - // return _list; - // } - - // _allSelectOption() { - // //若已全选则清空已选年份数组 - // if (_models.length == _selectYears.length) { - // _selectYears.clear(); - // _ids.clear(); - // _totalCost = 0; - // _count = 0; - // } else { - // for (var i = 0; i < _models.length; i++) { - // if (!_selectYears.contains(i)) { - // _selectYears.add(i); - // } - // } - // _totalCost = 0; - // _count = 0; - // _ids.clear(); - // for (var item in _selectPay) { - // _totalCost += item.payTotal; - // _count += item.payCount; - // _ids.addAll(item.ids); - // } - // } - // setState(() {}); - // } - Widget _payButton() { return MaterialButton( elevation: 0, @@ -342,14 +259,6 @@ class _LifePayPageState extends State { for (var i = 0; i < _selectModels.length; i++) { _selectYears.add(i); } - // _totalCost = 0; - // _count = 0; - // _selectPay.addAll(_models - // .map((e) => SelectPay( - // payCount: e.dailyPaymentTypeVos!.length, - // payTotal: getPayTotal(e), - // ids: getIds(e))) - // .toList()); if (mounted) setState(() {}); }, child: Column( @@ -386,7 +295,6 @@ class _LifePayPageState extends State { children: [ GestureDetector( onTap: () { - // _allSelectOption(); if (allSelect) { _selectYears.clear(); setState(() {}); diff --git a/lib/pages/life_pay/life_pay_record_page.dart b/lib/pages/life_pay/life_pay_record_page.dart index 22e401fe..8ec2abcd 100644 --- a/lib/pages/life_pay/life_pay_record_page.dart +++ b/lib/pages/life_pay/life_pay_record_page.dart @@ -7,11 +7,11 @@ 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/model/manager/life_pay_record_model.dart'; import 'package:aku_community/pages/things_page/widget/bee_list_view.dart'; import 'package:aku_community/utils/headers.dart'; import 'package:aku_community/widget/bee_scaffold.dart'; -import 'package:aku_community/extensions/widget_list_ext.dart'; class LifePayRecordPage extends StatefulWidget { LifePayRecordPage({Key? key}) : super(key: key); diff --git a/lib/pages/life_pay/shar_life_pay_model.dart b/lib/pages/life_pay/shar_life_pay_model.dart deleted file mode 100644 index fbe1f2fe..00000000 --- a/lib/pages/life_pay/shar_life_pay_model.dart +++ /dev/null @@ -1,21 +0,0 @@ - -import 'package:aku_community/models/life_pay/life_pay_list_model.dart'; -import 'package:flutter/material.dart'; - -class SharLifPayModel extends InheritedWidget { - SharLifPayModel({Key? key, required this.child, required this.models}) - : super(key: key, child: child); - - final Widget child; - List models; - - static SharLifPayModel? of(BuildContext context) { - return context.dependOnInheritedWidgetOfExactType(); - } - - @override - bool updateShouldNotify(SharLifPayModel oldWidget) { - return oldWidget.models != models; - } - -} 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 edc434b3..c6d8e1f7 100644 --- a/lib/pages/life_pay/widget/life_pay_detail_page.dart +++ b/lib/pages/life_pay/widget/life_pay_detail_page.dart @@ -1,13 +1,13 @@ -import 'package:aku_community/models/life_pay/life_pay_list_model.dart'; -import 'package:aku_community/pages/life_pay/life_pay_page.dart'; -import 'package:expandable/expandable.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; +import 'package:expandable/expandable.dart'; import 'package:get/get.dart'; import 'package:provider/provider.dart'; import 'package:aku_community/base/base_style.dart'; +import 'package:aku_community/models/life_pay/life_pay_list_model.dart'; +import 'package:aku_community/pages/life_pay/life_pay_page.dart'; import 'package:aku_community/provider/app_provider.dart'; import 'package:aku_community/utils/bee_parse.dart'; import 'package:aku_community/utils/headers.dart'; @@ -30,24 +30,7 @@ class LifePayDetailPage extends StatefulWidget { } class _LifePayDetailPageState extends State { - // List _selectItems = []; - // List _ids = []; - // double _payTotal = 0; - // int _payNum = 0; - // int get listLength { - // int count = 0; - // widget.model.dailyPaymentTypeVos!.forEach((element) { - // element.detailedVoList!.forEach((element) { - // count++; - // }); - // }); - // return count; - // } - - // bool get isAllSelect { - // return listLength == _selectItems.length; - // } - late LifePayListModel _selectModel; + late LifePayListModel _selectModel; //已选择的model late LifePayListModel _model; SelectPay get total { int count = 0; @@ -72,81 +55,10 @@ class _LifePayDetailPageState extends State { @override void initState() { super.initState(); - // for (var i = 0; i < widget.model!.dailyPaymentTypeVos!.length; i++) { - // for (var j = 0; - // j < widget.model!.dailyPaymentTypeVos![i].detailedVoList!.length; - // j++) { - // String id = widget.model!.dailyPaymentTypeVos![i].id.toString() + - // widget.model!.dailyPaymentTypeVos![i].detailedVoList![j].groupId - // .toString(); - // if (!_selectItems.contains(id)) { - // _selectItems.add(id); - // _ids.addAll(_findIds(widget.model!.dailyPaymentTypeVos![i] - // .detailedVoList![j].detailsVoList ?? - // [])); - // _payNum += 1; - // _payTotal += widget - // .model!.dailyPaymentTypeVos![i].detailedVoList![j].paymentPrice! - // .toDouble(); - // } - // } - // } _selectModel = widget.selectModel; _model = widget.model; } - // List _findIds(List list) { - // List _list = []; - // list.forEach((element) { - // _list.add(element.id!); - // }); - // return _list; - // } - - // Widget _buildTile( - // // int? groupId, int? id, int? years, double? price, List list - // DetailedVoList model,int index,int id, - // ) { - // return GestureDetector( - // onTap: () { - // // String item = id.toString() + model.groupId.toString(); - // // if (_selectItems.contains(item)) { - // // _selectItems.remove(item); - // // _payNum -= 1; - // // _payTotal -= price!.toDouble(); - // // list.forEach((element) { - // // _ids.remove(element); - // // }); - // // } else { - // // _selectItems.add(item); - // // _ids.addAll(list); - // // _payNum += 1; - // // _payTotal += price!.toDouble(); - // // } - // setState(() {}); - // }, - // child: Row( - // children: [ - // BeeCheckRadio( - // value: id.toString() + groupId.toString(), - // groupValue: _selectItems), - // 24.w.widthBox, - // groupId == 1 - // ? '$years上半年'.text.black.size(28.sp).make() - // : '$years下半年'.text.black.size(28.sp).make(), - // Spacer(), - // '¥${price.toString()}' - // .text - // .color(kDangerColor) - // .size(28.sp) - // .bold - // .make(), - // 24.w.widthBox, - // ], - // ).material(color: Colors.transparent), - // ); - // } - Widget _expandedTile(DetailedVoList model, int index1, int index2) { return ExpandablePanel( theme: ExpandableThemeData.combine( @@ -157,7 +69,6 @@ class _LifePayDetailPageState extends State { crossAxisAlignment: CrossAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center, children: [ - 12.w.widthBox, model.groupId == 1 ? '${widget.year}上半年'.text.black.size(28.sp).make() @@ -176,9 +87,7 @@ class _LifePayDetailPageState extends State { expanded: Column( children: model.detailsVoList .map((e) => _expandedChild(e, index1, index2)) - .toList() - // .sepWidget(separate: 12.w.heightBox), - ), + .toList()), ); } @@ -260,78 +169,45 @@ class _LifePayDetailPageState extends State { @override Widget build(BuildContext context) { var animatedContainer = AnimatedContainer( - duration: Duration(milliseconds: 300), - decoration: BoxDecoration( - border: Border.all( - width: 1.w, - color: isAllSelect ? kPrimaryColor : kDarkSubColor), - color: isAllSelect ? kPrimaryColor : Colors.transparent, - borderRadius: BorderRadius.circular(20.w)), - curve: Curves.easeInOutCubic, - width: 40.w, - height: 40.w, - child: isAllSelect - ? Icon( - CupertinoIcons.check_mark, - size: 25.w, - color: Colors.white, - ) - : SizedBox(), - ); - return BeeScaffold( - title: - '${BeeParse.getCustomYears(widget.model.years)}-${widget.model.years}年明细', - body: ListView( - padding: EdgeInsets.only(top: 16.w), - children: List.generate(_model.dailyPaymentTypeVos.length, - (index) => _buildCard(_model.dailyPaymentTypeVos[index], index))), - bottomNavi: Container( - padding: EdgeInsets.fromLTRB( - 32.w, 16.w, 32.w, 12.w + MediaQuery.of(context).padding.bottom), - child: Row( - children: [ - GestureDetector( - onTap: () { - if (isAllSelect) { - // _selectItems.clear(); - // _ids.clear(); - // _payNum = 0; - // _payTotal = 0; - clearModel(_selectModel); - } else { - // for (var i = 0; - // i < widget.model.dailyPaymentTypeVos!.length; - // i++) { - // for (var j = 0; - // j < - // widget.model.dailyPaymentTypeVos![i] - // .detailedVoList!.length; - // j++) { - // String id = - // widget.model.dailyPaymentTypeVos![i].id.toString() + - // widget.model.dailyPaymentTypeVos![i] - // .detailedVoList![j].groupId - // .toString(); - // if (!_selectItems.contains(id)) { - // _selectItems.add(id); - // _ids.addAll(_findIds(widget - // .model! - // .dailyPaymentTypeVos![i] - // .detailedVoList![j] - // .detailsVoList ?? - // [])); - // _payNum += 1; - // _payTotal += widget.model!.dailyPaymentTypeVos![i] - // .detailedVoList![j].paymentPrice! - // .toDouble(); - // } - // } - // } - _selectModel = LifePayListModel.fromJson(_model.toJson()); - } - setState(() {}); - }, - child: animatedContainer, + duration: Duration(milliseconds: 300), + decoration: BoxDecoration( + border: Border.all( + width: 1.w, color: isAllSelect ? kPrimaryColor : kDarkSubColor), + color: isAllSelect ? kPrimaryColor : Colors.transparent, + borderRadius: BorderRadius.circular(20.w)), + curve: Curves.easeInOutCubic, + width: 40.w, + height: 40.w, + child: isAllSelect + ? Icon( + CupertinoIcons.check_mark, + size: 25.w, + color: Colors.white, + ) + : SizedBox(), + ); + return BeeScaffold( + title: + '${BeeParse.getCustomYears(widget.model.years)}-${widget.model.years}年明细', + body: ListView( + padding: EdgeInsets.only(top: 16.w), + children: List.generate(_model.dailyPaymentTypeVos.length, + (index) => _buildCard(_model.dailyPaymentTypeVos[index], index))), + bottomNavi: Container( + padding: EdgeInsets.fromLTRB( + 32.w, 16.w, 32.w, 12.w + MediaQuery.of(context).padding.bottom), + child: Row( + children: [ + GestureDetector( + onTap: () { + if (isAllSelect) { + clearModel(_selectModel); + } else { + _selectModel = LifePayListModel.fromJson(_model.toJson()); + } + setState(() {}); + }, + child: animatedContainer, ), Spacer(), Column( diff --git a/lib/painters/contact_manager_painter.dart b/lib/painters/contact_manager_painter.dart index 4ee99a83..6f4187f1 100644 --- a/lib/painters/contact_manager_painter.dart +++ b/lib/painters/contact_manager_painter.dart @@ -19,8 +19,8 @@ class ContactManagerPainter extends CustomPainter { colors: [Color(0xFFF9F9F9), Color(0xFF4AFD71)]); paint.shader = gradient.createShader(rect); canvas.drawPath(path, paint); - rect= Rect.fromCircle(center: Offset(200.w, 200.w), radius: 150.w); - gradient = LinearGradient( + rect = Rect.fromCircle(center: Offset(200.w, 200.w), radius: 150.w); + gradient = LinearGradient( begin: Alignment.centerLeft, end: Alignment.centerRight, colors: [Color(0xFFF9F9F9), Color(0xFF4AFD71)]); diff --git a/lib/ui/profile/house/contract_stop/contract_stop_page.dart b/lib/ui/profile/house/contract_stop/contract_stop_page.dart index a8d3b9ac..ba250f49 100644 --- a/lib/ui/profile/house/contract_stop/contract_stop_page.dart +++ b/lib/ui/profile/house/contract_stop/contract_stop_page.dart @@ -1,14 +1,17 @@ +import 'package:flutter/material.dart'; + +import 'package:get/get.dart'; + import 'package:aku_community/base/base_style.dart'; import 'package:aku_community/ui/profile/house/contract_stop/upload_empty_list_page.dart'; import 'package:aku_community/utils/headers.dart'; -import 'package:aku_community/widget/buttons/bottom_button.dart'; -import 'package:flutter/material.dart'; - import 'package:aku_community/widget/bee_scaffold.dart'; -import 'package:get/get.dart'; +import 'package:aku_community/widget/buttons/bottom_button.dart'; class ContractStopPage extends StatefulWidget { - ContractStopPage({Key? key,}) : super(key: key); + ContractStopPage({ + Key? key, + }) : super(key: key); @override _ContractStopPageState createState() => _ContractStopPageState(); diff --git a/lib/ui/profile/house/contract_stop/pay_result_page.dart b/lib/ui/profile/house/contract_stop/pay_result_page.dart index da935c6c..eff1c37d 100644 --- a/lib/ui/profile/house/contract_stop/pay_result_page.dart +++ b/lib/ui/profile/house/contract_stop/pay_result_page.dart @@ -1,12 +1,14 @@ -import 'package:aku_community/base/base_style.dart'; -import 'package:aku_community/ui/profile/house/contract_stop/refund_bond_page.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:get/get.dart'; import 'package:velocity_x/velocity_x.dart'; +import 'package:aku_community/base/base_style.dart'; +import 'package:aku_community/ui/profile/house/contract_stop/refund_bond_page.dart'; +import 'package:aku_community/widget/bee_scaffold.dart'; +import 'package:aku_community/widget/others/finish_result_image.dart'; + class PayResultPage extends StatefulWidget { final String name; final double bond; diff --git a/lib/ui/profile/house/contract_stop/pay_surplus_rent_page.dart b/lib/ui/profile/house/contract_stop/pay_surplus_rent_page.dart index 17fb9714..677eddb9 100644 --- a/lib/ui/profile/house/contract_stop/pay_surplus_rent_page.dart +++ b/lib/ui/profile/house/contract_stop/pay_surplus_rent_page.dart @@ -1,21 +1,23 @@ +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: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/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/widget/bottom_sheets/pay_mothod_bottom_sheet.dart'; import 'package:aku_community/widget/bee_scaffold.dart'; +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/bee_input_row.dart'; import 'package:aku_community/widget/others/house_head_card.dart'; -import 'package:bot_toast/bot_toast.dart'; -import 'package:flustars/flustars.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 PaySuerplusRentPage extends StatefulWidget { ///不再计租时间 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 518bc1c8..a122a83f 100644 --- a/lib/ui/profile/house/contract_stop/refund_bond_page.dart +++ b/lib/ui/profile/house/contract_stop/refund_bond_page.dart @@ -1,14 +1,16 @@ +import 'package:flutter/material.dart'; + +import 'package:bot_toast/bot_toast.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:get/get.dart'; +import 'package:velocity_x/velocity_x.dart'; + import 'package:aku_community/base/base_style.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:bot_toast/bot_toast.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 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 eab951fc..e0e53413 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 @@ -1,12 +1,14 @@ -import 'package:aku_community/base/base_style.dart'; -import 'package:aku_community/ui/profile/house/contract_stop/refund_bond_page.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:get/get.dart'; import 'package:velocity_x/velocity_x.dart'; +import 'package:aku_community/base/base_style.dart'; +import 'package:aku_community/ui/profile/house/contract_stop/refund_bond_page.dart'; +import 'package:aku_community/widget/bee_scaffold.dart'; +import 'package:aku_community/widget/others/finish_result_image.dart'; + class RefundBondResultPage extends StatefulWidget { final int status; final String name; diff --git a/lib/ui/profile/house/contract_stop/submit_finish_page.dart b/lib/ui/profile/house/contract_stop/submit_finish_page.dart index 8512c998..b17cd603 100644 --- a/lib/ui/profile/house/contract_stop/submit_finish_page.dart +++ b/lib/ui/profile/house/contract_stop/submit_finish_page.dart @@ -1,14 +1,16 @@ +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/models/house/lease_detail_model.dart'; import 'package:aku_community/ui/profile/house/contract_stop/contract_stop_page.dart'; -import 'package:aku_community/ui/profile/house/house_func.dart'; import 'package:aku_community/ui/profile/house/contract_stop/pay_surplus_rent_page.dart'; +import 'package:aku_community/ui/profile/house/house_func.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:get/get.dart'; -import 'package:velocity_x/velocity_x.dart'; class SubmitFinishPage extends StatefulWidget { final int status; 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 11fd7df0..3ddd4d4b 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,5 +1,13 @@ import 'dart:io'; +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/ui/profile/house/house_func.dart'; import 'package:aku_community/widget/bee_scaffold.dart'; @@ -9,12 +17,6 @@ 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: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 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 1c4b6c03..f6296eaa 100644 --- a/lib/ui/profile/house/house_owners_page.dart +++ b/lib/ui/profile/house/house_owners_page.dart @@ -1,12 +1,7 @@ -import 'package:aku_community/models/house/lease_detail_model.dart'; -import 'package:aku_community/ui/profile/house/contract_stop/contract_stop_page.dart'; -import 'package:aku_community/ui/profile/house/contract_stop/pay_result_page.dart'; -import 'package:aku_community/ui/profile/house/contract_stop/refund_bond_result_page.dart'; -import 'package:aku_community/ui/profile/house/contract_stop/submit_finish_page.dart'; -import 'package:flustars/flustars.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:get/get.dart'; @@ -15,13 +10,18 @@ import 'package:provider/provider.dart'; import 'package:aku_community/base/base_style.dart'; import 'package:aku_community/const/resource.dart'; +import 'package:aku_community/models/house/lease_detail_model.dart'; import 'package:aku_community/provider/app_provider.dart'; import 'package:aku_community/ui/profile/house/add_house_page.dart'; +import 'package:aku_community/ui/profile/house/contract_stop/contract_stop_page.dart'; +import 'package:aku_community/ui/profile/house/contract_stop/pay_result_page.dart'; +import 'package:aku_community/ui/profile/house/contract_stop/refund_bond_result_page.dart'; +import 'package:aku_community/ui/profile/house/contract_stop/submit_finish_page.dart'; 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/my_house_list.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'; import 'package:aku_community/widget/bee_scaffold.dart'; import 'package:aku_community/widget/buttons/bottom_button.dart'; diff --git a/lib/ui/profile/house/identify_selection_page.dart b/lib/ui/profile/house/identify_selection_page.dart index 5770d918..5d1b7f60 100644 --- a/lib/ui/profile/house/identify_selection_page.dart +++ b/lib/ui/profile/house/identify_selection_page.dart @@ -7,8 +7,8 @@ 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/ui/profile/house/my_house_list.dart'; import 'package:aku_community/ui/profile/house/lease_relevation/user_identify_page.dart'; +import 'package:aku_community/ui/profile/house/my_house_list.dart'; import 'package:aku_community/widget/bee_scaffold.dart'; class IdentifySelectionPage extends StatelessWidget { 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 3f1120de..fbcd6b0a 100644 --- a/lib/ui/profile/house/lease_relevation/contract_pay_page.dart +++ b/lib/ui/profile/house/lease_relevation/contract_pay_page.dart @@ -1,4 +1,3 @@ -import 'package:aku_community/widget/bottom_sheets/pay_mothod_bottom_sheet.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; @@ -14,6 +13,7 @@ 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/widget/bee_scaffold.dart'; +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/bee_input_row.dart'; diff --git a/lib/ui/profile/house/lease_relevation/contract_preview_page.dart b/lib/ui/profile/house/lease_relevation/contract_preview_page.dart index 6a217074..7a8f42f2 100644 --- a/lib/ui/profile/house/lease_relevation/contract_preview_page.dart +++ b/lib/ui/profile/house/lease_relevation/contract_preview_page.dart @@ -12,8 +12,8 @@ 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/ui/profile/house/lease_relevation/download_contract_page.dart'; import 'package:aku_community/ui/profile/house/house_func.dart'; +import 'package:aku_community/ui/profile/house/lease_relevation/download_contract_page.dart'; import 'package:aku_community/widget/bee_scaffold.dart'; import 'package:aku_community/widget/buttons/bottom_button.dart'; import 'package:aku_community/widget/others/sign_name_board.dart'; diff --git a/lib/ui/profile/house/lease_relevation/house_information_check_page.dart b/lib/ui/profile/house/lease_relevation/house_information_check_page.dart index 488567eb..ee9a22d1 100644 --- a/lib/ui/profile/house/lease_relevation/house_information_check_page.dart +++ b/lib/ui/profile/house/lease_relevation/house_information_check_page.dart @@ -10,8 +10,8 @@ import 'package:aku_community/base/base_style.dart'; import 'package:aku_community/const/resource.dart'; import 'package:aku_community/models/house/lease_detail_model.dart'; import 'package:aku_community/models/house/submit_model.dart'; -import 'package:aku_community/ui/profile/house/lease_relevation/contract_preview_page.dart'; import 'package:aku_community/ui/profile/house/house_func.dart'; +import 'package:aku_community/ui/profile/house/lease_relevation/contract_preview_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'; diff --git a/lib/ui/profile/house/lease_relevation/identify_selection_page.dart b/lib/ui/profile/house/lease_relevation/identify_selection_page.dart index 5770d918..5d1b7f60 100644 --- a/lib/ui/profile/house/lease_relevation/identify_selection_page.dart +++ b/lib/ui/profile/house/lease_relevation/identify_selection_page.dart @@ -7,8 +7,8 @@ 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/ui/profile/house/my_house_list.dart'; import 'package:aku_community/ui/profile/house/lease_relevation/user_identify_page.dart'; +import 'package:aku_community/ui/profile/house/my_house_list.dart'; import 'package:aku_community/widget/bee_scaffold.dart'; class IdentifySelectionPage extends StatelessWidget { diff --git a/lib/ui/profile/house/lease_relevation/supplement_information_page.dart b/lib/ui/profile/house/lease_relevation/supplement_information_page.dart index 8f077ed7..c1d13c1e 100644 --- a/lib/ui/profile/house/lease_relevation/supplement_information_page.dart +++ b/lib/ui/profile/house/lease_relevation/supplement_information_page.dart @@ -1,6 +1,5 @@ import 'dart:io'; -import 'package:aku_community/widget/bottom_sheets/sex_bottom_sheet.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; @@ -16,6 +15,7 @@ import 'package:aku_community/models/house/submit_model.dart'; import 'package:aku_community/ui/profile/house/house_func.dart'; import 'package:aku_community/ui/profile/house/lease_relevation/house_information_check_page.dart'; import 'package:aku_community/widget/bee_scaffold.dart'; +import 'package:aku_community/widget/bottom_sheets/sex_bottom_sheet.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/user_tool.dart'; diff --git a/lib/ui/profile/house/lease_relevation/user_identify_page.dart b/lib/ui/profile/house/lease_relevation/user_identify_page.dart index d75bbb77..f0985280 100644 --- a/lib/ui/profile/house/lease_relevation/user_identify_page.dart +++ b/lib/ui/profile/house/lease_relevation/user_identify_page.dart @@ -1,4 +1,3 @@ -import 'package:aku_community/widget/bottom_sheets/sex_bottom_sheet.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; @@ -14,6 +13,7 @@ import 'package:aku_community/models/house/lease_echo_model.dart'; import 'package:aku_community/ui/profile/house/house_func.dart'; import 'package:aku_community/ui/profile/house/lease_relevation/tenant_house_list_page.dart'; import 'package:aku_community/widget/bee_scaffold.dart'; +import 'package:aku_community/widget/bottom_sheets/sex_bottom_sheet.dart'; import 'package:aku_community/widget/buttons/bottom_button.dart'; import 'package:aku_community/widget/others/bee_input_row.dart'; diff --git a/lib/widget/bottom_sheets/pay_mothod_bottom_sheet.dart b/lib/widget/bottom_sheets/pay_mothod_bottom_sheet.dart index 6e1fce33..f4474c4f 100644 --- a/lib/widget/bottom_sheets/pay_mothod_bottom_sheet.dart +++ b/lib/widget/bottom_sheets/pay_mothod_bottom_sheet.dart @@ -1,9 +1,11 @@ -import 'package:aku_community/base/base_style.dart'; import 'package:flutter/cupertino.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 PayMethodBottomSheet extends StatelessWidget { final Function(String value) onChoose; const PayMethodBottomSheet({Key? key, required this.onChoose}) diff --git a/lib/widget/bottom_sheets/sex_bottom_sheet.dart b/lib/widget/bottom_sheets/sex_bottom_sheet.dart index f375867d..b465af2d 100644 --- a/lib/widget/bottom_sheets/sex_bottom_sheet.dart +++ b/lib/widget/bottom_sheets/sex_bottom_sheet.dart @@ -1,10 +1,12 @@ -import 'package:aku_community/base/base_style.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import 'package:get/get.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'; + class SexBottomSheet extends StatelessWidget { final Function(String value) onChoose; const SexBottomSheet({Key? key, required this.onChoose}) : super(key: key);