Merge branch 'zhang'

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;

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<String, dynamic> toJson() {

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<ImgModel>();
       json['headImgURls'].forEach((v) {
         headImgURls.add(new ImgModel.fromJson(v));
       });
-    }else headImgURls=[];
+    } else
+      headImgURls = [];
   }
 
   Map<String, dynamic> toJson() {

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<String, dynamic> toJson() {
@@ -74,7 +75,8 @@ class QuestionnaireTopicVoList {
         questionnaireChoiceVoList
             .add(new QuestionnaireChoiceVoList.fromJson(v));
       });
-    }else questionnaireChoiceVoList=[];
+    } else
+      questionnaireChoiceVoList = [];
   }
 
   Map<String, dynamic> 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;
   }
 }

lib/model/user/user_info_model.dart

@@ -38,7 +38,7 @@ class UserInfoModel {
 
   UserInfoModel.fromJson(Map<String, dynamic> 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'];

lib/pages/address_page/widget/address_edit_item.dart

@@ -27,8 +27,10 @@ class _AddressEditItemState extends State<AddressEditItem> {
     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<AddressEditItem> {
                   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'],

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<Map<String, dynamic>> _listPay = [
     {
       'title': '支付宝支付',

lib/pages/event_activity/event_voting_page.dart

@@ -111,7 +111,9 @@ class _EventVotingPageState extends State<EventVotingPage> {
                       //     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

lib/pages/fitup_manage/widget/common_select.dart

@@ -25,7 +25,7 @@ class _CommonSelectState extends State<CommonSelect> {
   Widget build(BuildContext context) {
     return Container(
       child: InkWell(
-        onTap: (){
+        onTap: () {
           switch (widget.title) {
             case '时间':
               DatePicker.showDatePicker(context,

lib/pages/fitup_manage/widget/decorator_info.dart

@@ -54,8 +54,7 @@ class _DecoratorInfoState extends State<DecoratorInfo> {
         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<DecoratorInfo> {
         children: [
           Text(
             '上传证件照片',
-            style: TextStyle(
-                fontSize: 28.sp, color: Color(0xff333333)),
+            style: TextStyle(fontSize: 28.sp, color: Color(0xff333333)),
           ),
           SizedBox(height: 25.w),
           Row(

lib/pages/fitup_manage/widget/director_manage.dart

@@ -19,7 +19,6 @@ class DirectorManage extends StatefulWidget {
 }
 
 class _DirectorManageState extends State<DirectorManage> {
-
   TextEditingController _companyName = new TextEditingController();
 
   int memberNum = 1;

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();

lib/pages/fitup_manage/widget/owner_manage.dart

@@ -95,8 +95,7 @@ class _OwnerManageState extends State<OwnerManage>
                   Text(
                     _listWidget[index]['title'],
                     style: TextStyle(
-                        fontSize: BaseStyle.fontSize28,
-                        color: ktextPrimary),
+                        fontSize: BaseStyle.fontSize28, color: ktextPrimary),
                   ),
                   SizedBox(height: 25.w),
                   _listWidget[index]['widget'],

lib/pages/fitup_manage/widget/pay_model_sheet.dart

@@ -43,7 +43,7 @@ class _PayModelSheetState extends State<PayModelSheet> {
     }
   ];
 
-  int _currentindex = 0 ;
+  int _currentindex = 0;
 
   void _showModelBotoomSheet() {
     showModalBottomSheet(
@@ -153,8 +153,7 @@ class _PayModelSheetState extends State<PayModelSheet> {
                     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<PayModelSheet> {
                 Text(
                   _listPay[_currentindex]['title'],
                   style: TextStyle(
-                      fontSize: BaseStyle.fontSize28,
-                      color: ktextPrimary),
+                      fontSize: BaseStyle.fontSize28, color: ktextPrimary),
                 ),
               ],
             ),

lib/pages/goods_deto_page/deto_create_page/deto_create_page.dart

@@ -54,7 +54,7 @@ class _DetoCreatePageState extends State<DetoCreatePage> {
     '50kg-100kg',
     '> 100kg',
   ];
-  int _selectApproach=0;
+  int _selectApproach = 0;
   List<String> _listMode = [
     '自己搬运',
     '搬家公司',

lib/pages/goods_deto_page/deto_create_page/widget/common_radio.dart

@@ -36,7 +36,7 @@ class _CommonRadioState extends State<CommonRadio> {
               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,

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(

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);
                           }

lib/pages/goods_manage_page/goods_manage_page.dart

@@ -97,7 +97,6 @@ class _GoodsManagePageState extends State<GoodsManagePage> {
                 alignment: Alignment.center,
                 child: '我的借还物品'.text.black.size(28.sp).make()))
       ],
-
       body: BeeListView(
           path: API.manager.articleBorrow,
           controller: _easyRefreshController,

lib/pages/invoice/invoice_page.dart

@@ -39,7 +39,6 @@ class _InvoicePageState extends State<InvoicePage> {
     });
   }
 
-
   Container _containerInvoiceDetailCheck() {
     return Container(
       color: Colors.white,
@@ -219,7 +218,7 @@ class _InvoicePageState extends State<InvoicePage> {
     return BeeScaffold(
       key: _scaffoldKey,
       title: '开具发票',
-      leading:IconButton(
+      leading: IconButton(
         icon: Icon(AntDesign.left, size: 40.sp),
         onPressed: () {
           Get.back();

lib/pages/invoice/widget/invoice_input.dart

@@ -77,8 +77,7 @@ class _InvoiceInputState extends State<InvoiceInput> {
                               fillColor: Colors.white,
                               filled: true,
                               hintStyle: TextStyle(
-                                  color: Color(0xff999999),
-                                  fontSize: 24.sp),
+                                  color: Color(0xff999999), fontSize: 24.sp),
                             ),
                           ),
                         ),

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(),
       ),
     );
   }

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,7 +51,7 @@ class _DetailsCardState extends State<DetailsCard> {
   InkWell _detailContent(Function fun) {
     return InkWell(
       onTap: fun,
-      child:Container(
+      child: Container(
         margin: EdgeInsets.only(top: 32.w),
         child: Row(
           mainAxisAlignment: MainAxisAlignment.spaceBetween,

lib/pages/life_pay/life_pay_page.dart

@@ -125,6 +125,12 @@ class _LifePayPageState extends State<LifePayPage> {
                       _selectYears.remove(index);
                       _totalCost -= (_selectPay[index].payTotal ?? 0.0);
                       _count -= (_selectPay[index].payCount ?? 0);
+                      if (_count < 0) {
+                        _count = 0;
+                      }
+                      if (_totalCost < 0) {
+                        _totalCost = 0;
+                      }
                     } else {
                       _selectYears.add(index);
                       _totalCost += (_selectPay[index].payTotal ?? 0.0);

lib/pages/life_pay/widget/life_pay_detail_page.dart

@@ -62,7 +62,6 @@ class _LifePayDetailPageState extends State<LifePayDetailPage> {
       },
       child: Row(
         children: [
-           
           BeeCheckRadio(
               value: id.toString() + groupId.toString(),
               groupValue: _selectItems),
@@ -71,7 +70,12 @@ class _LifePayDetailPageState extends State<LifePayDetailPage> {
               ? '$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,

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<OrderCard> {
 
   Widget _checkInfo() {
     return InkWell(
-      onTap: (){
+      onTap: () {
         // LifePayInfoPage(bundle: Bundle()
         //   ..putMap('detailMap', {'title': '去年（2019年）'}),).to;
       },

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<SubmitBar> {
                     TextSpan(
                       text: '合计：',
                       style: TextStyle(
-                          fontSize: BaseStyle.fontSize26,
-                          color: ktextPrimary),
+                          fontSize: BaseStyle.fontSize26, color: ktextPrimary),
                     ),
                     TextSpan(
                       text: '¥${3009.84}',

lib/pages/market/market_cart_page/market_cart_page.dart

@@ -324,8 +324,7 @@ class _MarketCartPageState extends State<MarketCartPage> {
                 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<MarketCartPage> {
                   ),
                   child: Text(
                     '删除',
-                    style: TextStyle(
-                        fontSize: 28.sp, color: Colors.white),
+                    style: TextStyle(fontSize: 28.sp, color: Colors.white),
                   ),
                   // onTap: () => _showSnackBar(context, 'Delete'),
                 );

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,
+            )
           ],
         ),
       );

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'),
                 );

lib/pages/market/widget/sliver_goods_group_card.dart

@@ -145,8 +145,7 @@ class _SliverGoodsGroupCardState extends State<SliverGoodsGroupCard> {
             ),
             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<SliverGoodsGroupCard> {
                   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<SliverGoodsGroupCard> {
           ),
           decoration: BoxDecoration(
             color: Colors.white,
-            borderRadius:
-                BorderRadius.all(Radius.circular(8.w)),
+            borderRadius: BorderRadius.all(Radius.circular(8.w)),
           ),
           child: Row(
             crossAxisAlignment: CrossAxisAlignment.start,

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)),

lib/pages/mine_car_page/car_add_page/car_add_page.dart

@@ -85,8 +85,7 @@ class _CarAddPageState extends State<CarAddPage> {
                         Text(
                           '您的车牌号',
                           style: TextStyle(
-                              fontSize: 28.sp,
-                              color: Color(0xff333333)),
+                              fontSize: 28.sp, color: Color(0xff333333)),
                         ),
                         SizedBox(height: 25.w),
                         CommonInput(

lib/pages/mine_car_page/select_parking_page/select_parking_page.dart

@@ -39,9 +39,8 @@ class _SelectParkingPageState extends State<SelectParkingPage> {
                 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(

lib/pages/mine_house_page/house_authenticate_page/house_authenticate_page.dart

@@ -102,8 +102,7 @@ class _HouseAuthenticatePageState extends State<HouseAuthenticatePage> {
                             Text(
                               _inputList[index]['title'],
                               style: TextStyle(
-                                  fontSize: 28.sp,
-                                  color: Color(0xff333333)),
+                                  fontSize: 28.sp, color: Color(0xff333333)),
                             ),
                             SizedBox(height: 25.w),
                             CommonInput(

lib/pages/opening_code_page/opening_code_page.dart

@@ -39,8 +39,7 @@ class _OpeningCodePageState extends State<OpeningCodePage> {
               ),
               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<OpeningCodePage> {
                     ),
                     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,

lib/pages/personal/change_nick_name_page.dart

@@ -53,10 +53,8 @@ class _ChangeNickNameState extends State<ChangeNickName> {
                 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),

lib/pages/personal/order_page.dart

@@ -75,10 +75,7 @@ class _OrderPageState extends State<OrderPage>
       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)),

lib/pages/personal/refund_select_page.dart

@@ -23,8 +23,6 @@ class RefundSelectPage extends StatefulWidget {
 }
 
 class _RefundSelectPageState extends State<RefundSelectPage> {
-  
-
   Container _containerContentList(List<Map<String, dynamic>> listContent) {
     return Container(
       child: Column(

lib/pages/things_page/things_create_page/things_create_page.dart

@@ -135,10 +135,7 @@ class _ThingsCreatePageState extends State<ThingsCreatePage> {
 
   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<ThingsCreatePage> {
           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<ThingsCreatePage> {
         children: [
           Text(
             title,
-            style: TextStyle(
-                fontSize: 28.sp, color: Color(0xff333333)),
+            style: TextStyle(fontSize: 28.sp, color: Color(0xff333333)),
           ),
           SizedBox(height: 32.w),
           widget,

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),

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(

lib/pages/things_page/widget/fixed_check_box.dart

@@ -18,7 +18,6 @@ class FixedCheckBox extends StatefulWidget {
 class _FixedCheckBoxState extends State<FixedCheckBox> {
   bool _isSelected = false;
 
-  
   @override
   Widget build(BuildContext context) {
     return GestureDetector(
@@ -47,8 +46,7 @@ class _FixedCheckBoxState extends State<FixedCheckBox> {
           height: 24.w,
           decoration: BoxDecoration(
               borderRadius: BorderRadius.circular(24.w),
-            color: kPrimaryColor.withOpacity(_isSelected?1:0)
-          ),
+              color: kPrimaryColor.withOpacity(_isSelected ? 1 : 0)),
         ),
       ),
     );

lib/pages/things_page/widget/fixed_detail_page.dart

@@ -102,17 +102,12 @@ class _FixedDetailPageState extends State<FixedDetailPage> {
                     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<FixedDetailPage> {
           ...model.appProcessRecordVo
               .map((e) => Row(
                     children: [
-                      BeeMap
-                          .processClass[e.operationType]
-                          .text
+                      BeeMap.processClass[e.operationType].text
                           .color(ktextSubColor)
                           .size(28.sp)
                           .make(),

lib/pages/things_page/widget/things_app_bar.dart

@@ -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(

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;
+      AkuShopModel _newgoods = AkuShopModel.fromJson(newGoods);
+      int _goodIndex = cartList.indexWhere((element) {
+        return element.itemid == _newgoods.itemid;
       });
-   _goodIndex>-1?cartList[_goodIndex].count+=count:
-      cartList.add(_newgoods);
+      _goodIndex > -1
+          ? cartList[_goodIndex].count += count
+          : cartList.add(_newgoods);
     }
     cartString = json.encode(tempList).toString();
     print(cartString);

lib/ui/community/community_views/event_detail_page.dart

@@ -47,7 +47,7 @@ class _EventDetailPageState extends State<EventDetailPage> {
             : ListView(
                 children: [
                   ChatCard(
-                   model:_model,
+                    model: _model,
                     hideLine: true,
                     canTap: false,
                   ),

lib/ui/community/notice/notice_detail_page.dart

@@ -33,7 +33,7 @@ class _NoticeDetailPageState extends State<NoticeDetailPage> {
       );
 
   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,

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,
               ),
             ),

lib/ui/manager/visitor/visitor_record_view.dart

@@ -23,7 +23,6 @@ class VisitorRecordView extends StatefulWidget {
 class _VisitorRecordViewState extends State<VisitorRecordView> {
   EasyRefreshController _refreshController = EasyRefreshController();
 
- 
   @override
   void dispose() {
     _refreshController?.dispose();

lib/utils/toast.dart

@@ -7,8 +7,8 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
 
 class Toast {
   static globalToast(String text) {
-    return BotToast.showText(text: 
-      text,
+    return BotToast.showText(
+      text: text,
       duration: Duration(milliseconds: 2000),
       borderRadius: BorderRadius.circular(3.w),
       backgroundColor: Color(0xff000000).withOpacity(0.85),

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,

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);

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,
                 ),
               );
             },

lib/widget/circle_trend.dart

@@ -20,9 +20,7 @@ class CircleTrend extends StatefulWidget {
 class _CircleTrendState extends State<CircleTrend> {
   TextStyle _textStyleTitle() {
     return TextStyle(
-        fontWeight: FontWeight.w600,
-        fontSize: 52.sp,
-        color: Color(0xff333333));
+        fontWeight: FontWeight.w600, fontSize: 52.sp, color: Color(0xff333333));
   }
 
   TextStyle _textStyleSubtitle() {

lib/widget/common_image_picker.dart

@@ -54,7 +54,7 @@ class _CommonImagePickerState extends State<CommonImagePicker> {
     if (!mounted) return;
     setState(() {
       // images = (resultList == null) ? [] : resultList;
-      if(resultList != null){
+      if (resultList != null) {
         images.addAll(resultList);
       }
     });

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();

lib/widget/community_card.dart

@@ -105,8 +105,8 @@ class _CommunityCardState extends State<CommunityCard> {
     );
   }
 
-  Container _cardFooter(String imagePath,title,
-      List<String> headList, bool isOver, int peopleNum, Function fun) {
+  Container _cardFooter(String imagePath, title, List<String> 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<CommunityCard> {
                 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,

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,
                           ),

lib/widget/goods_specs_sheet.dart

@@ -305,7 +305,6 @@ class _GoodsSpecsSheetState extends State<GoodsSpecsSheet> {
             break;
           default:
         }
-
       },
       child: Container(
         decoration: BoxDecoration(

lib/widget/others/bee_header_house.dart

@@ -49,9 +49,7 @@ class _BeeHeaderHouseState extends State<BeeHeaderHouse> {
                       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()

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);

lib/widget/single_image_up.dart

@@ -104,12 +104,10 @@ class _SingleImageUpState extends State<SingleImageUp> {
                     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,