From 0c2168601a4b6cd384c5f2d5dc6af032ec9dda0f Mon Sep 17 00:00:00 2001 From: zhang <494089941@qq.com> Date: Tue, 9 Feb 2021 15:41:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E9=83=A8=E5=88=86=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/base/base_style.dart | 11 ++- lib/extensions/widget_list_ext.dart | 4 +- lib/model/manager/event_voting_model.dart | 3 +- lib/model/manager/questinnaire_model.dart | 6 +- .../manager/questionnaire_detail_model.dart | 9 +- lib/model/user/user_info_model.dart | 2 +- .../widget/address_edit_item.dart | 16 ++-- .../confirm_order_page/pay_order_page.dart | 1 - .../event_activity/event_voting_page.dart | 6 +- .../fitup_manage/widget/common_select.dart | 92 +++++++++---------- .../fitup_manage/widget/decorator_info.dart | 6 +- .../fitup_manage/widget/director_manage.dart | 1 - lib/pages/fitup_manage/widget/house_info.dart | 82 ++++++++--------- .../fitup_manage/widget/owner_manage.dart | 3 +- .../fitup_manage/widget/pay_model_sheet.dart | 8 +- .../deto_create_page/deto_create_page.dart | 2 +- .../deto_create_page/widget/common_radio.dart | 2 +- .../widget/goods_info_card.dart | 3 +- .../widget/goods_info_card_button.dart | 8 +- .../goods_manage_page/goods_manage_page.dart | 1 - lib/pages/invoice/invoice_page.dart | 3 +- lib/pages/invoice/widget/invoice_input.dart | 3 +- .../life_pay_bill_page/widget/bill_card.dart | 4 +- .../widget/details_card.dart | 82 ++++++++--------- .../life_pay/widget/life_pay_detail_page.dart | 42 +++++---- lib/pages/life_pay/widget/order_card.dart | 6 +- lib/pages/life_pay/widget/submit_bar.dart | 5 +- lib/pages/manager_func.dart | 2 +- .../market_cart_page/market_cart_page.dart | 6 +- .../widget/market_cart_bottom_bar.dart | 7 +- .../widget/market_cart_card.dart | 6 +- .../widget/sliver_goods_group_card.dart | 16 ++-- .../market_class/widget/market_class_bar.dart | 5 +- .../car_add_page/car_add_page.dart | 3 +- .../select_parking_page.dart | 5 +- .../house_authenticate_page.dart | 3 +- .../mine_house_page/mine_house_page.dart | 2 +- .../opening_code_page/opening_code_page.dart | 6 +- lib/pages/personal/change_nick_name_page.dart | 6 +- lib/pages/personal/order_page.dart | 5 +- lib/pages/personal/refund_select_page.dart | 2 - .../things_create_page.dart | 10 +- .../widget/goods_info_card.dart | 17 +--- .../widget/goods_info_card_button.dart | 3 +- .../things_page/widget/fixed_check_box.dart | 6 +- .../things_page/widget/fixed_detail_page.dart | 13 +-- .../things_page/widget/things_app_bar.dart | 8 +- lib/provider/cart.dart | 13 +-- lib/service/net.dart | 2 +- .../community_views/event_detail_page.dart | 2 +- .../community/notice/notice_detail_page.dart | 2 +- .../questionnaire/submit_complish_page.dart | 4 +- .../manager/visitor/visitor_record_view.dart | 1 - lib/utils/fade_route.dart | 2 +- lib/utils/toast.dart | 6 +- lib/widget/activity_card.dart | 9 +- lib/widget/bee_divider.dart | 14 +-- lib/widget/cached_image_wrapper.dart | 12 ++- lib/widget/circle_trend.dart | 4 +- lib/widget/common_image_picker.dart | 2 +- lib/widget/common_input.dart | 2 +- lib/widget/community_card.dart | 9 +- lib/widget/custom_action_sheet.dart | 4 +- lib/widget/goods_card_skeleton.dart | 6 +- lib/widget/goods_specs_sheet.dart | 1 - lib/widget/others/bee_header_house.dart | 4 +- lib/widget/picker/bee_custom_picker.dart | 1 - lib/widget/single_image_up.dart | 6 +- 68 files changed, 304 insertions(+), 344 deletions(-) diff --git a/lib/base/base_style.dart b/lib/base/base_style.dart index e735aad7..08b3fa03 100644 --- a/lib/base/base_style.dart +++ b/lib/base/base_style.dart @@ -8,11 +8,12 @@ import 'package:akuCommunity/utils/headers.dart'; const ktextPrimary = Color(0xff333333); const ktextSubColor = Color(0xff666666); const kForeGroundColor = Color(0xFFFFFFFF); -const kPrimaryColor=Color(0xFFFFC40C); -const kDarkPrimaryColor=Color(0xFFFF8200); -const kDangerColor=Color(0xFFFF3B30); -const kEstateName='宁波华悦茂峰'; -const kDarkSubColor=Color(0xFF979797); +const kPrimaryColor = Color(0xFFFFC40C); +const kDarkPrimaryColor = Color(0xFFFF8200); +const kDangerColor = Color(0xFFFF3B30); +const kEstateName = '宁波华悦茂峰'; +const kDarkSubColor = Color(0xFF979797); + class BaseStyle { ///字体类 static final double fontSize18 = 18.sp; diff --git a/lib/extensions/widget_list_ext.dart b/lib/extensions/widget_list_ext.dart index 2d726a1b..38aef0a7 100644 --- a/lib/extensions/widget_list_ext.dart +++ b/lib/extensions/widget_list_ext.dart @@ -29,8 +29,8 @@ extension OddListExt on List { } extension EvenListExt on List { - List evenList() { - List _newList = []; + List evenList() { + List _newList = []; this.forEach((element) { if (this.indexOf(element).isOdd) { _newList.add(element); diff --git a/lib/model/manager/event_voting_model.dart b/lib/model/manager/event_voting_model.dart index 696702f1..1202ab9a 100644 --- a/lib/model/manager/event_voting_model.dart +++ b/lib/model/manager/event_voting_model.dart @@ -40,7 +40,8 @@ class EventVotingModel { json['headImgURls'].forEach((v) { headImgURls.add(new ImgModel.fromJson(v)); }); - }else headImgURls=[]; + } else + headImgURls = []; } Map toJson() { diff --git a/lib/model/manager/questinnaire_model.dart b/lib/model/manager/questinnaire_model.dart index 3aad375d..fb6d4c09 100644 --- a/lib/model/manager/questinnaire_model.dart +++ b/lib/model/manager/questinnaire_model.dart @@ -36,13 +36,15 @@ class QuestionnaireModel { json['imgUrls'].forEach((v) { imgUrls.add(new ImgModel.fromJson(v)); }); - }else imgUrls=[]; + } else + imgUrls = []; if (json['headImgURls'] != null) { headImgURls = new List(); json['headImgURls'].forEach((v) { headImgURls.add(new ImgModel.fromJson(v)); }); - }else headImgURls=[]; + } else + headImgURls = []; } Map toJson() { diff --git a/lib/model/manager/questionnaire_detail_model.dart b/lib/model/manager/questionnaire_detail_model.dart index 0c9c17d2..842270b3 100644 --- a/lib/model/manager/questionnaire_detail_model.dart +++ b/lib/model/manager/questionnaire_detail_model.dart @@ -33,7 +33,8 @@ class QuestionnaireDetialModel { json['voResourcesImgList'].forEach((v) { voResourcesImgList.add(new VoResourcesImgList.fromJson(v)); }); - }else voResourcesImgList=[]; + } else + voResourcesImgList = []; } Map toJson() { @@ -74,7 +75,8 @@ class QuestionnaireTopicVoList { questionnaireChoiceVoList .add(new QuestionnaireChoiceVoList.fromJson(v)); }); - }else questionnaireChoiceVoList=[]; + } else + questionnaireChoiceVoList = []; } Map toJson() { @@ -85,7 +87,8 @@ class QuestionnaireTopicVoList { if (this.questionnaireChoiceVoList != null) { data['questionnaireChoiceVoList'] = this.questionnaireChoiceVoList.map((v) => v.toJson()).toList(); - }else questionnaireChoiceVoList=[]; + } else + questionnaireChoiceVoList = []; return data; } } diff --git a/lib/model/user/user_info_model.dart b/lib/model/user/user_info_model.dart index 6d929c17..3f48f871 100644 --- a/lib/model/user/user_info_model.dart +++ b/lib/model/user/user_info_model.dart @@ -38,7 +38,7 @@ class UserInfoModel { UserInfoModel.fromJson(Map json) { id = json['id']; - if (json['imgUrls'] != null&&(json['imgUrls'] as List).length!=0) + if (json['imgUrls'] != null && (json['imgUrls'] as List).length != 0) imgUrl = (json['imgUrls'] as List).first['url']; name = json['name']; nickName = json['nickName']; diff --git a/lib/pages/address_page/widget/address_edit_item.dart b/lib/pages/address_page/widget/address_edit_item.dart index c42d2b69..c1c9caad 100644 --- a/lib/pages/address_page/widget/address_edit_item.dart +++ b/lib/pages/address_page/widget/address_edit_item.dart @@ -27,8 +27,10 @@ class _AddressEditItemState extends State { super.initState(); _userName = new TextEditingController(text: widget.addressInfo['name']); _userPhone = new TextEditingController(text: widget.addressInfo['phone']); - _userAddress = new TextEditingController(text: widget.addressInfo['address']); - _userAddressDetail = new TextEditingController(text: widget.addressInfo['address']); + _userAddress = + new TextEditingController(text: widget.addressInfo['address']); + _userAddressDetail = + new TextEditingController(text: widget.addressInfo['address']); } @override @@ -70,16 +72,14 @@ class _AddressEditItemState extends State { border: InputBorder.none, //去掉输入框的下滑线 fillColor: Colors.white, filled: true, - hintStyle: TextStyle( - color: Color(0xff999999), fontSize: 28.sp), + hintStyle: + TextStyle(color: Color(0xff999999), fontSize: 28.sp), prefixIcon: Padding( padding: EdgeInsets.only( left: 32.w, - right: - (item['title'] == '收货人' ? 88 : 60).w, + right: (item['title'] == '收货人' ? 88 : 60).w, top: 28.w, - bottom: - (item['title'] == '详细地址' ? 158 : 28).w, + bottom: (item['title'] == '详细地址' ? 158 : 28).w, ), child: Text( item['title'], diff --git a/lib/pages/confirm_order_page/pay_order_page.dart b/lib/pages/confirm_order_page/pay_order_page.dart index 6d3553fb..96e29e28 100644 --- a/lib/pages/confirm_order_page/pay_order_page.dart +++ b/lib/pages/confirm_order_page/pay_order_page.dart @@ -15,7 +15,6 @@ class PayOrderPage extends StatelessWidget { final Bundle bundle; PayOrderPage({Key key, this.bundle}) : super(key: key); - final List> _listPay = [ { 'title': '支付宝支付', diff --git a/lib/pages/event_activity/event_voting_page.dart b/lib/pages/event_activity/event_voting_page.dart index 4ef5730b..14ba04ea 100644 --- a/lib/pages/event_activity/event_voting_page.dart +++ b/lib/pages/event_activity/event_voting_page.dart @@ -45,7 +45,7 @@ class _EventVotingPageState extends State { case 4: return '已填写'; default: - return ''; + return ''; } } @@ -111,7 +111,9 @@ class _EventVotingPageState extends State { // EdgeInsets.symmetric(horizontal: 30.w, vertical: 8.w), elevation: 0, onPressed: () { - VotingDetailPage(id: model.id,).to(); + VotingDetailPage( + id: model.id, + ).to(); }, child: (_getButtonText(model.status)) .text diff --git a/lib/pages/fitup_manage/widget/common_select.dart b/lib/pages/fitup_manage/widget/common_select.dart index cdb7e41b..e839096d 100644 --- a/lib/pages/fitup_manage/widget/common_select.dart +++ b/lib/pages/fitup_manage/widget/common_select.dart @@ -25,54 +25,54 @@ class _CommonSelectState extends State { Widget build(BuildContext context) { return Container( child: InkWell( - onTap: (){ + onTap: () { switch (widget.title) { - case '时间': - DatePicker.showDatePicker(context, - showTitleActions: true, - minTime: DateTime(2020, 1, 1), - maxTime: DateTime(2020, 12, 31), onChanged: (date) { - print('change $date in time zone ' + - date.timeZoneOffset.inHours.toString()); - }, onConfirm: (date) { - pickerData = date.toString().substring(0, 11); + case '时间': + DatePicker.showDatePicker(context, + showTitleActions: true, + minTime: DateTime(2020, 1, 1), + maxTime: DateTime(2020, 12, 31), onChanged: (date) { + print('change $date in time zone ' + + date.timeZoneOffset.inHours.toString()); + }, onConfirm: (date) { + pickerData = date.toString().substring(0, 11); + setState(() {}); + }, currentTime: DateTime.now(), locale: LocaleType.zh); + break; + case '证件类型': + Picker( + adapter: PickerDataAdapter( + pickerdata: [ + ["身份证", "驾驶证", "护照"] + ], + isArray: true, + ), + changeToFirst: true, + hideHeader: false, + title: Text( + "证件类型", + style: TextStyle( + fontSize: 32.sp, + color: Color(0xff333333), + ), + ), + confirmTextStyle: TextStyle( + fontSize: 28.sp, + color: Color(0xffffc40c), + ), + cancelTextStyle: TextStyle( + fontSize: 28.sp, + color: Color(0xff333333), + ), + onConfirm: (Picker picker, List value) { + pickerData = picker.getSelectedValues()[0]; setState(() {}); - }, currentTime: DateTime.now(), locale: LocaleType.zh); - break; - case '证件类型': - Picker( - adapter: PickerDataAdapter( - pickerdata: [ - ["身份证", "驾驶证", "护照"] - ], - isArray: true, - ), - changeToFirst: true, - hideHeader: false, - title: Text( - "证件类型", - style: TextStyle( - fontSize: 32.sp, - color: Color(0xff333333), - ), - ), - confirmTextStyle: TextStyle( - fontSize: 28.sp, - color: Color(0xffffc40c), - ), - cancelTextStyle: TextStyle( - fontSize: 28.sp, - color: Color(0xff333333), - ), - onConfirm: (Picker picker, List value) { - pickerData = picker.getSelectedValues()[0]; - setState(() {}); - print(value.toString()); - print(picker.getSelectedValues()); - }).showModal(context); - break; - default: - } + print(value.toString()); + print(picker.getSelectedValues()); + }).showModal(context); + break; + default: + } }, child: Container( child: Row( diff --git a/lib/pages/fitup_manage/widget/decorator_info.dart b/lib/pages/fitup_manage/widget/decorator_info.dart index f23431e8..c5b77b5a 100644 --- a/lib/pages/fitup_manage/widget/decorator_info.dart +++ b/lib/pages/fitup_manage/widget/decorator_info.dart @@ -54,8 +54,7 @@ class _DecoratorInfoState extends State { children: [ Text( title, - style: TextStyle( - fontSize: 28.sp, color: Color(0xff333333)), + style: TextStyle(fontSize: 28.sp, color: Color(0xff333333)), ), SizedBox(height: 25.w), widget @@ -79,8 +78,7 @@ class _DecoratorInfoState extends State { children: [ Text( '上传证件照片', - style: TextStyle( - fontSize: 28.sp, color: Color(0xff333333)), + style: TextStyle(fontSize: 28.sp, color: Color(0xff333333)), ), SizedBox(height: 25.w), Row( diff --git a/lib/pages/fitup_manage/widget/director_manage.dart b/lib/pages/fitup_manage/widget/director_manage.dart index 61c838bf..0a20c3ac 100644 --- a/lib/pages/fitup_manage/widget/director_manage.dart +++ b/lib/pages/fitup_manage/widget/director_manage.dart @@ -19,7 +19,6 @@ class DirectorManage extends StatefulWidget { } class _DirectorManageState extends State { - TextEditingController _companyName = new TextEditingController(); int memberNum = 1; diff --git a/lib/pages/fitup_manage/widget/house_info.dart b/lib/pages/fitup_manage/widget/house_info.dart index 4c7aadd1..ef17cd07 100644 --- a/lib/pages/fitup_manage/widget/house_info.dart +++ b/lib/pages/fitup_manage/widget/house_info.dart @@ -8,8 +8,8 @@ import 'package:akuCommunity/base/base_style.dart'; import 'package:akuCommunity/utils/headers.dart'; class HouseInfo extends StatefulWidget { - final String title,subtitle; - HouseInfo({Key key,this.title,this.subtitle}) : super(key: key); + final String title, subtitle; + HouseInfo({Key key, this.title, this.subtitle}) : super(key: key); @override _HouseInfoState createState() => _HouseInfoState(); @@ -19,45 +19,45 @@ class _HouseInfoState extends State { @override Widget build(BuildContext context) { return Container( - padding: EdgeInsets.only( - bottom: 32.w, - ), - decoration: BoxDecoration( - border: Border( - bottom: BorderSide(color: BaseStyle.coloreeeeee, width: 0.5)), - ), - child: Row( - mainAxisAlignment: MainAxisAlignment.start, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Image.asset( - AssetsImage.HOUSEATTESTATION, - height: 48.w, - width: 48.w, - ), - SizedBox(width: 20.w), - Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - widget.title, - style: TextStyle( - fontSize: BaseStyle.fontSize32, - color: BaseStyle.color474747, - ), + padding: EdgeInsets.only( + bottom: 32.w, + ), + decoration: BoxDecoration( + border: Border( + bottom: BorderSide(color: BaseStyle.coloreeeeee, width: 0.5)), + ), + child: Row( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Image.asset( + AssetsImage.HOUSEATTESTATION, + height: 48.w, + width: 48.w, + ), + SizedBox(width: 20.w), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + widget.title, + style: TextStyle( + fontSize: BaseStyle.fontSize32, + color: BaseStyle.color474747, ), - SizedBox(height: 10.w), - Text( - widget.subtitle, - style: TextStyle( - fontSize: BaseStyle.fontSize32, - color: BaseStyle.color474747, - ), - ) - ], - ), - ], - ), - ); + ), + SizedBox(height: 10.w), + Text( + widget.subtitle, + style: TextStyle( + fontSize: BaseStyle.fontSize32, + color: BaseStyle.color474747, + ), + ) + ], + ), + ], + ), + ); } } diff --git a/lib/pages/fitup_manage/widget/owner_manage.dart b/lib/pages/fitup_manage/widget/owner_manage.dart index c4991cc7..ad13d6a7 100644 --- a/lib/pages/fitup_manage/widget/owner_manage.dart +++ b/lib/pages/fitup_manage/widget/owner_manage.dart @@ -95,8 +95,7 @@ class _OwnerManageState extends State Text( _listWidget[index]['title'], style: TextStyle( - fontSize: BaseStyle.fontSize28, - color: ktextPrimary), + fontSize: BaseStyle.fontSize28, color: ktextPrimary), ), SizedBox(height: 25.w), _listWidget[index]['widget'], diff --git a/lib/pages/fitup_manage/widget/pay_model_sheet.dart b/lib/pages/fitup_manage/widget/pay_model_sheet.dart index ca914924..be6a85ca 100644 --- a/lib/pages/fitup_manage/widget/pay_model_sheet.dart +++ b/lib/pages/fitup_manage/widget/pay_model_sheet.dart @@ -43,7 +43,7 @@ class _PayModelSheetState extends State { } ]; - int _currentindex = 0 ; + int _currentindex = 0; void _showModelBotoomSheet() { showModalBottomSheet( @@ -153,8 +153,7 @@ class _PayModelSheetState extends State { Text( title, style: TextStyle( - fontSize: BaseStyle.fontSize28, - color: ktextPrimary), + fontSize: BaseStyle.fontSize28, color: ktextPrimary), ), _listPay[index]['isCheck'] ? Icon( @@ -195,8 +194,7 @@ class _PayModelSheetState extends State { Text( _listPay[_currentindex]['title'], style: TextStyle( - fontSize: BaseStyle.fontSize28, - color: ktextPrimary), + fontSize: BaseStyle.fontSize28, color: ktextPrimary), ), ], ), diff --git a/lib/pages/goods_deto_page/deto_create_page/deto_create_page.dart b/lib/pages/goods_deto_page/deto_create_page/deto_create_page.dart index ac5d0107..83bc5d65 100644 --- a/lib/pages/goods_deto_page/deto_create_page/deto_create_page.dart +++ b/lib/pages/goods_deto_page/deto_create_page/deto_create_page.dart @@ -54,7 +54,7 @@ class _DetoCreatePageState extends State { '50kg-100kg', '> 100kg', ]; - int _selectApproach=0; + int _selectApproach = 0; List _listMode = [ '自己搬运', '搬家公司', diff --git a/lib/pages/goods_deto_page/deto_create_page/widget/common_radio.dart b/lib/pages/goods_deto_page/deto_create_page/widget/common_radio.dart index 9cf8f612..9da4ee77 100644 --- a/lib/pages/goods_deto_page/deto_create_page/widget/common_radio.dart +++ b/lib/pages/goods_deto_page/deto_create_page/widget/common_radio.dart @@ -36,7 +36,7 @@ class _CommonRadioState extends State { color: _selected ? kPrimaryColor : Color(0xFF979797), width: 3.w, ), - borderRadius: BorderRadius.circular(widget.size??20.w), + borderRadius: BorderRadius.circular(widget.size ?? 20.w), ), duration: Duration(milliseconds: 300), curve: Curves.easeInOutCubic, diff --git a/lib/pages/goods_deto_page/widget/goods_info_card.dart b/lib/pages/goods_deto_page/widget/goods_info_card.dart index 87b21f75..743cabaf 100644 --- a/lib/pages/goods_deto_page/widget/goods_info_card.dart +++ b/lib/pages/goods_deto_page/widget/goods_info_card.dart @@ -122,8 +122,7 @@ class GoodsInfoCard extends StatelessWidget { _builTile('物品重量', BeeMap.goodsOutweight[model.weight]), _builTile('出户时间', model.expectedTime), _builTile('物品名称', model.name), - _builTile( - '搬运方式', BeeMap.goodsOutApproach[model.approach]), + _builTile('搬运方式', BeeMap.goodsOutApproach[model.approach]), ]), ), Container( diff --git a/lib/pages/goods_deto_page/widget/goods_info_card_button.dart b/lib/pages/goods_deto_page/widget/goods_info_card_button.dart index e619d077..7dc91b7a 100644 --- a/lib/pages/goods_deto_page/widget/goods_info_card_button.dart +++ b/lib/pages/goods_deto_page/widget/goods_info_card_button.dart @@ -98,12 +98,10 @@ class GoodsInfoCardButton extends StatelessWidget { onTap: () async { switch (_listButton[index]['title']) { case '查看二维码': - ArticleQRModel _model = await ManagerFunc.getQRcode(id); + ArticleQRModel _model = + await ManagerFunc.getQRcode(id); if (_model.status) { - DetoCodePage( - id: id, - model: _model - ).to(); + DetoCodePage(id: id, model: _model).to(); } else { BotToast.showText(text: _model.message); } diff --git a/lib/pages/goods_manage_page/goods_manage_page.dart b/lib/pages/goods_manage_page/goods_manage_page.dart index 085f7cb0..e2db06bd 100644 --- a/lib/pages/goods_manage_page/goods_manage_page.dart +++ b/lib/pages/goods_manage_page/goods_manage_page.dart @@ -97,7 +97,6 @@ class _GoodsManagePageState extends State { alignment: Alignment.center, child: '我的借还物品'.text.black.size(28.sp).make())) ], - body: BeeListView( path: API.manager.articleBorrow, controller: _easyRefreshController, diff --git a/lib/pages/invoice/invoice_page.dart b/lib/pages/invoice/invoice_page.dart index 3c8fc147..c40f81f2 100644 --- a/lib/pages/invoice/invoice_page.dart +++ b/lib/pages/invoice/invoice_page.dart @@ -39,7 +39,6 @@ class _InvoicePageState extends State { }); } - Container _containerInvoiceDetailCheck() { return Container( color: Colors.white, @@ -219,7 +218,7 @@ class _InvoicePageState extends State { return BeeScaffold( key: _scaffoldKey, title: '开具发票', - leading:IconButton( + leading: IconButton( icon: Icon(AntDesign.left, size: 40.sp), onPressed: () { Get.back(); diff --git a/lib/pages/invoice/widget/invoice_input.dart b/lib/pages/invoice/widget/invoice_input.dart index 9599e062..4caf7581 100644 --- a/lib/pages/invoice/widget/invoice_input.dart +++ b/lib/pages/invoice/widget/invoice_input.dart @@ -77,8 +77,7 @@ class _InvoiceInputState extends State { fillColor: Colors.white, filled: true, hintStyle: TextStyle( - color: Color(0xff999999), - fontSize: 24.sp), + color: Color(0xff999999), fontSize: 24.sp), ), ), ), diff --git a/lib/pages/life_pay/life_pay_bill_page/widget/bill_card.dart b/lib/pages/life_pay/life_pay_bill_page/widget/bill_card.dart index 96ea036e..a34391cc 100644 --- a/lib/pages/life_pay/life_pay_bill_page/widget/bill_card.dart +++ b/lib/pages/life_pay/life_pay_bill_page/widget/bill_card.dart @@ -65,7 +65,9 @@ class BillCard extends StatelessWidget { ), child: Column( crossAxisAlignment: CrossAxisAlignment.start, - children: _listBill.map((item) => _billItem(item['title'],item['value'])).toList(), + children: _listBill + .map((item) => _billItem(item['title'], item['value'])) + .toList(), ), ); } diff --git a/lib/pages/life_pay/life_pay_info_page/widget/details_card.dart b/lib/pages/life_pay/life_pay_info_page/widget/details_card.dart index 379156b5..e2f6a751 100644 --- a/lib/pages/life_pay/life_pay_info_page/widget/details_card.dart +++ b/lib/pages/life_pay/life_pay_info_page/widget/details_card.dart @@ -11,7 +11,7 @@ import 'package:akuCommunity/utils/headers.dart'; class DetailsCard extends StatefulWidget { final Function fun; - DetailsCard({Key key,this.fun}) : super(key: key); + DetailsCard({Key key, this.fun}) : super(key: key); @override _DetailsCardState createState() => _DetailsCardState(); @@ -51,49 +51,49 @@ class _DetailsCardState extends State { InkWell _detailContent(Function fun) { return InkWell( onTap: fun, - child:Container( - margin: EdgeInsets.only(top: 32.w), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Row( - children: [ - Icon( - Icons.radio_button_unchecked, - color: BaseStyle.color999999, - size: 40.w, - ), - SizedBox(width: 24.w), - Text( - '2019上半年', - style: TextStyle( - fontSize: BaseStyle.fontSize28, - color: ktextPrimary, + child: Container( + margin: EdgeInsets.only(top: 32.w), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Row( + children: [ + Icon( + Icons.radio_button_unchecked, + color: BaseStyle.color999999, + size: 40.w, ), - ), - ], - ), - Row( - children: [ - Text( - '¥${50.90}', - style: TextStyle( - fontWeight: FontWeight.w600, - fontSize: BaseStyle.fontSize28, - color: Color(0xfffc361d), + SizedBox(width: 24.w), + Text( + '2019上半年', + style: TextStyle( + fontSize: BaseStyle.fontSize28, + color: ktextPrimary, + ), ), - ), - SizedBox(width: 28.w), - Icon( - AntDesign.right, - color: BaseStyle.color999999, - size: 30.w, - ), - ], - ), - ], + ], + ), + Row( + children: [ + Text( + '¥${50.90}', + style: TextStyle( + fontWeight: FontWeight.w600, + fontSize: BaseStyle.fontSize28, + color: Color(0xfffc361d), + ), + ), + SizedBox(width: 28.w), + Icon( + AntDesign.right, + color: BaseStyle.color999999, + size: 30.w, + ), + ], + ), + ], + ), ), - ), ); } 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 1321005c..6fadc2da 100644 --- a/lib/pages/life_pay/widget/life_pay_detail_page.dart +++ b/lib/pages/life_pay/widget/life_pay_detail_page.dart @@ -46,32 +46,36 @@ class _LifePayDetailPageState extends State { Widget _buildTile(int groupId, int id, int years, double price) { return GestureDetector( - onTap: () { - String item = id.toString() + groupId.toString(); - if (_selectItems.contains(item)) { - _selectItems.remove(item); - _payNum -= 1; - _payTotal -= price.toDouble(); - } else { - _selectItems.add(item); - _payNum += 1; - _payTotal += price.toDouble(); - } + onTap: () { + String item = id.toString() + groupId.toString(); + if (_selectItems.contains(item)) { + _selectItems.remove(item); + _payNum -= 1; + _payTotal -= price.toDouble(); + } else { + _selectItems.add(item); + _payNum += 1; + _payTotal += price.toDouble(); + } - setState(() {}); - }, - child: Row( + setState(() {}); + }, + child: Row( children: [ - - BeeCheckRadio( - value: id.toString() + groupId.toString(), - groupValue: _selectItems), + 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(), + '¥${price.toString()}' + .text + .color(kDangerColor) + .size(28.sp) + .bold + .make(), 24.w.widthBox, Icon( CupertinoIcons.chevron_forward, diff --git a/lib/pages/life_pay/widget/order_card.dart b/lib/pages/life_pay/widget/order_card.dart index 327df524..5d6b3a55 100644 --- a/lib/pages/life_pay/widget/order_card.dart +++ b/lib/pages/life_pay/widget/order_card.dart @@ -7,7 +7,9 @@ import 'package:akuCommunity/base/base_style.dart'; import 'package:akuCommunity/utils/headers.dart'; class OrderCard extends StatefulWidget { - OrderCard({Key key,}) : super(key: key); + OrderCard({ + Key key, + }) : super(key: key); @override _OrderCardState createState() => _OrderCardState(); @@ -76,7 +78,7 @@ class _OrderCardState extends State { Widget _checkInfo() { return InkWell( - onTap: (){ + onTap: () { // LifePayInfoPage(bundle: Bundle() // ..putMap('detailMap', {'title': '去年（2019年）'}),).to; }, diff --git a/lib/pages/life_pay/widget/submit_bar.dart b/lib/pages/life_pay/widget/submit_bar.dart index 15f088fa..e6beff9d 100644 --- a/lib/pages/life_pay/widget/submit_bar.dart +++ b/lib/pages/life_pay/widget/submit_bar.dart @@ -8,7 +8,7 @@ import 'package:akuCommunity/utils/headers.dart'; class SubmitBar extends StatefulWidget { final String title; - SubmitBar({Key key,this.title}) : super(key: key); + SubmitBar({Key key, this.title}) : super(key: key); @override _SubmitBarState createState() => _SubmitBarState(); @@ -54,8 +54,7 @@ class _SubmitBarState extends State { TextSpan( text: '合计：', style: TextStyle( - fontSize: BaseStyle.fontSize26, - color: ktextPrimary), + fontSize: BaseStyle.fontSize26, color: ktextPrimary), ), TextSpan( text: '¥${3009.84}', diff --git a/lib/pages/manager_func.dart b/lib/pages/manager_func.dart index accb71d1..5416bc79 100644 --- a/lib/pages/manager_func.dart +++ b/lib/pages/manager_func.dart @@ -204,7 +204,7 @@ class ManagerFunc { API.manager.questionnaireSubmit, params: { 'id': id, - 'appQuestionnaireAnswerSubmits':model, + 'appQuestionnaireAnswerSubmits': model, }, showMessage: true, ); diff --git a/lib/pages/market/market_cart_page/market_cart_page.dart b/lib/pages/market/market_cart_page/market_cart_page.dart index 45ccb0d0..2e3595fa 100644 --- a/lib/pages/market/market_cart_page/market_cart_page.dart +++ b/lib/pages/market/market_cart_page/market_cart_page.dart @@ -324,8 +324,7 @@ class _MarketCartPageState extends State { return SlideAction( child: Text( '移至收藏夹', - style: TextStyle( - fontSize: 28.sp, color: Colors.white), + style: TextStyle(fontSize: 28.sp, color: Colors.white), ), color: renderingMode == SlidableRenderingMode.slide ? Color(0xffffc40c).withOpacity(animation.value) @@ -349,8 +348,7 @@ class _MarketCartPageState extends State { ), child: Text( '删除', - style: TextStyle( - fontSize: 28.sp, color: Colors.white), + style: TextStyle(fontSize: 28.sp, color: Colors.white), ), // onTap: () => _showSnackBar(context, 'Delete'), ); diff --git a/lib/pages/market/market_cart_page/widget/market_cart_bottom_bar.dart b/lib/pages/market/market_cart_page/widget/market_cart_bottom_bar.dart index 73d9beab..63563338 100644 --- a/lib/pages/market/market_cart_page/widget/market_cart_bottom_bar.dart +++ b/lib/pages/market/market_cart_page/widget/market_cart_bottom_bar.dart @@ -45,7 +45,7 @@ class MarketCartBottomBar extends StatelessWidget { ); } - Widget _settlement(CartProvidde model,BuildContext context) { + Widget _settlement(CartProvidde model, BuildContext context) { return Row( children: [ model.allPrice != 0 @@ -99,7 +99,10 @@ class MarketCartBottomBar extends StatelessWidget { mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ _selectAll(model), - _settlement(model,context,) + _settlement( + model, + context, + ) ], ), ); diff --git a/lib/pages/market/market_cart_page/widget/market_cart_card.dart b/lib/pages/market/market_cart_page/widget/market_cart_card.dart index 44f7804e..96e033db 100644 --- a/lib/pages/market/market_cart_page/widget/market_cart_card.dart +++ b/lib/pages/market/market_cart_page/widget/market_cart_card.dart @@ -142,8 +142,7 @@ class MarketCartCard extends StatelessWidget { return SlideAction( child: Text( '移至收藏夹', - style: TextStyle( - fontSize: 28.sp, color: Colors.white), + style: TextStyle(fontSize: 28.sp, color: Colors.white), ), color: renderingMode == SlidableRenderingMode.slide ? Color(0xffffc40c).withOpacity(animation.value) @@ -167,8 +166,7 @@ class MarketCartCard extends StatelessWidget { ), child: Text( '删除', - style: TextStyle( - fontSize: 28.sp, color: Colors.white), + style: TextStyle(fontSize: 28.sp, color: Colors.white), ), // onTap: () => _showSnackBar(context, 'Delete'), ); diff --git a/lib/pages/market/widget/sliver_goods_group_card.dart b/lib/pages/market/widget/sliver_goods_group_card.dart index 683dbe16..eca1dda9 100644 --- a/lib/pages/market/widget/sliver_goods_group_card.dart +++ b/lib/pages/market/widget/sliver_goods_group_card.dart @@ -145,8 +145,7 @@ class _SliverGoodsGroupCardState extends State { ), decoration: BoxDecoration( color: isOverTime ? Color(0xffd9d9d9) : Color(0xffffeee3), - borderRadius: - BorderRadius.all(Radius.circular(4.w)), + borderRadius: BorderRadius.all(Radius.circular(4.w)), ), child: Row( children: [ @@ -178,16 +177,14 @@ class _SliverGoodsGroupCardState extends State { children: [ Text( '原产地:$address', - style: TextStyle( - color: Color(0xff999999), - fontSize: 20.sp), + style: + TextStyle(color: Color(0xff999999), fontSize: 20.sp), ), SizedBox(height: 10.w), Text( '预计到货:$arrivalTime', - style: TextStyle( - color: Color(0xff999999), - fontSize: 20.sp), + style: + TextStyle(color: Color(0xff999999), fontSize: 20.sp), ) ], ), @@ -217,8 +214,7 @@ class _SliverGoodsGroupCardState extends State { ), decoration: BoxDecoration( color: Colors.white, - borderRadius: - BorderRadius.all(Radius.circular(8.w)), + borderRadius: BorderRadius.all(Radius.circular(8.w)), ), child: Row( crossAxisAlignment: CrossAxisAlignment.start, diff --git a/lib/pages/market_class/widget/market_class_bar.dart b/lib/pages/market_class/widget/market_class_bar.dart index 264a9bae..5d417a05 100644 --- a/lib/pages/market_class/widget/market_class_bar.dart +++ b/lib/pages/market_class/widget/market_class_bar.dart @@ -18,10 +18,7 @@ class MarketClassBar extends StatelessWidget { }, child: Container( margin: EdgeInsets.only(right: 32.w), - padding: EdgeInsets.only( - left: 40.w, - top: 15.w, - bottom: 15.w), + padding: EdgeInsets.only(left: 40.w, top: 15.w, bottom: 15.w), decoration: BoxDecoration( color: Color(0xfff3f3f3), borderRadius: BorderRadius.all(Radius.circular(36)), diff --git a/lib/pages/mine_car_page/car_add_page/car_add_page.dart b/lib/pages/mine_car_page/car_add_page/car_add_page.dart index c8859764..33d630b3 100644 --- a/lib/pages/mine_car_page/car_add_page/car_add_page.dart +++ b/lib/pages/mine_car_page/car_add_page/car_add_page.dart @@ -85,8 +85,7 @@ class _CarAddPageState extends State { Text( '您的车牌号', style: TextStyle( - fontSize: 28.sp, - color: Color(0xff333333)), + fontSize: 28.sp, color: Color(0xff333333)), ), SizedBox(height: 25.w), CommonInput( diff --git a/lib/pages/mine_car_page/select_parking_page/select_parking_page.dart b/lib/pages/mine_car_page/select_parking_page/select_parking_page.dart index d0561d4c..922dc16d 100644 --- a/lib/pages/mine_car_page/select_parking_page/select_parking_page.dart +++ b/lib/pages/mine_car_page/select_parking_page/select_parking_page.dart @@ -39,9 +39,8 @@ class _SelectParkingPageState extends State { child: Container( width: MediaQuery.of(context).size.width, color: Colors.white, - padding: EdgeInsets.symmetric( - vertical: 28.w, - horizontal: 32.w), + padding: + EdgeInsets.symmetric(vertical: 28.w, horizontal: 32.w), child: Text( '${widget.bundle.getString('title')}地下车库11号${index + 1}', style: TextStyle( diff --git a/lib/pages/mine_house_page/house_authenticate_page/house_authenticate_page.dart b/lib/pages/mine_house_page/house_authenticate_page/house_authenticate_page.dart index d1caf484..9a686661 100644 --- a/lib/pages/mine_house_page/house_authenticate_page/house_authenticate_page.dart +++ b/lib/pages/mine_house_page/house_authenticate_page/house_authenticate_page.dart @@ -102,8 +102,7 @@ class _HouseAuthenticatePageState extends State { Text( _inputList[index]['title'], style: TextStyle( - fontSize: 28.sp, - color: Color(0xff333333)), + fontSize: 28.sp, color: Color(0xff333333)), ), SizedBox(height: 25.w), CommonInput( diff --git a/lib/pages/mine_house_page/mine_house_page.dart b/lib/pages/mine_house_page/mine_house_page.dart index dc423605..02e42091 100644 --- a/lib/pages/mine_house_page/mine_house_page.dart +++ b/lib/pages/mine_house_page/mine_house_page.dart @@ -76,7 +76,7 @@ class _MineHousePageState extends State { Widget _inkWellCheck() { return InkWell( onTap: () { - HouseAuthenticatePage().to; + HouseAuthenticatePage().to; }, child: Container( padding: EdgeInsets.only( diff --git a/lib/pages/opening_code_page/opening_code_page.dart b/lib/pages/opening_code_page/opening_code_page.dart index 17c525ad..09773e33 100644 --- a/lib/pages/opening_code_page/opening_code_page.dart +++ b/lib/pages/opening_code_page/opening_code_page.dart @@ -39,8 +39,7 @@ class _OpeningCodePageState extends State { ), decoration: BoxDecoration( color: Color(0xffffffff), - borderRadius: - BorderRadius.all(Radius.circular(8.w)), + borderRadius: BorderRadius.all(Radius.circular(8.w)), ), height: 746.w, width: 686.w, @@ -66,8 +65,7 @@ class _OpeningCodePageState extends State { ), decoration: BoxDecoration( color: Color(0xfffffbf6), - borderRadius: BorderRadius.all( - Radius.circular(8.w)), + borderRadius: BorderRadius.all(Radius.circular(8.w)), ), width: 646.w, height: 146.w, diff --git a/lib/pages/personal/change_nick_name_page.dart b/lib/pages/personal/change_nick_name_page.dart index 60ab4c9e..6140f61f 100644 --- a/lib/pages/personal/change_nick_name_page.dart +++ b/lib/pages/personal/change_nick_name_page.dart @@ -53,10 +53,8 @@ class _ChangeNickNameState extends State { decoration: InputDecoration( contentPadding: EdgeInsets.zero, hintText: '${userProvider.userInfoModel.nickName}', - hintStyle: TextStyle( - color: Color(0xFF999999), - fontSize: 34.sp - ), + hintStyle: + TextStyle(color: Color(0xFF999999), fontSize: 34.sp), border: UnderlineInputBorder( borderSide: BorderSide( color: Color(0xFFEEEEEE), diff --git a/lib/pages/personal/order_page.dart b/lib/pages/personal/order_page.dart index b949b7c0..b8c89c63 100644 --- a/lib/pages/personal/order_page.dart +++ b/lib/pages/personal/order_page.dart @@ -75,10 +75,7 @@ class _OrderPageState extends State onTap: () {}, child: Container( margin: EdgeInsets.only(right: 32.w), - padding: EdgeInsets.only( - left: 40.w, - top: 20.w, - bottom: 20.w), + padding: EdgeInsets.only(left: 40.w, top: 20.w, bottom: 20.w), decoration: BoxDecoration( color: BaseStyle.colorf3f3f3, borderRadius: BorderRadius.all(Radius.circular(36)), diff --git a/lib/pages/personal/refund_select_page.dart b/lib/pages/personal/refund_select_page.dart index 078cec2f..a946d6ed 100644 --- a/lib/pages/personal/refund_select_page.dart +++ b/lib/pages/personal/refund_select_page.dart @@ -23,8 +23,6 @@ class RefundSelectPage extends StatefulWidget { } class _RefundSelectPageState extends State { - - Container _containerContentList(List> listContent) { return Container( child: Column( diff --git a/lib/pages/things_page/things_create_page/things_create_page.dart b/lib/pages/things_page/things_create_page/things_create_page.dart index 66a52feb..72033d0c 100644 --- a/lib/pages/things_page/things_create_page/things_create_page.dart +++ b/lib/pages/things_page/things_create_page/things_create_page.dart @@ -135,10 +135,7 @@ class _ThingsCreatePageState extends State { Widget _containerTextField() { return Container( - padding: EdgeInsets.only( - top: 32.w, - left: 22.w, - right: 35.w), + padding: EdgeInsets.only(top: 32.w, left: 22.w, right: 35.w), decoration: BoxDecoration( borderRadius: BorderRadius.all(Radius.circular(8)), border: Border.all(color: Color(0xffd4cfbe), width: 1.0), @@ -180,7 +177,7 @@ class _ThingsCreatePageState extends State { alignment: Alignment.center, height: 98.w, width: 750.w, - padding: EdgeInsets.symmetric(vertical:26.5.w), + padding: EdgeInsets.symmetric(vertical: 26.5.w), color: Color(0xffffc40c), child: Text( '确认提交', @@ -207,8 +204,7 @@ class _ThingsCreatePageState extends State { children: [ Text( title, - style: TextStyle( - fontSize: 28.sp, color: Color(0xff333333)), + style: TextStyle(fontSize: 28.sp, color: Color(0xff333333)), ), SizedBox(height: 32.w), widget, diff --git a/lib/pages/things_page/things_detail_page/widget/goods_info_card.dart b/lib/pages/things_page/things_detail_page/widget/goods_info_card.dart index 4f17b628..4937d61c 100644 --- a/lib/pages/things_page/things_detail_page/widget/goods_info_card.dart +++ b/lib/pages/things_page/things_detail_page/widget/goods_info_card.dart @@ -49,10 +49,7 @@ class GoodsInfoCard extends StatelessWidget { blurRadius: 10.0), ], ), - padding: EdgeInsets.only( - top: 25.w, - left: 24.w, - right: 24.w), + padding: EdgeInsets.only(top: 25.w, left: 24.w, right: 24.w), child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -97,8 +94,7 @@ class GoodsInfoCard extends StatelessWidget { child: Text( infodetails, style: TextStyle( - fontSize: 28.sp, - color: Color(0xff333333)), + fontSize: 28.sp, color: Color(0xff333333)), ), ) : Column( @@ -106,8 +102,7 @@ class GoodsInfoCard extends StatelessWidget { children: detoInfoList .map( (item) => Container( - padding: EdgeInsets.only( - top: 8.w), + padding: EdgeInsets.only(top: 8.w), child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, @@ -141,13 +136,11 @@ class GoodsInfoCard extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Container( - margin: EdgeInsets.only( - bottom: 25.w), + margin: EdgeInsets.only(bottom: 25.w), child: Text( '图片信息', style: TextStyle( - fontSize: 28.sp, - color: Color(0xff333333)), + fontSize: 28.sp, color: Color(0xff333333)), ), ), ImageHorizontalList(imageUrl: listImage), diff --git a/lib/pages/things_page/things_detail_page/widget/goods_info_card_button.dart b/lib/pages/things_page/things_detail_page/widget/goods_info_card_button.dart index 9b5d6af1..d82d8313 100644 --- a/lib/pages/things_page/things_detail_page/widget/goods_info_card_button.dart +++ b/lib/pages/things_page/things_detail_page/widget/goods_info_card_button.dart @@ -121,8 +121,7 @@ class GoodsInfoCardButton extends StatelessWidget { color: Color(0xff333333), ), Container( - margin: - EdgeInsets.only(left: 14.w), + margin: EdgeInsets.only(left: 14.w), child: Text( _listButton[index]['title'], style: TextStyle( diff --git a/lib/pages/things_page/widget/fixed_check_box.dart b/lib/pages/things_page/widget/fixed_check_box.dart index 582a5403..13560c7c 100644 --- a/lib/pages/things_page/widget/fixed_check_box.dart +++ b/lib/pages/things_page/widget/fixed_check_box.dart @@ -18,7 +18,6 @@ class FixedCheckBox extends StatefulWidget { class _FixedCheckBoxState extends State { bool _isSelected = false; - @override Widget build(BuildContext context) { return GestureDetector( @@ -46,9 +45,8 @@ class _FixedCheckBoxState extends State { width: 24.w, height: 24.w, decoration: BoxDecoration( - borderRadius: BorderRadius.circular(24.w), - color: kPrimaryColor.withOpacity(_isSelected?1:0) - ), + borderRadius: BorderRadius.circular(24.w), + color: kPrimaryColor.withOpacity(_isSelected ? 1 : 0)), ), ), ); diff --git a/lib/pages/things_page/widget/fixed_detail_page.dart b/lib/pages/things_page/widget/fixed_detail_page.dart index 638f2821..1b65598b 100644 --- a/lib/pages/things_page/widget/fixed_detail_page.dart +++ b/lib/pages/things_page/widget/fixed_detail_page.dart @@ -102,17 +102,12 @@ class _FixedDetailPageState extends State { borderRadius: BorderRadius.circular(36.w), color: Colors.transparent, ), - child: BeeMap - .fixTag[model.appReportRepairVo.type] - .text - .black + child: BeeMap.fixTag[model.appReportRepairVo.type].text.black .size(20.sp) .make(), ), Spacer(), - BeeMap - .fixState[model.appReportRepairVo.status] - .text + BeeMap.fixState[model.appReportRepairVo.status].text .color(_getColor(_model.appReportRepairVo.status)) .size(24.sp) .bold @@ -226,9 +221,7 @@ class _FixedDetailPageState extends State { ...model.appProcessRecordVo .map((e) => Row( children: [ - BeeMap - .processClass[e.operationType] - .text + BeeMap.processClass[e.operationType].text .color(ktextSubColor) .size(28.sp) .make(), diff --git a/lib/pages/things_page/widget/things_app_bar.dart b/lib/pages/things_page/widget/things_app_bar.dart index ec278bf4..9e8de7a8 100644 --- a/lib/pages/things_page/widget/things_app_bar.dart +++ b/lib/pages/things_page/widget/things_app_bar.dart @@ -9,7 +9,7 @@ import 'package:get/get.dart'; // Project imports: import 'package:akuCommunity/utils/headers.dart'; -//TODO CLEAN BOTTOM CODES. +//TODO CLEAN BOTTOM CODES. @Deprecated("sh*t app bar need to be cleaned.") class ThingsAppBar extends StatelessWidget { final String title, subtitle; @@ -54,12 +54,10 @@ class ThingsAppBar extends StatelessWidget { fontWeight: FontWeight.w600, fontSize: 28.sp, ), - labelPadding: - EdgeInsets.symmetric(horizontal: 131.5.w), + labelPadding: EdgeInsets.symmetric(horizontal: 131.5.w), indicatorColor: Color(0xffffc40c), indicatorSize: TabBarIndicatorSize.label, - indicatorPadding: - EdgeInsets.symmetric(horizontal: 21.w), + indicatorPadding: EdgeInsets.symmetric(horizontal: 21.w), isScrollable: true, controller: tabController, tabs: List.generate( diff --git a/lib/provider/cart.dart b/lib/provider/cart.dart index c099b2fb..8a0d5073 100644 --- a/lib/provider/cart.dart +++ b/lib/provider/cart.dart @@ -44,12 +44,13 @@ class CartProvidde with ChangeNotifier { "isCheck": false }; tempList.add(newGoods); - AkuShopModel _newgoods= AkuShopModel.fromJson(newGoods); - int _goodIndex= cartList.indexWhere((element) { - return element.itemid==_newgoods.itemid; - }); - _goodIndex>-1?cartList[_goodIndex].count+=count: - cartList.add(_newgoods); + AkuShopModel _newgoods = AkuShopModel.fromJson(newGoods); + int _goodIndex = cartList.indexWhere((element) { + return element.itemid == _newgoods.itemid; + }); + _goodIndex > -1 + ? cartList[_goodIndex].count += count + : cartList.add(_newgoods); } cartString = json.encode(tempList).toString(); print(cartString); diff --git a/lib/service/net.dart b/lib/service/net.dart index 45c9c13a..4205067e 100644 --- a/lib/service/net.dart +++ b/lib/service/net.dart @@ -41,7 +41,7 @@ class Net { (client) { client.badCertificateCallback = (X509Certificate cert, String host, int port) { - //TODO + //TODO return true; }; }; diff --git a/lib/ui/community/community_views/event_detail_page.dart b/lib/ui/community/community_views/event_detail_page.dart index d19879a3..2ede27a8 100644 --- a/lib/ui/community/community_views/event_detail_page.dart +++ b/lib/ui/community/community_views/event_detail_page.dart @@ -47,7 +47,7 @@ class _EventDetailPageState extends State { : ListView( children: [ ChatCard( - model:_model, + model: _model, hideLine: true, canTap: false, ), diff --git a/lib/ui/community/notice/notice_detail_page.dart b/lib/ui/community/notice/notice_detail_page.dart index 9daab321..1b64cf77 100644 --- a/lib/ui/community/notice/notice_detail_page.dart +++ b/lib/ui/community/notice/notice_detail_page.dart @@ -33,7 +33,7 @@ class _NoticeDetailPageState extends State { ); Widget docView(String title, String path) { - if (title?.isEmpty??true) return SizedBox(); + if (title?.isEmpty ?? true) return SizedBox(); return Container( margin: EdgeInsets.only(right: 113.w), alignment: Alignment.centerLeft, diff --git a/lib/ui/manager/questionnaire/submit_complish_page.dart b/lib/ui/manager/questionnaire/submit_complish_page.dart index 8053b962..0412dd21 100644 --- a/lib/ui/manager/questionnaire/submit_complish_page.dart +++ b/lib/ui/manager/questionnaire/submit_complish_page.dart @@ -29,7 +29,9 @@ class SubmitComplishPage extends StatelessWidget { color: this.status ? kPrimaryColor : kDangerColor, ), child: Icon( - this.status ? CupertinoIcons.checkmark : CupertinoIcons.multiply, + this.status + ? CupertinoIcons.checkmark + : CupertinoIcons.multiply, size: 100.w, ), ), diff --git a/lib/ui/manager/visitor/visitor_record_view.dart b/lib/ui/manager/visitor/visitor_record_view.dart index d8d5d5d7..e7244e32 100644 --- a/lib/ui/manager/visitor/visitor_record_view.dart +++ b/lib/ui/manager/visitor/visitor_record_view.dart @@ -23,7 +23,6 @@ class VisitorRecordView extends StatefulWidget { class _VisitorRecordViewState extends State { EasyRefreshController _refreshController = EasyRefreshController(); - @override void dispose() { _refreshController?.dispose(); diff --git a/lib/utils/fade_route.dart b/lib/utils/fade_route.dart index 9100d435..7b43b077 100644 --- a/lib/utils/fade_route.dart +++ b/lib/utils/fade_route.dart @@ -1,7 +1,7 @@ // Flutter imports: import 'package:flutter/material.dart'; -class FadeRoute extends PageRouteBuilder { +class FadeRoute extends PageRouteBuilder { final Widget page; FadeRoute({this.page}) : super( diff --git a/lib/utils/toast.dart b/lib/utils/toast.dart index 2ecb1e0b..f22361c9 100644 --- a/lib/utils/toast.dart +++ b/lib/utils/toast.dart @@ -6,9 +6,9 @@ import 'package:bot_toast/bot_toast.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; class Toast { - static globalToast(String text) { - return BotToast.showText(text: - text, + static globalToast(String text) { + return BotToast.showText( + text: text, duration: Duration(milliseconds: 2000), borderRadius: BorderRadius.circular(3.w), backgroundColor: Color(0xff000000).withOpacity(0.85), diff --git a/lib/widget/activity_card.dart b/lib/widget/activity_card.dart index 616d3e99..517c94f1 100644 --- a/lib/widget/activity_card.dart +++ b/lib/widget/activity_card.dart @@ -122,8 +122,7 @@ class ActivityCard extends StatelessWidget { TextSpan( text: subtitleSecond, style: TextStyle( - fontSize: BaseStyle.fontSize24, - color: ktextPrimary), + fontSize: BaseStyle.fontSize24, color: ktextPrimary), ), ]), ), @@ -166,7 +165,11 @@ class ActivityCard extends StatelessWidget { borderRadius: BorderRadius.all(Radius.circular(22)), ), child: Text( - isOver ? '已结束' : isVote ? '去投票' : '去参与', + isOver + ? '已结束' + : isVote + ? '去投票' + : '去参与', style: TextStyle( fontWeight: FontWeight.w600, fontSize: BaseStyle.fontSize22, diff --git a/lib/widget/bee_divider.dart b/lib/widget/bee_divider.dart index d3511ca1..e44a87ee 100644 --- a/lib/widget/bee_divider.dart +++ b/lib/widget/bee_divider.dart @@ -19,16 +19,18 @@ class BeeDivider extends StatelessWidget { this.isHorizontal}) : super(key: key); BeeDivider.horizontal({ - Key key, this.indent, this.endIndent, - }) : - thickness = 1.w, + Key key, + this.indent, + this.endIndent, + }) : thickness = 1.w, color = Color(0xFFE8E8E8), isHorizontal = true, super(key: key); BeeDivider.vertical({ - Key key, this.indent, this.endIndent, - }) : - thickness = 1.w, + Key key, + this.indent, + this.endIndent, + }) : thickness = 1.w, color = Color(0xFFE8E8E8), isHorizontal = false, super(key: key); diff --git a/lib/widget/cached_image_wrapper.dart b/lib/widget/cached_image_wrapper.dart index 9a582d24..c178df9c 100644 --- a/lib/widget/cached_image_wrapper.dart +++ b/lib/widget/cached_image_wrapper.dart @@ -26,7 +26,7 @@ class CachedImageWrapper extends StatelessWidget { {@required this.url, @required this.width, @required this.height, - this.isSigned=true, + this.isSigned = true, this.imageType: ImageType.normal, this.fit: BoxFit.cover}); @@ -40,9 +40,13 @@ class CachedImageWrapper extends StatelessWidget { width: width, height: height, decoration: BoxDecoration( - color:isSigned?Colors.transparent:Colors.grey.withOpacity(0.6), - image:isSigned? DecorationImage( - image: imageProvider, fit: BoxFit.cover, scale: 1):null, + color: isSigned + ? Colors.transparent + : Colors.grey.withOpacity(0.6), + image: isSigned + ? DecorationImage( + image: imageProvider, fit: BoxFit.cover, scale: 1) + : null, ), ); }, diff --git a/lib/widget/circle_trend.dart b/lib/widget/circle_trend.dart index 3013a3ce..df70ebed 100644 --- a/lib/widget/circle_trend.dart +++ b/lib/widget/circle_trend.dart @@ -20,9 +20,7 @@ class CircleTrend extends StatefulWidget { class _CircleTrendState extends State { TextStyle _textStyleTitle() { return TextStyle( - fontWeight: FontWeight.w600, - fontSize: 52.sp, - color: Color(0xff333333)); + fontWeight: FontWeight.w600, fontSize: 52.sp, color: Color(0xff333333)); } TextStyle _textStyleSubtitle() { diff --git a/lib/widget/common_image_picker.dart b/lib/widget/common_image_picker.dart index afb6b215..cad3da91 100644 --- a/lib/widget/common_image_picker.dart +++ b/lib/widget/common_image_picker.dart @@ -54,7 +54,7 @@ class _CommonImagePickerState extends State { if (!mounted) return; setState(() { // images = (resultList == null) ? [] : resultList; - if(resultList != null){ + if (resultList != null) { images.addAll(resultList); } }); diff --git a/lib/widget/common_input.dart b/lib/widget/common_input.dart index 8c712a7c..8d9c62a7 100644 --- a/lib/widget/common_input.dart +++ b/lib/widget/common_input.dart @@ -9,7 +9,7 @@ import 'package:akuCommunity/utils/headers.dart'; class CommonInput extends StatefulWidget { final TextEditingController inputController; final String hintText; - CommonInput({Key key,this.inputController,this.hintText}) : super(key: key); + CommonInput({Key key, this.inputController, this.hintText}) : super(key: key); @override _CommonInputState createState() => _CommonInputState(); diff --git a/lib/widget/community_card.dart b/lib/widget/community_card.dart index 99dfff2f..4f55dcb1 100644 --- a/lib/widget/community_card.dart +++ b/lib/widget/community_card.dart @@ -105,8 +105,8 @@ class _CommunityCardState extends State { ); } - Container _cardFooter(String imagePath,title, - List headList, bool isOver, int peopleNum, Function fun) { + Container _cardFooter(String imagePath, title, List headList, + bool isOver, int peopleNum, Function fun) { return Container( margin: EdgeInsets.only(top: 40.w), child: Row( @@ -130,15 +130,14 @@ class _CommunityCardState extends State { Text( '$peopleNum人已参加', style: TextStyle( - fontSize: BaseStyle.fontSize22, - color: ktextPrimary), + fontSize: BaseStyle.fontSize22, color: ktextPrimary), ), ], ), ), InkWell( onTap: () { - fun(imagePath,title); + fun(imagePath, title); }, child: Container( alignment: Alignment.center, diff --git a/lib/widget/custom_action_sheet.dart b/lib/widget/custom_action_sheet.dart index 7816b145..57a87ee4 100644 --- a/lib/widget/custom_action_sheet.dart +++ b/lib/widget/custom_action_sheet.dart @@ -22,8 +22,8 @@ Future showCustomBottomSheet({ elevation: 0, // 透明度 builder: (BuildContext context) { return GestureDetector( - onTap: () { - Navigator.pop(context, -1); + onTap: () { + Navigator.pop(context, -1); }, child: Container( color: Color(0x00ffffff), // 设置颜色后点击事件才有效 diff --git a/lib/widget/goods_card_skeleton.dart b/lib/widget/goods_card_skeleton.dart index 7f2f40d4..4067b7ae 100644 --- a/lib/widget/goods_card_skeleton.dart +++ b/lib/widget/goods_card_skeleton.dart @@ -59,8 +59,7 @@ class GoodsCardSkeleton extends StatelessWidget { color: Colors.white, borderRadius: BorderRadius.circular(4), ), - margin: - EdgeInsets.only(bottom: 6.w), + margin: EdgeInsets.only(bottom: 6.w), height: 30.w, width: double.infinity, ), @@ -69,8 +68,7 @@ class GoodsCardSkeleton extends StatelessWidget { color: Colors.white, borderRadius: BorderRadius.circular(4), ), - margin: - EdgeInsets.only(bottom: 20.w), + margin: EdgeInsets.only(bottom: 20.w), height: 30.w, width: double.infinity, ), diff --git a/lib/widget/goods_specs_sheet.dart b/lib/widget/goods_specs_sheet.dart index 6bf8ab0e..df54b78e 100644 --- a/lib/widget/goods_specs_sheet.dart +++ b/lib/widget/goods_specs_sheet.dart @@ -305,7 +305,6 @@ class _GoodsSpecsSheetState extends State { break; default: } - }, child: Container( decoration: BoxDecoration( diff --git a/lib/widget/others/bee_header_house.dart b/lib/widget/others/bee_header_house.dart index 87510915..6c17c7d9 100644 --- a/lib/widget/others/bee_header_house.dart +++ b/lib/widget/others/bee_header_house.dart @@ -49,9 +49,7 @@ class _BeeHeaderHouseState extends State { children: [ kEstateName.text.black.size(32.sp).bold.make(), 10.w.heightBox, - userProvider.currentHouse - .text - .black + userProvider.currentHouse.text.black .size(32.sp) .bold .make() diff --git a/lib/widget/picker/bee_custom_picker.dart b/lib/widget/picker/bee_custom_picker.dart index 1410c875..f5c13af9 100644 --- a/lib/widget/picker/bee_custom_picker.dart +++ b/lib/widget/picker/bee_custom_picker.dart @@ -8,7 +8,6 @@ import 'package:get/get.dart'; import 'package:akuCommunity/utils/headers.dart'; class BeeCustomPicker extends StatefulWidget { - final Widget body; final VoidCallback onPressed; BeeCustomPicker({Key key, this.body, this.onPressed}) : super(key: key); diff --git a/lib/widget/single_image_up.dart b/lib/widget/single_image_up.dart index cec998cf..a5442038 100644 --- a/lib/widget/single_image_up.dart +++ b/lib/widget/single_image_up.dart @@ -104,12 +104,10 @@ class _SingleImageUpState extends State { border: Border.all( color: Color(0xffe8e8e8), width: images.length == 0 ? 0 : 4.w), - borderRadius: - BorderRadius.all(Radius.circular(6.w)), + borderRadius: BorderRadius.all(Radius.circular(6.w)), ), child: ClipRRect( - borderRadius: - BorderRadius.all(Radius.circular(6.w)), + borderRadius: BorderRadius.all(Radius.circular(6.w)), child: images.length == 0 ? Image.asset( widget.imagePath,