diff --git a/lib/constants/application_objects.dart b/lib/constants/application_objects.dart index d822e8b5..7e32a7c2 100644 --- a/lib/constants/application_objects.dart +++ b/lib/constants/application_objects.dart @@ -80,7 +80,8 @@ List appObjects = [ AO('投诉表扬', R.ASSETS_APPLICATIONS_COMPLAINT_PNG, () => AdvicePage(type: AdviceType.COMPLAIN)), AO('问卷调查', R.ASSETS_APPLICATIONS_QUESTION_PNG, () => QuestionnairePage()), - AO('装修管理', R.ASSETS_APPLICATIONS_DECORATION_PNG,()=> RenovationManagePage()), + AO('装修管理', R.ASSETS_APPLICATIONS_DECORATION_PNG, + () => RenovationManagePage()), AO('借还管理', R.ASSETS_APPLICATIONS_BORROW_PNG, () => SelectBorrowReturnPage()), AO('一键报警', R.ASSETS_APPLICATIONS_POLICE_PNG, () => AlarmPage()), AO('设施预约', R.ASSETS_ICONS_TOOL_FACILITY_PNG, () => FacilityAppointmentPage()), diff --git a/lib/generated_plugin_registrant.dart b/lib/generated_plugin_registrant.dart index 222a4e7a..8e0b1cb0 100644 --- a/lib/generated_plugin_registrant.dart +++ b/lib/generated_plugin_registrant.dart @@ -6,13 +6,12 @@ import 'package:device_info_plus_web/device_info_plus_web.dart'; import 'package:firebase_core_web/firebase_core_web.dart'; +import 'package:flutter_web_plugins/flutter_web_plugins.dart'; import 'package:image_picker_for_web/image_picker_for_web.dart'; import 'package:package_info_plus_web/package_info_plus_web.dart'; import 'package:shared_preferences_web/shared_preferences_web.dart'; import 'package:url_launcher_web/url_launcher_web.dart'; -import 'package:flutter_web_plugins/flutter_web_plugins.dart'; - // ignore: public_member_api_docs void registerPlugins(Registrar registrar) { DeviceInfoPlusPlugin.registerWith(registrar); diff --git a/lib/model/community/activity_item_model.dart b/lib/model/community/activity_item_model.dart index 0c4ba035..4ec82d3d 100644 --- a/lib/model/community/activity_item_model.dart +++ b/lib/model/community/activity_item_model.dart @@ -1,8 +1,9 @@ -import 'package:aku_community/base/base_style.dart'; +import 'package:flutter/material.dart'; + import 'package:flustars/flustars.dart'; +import 'package:aku_community/base/base_style.dart'; import 'package:aku_community/model/common/img_model.dart'; -import 'package:flutter/material.dart'; class ActivityItemModel { int? id; diff --git a/lib/models/community_introduce/community_introduce_model.dart b/lib/models/community_introduce/community_introduce_model.dart index 25d4a329..8d0aecaa 100644 --- a/lib/models/community_introduce/community_introduce_model.dart +++ b/lib/models/community_introduce/community_introduce_model.dart @@ -1,7 +1,8 @@ import 'package:equatable/equatable.dart'; +import 'package:json_annotation/json_annotation.dart'; import 'package:aku_community/model/common/img_model.dart'; -import 'package:json_annotation/json_annotation.dart'; + part 'community_introduce_model.g.dart'; @JsonSerializable() diff --git a/lib/models/electronic_commerc/electronic_commerc_category_model.dart b/lib/models/electronic_commerc/electronic_commerc_category_model.dart index b863ce3e..14a12e1e 100644 --- a/lib/models/electronic_commerc/electronic_commerc_category_model.dart +++ b/lib/models/electronic_commerc/electronic_commerc_category_model.dart @@ -1,5 +1,6 @@ import 'package:equatable/equatable.dart'; import 'package:json_annotation/json_annotation.dart'; + part 'electronic_commerc_category_model.g.dart'; @JsonSerializable() diff --git a/lib/models/electronic_commerc/electronic_commerc_detail_model.dart b/lib/models/electronic_commerc/electronic_commerc_detail_model.dart index 606aa741..5983cf3e 100644 --- a/lib/models/electronic_commerc/electronic_commerc_detail_model.dart +++ b/lib/models/electronic_commerc/electronic_commerc_detail_model.dart @@ -1,5 +1,6 @@ import 'package:equatable/equatable.dart'; import 'package:json_annotation/json_annotation.dart'; + part 'electronic_commerc_detail_model.g.dart'; @JsonSerializable() diff --git a/lib/models/electronic_commerc/electronic_commerc_list_model.dart b/lib/models/electronic_commerc/electronic_commerc_list_model.dart index 7cf347ef..e1a7df79 100644 --- a/lib/models/electronic_commerc/electronic_commerc_list_model.dart +++ b/lib/models/electronic_commerc/electronic_commerc_list_model.dart @@ -1,7 +1,8 @@ import 'package:equatable/equatable.dart'; +import 'package:json_annotation/json_annotation.dart'; import 'package:aku_community/model/common/img_model.dart'; -import 'package:json_annotation/json_annotation.dart'; + part 'electronic_commerc_list_model.g.dart'; @JsonSerializable() diff --git a/lib/models/express_package/express_package_list_model.dart b/lib/models/express_package/express_package_list_model.dart index 2d414ea5..887718b2 100644 --- a/lib/models/express_package/express_package_list_model.dart +++ b/lib/models/express_package/express_package_list_model.dart @@ -28,10 +28,9 @@ class ExpressPackageListModel extends Equatable { }); factory ExpressPackageListModel.fromJson(Map json) => _$ExpressPackageListModelFromJson(json); - String get createDateString => DateUtil.formatDateStr(this.createDate, - format: 'yyyy-MM-dd HH:mm'); + String get createDateString => + DateUtil.formatDateStr(this.createDate, format: 'yyyy-MM-dd HH:mm'); @override List get props => throw UnimplementedError(); - } diff --git a/lib/models/facility/facility_order_date_list_model.dart b/lib/models/facility/facility_order_date_list_model.dart index c526cdb2..18648736 100644 --- a/lib/models/facility/facility_order_date_list_model.dart +++ b/lib/models/facility/facility_order_date_list_model.dart @@ -1,6 +1,7 @@ import 'package:equatable/equatable.dart'; import 'package:flustars/flustars.dart'; import 'package:json_annotation/json_annotation.dart'; + part 'facility_order_date_list_model.g.dart'; @JsonSerializable() diff --git a/lib/models/market/order/my_order_list_model.dart b/lib/models/market/order/my_order_list_model.dart index a4b5217c..93e4f5a4 100644 --- a/lib/models/market/order/my_order_list_model.dart +++ b/lib/models/market/order/my_order_list_model.dart @@ -1,6 +1,7 @@ +import 'package:flutter/material.dart'; + import 'package:equatable/equatable.dart'; import 'package:flustars/flustars.dart'; -import 'package:flutter/material.dart'; import 'package:json_annotation/json_annotation.dart'; import 'package:aku_community/model/common/img_model.dart'; diff --git a/lib/models/news/news_detail_model.dart b/lib/models/news/news_detail_model.dart index 0750610b..9570cb9d 100644 --- a/lib/models/news/news_detail_model.dart +++ b/lib/models/news/news_detail_model.dart @@ -1,5 +1,6 @@ import 'package:equatable/equatable.dart'; import 'package:json_annotation/json_annotation.dart'; + part 'news_detail_model.g.dart'; @JsonSerializable() diff --git a/lib/models/search/search_model.dart b/lib/models/search/search_model.dart index 6db340b8..b8afe289 100644 --- a/lib/models/search/search_model.dart +++ b/lib/models/search/search_model.dart @@ -1,8 +1,8 @@ import 'package:equatable/equatable.dart'; +import 'package:json_annotation/json_annotation.dart'; import 'package:aku_community/model/community/activity_item_model.dart'; import 'package:aku_community/model/community/community_topic_model.dart'; -import 'package:json_annotation/json_annotation.dart'; part 'search_model.g.dart'; diff --git a/lib/models/service_browse/service_browse_list_mode.dart b/lib/models/service_browse/service_browse_list_mode.dart index 2faf46b5..82a526f9 100644 --- a/lib/models/service_browse/service_browse_list_mode.dart +++ b/lib/models/service_browse/service_browse_list_mode.dart @@ -1,5 +1,6 @@ import 'package:equatable/equatable.dart'; import 'package:json_annotation/json_annotation.dart'; + part 'service_browse_list_mode.g.dart'; @JsonSerializable() diff --git a/lib/pages/community_introduce/community_introduce_page.dart b/lib/pages/community_introduce/community_introduce_page.dart index ae516432..e6cbd44e 100644 --- a/lib/pages/community_introduce/community_introduce_page.dart +++ b/lib/pages/community_introduce/community_introduce_page.dart @@ -1,15 +1,17 @@ +import 'package:flutter/material.dart'; + +import 'package:flutter_easyrefresh/easy_refresh.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:velocity_x/velocity_x.dart'; + import 'package:aku_community/base/base_style.dart'; +import 'package:aku_community/const/resource.dart'; import 'package:aku_community/constants/api.dart'; import 'package:aku_community/model/common/img_model.dart'; import 'package:aku_community/models/community_introduce/community_introduce_model.dart'; import 'package:aku_community/utils/network/base_model.dart'; import 'package:aku_community/utils/network/net_util.dart'; import 'package:aku_community/widget/bee_scaffold.dart'; -import 'package:flutter/material.dart'; -import 'package:aku_community/const/resource.dart'; -import 'package:flutter_easyrefresh/easy_refresh.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:velocity_x/velocity_x.dart'; class CommunityIntroducePage extends StatefulWidget { CommunityIntroducePage({Key? key}) : super(key: key); diff --git a/lib/pages/electronic_commerc/electronic_commerc_card.dart b/lib/pages/electronic_commerc/electronic_commerc_card.dart index 318cfa37..69f1217f 100644 --- a/lib/pages/electronic_commerc/electronic_commerc_card.dart +++ b/lib/pages/electronic_commerc/electronic_commerc_card.dart @@ -1,15 +1,16 @@ -import 'package:aku_community/base/base_style.dart'; -import 'package:aku_community/constants/api.dart'; -import 'package:aku_community/model/common/img_model.dart'; -import 'package:aku_community/pages/electronic_commerc/electronic_commerc_detail_page.dart'; -import 'package:flustars/flustars.dart'; import 'package:flutter/material.dart'; -import 'package:aku_community/models/electronic_commerc/electronic_commerc_list_model.dart'; +import 'package:flustars/flustars.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:velocity_x/velocity_x.dart'; + +import 'package:aku_community/base/base_style.dart'; import 'package:aku_community/const/resource.dart'; +import 'package:aku_community/constants/api.dart'; +import 'package:aku_community/model/common/img_model.dart'; +import 'package:aku_community/models/electronic_commerc/electronic_commerc_list_model.dart'; +import 'package:aku_community/pages/electronic_commerc/electronic_commerc_detail_page.dart'; class ElectronicCommercCard extends StatefulWidget { final ElectronicCommercListModel model; diff --git a/lib/pages/electronic_commerc/electronic_commerc_detail_page.dart b/lib/pages/electronic_commerc/electronic_commerc_detail_page.dart index 8d873d6c..38af8ccb 100644 --- a/lib/pages/electronic_commerc/electronic_commerc_detail_page.dart +++ b/lib/pages/electronic_commerc/electronic_commerc_detail_page.dart @@ -1,25 +1,29 @@ -import 'package:aku_community/base/base_style.dart'; -import 'package:aku_community/constants/api.dart'; -import 'package:aku_community/utils/network/base_model.dart'; -import 'package:aku_community/utils/network/net_util.dart'; -import 'package:aku_community/widget/bee_scaffold.dart'; +import 'package:flutter/material.dart'; + import 'package:bot_toast/bot_toast.dart'; import 'package:flustars/flustars.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_easyrefresh/easy_refresh.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:aku_community/models/electronic_commerc/electronic_commerc_detail_model.dart'; import 'package:velocity_x/velocity_x.dart'; + +import 'package:aku_community/base/base_style.dart'; +import 'package:aku_community/constants/api.dart'; +import 'package:aku_community/models/electronic_commerc/electronic_commerc_detail_model.dart'; +import 'package:aku_community/utils/network/base_model.dart'; +import 'package:aku_community/utils/network/net_util.dart'; +import 'package:aku_community/widget/bee_scaffold.dart'; + class ElectronicCommercDetailPage extends StatefulWidget { final int id; ElectronicCommercDetailPage({Key? key, required this.id}) : super(key: key); @override - _ElectronicCommercDetailPageState createState() => _ElectronicCommercDetailPageState(); + _ElectronicCommercDetailPageState createState() => + _ElectronicCommercDetailPageState(); } -class _ElectronicCommercDetailPageState extends State { - +class _ElectronicCommercDetailPageState + extends State { late EasyRefreshController _easyRefreshController; bool _onload = true; late ElectronicCommercDetailModel _detailModel; @@ -38,18 +42,19 @@ class _ElectronicCommercDetailPageState extends State { return BeeListView( path: API.manager.electronicCommercList, controller: _refreshController, - extraParams: { - "electronicCommerceCategoryId":widget.id - }, + extraParams: {"electronicCommerceCategoryId": widget.id}, convert: (models) { return models.tableList! .map((e) => ElectronicCommercListModel.fromJson(e)) @@ -50,7 +50,7 @@ class _ElectronicCommercViewState extends State { }, builder: (items) { return ListView.separated( - padding: EdgeInsets.symmetric(vertical: 24.w), + padding: EdgeInsets.symmetric(vertical: 24.w), itemBuilder: (context, index) { return ElectronicCommercCard( model: items[index], diff --git a/lib/pages/express_packages/express_package_card.dart b/lib/pages/express_packages/express_package_card.dart index 048240cc..4f7a332c 100644 --- a/lib/pages/express_packages/express_package_card.dart +++ b/lib/pages/express_packages/express_package_card.dart @@ -1,16 +1,16 @@ -import 'package:aku_community/constants/api.dart'; -import 'package:aku_community/models/express_package/express_package_list_model.dart'; -import 'package:aku_community/utils/network/base_model.dart'; -import 'package:aku_community/utils/network/net_util.dart'; -import 'package:bot_toast/bot_toast.dart'; import 'package:flutter/material.dart'; +import 'package:bot_toast/bot_toast.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:velocity_x/velocity_x.dart'; import 'package:aku_community/base/base_style.dart'; import 'package:aku_community/const/resource.dart'; +import 'package:aku_community/constants/api.dart'; import 'package:aku_community/extensions/widget_list_ext.dart'; +import 'package:aku_community/models/express_package/express_package_list_model.dart'; +import 'package:aku_community/utils/network/base_model.dart'; +import 'package:aku_community/utils/network/net_util.dart'; import 'package:aku_community/widget/bee_divider.dart'; class ExpressPackageCard extends StatefulWidget { diff --git a/lib/pages/express_packages/express_package_view.dart b/lib/pages/express_packages/express_package_view.dart index 19338925..7c3dd578 100644 --- a/lib/pages/express_packages/express_package_view.dart +++ b/lib/pages/express_packages/express_package_view.dart @@ -1,12 +1,14 @@ -import 'package:aku_community/constants/api.dart'; -import 'package:aku_community/models/express_package/express_package_list_model.dart'; -import 'package:aku_community/pages/express_packages/express_package_card.dart'; -import 'package:aku_community/pages/things_page/widget/bee_list_view.dart'; import 'package:flutter/material.dart'; + import 'package:flutter_easyrefresh/easy_refresh.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:velocity_x/velocity_x.dart'; +import 'package:aku_community/constants/api.dart'; +import 'package:aku_community/models/express_package/express_package_list_model.dart'; +import 'package:aku_community/pages/express_packages/express_package_card.dart'; +import 'package:aku_community/pages/things_page/widget/bee_list_view.dart'; + class ExpressPackageView extends StatefulWidget { final int index; ExpressPackageView({Key? key, required this.index}) : super(key: key); 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 77b68540..0aa5807b 100644 --- a/lib/pages/goods_deto_page/widget/goods_info_card.dart +++ b/lib/pages/goods_deto_page/widget/goods_info_card.dart @@ -37,10 +37,8 @@ class GoodsInfoCard extends StatelessWidget { Color _getColor(int? state) { switch (state) { case 1: - return kDarkPrimaryColor; case 2: - return ktextSubColor; default: return kDangerColor; diff --git a/lib/pages/goods_manage_page/borrow/borrow_goods_detail_page.dart b/lib/pages/goods_manage_page/borrow/borrow_goods_detail_page.dart index 96b4415a..566c1780 100644 --- a/lib/pages/goods_manage_page/borrow/borrow_goods_detail_page.dart +++ b/lib/pages/goods_manage_page/borrow/borrow_goods_detail_page.dart @@ -19,8 +19,7 @@ import 'package:aku_community/widget/buttons/radio_button.dart'; class BorrowGoodsDetailPage extends StatefulWidget { final int articleId; final List? receiveIds; - BorrowGoodsDetailPage( - {Key? key, required this.articleId, this.receiveIds}) + BorrowGoodsDetailPage({Key? key, required this.articleId, this.receiveIds}) : super(key: key); @override @@ -66,9 +65,8 @@ class _BorrowGoodsDetailPageState extends State { child: _onload ? _empty() : ListView( - padding: EdgeInsets.symmetric(vertical: 12.w), - children: [..._models.map((e) => _goodsCard(e)).toList()] - ), + padding: EdgeInsets.symmetric(vertical: 12.w), + children: [..._models.map((e) => _goodsCard(e)).toList()]), ), bottomNavi: _onload ? _empty() : _bottomButton(), ); diff --git a/lib/pages/goods_manage_page/borrow/borrow_goods_page.dart b/lib/pages/goods_manage_page/borrow/borrow_goods_page.dart index 9064db42..619a591b 100644 --- a/lib/pages/goods_manage_page/borrow/borrow_goods_page.dart +++ b/lib/pages/goods_manage_page/borrow/borrow_goods_page.dart @@ -1,4 +1,5 @@ import 'package:flutter/material.dart'; + import 'package:flutter_easyrefresh/easy_refresh.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; @@ -74,9 +75,7 @@ class _BorrowGoodsPageState extends State { _receiveIds = List.generate(models.tableList?.length ?? 0, (index) => BorrowGoodsSubmitModel.init()); print(_submitIds); - setState(() { - - }); + setState(() {}); return models.tableList! .map((e) => ArticleBorrowModel.fromJson(e)) .toList(); diff --git a/lib/pages/goods_manage_page/mine_goods_page/mine_goods_page.dart b/lib/pages/goods_manage_page/mine_goods_page/mine_goods_page.dart index a3249eb9..19eb4122 100644 --- a/lib/pages/goods_manage_page/mine_goods_page/mine_goods_page.dart +++ b/lib/pages/goods_manage_page/mine_goods_page/mine_goods_page.dart @@ -19,7 +19,7 @@ class MineGoodsPage extends StatefulWidget { } class _MineGoodsPageState extends State { - late EasyRefreshController _controller; + late EasyRefreshController _controller; @override void initState() { diff --git a/lib/pages/home/home_page.dart b/lib/pages/home/home_page.dart index 693db6bb..f6157be2 100644 --- a/lib/pages/home/home_page.dart +++ b/lib/pages/home/home_page.dart @@ -1,14 +1,10 @@ // Dart imports: -import 'package:aku_community/constants/api.dart'; -import 'package:aku_community/models/news/news_category_model.dart'; -import 'package:aku_community/utils/network/base_model.dart'; -import 'package:aku_community/utils/network/net_util.dart'; -import 'package:bot_toast/bot_toast.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:badges/badges.dart'; +import 'package:bot_toast/bot_toast.dart'; import 'package:flutter_easyrefresh/easy_refresh.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; @@ -16,8 +12,10 @@ import 'package:provider/provider.dart'; import 'package:velocity_x/velocity_x.dart'; import 'package:aku_community/const/resource.dart'; +import 'package:aku_community/constants/api.dart'; import 'package:aku_community/model/community/activity_item_model.dart'; import 'package:aku_community/model/community/board_model.dart'; +import 'package:aku_community/models/news/news_category_model.dart'; import 'package:aku_community/pages/home/widget/animate_app_bar.dart'; import 'package:aku_community/pages/message_center_page/message_center_page.dart'; import 'package:aku_community/provider/app_provider.dart'; @@ -29,6 +27,8 @@ import 'package:aku_community/ui/home/home_title.dart'; import 'package:aku_community/ui/home/public_infomation/public_infomation_page.dart'; import 'package:aku_community/utils/headers.dart'; import 'package:aku_community/utils/login_util.dart'; +import 'package:aku_community/utils/network/base_model.dart'; +import 'package:aku_community/utils/network/net_util.dart'; import 'package:aku_community/widget/buttons/column_action_button.dart'; import 'package:aku_community/widget/views/application_box.dart'; import 'package:aku_community/widget/views/application_view.dart'; diff --git a/lib/pages/life_pay/life_pay_page.dart b/lib/pages/life_pay/life_pay_page.dart index 5ae2300c..d8e4efaf 100644 --- a/lib/pages/life_pay/life_pay_page.dart +++ b/lib/pages/life_pay/life_pay_page.dart @@ -1,6 +1,3 @@ -import 'package:aku_community/pages/life_pay/pay_finish_page.dart'; -import 'package:aku_community/utils/network/base_model.dart'; -import 'package:aku_community/utils/network/net_util.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; @@ -13,12 +10,15 @@ import 'package:aku_community/base/base_style.dart'; import 'package:aku_community/constants/api.dart'; import 'package:aku_community/model/manager/life_pay_model.dart'; import 'package:aku_community/pages/life_pay/life_pay_record_page.dart'; +import 'package:aku_community/pages/life_pay/pay_finish_page.dart'; import 'package:aku_community/pages/life_pay/widget/life_pay_detail_page.dart'; import 'package:aku_community/pages/things_page/widget/bee_list_view.dart'; import 'package:aku_community/provider/app_provider.dart'; import 'package:aku_community/ui/profile/house/pick_my_house_page.dart'; import 'package:aku_community/utils/bee_parse.dart'; import 'package:aku_community/utils/headers.dart'; +import 'package:aku_community/utils/network/base_model.dart'; +import 'package:aku_community/utils/network/net_util.dart'; import 'package:aku_community/widget/bee_divider.dart'; import 'package:aku_community/widget/bee_scaffold.dart'; import 'package:aku_community/widget/buttons/bee_check_radio.dart'; @@ -396,11 +396,11 @@ class _LifePayPageState extends State { color: kPrimaryColor, padding: EdgeInsets.symmetric(horizontal: 50.w, vertical: 15.w), onPressed: () async { - BaseModel baseModel = await NetUtil() - .post('/user/dailyPayment/pay', params: { + BaseModel baseModel = + await NetUtil().post('/user/dailyPayment/pay', params: { "ids": _ids, - "payType":1, //暂时写死 等待后续补充 - "payPrice":_totalCost + "payType": 1, //暂时写死 等待后续补充 + "payPrice": _totalCost }); if (baseModel.status ?? false) { Get.off(() => PayFinishPage()); diff --git a/lib/pages/life_pay/pay_finish_page.dart b/lib/pages/life_pay/pay_finish_page.dart index 89094e53..f94c73cb 100644 --- a/lib/pages/life_pay/pay_finish_page.dart +++ b/lib/pages/life_pay/pay_finish_page.dart @@ -1,8 +1,9 @@ -import 'package:aku_community/utils/headers.dart'; -import 'package:aku_community/widget/bee_back_button.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; +import 'package:aku_community/utils/headers.dart'; +import 'package:aku_community/widget/bee_back_button.dart'; + class PayFinishPage extends StatelessWidget { const PayFinishPage({Key? key}) : super(key: key); @@ -36,7 +37,11 @@ class PayFinishPage extends StatelessWidget { end: Alignment.bottomCenter), ), alignment: Alignment.center, - child: Icon(CupertinoIcons.checkmark_alt,size:150.w ,color: Colors.white,), + child: Icon( + CupertinoIcons.checkmark_alt, + size: 150.w, + color: Colors.white, + ), ), 70.w.heightBox, '支付成功'.text.size(48.sp).color(Colors.white).bold.make(), 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 d3ba8232..555234c8 100644 --- a/lib/pages/life_pay/widget/life_pay_detail_page.dart +++ b/lib/pages/life_pay/widget/life_pay_detail_page.dart @@ -253,7 +253,7 @@ class _LifePayDetailPageState extends State { color: kPrimaryColor, padding: EdgeInsets.symmetric(horizontal: 50.w, vertical: 15.w), onPressed: () { - Get.back(result: [_payNum, _payTotal,_ids]); + Get.back(result: [_payNum, _payTotal, _ids]); }, child: '选好了'.text.black.size(32.sp).bold.make(), ), diff --git a/lib/pages/one_alarm/widget/alarm_page.dart b/lib/pages/one_alarm/widget/alarm_page.dart index e54252b7..1c14de34 100644 --- a/lib/pages/one_alarm/widget/alarm_page.dart +++ b/lib/pages/one_alarm/widget/alarm_page.dart @@ -1,5 +1,3 @@ -import 'package:aku_community/constants/api.dart'; -import 'package:aku_community/utils/network/net_util.dart'; import 'package:flutter/material.dart'; import 'package:amap_flutter_base/amap_flutter_base.dart'; @@ -12,9 +10,11 @@ import 'package:provider/provider.dart'; import 'package:url_launcher/url_launcher.dart'; import 'package:velocity_x/velocity_x.dart'; +import 'package:aku_community/constants/api.dart'; import 'package:aku_community/pages/one_alarm/alarm_detail_page.dart'; import 'package:aku_community/provider/app_provider.dart'; import 'package:aku_community/utils/headers.dart'; +import 'package:aku_community/utils/network/net_util.dart'; import 'package:aku_community/widget/bee_scaffold.dart'; class PermissionUtil { @@ -221,18 +221,18 @@ class _AlarmPageState extends State { child: MaterialButton( shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(172.w)), - onPressed: () async{ - + onPressed: () async { setState(() { _makephonenum('tel:110'); }); - if (appProvider.selectedHouse?.status==4) { - await NetUtil().post(API.manager.recordAlarmInfo,params: { - "estateId":appProvider.selectedHouse?.estateId, - }); + if (appProvider.selectedHouse?.status == 4) { + await NetUtil() + .post(API.manager.recordAlarmInfo, params: { + "estateId": + appProvider.selectedHouse?.estateId, + }); } - }, child: Icon( Feather.phone_call, diff --git a/lib/pages/renovation_manage/renovation_manage_card.dart b/lib/pages/renovation_manage/renovation_manage_card.dart index 01405e99..dc9aad90 100644 --- a/lib/pages/renovation_manage/renovation_manage_card.dart +++ b/lib/pages/renovation_manage/renovation_manage_card.dart @@ -1,12 +1,14 @@ -import 'package:aku_community/base/base_style.dart'; -import 'package:aku_community/pages/renovation_manage/renovation_manage_detail_page.dart'; -import 'package:aku_community/pages/renovation_manage/renovation_map.dart'; -import 'package:flustars/flustars.dart'; import 'package:flutter/material.dart'; + +import 'package:flustars/flustars.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:velocity_x/velocity_x.dart'; + +import 'package:aku_community/base/base_style.dart'; import 'package:aku_community/const/resource.dart'; +import 'package:aku_community/pages/renovation_manage/renovation_manage_detail_page.dart'; +import 'package:aku_community/pages/renovation_manage/renovation_map.dart'; class RenovationManageCard extends StatefulWidget { final int index; @@ -21,7 +23,7 @@ class _RenovationManageCardState extends State { Widget build(BuildContext context) { return GestureDetector( onTap: () { - Get.to(()=>RenovationManageDetailPage()); + Get.to(() => RenovationManageDetailPage()); }, child: Container( margin: EdgeInsets.only(top: 16.w), diff --git a/lib/pages/renovation_manage/renovation_manage_detail_page.dart b/lib/pages/renovation_manage/renovation_manage_detail_page.dart index d14ec0e8..5bf47217 100644 --- a/lib/pages/renovation_manage/renovation_manage_detail_page.dart +++ b/lib/pages/renovation_manage/renovation_manage_detail_page.dart @@ -1,13 +1,15 @@ import 'dart:math'; -import 'package:aku_community/base/base_style.dart'; -import 'package:aku_community/pages/renovation_manage/renovation_map.dart'; -import 'package:aku_community/widget/bee_scaffold.dart'; -import 'package:flustars/flustars.dart'; import 'package:flutter/material.dart'; -import 'package:velocity_x/velocity_x.dart'; + +import 'package:flustars/flustars.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:velocity_x/velocity_x.dart'; + +import 'package:aku_community/base/base_style.dart'; import 'package:aku_community/const/resource.dart'; +import 'package:aku_community/pages/renovation_manage/renovation_map.dart'; +import 'package:aku_community/widget/bee_scaffold.dart'; class RenovationManageDetailPage extends StatefulWidget { RenovationManageDetailPage({Key? key}) : super(key: key); @@ -25,7 +27,11 @@ class _RenovationManageDetailPageState title: '装修详情', body: ListView( padding: EdgeInsets.symmetric(vertical: 24.w), - children: [_buildInfo(), _buildFinishWorkCheck(),_buildCycleCheck(),], + children: [ + _buildInfo(), + _buildFinishWorkCheck(), + _buildCycleCheck(), + ], ), ); } @@ -213,11 +219,10 @@ class _RenovationManageDetailPageState ); } - _buildFinishWorkCheck() { return _akuTitleBox( - '完工检查', - SizedBox(), + '完工检查', + SizedBox(), 24, [ _buildRow( @@ -246,7 +251,7 @@ class _RenovationManageDetailPageState child: Text( '检查内容', style: TextStyle( - color:ktextPrimary, + color: ktextPrimary, fontSize: 28.w, ), ), @@ -263,8 +268,8 @@ class _RenovationManageDetailPageState return _akuTitleBox( '周期检查', SizedBox(), - 24, - [ + 24, + [ _buildRow( title: '开始装修时间', subTitle: DateUtil.formatDateStr( @@ -272,12 +277,7 @@ class _RenovationManageDetailPageState format: 'yyyy-MM-dd', ), ), - _buildRow( - title: '接受人', - subTitle: '黄鑫', - onTap: () { - } - ), + _buildRow(title: '接受人', subTitle: '黄鑫', onTap: () {}), _buildRow(title: '所属项目', subTitle: '装修管理'), _buildRow( title: '开始日期', @@ -285,143 +285,142 @@ class _RenovationManageDetailPageState '2020-10-23 10:24:56', format: 'yyyy-MM-dd', ), - onTap:() { - // showBottomSheet( - // child: Column( - // mainAxisSize: MainAxisSize.min, - // children: [ - // Row( - // children: [ - // AkuBox.h(96), - // AkuBackButton.text(), - // Spacer(), - // Text( - // '开始日期', - // style: TextStyle( - // color: AppStyle.primaryTextColor, - // fontSize: 32.sp, - // fontWeight: FontWeight.bold, - // ), - // ), - // Spacer(), - // AkuMaterialButton( - // minWidth: (64 + 56).w, - // onPressed: () { - // Get.back(); - // }, - // child: Text( - // '确定', - // style: TextStyle( - // color: AppStyle.secondaryColor, - // fontSize: 28.sp, - // ), - // ), - // ), - // ], - // ), - // Container( - // height: 500.w, - // child: CupertinoDatePicker( - // onDateTimeChanged: (dateTime) { - // widget.model.cycleCheck.startDate = dateTime; - // }, - // ), - // ), - // ], - // ), - // ).then((value) { - // setState(() {}); - // }); - }, - ), - _buildRow( - title: '检查周期', - subTitle:'2020-10-23 10:24:56', onTap: () { - // showAkuSheet( - // child: Column( - // mainAxisSize: MainAxisSize.min, - // children: [ - // Row( - // children: [ - // AkuBox.h(96), - // AkuBackButton.text(), - // Spacer(), - // Text( - // '检查周期', - // style: TextStyle( - // color: AppStyle.primaryTextColor, - // fontSize: 32.sp, - // fontWeight: FontWeight.bold, - // ), - // ), - // Spacer(), - // AkuMaterialButton( - // minWidth: (64 + 56).w, - // onPressed: () { - // Get.back(); - // }, - // child: Text( - // '确定', - // style: TextStyle( - // color: AppStyle.secondaryColor, - // fontSize: 28.sp, - // ), - // ), - // ), - // ], - // ), - // Container( - // height: 500.w, - // child: CupertinoPicker( - // children: [ - // Center( - // child: Text('1天'), - // ), - // Center( - // child: Text('3天'), - // ), - // Center( - // child: Text('7天'), - // ), - // Center( - // child: Text('14天'), - // ), - // Center( - // child: Text('30天'), - // ), - // ], - // itemExtent: 88.w, - // onSelectedItemChanged: (int value) { - // int realValue = 0; - // switch (value) { - // case 0: - // realValue = 1; - // break; - // case 1: - // realValue = 3; - // break; - // case 2: - // realValue = 7; - // break; - // case 3: - // realValue = 14; - // break; - // case 4: - // realValue = 30; - // break; - // } - // widget.model.cycleCheck.checkCycle = realValue; - // }, - // ), - // ), - // ], - // ), - // ).then((value) { - // setState(() {}); - // }); - } + // showBottomSheet( + // child: Column( + // mainAxisSize: MainAxisSize.min, + // children: [ + // Row( + // children: [ + // AkuBox.h(96), + // AkuBackButton.text(), + // Spacer(), + // Text( + // '开始日期', + // style: TextStyle( + // color: AppStyle.primaryTextColor, + // fontSize: 32.sp, + // fontWeight: FontWeight.bold, + // ), + // ), + // Spacer(), + // AkuMaterialButton( + // minWidth: (64 + 56).w, + // onPressed: () { + // Get.back(); + // }, + // child: Text( + // '确定', + // style: TextStyle( + // color: AppStyle.secondaryColor, + // fontSize: 28.sp, + // ), + // ), + // ), + // ], + // ), + // Container( + // height: 500.w, + // child: CupertinoDatePicker( + // onDateTimeChanged: (dateTime) { + // widget.model.cycleCheck.startDate = dateTime; + // }, + // ), + // ), + // ], + // ), + // ).then((value) { + // setState(() {}); + // }); + }, ), + _buildRow( + title: '检查周期', + subTitle: '2020-10-23 10:24:56', + onTap: () { + // showAkuSheet( + // child: Column( + // mainAxisSize: MainAxisSize.min, + // children: [ + // Row( + // children: [ + // AkuBox.h(96), + // AkuBackButton.text(), + // Spacer(), + // Text( + // '检查周期', + // style: TextStyle( + // color: AppStyle.primaryTextColor, + // fontSize: 32.sp, + // fontWeight: FontWeight.bold, + // ), + // ), + // Spacer(), + // AkuMaterialButton( + // minWidth: (64 + 56).w, + // onPressed: () { + // Get.back(); + // }, + // child: Text( + // '确定', + // style: TextStyle( + // color: AppStyle.secondaryColor, + // fontSize: 28.sp, + // ), + // ), + // ), + // ], + // ), + // Container( + // height: 500.w, + // child: CupertinoPicker( + // children: [ + // Center( + // child: Text('1天'), + // ), + // Center( + // child: Text('3天'), + // ), + // Center( + // child: Text('7天'), + // ), + // Center( + // child: Text('14天'), + // ), + // Center( + // child: Text('30天'), + // ), + // ], + // itemExtent: 88.w, + // onSelectedItemChanged: (int value) { + // int realValue = 0; + // switch (value) { + // case 0: + // realValue = 1; + // break; + // case 1: + // realValue = 3; + // break; + // case 2: + // realValue = 7; + // break; + // case 3: + // realValue = 14; + // break; + // case 4: + // realValue = 30; + // break; + // } + // widget.model.cycleCheck.checkCycle = realValue; + // }, + // ), + // ), + // ], + // ), + // ).then((value) { + // setState(() {}); + // }); + }), Padding( padding: EdgeInsets.symmetric( vertical: 28.w, @@ -451,8 +450,6 @@ class _RenovationManageDetailPageState ); } - - _buildRow({ String? title, String? subTitle, diff --git a/lib/pages/renovation_manage/renovation_manage_page.dart b/lib/pages/renovation_manage/renovation_manage_page.dart index a9d921b1..10d8a671 100644 --- a/lib/pages/renovation_manage/renovation_manage_page.dart +++ b/lib/pages/renovation_manage/renovation_manage_page.dart @@ -1,7 +1,8 @@ +import 'package:flutter/material.dart'; + import 'package:aku_community/pages/renovation_manage/renovation_manage_view.dart'; import 'package:aku_community/widget/bee_scaffold.dart'; import 'package:aku_community/widget/tab_bar/bee_tab_bar.dart'; -import 'package:flutter/material.dart'; class RenovationManagePage extends StatefulWidget { RenovationManagePage({Key? key}) : super(key: key); diff --git a/lib/pages/renovation_manage/renovation_manage_view.dart b/lib/pages/renovation_manage/renovation_manage_view.dart index 4245d8c4..a609bc73 100644 --- a/lib/pages/renovation_manage/renovation_manage_view.dart +++ b/lib/pages/renovation_manage/renovation_manage_view.dart @@ -1,6 +1,7 @@ -import 'package:aku_community/pages/renovation_manage/renovation_manage_card.dart'; import 'package:flutter/material.dart'; +import 'package:aku_community/pages/renovation_manage/renovation_manage_card.dart'; + class RenovationManageView extends StatefulWidget { final int index; RenovationManageView({Key? key, required this.index}) : super(key: key); diff --git a/lib/pages/renovation_manage/renovation_map.dart b/lib/pages/renovation_manage/renovation_map.dart index 69434732..f20d1475 100644 --- a/lib/pages/renovation_manage/renovation_map.dart +++ b/lib/pages/renovation_manage/renovation_map.dart @@ -4,14 +4,14 @@ class RenovationMap { static String getTagName(int operationStatus, int status, {int? tracker}) { switch (operationStatus) { case 0: - return '待指派'; - + return '待指派'; + case 1: - return '待执行'; - + return '待执行'; + case 2: - return '已完成'; - + return '已完成'; + default: return '已完成'; } @@ -33,7 +33,7 @@ class RenovationMap { -1: '申请中', -2: '申请未通过', -3: '申请通过', - 0:'待处理', + 0: '待处理', 1: '已付押金', 2: '装修中', 3: '完工检查申请中', diff --git a/lib/pages/service_browse/service_browse_detail_page.dart b/lib/pages/service_browse/service_browse_detail_page.dart index d3997d1e..6b2a3060 100644 --- a/lib/pages/service_browse/service_browse_detail_page.dart +++ b/lib/pages/service_browse/service_browse_detail_page.dart @@ -1,14 +1,16 @@ -import 'package:aku_community/base/base_style.dart'; -import 'package:aku_community/models/service_browse/service_browse_list_mode.dart'; -import 'package:aku_community/utils/link_text_parase.dart'; -import 'package:aku_community/widget/bee_scaffold.dart'; -import 'package:flustars/flustars.dart'; import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; + +import 'package:flustars/flustars.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:url_launcher/url_launcher.dart'; import 'package:velocity_x/velocity_x.dart'; +import 'package:aku_community/base/base_style.dart'; +import 'package:aku_community/models/service_browse/service_browse_list_mode.dart'; +import 'package:aku_community/utils/link_text_parase.dart'; +import 'package:aku_community/widget/bee_scaffold.dart'; + class ServiceBrowseDetailPage extends StatefulWidget { final ServiceBrowseListModel model; ServiceBrowseDetailPage({Key? key, required this.model}) : super(key: key); diff --git a/lib/pages/service_browse/service_browse_page.dart b/lib/pages/service_browse/service_browse_page.dart index 23054f33..361795dd 100644 --- a/lib/pages/service_browse/service_browse_page.dart +++ b/lib/pages/service_browse/service_browse_page.dart @@ -1,15 +1,17 @@ +import 'package:flutter/material.dart'; + +import 'package:flustars/flustars.dart'; +import 'package:flutter_easyrefresh/easy_refresh.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:get/get.dart'; +import 'package:velocity_x/velocity_x.dart'; + import 'package:aku_community/base/base_style.dart'; import 'package:aku_community/constants/api.dart'; import 'package:aku_community/models/service_browse/service_browse_list_mode.dart'; import 'package:aku_community/pages/service_browse/service_browse_detail_page.dart'; import 'package:aku_community/pages/things_page/widget/bee_list_view.dart'; import 'package:aku_community/widget/bee_scaffold.dart'; -import 'package:flustars/flustars.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_easyrefresh/easy_refresh.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:get/get.dart'; -import 'package:velocity_x/velocity_x.dart'; class ServiceBrowsePage extends StatefulWidget { ServiceBrowsePage({Key? key}) : super(key: key); @@ -60,7 +62,9 @@ class _ServiceBrowsePageState extends State { Widget _buildCard(ServiceBrowseListModel model) { return MaterialButton( onPressed: () { - Get.to(() => ServiceBrowseDetailPage(model: model,)); + Get.to(() => ServiceBrowseDetailPage( + model: model, + )); }, elevation: 0, color: Colors.white, diff --git a/lib/provider/user_provider.dart b/lib/provider/user_provider.dart index 936f5887..5e16ba63 100644 --- a/lib/provider/user_provider.dart +++ b/lib/provider/user_provider.dart @@ -52,7 +52,7 @@ class UserProvider extends ChangeNotifier { Future updateProfile() async { _userInfoModel = await SignFunc.getUserInfo(); if (_userInfoModel != null && !kIsWeb && !Platform.isMacOS) { - await JPush().setAlias(_userInfoModel?.id.toString()??''); + await JPush().setAlias(_userInfoModel?.id.toString() ?? ''); } notifyListeners(); } diff --git a/lib/ui/community/facility/facility_appointment_page.dart b/lib/ui/community/facility/facility_appointment_page.dart index 2975bda4..5a81c4b5 100644 --- a/lib/ui/community/facility/facility_appointment_page.dart +++ b/lib/ui/community/facility/facility_appointment_page.dart @@ -38,8 +38,8 @@ class _FacilityAppointmentPageState extends State actions: [ IconButton( icon: Icon(CupertinoIcons.add_circled), - onPressed: () async{ - await Get.to(() => PickFacilityPage()); + onPressed: () async { + await Get.to(() => PickFacilityPage()); childKey.currentState!.callRefresh(); }, ), @@ -54,7 +54,9 @@ class _FacilityAppointmentPageState extends State type: FacilityAppointmentType.MY, key: childKey, ), - FacilityAppointmentView(type: FacilityAppointmentType.HISTORY,), + FacilityAppointmentView( + type: FacilityAppointmentType.HISTORY, + ), ], controller: _tabController, ), diff --git a/lib/ui/community/facility/facility_appointment_view.dart b/lib/ui/community/facility/facility_appointment_view.dart index 3610062e..b24a2cbe 100644 --- a/lib/ui/community/facility/facility_appointment_view.dart +++ b/lib/ui/community/facility/facility_appointment_view.dart @@ -1,4 +1,3 @@ - import 'package:flutter/material.dart'; import 'package:flutter_easyrefresh/easy_refresh.dart'; diff --git a/lib/ui/community/facility/facility_preorder_page.dart b/lib/ui/community/facility/facility_preorder_page.dart index 75e3416c..1c876356 100644 --- a/lib/ui/community/facility/facility_preorder_page.dart +++ b/lib/ui/community/facility/facility_preorder_page.dart @@ -1,4 +1,3 @@ -import 'package:aku_community/ui/community/facility/fcility_order_date_list_page.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; @@ -13,6 +12,7 @@ import 'package:aku_community/constants/app_theme.dart'; import 'package:aku_community/models/facility/facility_type_detail_model.dart'; import 'package:aku_community/provider/app_provider.dart'; import 'package:aku_community/ui/community/facility/facility_type_detail_page.dart'; +import 'package:aku_community/ui/community/facility/fcility_order_date_list_page.dart'; import 'package:aku_community/ui/profile/house/pick_my_house_page.dart'; import 'package:aku_community/utils/headers.dart'; import 'package:aku_community/utils/network/net_util.dart'; @@ -122,7 +122,6 @@ class _FacilityPreorderPageState extends State { materialTapTargetSize: MaterialTapTargetSize.shrinkWrap, height: 120.w, onPressed: () async { - DateTime? date = await BeeDatePicker.pick( startDate == null ? DateTime.now().add(Duration(minutes: 90)) @@ -180,7 +179,7 @@ class _FacilityPreorderPageState extends State { BotToast.showText(text: '预约成功'); Get.back(result: true); } else if (model.message == '该时段已被预约') { - await Get.dialog(_hasBeenOrder()); + await Get.dialog(_hasBeenOrder()); } else { BotToast.showText(text: '预约失败'); } @@ -209,19 +208,33 @@ class _FacilityPreorderPageState extends State { Widget _hasBeenOrder() { return CupertinoAlertDialog( - title: '此设施已被预约'.text.size(32.sp).bold.color(ktextPrimary).isIntrinsic.make(), - content: '是否查看此设施已被预约时段？'.text.size(28.sp).color(ktextPrimary).isIntrinsic.make(), + title: '此设施已被预约' + .text + .size(32.sp) + .bold + .color(ktextPrimary) + .isIntrinsic + .make(), + content: '是否查看此设施已被预约时段？' + .text + .size(28.sp) + .color(ktextPrimary) + .isIntrinsic + .make(), actions: [ CupertinoActionSheetAction( onPressed: () { Get.back(); }, - child: '取消'.text.size(30.sp).color(ktextPrimary).isIntrinsic.make()), + child: + '取消'.text.size(30.sp).color(ktextPrimary).isIntrinsic.make()), CupertinoActionSheetAction( onPressed: () { - Get.off(() => FacilityOrderDateListPage(facilitiesId: typeModel!.id)); + Get.off( + () => FacilityOrderDateListPage(facilitiesId: typeModel!.id)); }, - child: '查看'.text.size(30.sp).color(kPrimaryColor).isIntrinsic.make()), + child: + '查看'.text.size(30.sp).color(kPrimaryColor).isIntrinsic.make()), ], ); } diff --git a/lib/ui/community/facility/fcility_order_date_list_page.dart b/lib/ui/community/facility/fcility_order_date_list_page.dart index d327f6a5..f4143e34 100644 --- a/lib/ui/community/facility/fcility_order_date_list_page.dart +++ b/lib/ui/community/facility/fcility_order_date_list_page.dart @@ -1,13 +1,15 @@ +import 'package:flutter/material.dart'; + +import 'package:flutter_easyrefresh/easy_refresh.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:velocity_x/velocity_x.dart'; + import 'package:aku_community/base/base_style.dart'; import 'package:aku_community/constants/api.dart'; import 'package:aku_community/models/facility/facility_order_date_list_model.dart'; import 'package:aku_community/pages/things_page/widget/bee_list_view.dart'; import 'package:aku_community/widget/bee_divider.dart'; import 'package:aku_community/widget/bee_scaffold.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_easyrefresh/easy_refresh.dart'; -import 'package:velocity_x/velocity_x.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; class FacilityOrderDateListPage extends StatefulWidget { final int facilitiesId; @@ -51,7 +53,7 @@ class _FacilityOrderDateListPageState extends State { }, builder: (items) { return ListView.separated( - padding: EdgeInsets.all(32.w), + padding: EdgeInsets.all(32.w), itemBuilder: (context, index) { return _buildCard(items[index]); }, diff --git a/lib/ui/home/public_infomation/public_infomation_card.dart b/lib/ui/home/public_infomation/public_infomation_card.dart index 9364d91e..f6299a95 100644 --- a/lib/ui/home/public_infomation/public_infomation_card.dart +++ b/lib/ui/home/public_infomation/public_infomation_card.dart @@ -1,13 +1,14 @@ +import 'package:flutter/material.dart'; + +import 'package:flustars/flustars.dart'; +import 'package:get/get.dart'; + +import 'package:aku_community/base/base_style.dart'; import 'package:aku_community/constants/api.dart'; import 'package:aku_community/model/common/img_model.dart'; import 'package:aku_community/models/news/news_item_model.dart'; import 'package:aku_community/ui/home/public_infomation/public_information_detail_page.dart'; -import 'package:flustars/flustars.dart'; -import 'package:flutter/material.dart'; - -import 'package:aku_community/base/base_style.dart'; import 'package:aku_community/utils/headers.dart'; -import 'package:get/get.dart'; class PublicInfomationCard extends StatelessWidget { final NewsItemModel model; @@ -20,7 +21,7 @@ class PublicInfomationCard extends StatelessWidget { elevation: 0, materialTapTargetSize: MaterialTapTargetSize.shrinkWrap, onPressed: () { - Get.to(() => PublicInformationDetailPage(id:this.model.id)); + Get.to(() => PublicInformationDetailPage(id: this.model.id)); }, padding: EdgeInsets.zero, child: Container( diff --git a/lib/ui/home/public_infomation/public_infomation_view.dart b/lib/ui/home/public_infomation/public_infomation_view.dart index 33b07d9f..aa9782b7 100644 --- a/lib/ui/home/public_infomation/public_infomation_view.dart +++ b/lib/ui/home/public_infomation/public_infomation_view.dart @@ -1,12 +1,13 @@ +import 'package:flutter/material.dart'; + +import 'package:flutter_easyrefresh/easy_refresh.dart'; + import 'package:aku_community/constants/api.dart'; import 'package:aku_community/models/news/news_category_model.dart'; import 'package:aku_community/models/news/news_item_model.dart'; import 'package:aku_community/pages/things_page/widget/bee_list_view.dart'; -import 'package:flutter/material.dart'; - import 'package:aku_community/ui/home/public_infomation/public_infomation_card.dart'; import 'package:aku_community/utils/headers.dart'; -import 'package:flutter_easyrefresh/easy_refresh.dart'; class PublicInfomationView extends StatefulWidget { final NewsCategoryModel model; diff --git a/lib/ui/home/public_infomation/public_information_detail_page.dart b/lib/ui/home/public_infomation/public_information_detail_page.dart index 0b927640..cf9ac076 100644 --- a/lib/ui/home/public_infomation/public_information_detail_page.dart +++ b/lib/ui/home/public_infomation/public_information_detail_page.dart @@ -1,3 +1,13 @@ +import 'package:flutter/gestures.dart'; +import 'package:flutter/material.dart'; + +import 'package:bot_toast/bot_toast.dart'; +import 'package:flustars/flustars.dart'; +import 'package:flutter_easyrefresh/easy_refresh.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:url_launcher/url_launcher.dart'; +import 'package:velocity_x/velocity_x.dart'; + import 'package:aku_community/base/base_style.dart'; import 'package:aku_community/constants/api.dart'; import 'package:aku_community/models/news/news_detail_model.dart'; @@ -5,14 +15,6 @@ import 'package:aku_community/utils/link_text_parase.dart'; import 'package:aku_community/utils/network/base_model.dart'; import 'package:aku_community/utils/network/net_util.dart'; import 'package:aku_community/widget/bee_scaffold.dart'; -import 'package:bot_toast/bot_toast.dart'; -import 'package:flustars/flustars.dart'; -import 'package:flutter/gestures.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_easyrefresh/easy_refresh.dart'; -import 'package:url_launcher/url_launcher.dart'; -import 'package:velocity_x/velocity_x.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; class PublicInformationDetailPage extends StatefulWidget { final int id; diff --git a/lib/ui/manager/advice/advice_detail_page.dart b/lib/ui/manager/advice/advice_detail_page.dart index b1e01f91..43190c6e 100644 --- a/lib/ui/manager/advice/advice_detail_page.dart +++ b/lib/ui/manager/advice/advice_detail_page.dart @@ -1,7 +1,6 @@ -import 'package:aku_community/utils/network/base_model.dart'; -import 'package:bot_toast/bot_toast.dart'; import 'package:flutter/material.dart'; +import 'package:bot_toast/bot_toast.dart'; import 'package:dio/dio.dart'; import 'package:flustars/flustars.dart'; import 'package:flutter_easyrefresh/easy_refresh.dart'; @@ -17,6 +16,7 @@ import 'package:aku_community/model/manager/suggestion_or_complain_model.dart'; import 'package:aku_community/ui/manager/advice/advice_add_comment_page.dart'; import 'package:aku_community/ui/manager/advice/advice_evaluate_page.dart'; import 'package:aku_community/utils/headers.dart'; +import 'package:aku_community/utils/network/base_model.dart'; import 'package:aku_community/utils/network/net_util.dart'; import 'package:aku_community/widget/bee_scaffold.dart'; import 'package:aku_community/widget/buttons/bottom_button.dart'; diff --git a/lib/ui/market/goods/goods_card.dart b/lib/ui/market/goods/goods_card.dart index cfe4b63e..d5d43584 100644 --- a/lib/ui/market/goods/goods_card.dart +++ b/lib/ui/market/goods/goods_card.dart @@ -1,10 +1,10 @@ -import 'package:aku_community/constants/api.dart'; -import 'package:aku_community/model/common/img_model.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:aku_community/base/base_style.dart'; +import 'package:aku_community/constants/api.dart'; +import 'package:aku_community/model/common/img_model.dart'; import 'package:aku_community/models/market/goods_item.dart'; import 'package:aku_community/ui/market/goods/goods_detail_page.dart'; import 'package:aku_community/utils/headers.dart'; diff --git a/lib/ui/market/goods/goods_detail_page.dart b/lib/ui/market/goods/goods_detail_page.dart index e1cc4a88..039459b9 100644 --- a/lib/ui/market/goods/goods_detail_page.dart +++ b/lib/ui/market/goods/goods_detail_page.dart @@ -1,4 +1,3 @@ -import 'package:aku_community/widget/buttons/bottom_button.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; @@ -19,11 +18,12 @@ import 'package:aku_community/models/market/goods_item.dart'; import 'package:aku_community/provider/user_provider.dart'; import 'package:aku_community/ui/market/goods/goods_card.dart'; import 'package:aku_community/ui/market/search/search_goods_page.dart'; +import 'package:aku_community/utils/headers.dart'; import 'package:aku_community/utils/network/base_model.dart'; import 'package:aku_community/utils/network/net_util.dart'; import 'package:aku_community/widget/bee_back_button.dart'; import 'package:aku_community/widget/bee_scaffold.dart'; -import 'package:aku_community/utils/headers.dart'; +import 'package:aku_community/widget/buttons/bottom_button.dart'; ///商品详情页面 class GoodsDetailPage extends StatefulWidget { @@ -128,9 +128,8 @@ class _GoodsDetailPageState extends State { .size(36.sp) .bold .color(Colors.red) - .make(), - 8.w.widthBox, + 8.w.widthBox, '¥${_goodsModel.markingPrice}' .text .size(18.sp) diff --git a/lib/ui/market/market_page.dart b/lib/ui/market/market_page.dart index 96ed037b..c3411046 100644 --- a/lib/ui/market/market_page.dart +++ b/lib/ui/market/market_page.dart @@ -1,6 +1,5 @@ // import 'package:aku_community/base/base_style.dart'; -import 'package:aku_community/ui/market/order/my_order_page.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; @@ -16,6 +15,7 @@ import 'package:aku_community/models/market/market_category_model.dart'; import 'package:aku_community/ui/market/category/category_card.dart'; import 'package:aku_community/ui/market/category/category_page.dart'; import 'package:aku_community/ui/market/goods/goods_card.dart'; +import 'package:aku_community/ui/market/order/my_order_page.dart'; import 'package:aku_community/ui/market/search/search_goods_page.dart'; import 'package:aku_community/utils/headers.dart'; import 'package:aku_community/utils/network/base_model.dart'; diff --git a/lib/ui/market/order/my_order_card.dart b/lib/ui/market/order/my_order_card.dart index 9df61707..5a34decf 100644 --- a/lib/ui/market/order/my_order_card.dart +++ b/lib/ui/market/order/my_order_card.dart @@ -1,19 +1,21 @@ +import 'package:flutter/material.dart'; + +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:get/get.dart'; +import 'package:velocity_x/velocity_x.dart'; + import 'package:aku_community/base/base_style.dart'; +import 'package:aku_community/const/resource.dart'; import 'package:aku_community/constants/api.dart'; +import 'package:aku_community/extensions/widget_list_ext.dart'; import 'package:aku_community/model/common/img_model.dart'; import 'package:aku_community/models/market/order/my_order_list_model.dart'; import 'package:aku_community/ui/market/order/my_order_detail_page.dart'; import 'package:aku_community/ui/market/order/my_order_evaluation_page.dart'; import 'package:aku_community/ui/market/order/my_order_func.dart'; import 'package:aku_community/ui/market/order/my_order_refund_page.dart'; -import 'package:aku_community/widget/buttons/card_bottom_button.dart'; import 'package:aku_community/widget/bee_divider.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:get/get.dart'; -import 'package:velocity_x/velocity_x.dart'; -import 'package:aku_community/const/resource.dart'; -import 'package:aku_community/extensions/widget_list_ext.dart'; +import 'package:aku_community/widget/buttons/card_bottom_button.dart'; class MyOrderCard extends StatefulWidget { final MyOrderListModel model; @@ -30,7 +32,9 @@ class _MyOrderCardState extends State { Widget build(BuildContext context) { return GestureDetector( onTap: () { - Get.to(() => MyOrderDetailPage(model: widget.model,)); + Get.to(() => MyOrderDetailPage( + model: widget.model, + )); }, child: Container( width: double.infinity, diff --git a/lib/ui/market/order/my_order_detail_page.dart b/lib/ui/market/order/my_order_detail_page.dart index ad65261d..6f9686d1 100644 --- a/lib/ui/market/order/my_order_detail_page.dart +++ b/lib/ui/market/order/my_order_detail_page.dart @@ -1,5 +1,15 @@ +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; + +import 'package:flutter_easyrefresh/easy_refresh.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:velocity_x/velocity_x.dart'; +import 'package:waterfall_flow/waterfall_flow.dart'; + import 'package:aku_community/base/base_style.dart'; +import 'package:aku_community/const/resource.dart'; import 'package:aku_community/constants/api.dart'; +import 'package:aku_community/extensions/widget_list_ext.dart'; import 'package:aku_community/model/common/img_model.dart'; import 'package:aku_community/models/market/goods_item.dart'; import 'package:aku_community/models/market/order/my_order_list_model.dart'; @@ -7,14 +17,6 @@ import 'package:aku_community/ui/market/goods/goods_card.dart'; import 'package:aku_community/ui/market/order/my_order_func.dart'; import 'package:aku_community/widget/bee_divider.dart'; import 'package:aku_community/widget/bee_scaffold.dart'; -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_easyrefresh/easy_refresh.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:velocity_x/velocity_x.dart'; -import 'package:aku_community/const/resource.dart'; -import 'package:waterfall_flow/waterfall_flow.dart'; -import 'package:aku_community/extensions/widget_list_ext.dart'; class MyOrderDetailPage extends StatefulWidget { final MyOrderListModel model; diff --git a/lib/ui/market/order/my_order_evaluation_page.dart b/lib/ui/market/order/my_order_evaluation_page.dart index 3e4d25a1..8c310553 100644 --- a/lib/ui/market/order/my_order_evaluation_page.dart +++ b/lib/ui/market/order/my_order_evaluation_page.dart @@ -1,4 +1,11 @@ +import 'package:flutter/material.dart'; + +import 'package:flutter_rating_bar/flutter_rating_bar.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:velocity_x/velocity_x.dart'; + import 'package:aku_community/base/base_style.dart'; +import 'package:aku_community/const/resource.dart'; import 'package:aku_community/constants/api.dart'; import 'package:aku_community/model/common/img_model.dart'; import 'package:aku_community/models/market/order/my_order_list_model.dart'; @@ -7,11 +14,6 @@ import 'package:aku_community/widget/bee_divider.dart'; import 'package:aku_community/widget/bee_scaffold.dart'; import 'package:aku_community/widget/buttons/bottom_button.dart'; import 'package:aku_community/widget/others/bee_text_field.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_rating_bar/flutter_rating_bar.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:velocity_x/velocity_x.dart'; -import 'package:aku_community/const/resource.dart'; class MyOrderEvaluationPage extends StatefulWidget { final MyOrderListModel model; @@ -69,11 +71,7 @@ class _MyOrderEvaluationPageState extends State { children: [ Row( children: [ - '商品信息'.text - .size(32.sp) - .bold - .color(ktextPrimary) - .make(), + '商品信息'.text.size(32.sp).bold.color(ktextPrimary).make(), Spacer(), // widget.model.statusString.text // .size(30.sp) diff --git a/lib/ui/market/order/my_order_page.dart b/lib/ui/market/order/my_order_page.dart index 11d17bd3..730760ce 100644 --- a/lib/ui/market/order/my_order_page.dart +++ b/lib/ui/market/order/my_order_page.dart @@ -1,8 +1,10 @@ +import 'package:flutter/material.dart'; + +import 'package:flutter_screenutil/flutter_screenutil.dart'; + import 'package:aku_community/ui/market/order/my_order_view.dart'; import 'package:aku_community/widget/bee_scaffold.dart'; import 'package:aku_community/widget/tab_bar/bee_tab_bar.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; class MyOrderPage extends StatefulWidget { MyOrderPage({Key? key}) : super(key: key); diff --git a/lib/ui/market/order/my_order_refund_page.dart b/lib/ui/market/order/my_order_refund_page.dart index 3ad844a8..7713494e 100644 --- a/lib/ui/market/order/my_order_refund_page.dart +++ b/lib/ui/market/order/my_order_refund_page.dart @@ -1,4 +1,10 @@ +import 'package:flutter/material.dart'; + +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:velocity_x/velocity_x.dart'; + import 'package:aku_community/base/base_style.dart'; +import 'package:aku_community/const/resource.dart'; import 'package:aku_community/constants/api.dart'; import 'package:aku_community/model/common/img_model.dart'; import 'package:aku_community/models/market/order/my_order_list_model.dart'; @@ -8,15 +14,10 @@ import 'package:aku_community/widget/bee_scaffold.dart'; import 'package:aku_community/widget/buttons/aku_single_check_button.dart'; import 'package:aku_community/widget/buttons/bottom_button.dart'; import 'package:aku_community/widget/others/bee_text_field.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:velocity_x/velocity_x.dart'; -import 'package:aku_community/const/resource.dart'; class MyOrderRefundPage extends StatefulWidget { final MyOrderListModel model; - MyOrderRefundPage({Key? key, required this.model}) - : super(key: key); + MyOrderRefundPage({Key? key, required this.model}) : super(key: key); @override _MyOrderRefundPageState createState() => _MyOrderRefundPageState(); @@ -51,7 +52,8 @@ class _MyOrderRefundPageState extends State { ), bottomNavi: BottomButton( onPressed: () async { - await MyOrderFunc.refundOrder(widget.model.id, _editingController.text); + await MyOrderFunc.refundOrder( + widget.model.id, _editingController.text); }, child: '确认提交'.text.size(32.sp).color(ktextPrimary).bold.make()), ); @@ -69,11 +71,7 @@ class _MyOrderRefundPageState extends State { children: [ Row( children: [ - '商品信息'.text - .size(32.sp) - .bold - .color(ktextPrimary) - .make(), + '商品信息'.text.size(32.sp).bold.color(ktextPrimary).make(), Spacer(), // widget.model.statusString.text // .size(30.sp) diff --git a/lib/ui/market/order/my_order_view.dart b/lib/ui/market/order/my_order_view.dart index 2c18eb16..894629c4 100644 --- a/lib/ui/market/order/my_order_view.dart +++ b/lib/ui/market/order/my_order_view.dart @@ -1,12 +1,14 @@ -import 'package:aku_community/constants/api.dart'; -import 'package:aku_community/models/market/order/my_order_list_model.dart'; -import 'package:aku_community/pages/things_page/widget/bee_list_view.dart'; -import 'package:aku_community/ui/market/order/my_order_card.dart'; import 'package:flutter/material.dart'; + import 'package:flutter_easyrefresh/easy_refresh.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:velocity_x/velocity_x.dart'; +import 'package:aku_community/constants/api.dart'; +import 'package:aku_community/models/market/order/my_order_list_model.dart'; +import 'package:aku_community/pages/things_page/widget/bee_list_view.dart'; +import 'package:aku_community/ui/market/order/my_order_card.dart'; + class MyOrderView extends StatefulWidget { final int index; MyOrderView({Key? key, required this.index}) : super(key: key); @@ -34,9 +36,7 @@ class _MyOrderViewState extends State { return BeeListView( path: API.market.myOrderList, controller: _refreshController, - extraParams: { - "orderStart":widget.index - }, + extraParams: {"orderStart": widget.index}, convert: (models) { return models.tableList! .map((e) => MyOrderListModel.fromJson(e)) @@ -44,7 +44,7 @@ class _MyOrderViewState extends State { }, builder: (items) { return ListView.separated( - padding: EdgeInsets.symmetric(vertical: 24.w,horizontal: 32.w), + padding: EdgeInsets.symmetric(vertical: 24.w, horizontal: 32.w), itemBuilder: (context, index) { return MyOrderCard( model: items[index], diff --git a/lib/ui/market/second_hand/add_second_hand_goods_page.dart b/lib/ui/market/second_hand/add_second_hand_goods_page.dart index d98f36e9..cdaf4772 100644 --- a/lib/ui/market/second_hand/add_second_hand_goods_page.dart +++ b/lib/ui/market/second_hand/add_second_hand_goods_page.dart @@ -1,12 +1,14 @@ import 'dart:io'; +import 'package:flutter/material.dart'; + +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:velocity_x/velocity_x.dart'; + import 'package:aku_community/base/base_style.dart'; import 'package:aku_community/widget/bee_scaffold.dart'; import 'package:aku_community/widget/buttons/bottom_button.dart'; import 'package:aku_community/widget/picker/grid_image_picker.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:velocity_x/velocity_x.dart'; class AddSecondGoodsPage extends StatefulWidget { AddSecondGoodsPage({Key? key}) : super(key: key); diff --git a/lib/ui/market/second_hand/second_hand_page.dart b/lib/ui/market/second_hand/second_hand_page.dart index a97f5c44..70d407c9 100644 --- a/lib/ui/market/second_hand/second_hand_page.dart +++ b/lib/ui/market/second_hand/second_hand_page.dart @@ -1,12 +1,14 @@ -import 'package:aku_community/models/market/goods_item.dart'; -import 'package:aku_community/ui/market/goods/goods_card.dart'; -import 'package:aku_community/ui/market/second_hand/add_second_hand_goods_page.dart'; -import 'package:aku_community/widget/bee_scaffold.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; + +import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:waterfall_flow/waterfall_flow.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; + +import 'package:aku_community/models/market/goods_item.dart'; +import 'package:aku_community/ui/market/goods/goods_card.dart'; +import 'package:aku_community/ui/market/second_hand/add_second_hand_goods_page.dart'; +import 'package:aku_community/widget/bee_scaffold.dart'; class SecondHandPage extends StatefulWidget { SecondHandPage({Key? key}) : super(key: key); diff --git a/lib/ui/search/bee_search.dart b/lib/ui/search/bee_search.dart index 943179c8..ec4016dd 100644 --- a/lib/ui/search/bee_search.dart +++ b/lib/ui/search/bee_search.dart @@ -1,21 +1,21 @@ -import 'package:aku_community/base/base_style.dart'; -import 'package:aku_community/constants/api.dart'; -import 'package:aku_community/model/common/img_model.dart'; -import 'package:aku_community/model/community/activity_item_model.dart'; -import 'package:aku_community/model/community/community_topic_model.dart'; -import 'package:aku_community/models/search/search_model.dart'; -import 'package:aku_community/utils/network/base_model.dart'; -import 'package:aku_community/utils/network/net_util.dart'; import 'package:flutter/material.dart'; import 'package:flutter_easyrefresh/easy_refresh.dart'; import 'package:get/get.dart'; +import 'package:velocity_x/velocity_x.dart'; +import 'package:aku_community/base/base_style.dart'; +import 'package:aku_community/constants/api.dart'; import 'package:aku_community/constants/application_objects.dart'; +import 'package:aku_community/model/common/img_model.dart'; +import 'package:aku_community/model/community/activity_item_model.dart'; +import 'package:aku_community/model/community/community_topic_model.dart'; +import 'package:aku_community/models/search/search_model.dart'; import 'package:aku_community/utils/headers.dart'; import 'package:aku_community/utils/login_util.dart'; +import 'package:aku_community/utils/network/base_model.dart'; +import 'package:aku_community/utils/network/net_util.dart'; import 'package:aku_community/widget/bee_back_button.dart'; -import 'package:velocity_x/velocity_x.dart'; class BeeSearch extends StatefulWidget { BeeSearch({Key? key}) : super(key: key); @@ -154,7 +154,7 @@ class _BeeSearchState extends State { child: FadeInImage.assetNetwork( placeholder: R.ASSETS_IMAGES_PLACEHOLDER_WEBP, image: API.image(ImgModel.first(model.imgUrl)), - fit: BoxFit.cover, + fit: BoxFit.cover, )), ), 12.w.widthBox, @@ -167,7 +167,8 @@ class _BeeSearchState extends State { .size(28.sp) .color(ktextPrimary) .maxLines(2) - .bold.overflow(TextOverflow.ellipsis) + .bold + .overflow(TextOverflow.ellipsis) .isIntrinsic .make() .expand(), @@ -189,11 +190,7 @@ class _BeeSearchState extends State { width: 24.w, ), 12.wb, - '${model.activityNum}' - .text - .maxLines(1) - .size(22.sp) - .make() + '${model.activityNum}'.text.maxLines(1).size(22.sp).make() ], ), ) @@ -279,7 +276,7 @@ class _BeeSearchState extends State { child: GridView.count( crossAxisCount: 1, shrinkWrap: true, - childAspectRatio: 4/1, + childAspectRatio: 4 / 1, mainAxisSpacing: 20.w, physics: NeverScrollableScrollPhysics(), children: _getNullSafeObjects(_searchModel.activityVoList) @@ -293,9 +290,8 @@ class _BeeSearchState extends State { child: GridView.count( crossAxisCount: 1, shrinkWrap: true, - childAspectRatio: 4/1, - - mainAxisSpacing: 20.w, + childAspectRatio: 4 / 1, + mainAxisSpacing: 20.w, physics: NeverScrollableScrollPhysics(), children: [ ..._getNullSafeObjects(_searchModel.gambitVoList) diff --git a/lib/utils/bee_map.dart b/lib/utils/bee_map.dart index af4d1bb1..b549e951 100644 --- a/lib/utils/bee_map.dart +++ b/lib/utils/bee_map.dart @@ -37,11 +37,7 @@ class BeeMap { 1: '自己搬运', 2: '搬家公司', }; - static Map goodsOutStatus = { - 1:'审核中', - 2:'审核通过', - 3:'审核失败' - }; + static Map goodsOutStatus = {1: '审核中', 2: '审核通过', 3: '审核失败'}; static Map borrowStatus = {1: '出借中', 2: '已归还'}; diff --git a/lib/utils/link_text_parase.dart b/lib/utils/link_text_parase.dart index f52c0857..728d46b8 100644 --- a/lib/utils/link_text_parase.dart +++ b/lib/utils/link_text_parase.dart @@ -1,5 +1,3 @@ - - class LinkTextParase { static List stringParase(String text, {Pattern? pattern}) { List _listString = []; diff --git a/lib/widget/buttons/aku_single_check_button.dart b/lib/widget/buttons/aku_single_check_button.dart index 17136b5d..ce08ba15 100644 --- a/lib/widget/buttons/aku_single_check_button.dart +++ b/lib/widget/buttons/aku_single_check_button.dart @@ -1,7 +1,5 @@ -// Flutter imports: import 'package:flutter/material.dart'; -// Package imports: import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:velocity_x/velocity_x.dart'; diff --git a/lib/widget/buttons/card_bottom_button.dart b/lib/widget/buttons/card_bottom_button.dart index a83a1d13..fbb1ade8 100644 --- a/lib/widget/buttons/card_bottom_button.dart +++ b/lib/widget/buttons/card_bottom_button.dart @@ -1,8 +1,10 @@ -import 'package:aku_community/base/base_style.dart'; import 'package:flutter/material.dart'; + import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:velocity_x/velocity_x.dart'; +import 'package:aku_community/base/base_style.dart'; + class CardBottomButton extends StatelessWidget { final String text; final Color textColor; @@ -17,16 +19,16 @@ class CardBottomButton extends StatelessWidget { this.hasBorder = false, required this.onPressed}) : super(key: key); - CardBottomButton.white( - {Key? key, + CardBottomButton.white({ + Key? key, required this.text, required this.onPressed, }) : this.bgColor = Colors.white, this.textColor = ktextPrimary, this.hasBorder = true, super(key: key); - CardBottomButton.yellow( - {Key? key, + CardBottomButton.yellow({ + Key? key, required this.text, required this.onPressed, }) : this.bgColor = Color(0xFFFFC40C), diff --git a/lib/widget/others/bee_text_field.dart b/lib/widget/others/bee_text_field.dart index e445632d..98c98a5b 100644 --- a/lib/widget/others/bee_text_field.dart +++ b/lib/widget/others/bee_text_field.dart @@ -1,7 +1,9 @@ -import 'package:aku_community/base/base_style.dart'; import 'package:flutter/material.dart'; + import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:aku_community/base/base_style.dart'; + class BeeTextField extends StatefulWidget { final TextEditingController controller; final VoidCallback? onChange;