From 8e5b2f2fcb082b1eb398d482b94411de792a0b9e Mon Sep 17 00:00:00 2001 From: zhang <494089941@qq.com> Date: Wed, 13 Jan 2021 13:31:08 +0800 Subject: [PATCH 1/3] update home grid button add fixed submit page --- ios/Podfile.lock | 18 ++-- lib/pages/home/home_page.dart | 6 +- lib/pages/things_page/fixed_submit_page.dart | 17 ++++ lib/widget/home_gride_button.dart | 93 ++++++++++++++++++++ 4 files changed, 120 insertions(+), 14 deletions(-) create mode 100644 lib/pages/things_page/fixed_submit_page.dart create mode 100644 lib/widget/home_gride_button.dart diff --git a/ios/Podfile.lock b/ios/Podfile.lock index d1321873..3581949c 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -28,10 +28,6 @@ PODS: - AMapFoundation-NO-IDFA (~> 1.6.4) - AMapSearch-NO-IDFA (7.3.0): - AMapFoundation-NO-IDFA (~> 1.6.3) - - barcode_scan (0.0.1): - - Flutter - - MTBBarcodeScanner - - SwiftProtobuf - BSGridCollectionViewLayout (1.2.5) - BSImagePicker (2.10.3): - BSGridCollectionViewLayout (= 1.2.5) @@ -59,6 +55,9 @@ PODS: - Flutter - "permission_handler (5.0.1+1)": - Flutter + - qr_code_scanner (0.2.0): + - Flutter + - MTBBarcodeScanner - screen (0.0.1): - Flutter - shared_preferences (0.0.1): @@ -66,7 +65,6 @@ PODS: - sqflite (0.0.1): - Flutter - FMDB (~> 2.7.2) - - SwiftProtobuf (1.12.0) - url_launcher (0.0.1): - Flutter - video_player (0.0.1): @@ -82,7 +80,6 @@ DEPENDENCIES: - amap_location_fluttify (from `.symlinks/plugins/amap_location_fluttify/ios`) - amap_map_fluttify (from `.symlinks/plugins/amap_map_fluttify/ios`) - amap_search_fluttify (from `.symlinks/plugins/amap_search_fluttify/ios`) - - barcode_scan (from `.symlinks/plugins/barcode_scan/ios`) - core_location_fluttify (from `.symlinks/plugins/core_location_fluttify/ios`) - Flutter (from `Flutter`) - fluwx (from `.symlinks/plugins/fluwx/ios`) @@ -91,6 +88,7 @@ DEPENDENCIES: - package_info (from `.symlinks/plugins/package_info/ios`) - path_provider (from `.symlinks/plugins/path_provider/ios`) - permission_handler (from `.symlinks/plugins/permission_handler/ios`) + - qr_code_scanner (from `.symlinks/plugins/qr_code_scanner/ios`) - screen (from `.symlinks/plugins/screen/ios`) - shared_preferences (from `.symlinks/plugins/shared_preferences/ios`) - sqflite (from `.symlinks/plugins/sqflite/ios`) @@ -110,7 +108,6 @@ SPEC REPOS: - BSImageView - FMDB - MTBBarcodeScanner - - SwiftProtobuf - WechatOpenSDK EXTERNAL SOURCES: @@ -122,8 +119,6 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/amap_map_fluttify/ios" amap_search_fluttify: :path: ".symlinks/plugins/amap_search_fluttify/ios" - barcode_scan: - :path: ".symlinks/plugins/barcode_scan/ios" core_location_fluttify: :path: ".symlinks/plugins/core_location_fluttify/ios" Flutter: @@ -140,6 +135,8 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/path_provider/ios" permission_handler: :path: ".symlinks/plugins/permission_handler/ios" + qr_code_scanner: + :path: ".symlinks/plugins/qr_code_scanner/ios" screen: :path: ".symlinks/plugins/screen/ios" shared_preferences: @@ -164,7 +161,6 @@ SPEC CHECKSUMS: AMapFoundation-NO-IDFA: 68a24362b110b8e0a3677605d0fd36bdf521f2bb AMapLocation-NO-IDFA: 2a3edfee336b38481b892e1ecc85df0f6b365851 AMapSearch-NO-IDFA: 85555dc9ba312949d39a259baa4ef4e0619fa944 - barcode_scan: a5c27959edfafaa0c771905bad0b29d6d39e4479 BSGridCollectionViewLayout: 333dcb457a5a3bdd9212607ab5756553dcfe06cb BSImagePicker: 07404254f2fcdaf5a2eb403c0f8c337267ce8738 BSImageView: a149459433a2687157d034c78e059d30ac7f2544 @@ -178,10 +174,10 @@ SPEC CHECKSUMS: package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62 path_provider: abfe2b5c733d04e238b0d8691db0cfd63a27a93c permission_handler: eac8e15b4a1a3fba55b761d19f3f4e6b005d15b6 + qr_code_scanner: bb67d64904c3b9658ada8c402e8b4d406d5d796e screen: abd91ca7bf3426e1cc3646d27e9b2358d6bf07b0 shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d sqflite: 4001a31ff81d210346b500c55b17f4d6c7589dd0 - SwiftProtobuf: 4ef85479c18ca85b5482b343df9c319c62bda699 url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef video_player: 9cc823b1d9da7e8427ee591e8438bfbcde500e6e wakelock: 0d4a70faf8950410735e3f61fb15d517c8a6efc4 diff --git a/lib/pages/home/home_page.dart b/lib/pages/home/home_page.dart index 90ce1c77..f5ad9444 100644 --- a/lib/pages/home/home_page.dart +++ b/lib/pages/home/home_page.dart @@ -5,6 +5,7 @@ import 'package:akuCommunity/pages/message_center_page/message_center_page.dart' import 'package:akuCommunity/pages/scan/scan_page.dart'; import 'package:akuCommunity/widget/bee_scaffold.dart'; import 'package:akuCommunity/extensions/num_ext.dart'; +import 'package:akuCommunity/widget/home_gride_button.dart'; import 'package:flutter/material.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter_icons/flutter_icons.dart'; @@ -159,9 +160,8 @@ class _HomePageState extends State SizedBox(height: 100.w), ContainerComment( radius: 8, - customWidget: GridButton( - gridList: AssetsImage.homeGridList, - count: 4, + customWidget: HomeGridButton( + crossCount: 4, ), ), SingleAdSpace( diff --git a/lib/pages/things_page/fixed_submit_page.dart b/lib/pages/things_page/fixed_submit_page.dart new file mode 100644 index 00000000..1cbdb11f --- /dev/null +++ b/lib/pages/things_page/fixed_submit_page.dart @@ -0,0 +1,17 @@ +import 'package:flutter/material.dart'; + +class FixedSubmitPage extends StatefulWidget { + FixedSubmitPage({Key key}) : super(key: key); + + @override + _FixedSubmitPageState createState() => _FixedSubmitPageState(); +} + +class _FixedSubmitPageState extends State { + @override + Widget build(BuildContext context) { + return Scaffold( + + ); + } +} \ No newline at end of file diff --git a/lib/widget/home_gride_button.dart b/lib/widget/home_gride_button.dart new file mode 100644 index 00000000..95444018 --- /dev/null +++ b/lib/widget/home_gride_button.dart @@ -0,0 +1,93 @@ +import 'package:akuCommunity/pages/convenient_phone/convenient_phone_page.dart'; +import 'package:akuCommunity/pages/industry_committee/industry_committee_page.dart'; +import 'package:akuCommunity/pages/life_pay/life_pay_page.dart'; +import 'package:akuCommunity/pages/open_door_page/open_door_page.dart'; +import 'package:akuCommunity/pages/things_page/things_page.dart'; +import 'package:akuCommunity/pages/total_application_page/total_applications_page.dart'; +import 'package:akuCommunity/pages/visitor_access_page/visitor_access_page.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:akuCommunity/const/resource.dart'; +import 'package:get/get.dart'; + +class HomeGridButton extends StatefulWidget { + final int crossCount; + HomeGridButton({Key key, this.crossCount}) : super(key: key); + + @override + _HomeGridButtonState createState() => _HomeGridButtonState(); +} + +class GridButton { + String title; + String path; + VoidCallback onTap; + GridButton(this.title, this.path, this.onTap); +} + +class _HomeGridButtonState extends State { + List _gridList = [ + GridButton('一键开门', R.ASSETS_ICONS_TOOL_YJKM_PNG, () { + Get.to(OpenDoorPage()); + }), + GridButton('访客通行', R.ASSETS_ICONS_TOOL_FKYQ_PNG, () { + Get.to(VisitorAccessPage()); + }), + GridButton('报事报修', R.ASSETS_ICONS_TOOL_BSBX_PNG, () { + Get.to(ThingsPage()); + }), + GridButton('生活缴费', R.ASSETS_ICONS_TOOL_SHJF_PNG, () { + Get.to(LifePayPage()); + }), + GridButton('业委会', R.ASSETS_ICONS_TOOL_YWH_PNG, () { + Get.to(IndustryCommitteePage()); + }), + GridButton('建议咨询', R.ASSETS_ICONS_TOOL_JYTS_PNG, () { + Get.to(ThingsPage()); + }), + GridButton('便民电话', R.ASSETS_ICONS_TOOL_BMDH_PNG, () { + Get.to(ConvenientPhonePage()); + }), + GridButton('全部应用', R.ASSETS_ICONS_TOOL_QBYY_PNG, () { + Get.to(TotalApplicationsPage()); + }), + ]; + @override + Widget build(BuildContext context) { + return GridView.builder( + padding: EdgeInsets.zero, + shrinkWrap: true, + physics: NeverScrollableScrollPhysics(), + itemCount: _gridList.length, + itemBuilder: (BuildContext context, int index) { + return InkWell( + onTap: _gridList[index].onTap, + child: Container( + alignment: Alignment.center, + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Image.asset( + _gridList[index].path, + height: 53.w, + width: 53.w, + fit: BoxFit.cover, + ), + SizedBox(height: 5), + Text( + _gridList[index].title, + style: TextStyle(fontSize: 24.sp), + ) + ], + ), + ), + ); + }, + gridDelegate: SliverGridDelegateWithFixedCrossAxisCount( + crossAxisCount: widget.crossCount, + mainAxisSpacing: 6.0, + childAspectRatio: 1.0), + ); + } +} From 95f3e0e0b9ea575ce31d8e202e50854912162eaa Mon Sep 17 00:00:00 2001 From: zhang <494089941@qq.com> Date: Wed, 13 Jan 2021 15:24:18 +0800 Subject: [PATCH 2/3] update base style rewrite fixed submit page add bee map tool --- lib/base/base_style.dart | 20 +-- .../activities_details_page.dart | 8 +- .../member_list_page/member_list_page.dart | 4 +- lib/pages/common/common_page.dart | 2 +- .../widget/confirm_bottom_bar.dart | 2 +- .../fitup_manage/widget/director_manage.dart | 8 +- .../fitup_manage/widget/owner_manage.dart | 2 +- .../fitup_manage/widget/pay_model_sheet.dart | 8 +- .../goods_details/view_comments_page.dart | 2 +- .../widget/goods_comments_card.dart | 8 +- .../deto_create_page/widget/common_radio.dart | 2 +- .../life_pay_bill_page/widget/bill_card.dart | 4 +- .../widget/details_card.dart | 6 +- .../widget/record_card.dart | 16 +-- lib/pages/life_pay/widget/order_card.dart | 8 +- lib/pages/life_pay/widget/submit_bar.dart | 6 +- lib/pages/market_class/market_class_page.dart | 6 +- .../message_center_page/refund_details.dart | 10 +- .../one_alarm/widget/explain_template.dart | 4 +- lib/pages/personal/evaluate_good_page.dart | 8 +- lib/pages/personal/look_logistics_page.dart | 8 +- lib/pages/personal/order_details_page.dart | 16 +-- lib/pages/personal/order_page.dart | 2 +- lib/pages/personal/personal_page.dart | 4 +- lib/pages/personal/refund_apply_page.dart | 8 +- lib/pages/personal/refund_select_page.dart | 2 +- lib/pages/personal/widget/order_card.dart | 8 +- .../personal/widget/refund_shop_card.dart | 2 +- .../personal/widget/refund_tile_card.dart | 2 +- .../questionnaire_details_page.dart | 4 +- lib/pages/setting_page/settings_page.dart | 4 +- lib/pages/sign/sign_in_page.dart | 4 +- lib/pages/sign/user_authentication_page.dart | 6 +- lib/pages/things_page/fixed_submit_page.dart | 116 +++++++++++++++++- lib/utils/bee_map.dart | 8 ++ lib/widget/activity_card.dart | 4 +- lib/widget/bottom_button.dart | 2 +- lib/widget/common_input.dart | 2 +- lib/widget/community_card.dart | 2 +- lib/widget/home_gride_button.dart | 3 +- 40 files changed, 233 insertions(+), 108 deletions(-) create mode 100644 lib/utils/bee_map.dart diff --git a/lib/base/base_style.dart b/lib/base/base_style.dart index 216b680b..0e20133b 100644 --- a/lib/base/base_style.dart +++ b/lib/base/base_style.dart @@ -2,16 +2,22 @@ import 'package:flutter/material.dart'; import 'package:flutter/cupertino.dart'; import 'package:akuCommunity/utils/screenutil.dart'; +const ktextPrimary = Color(0xff333333); +const ktextSubColor = Color(0xff666666); +const kForeGroundColor = Color(0xFFFFFFFF); +const kPrimaryColor=Color(0xFFFFC40C); +const kDarkPrimaryColor=Color(0xFFFF8200); + class BaseStyle { ///字体类 static final double fontSize18 = 18.sp; - + static final double fontSize22 = 22.sp; static final double fontSize24 = 24.sp; static final double fontSize26 = 26.sp; - + static final double fontSize28 = 28.sp; static final double fontSize30 = 30.sp; @@ -25,8 +31,8 @@ class BaseStyle { static final double fontSize38 = 38.sp; static final double fontSize52 = 52.sp; + ///颜色 - static final Color color333333 = Color(0xff333333); static final Color color666666 = Color(0xff666666); @@ -40,9 +46,9 @@ class BaseStyle { static final Color color474747 = Color(0xff474747); - static final Color colord8d8d8= Color(0xffd8d8d8); + static final Color colord8d8d8 = Color(0xffd8d8d8); - static final Color coloreeeeee= Color(0xffeeeeee); + static final Color coloreeeeee = Color(0xffeeeeee); static final Color colorff8500 = Color(0xffff8500); @@ -56,5 +62,5 @@ class BaseStyle { static final Color colorffc40c = Color(0xffffc40c); - static final Color color979797= Color(0xff979797); -} \ No newline at end of file + static final Color color979797 = Color(0xff979797); +} diff --git a/lib/pages/activities_page/activities_details_page/activities_details_page.dart b/lib/pages/activities_page/activities_details_page/activities_details_page.dart index 26e48848..5d3faf25 100644 --- a/lib/pages/activities_page/activities_details_page/activities_details_page.dart +++ b/lib/pages/activities_page/activities_details_page/activities_details_page.dart @@ -193,7 +193,7 @@ class _ActivitiesDetailsPageState extends State { post, style: TextStyle( fontSize: BaseStyle.fontSize32, - color: BaseStyle.color333333, + color: ktextPrimary, ), ), SizedBox(height: 10.w), @@ -201,7 +201,7 @@ class _ActivitiesDetailsPageState extends State { name, style: TextStyle( fontSize: BaseStyle.fontSize32, - color: BaseStyle.color333333, + color: ktextPrimary, ), ), ], @@ -244,7 +244,7 @@ class _ActivitiesDetailsPageState extends State { '已有${320}人参加', style: TextStyle( fontSize: BaseStyle.fontSize28, - color: BaseStyle.color333333), + color: ktextPrimary), ), ), Icon( @@ -288,7 +288,7 @@ class _ActivitiesDetailsPageState extends State { widget.bundle.getMap('details')['title'], style: TextStyle( fontSize: BaseStyle.fontSize32, - color: BaseStyle.color333333, + color: ktextPrimary, fontWeight: FontWeight.w600), ), Container( diff --git a/lib/pages/activities_page/member_list_page/member_list_page.dart b/lib/pages/activities_page/member_list_page/member_list_page.dart index c37a47d8..730674f7 100644 --- a/lib/pages/activities_page/member_list_page/member_list_page.dart +++ b/lib/pages/activities_page/member_list_page/member_list_page.dart @@ -130,7 +130,7 @@ class _MemberListPageState extends State { name, style: TextStyle( fontSize: BaseStyle.fontSize28, - color: BaseStyle.color333333, + color: ktextPrimary, ), ), ], @@ -140,7 +140,7 @@ class _MemberListPageState extends State { (Match m) => "${m[1]}****${m[2]}"), style: TextStyle( fontSize: BaseStyle.fontSize28, - color: BaseStyle.color333333, + color: ktextPrimary, ), ), ], diff --git a/lib/pages/common/common_page.dart b/lib/pages/common/common_page.dart index 3333f46d..5cce5bba 100644 --- a/lib/pages/common/common_page.dart +++ b/lib/pages/common/common_page.dart @@ -104,7 +104,7 @@ class _CommonPageState extends State { // '点击“呼叫110”后,您可以直接拨打本地110。页面中提供了您当前所在位置,以便您与警方沟通。(GPS信号弱时，位置可能存在偏移)', // style: TextStyle( // fontSize: BaseStyle.fontSize28, - // color: BaseStyle.color666666, + // color: ktextSubColor, // ), // ), // actions: [ diff --git a/lib/pages/confirm_order_page/widget/confirm_bottom_bar.dart b/lib/pages/confirm_order_page/widget/confirm_bottom_bar.dart index d0c1ca25..bf201619 100644 --- a/lib/pages/confirm_order_page/widget/confirm_bottom_bar.dart +++ b/lib/pages/confirm_order_page/widget/confirm_bottom_bar.dart @@ -50,7 +50,7 @@ class ConfirmBottomBar extends StatelessWidget { '提交订单', style: TextStyle( fontSize: BaseStyle.fontSize30, - color: BaseStyle.color333333, + color: ktextPrimary, ), ), ), diff --git a/lib/pages/fitup_manage/widget/director_manage.dart b/lib/pages/fitup_manage/widget/director_manage.dart index 10e29f7d..52dae82c 100644 --- a/lib/pages/fitup_manage/widget/director_manage.dart +++ b/lib/pages/fitup_manage/widget/director_manage.dart @@ -53,7 +53,7 @@ class _DirectorManageState extends State { text: '2', style: TextStyle( fontSize: BaseStyle.fontSize36, - color: BaseStyle.color333333, + color: ktextPrimary, fontWeight: FontWeight.w600, ), ), @@ -61,7 +61,7 @@ class _DirectorManageState extends State { text: '张', style: TextStyle( fontSize: BaseStyle.fontSize28, - color: BaseStyle.color333333, + color: ktextPrimary, fontWeight: FontWeight.w600, ), ), @@ -173,7 +173,7 @@ class _DirectorManageState extends State { '确认提交', style: TextStyle( fontSize: BaseStyle.fontSize32, - color: BaseStyle.color333333, + color: ktextPrimary, fontWeight: FontWeight.w600, ), ), @@ -224,7 +224,7 @@ class _DirectorManageState extends State { style: TextStyle( fontWeight: FontWeight.w600, fontSize: BaseStyle.fontSize32, - color: BaseStyle.color333333), + color: ktextPrimary), ), Column( children: diff --git a/lib/pages/fitup_manage/widget/owner_manage.dart b/lib/pages/fitup_manage/widget/owner_manage.dart index 4c422bf9..ff8e9aae 100644 --- a/lib/pages/fitup_manage/widget/owner_manage.dart +++ b/lib/pages/fitup_manage/widget/owner_manage.dart @@ -93,7 +93,7 @@ class _OwnerManageState extends State _listWidget[index]['title'], style: TextStyle( fontSize: BaseStyle.fontSize28, - color: BaseStyle.color333333), + color: ktextPrimary), ), SizedBox(height: 25.w), _listWidget[index]['widget'], diff --git a/lib/pages/fitup_manage/widget/pay_model_sheet.dart b/lib/pages/fitup_manage/widget/pay_model_sheet.dart index 8241b25d..784f9b48 100644 --- a/lib/pages/fitup_manage/widget/pay_model_sheet.dart +++ b/lib/pages/fitup_manage/widget/pay_model_sheet.dart @@ -86,7 +86,7 @@ class _PayModelSheetState extends State { '选择付款方式', style: TextStyle( fontSize: BaseStyle.fontSize32, - color: BaseStyle.color333333, + color: ktextPrimary, fontWeight: FontWeight.w600, ), ), @@ -148,7 +148,7 @@ class _PayModelSheetState extends State { title, style: TextStyle( fontSize: BaseStyle.fontSize28, - color: BaseStyle.color333333), + color: ktextPrimary), ), _listPay[index]['isCheck'] ? Icon( @@ -190,7 +190,7 @@ class _PayModelSheetState extends State { _listPay[_currentindex]['title'], style: TextStyle( fontSize: BaseStyle.fontSize28, - color: BaseStyle.color333333), + color: ktextPrimary), ), ], ), @@ -230,7 +230,7 @@ class _PayModelSheetState extends State { '付款详情', style: TextStyle( fontSize: BaseStyle.fontSize32, - color: BaseStyle.color333333, + color: ktextPrimary, fontWeight: FontWeight.w600, ), ), diff --git a/lib/pages/goods_details/view_comments_page.dart b/lib/pages/goods_details/view_comments_page.dart index d0ab9950..97f48086 100644 --- a/lib/pages/goods_details/view_comments_page.dart +++ b/lib/pages/goods_details/view_comments_page.dart @@ -160,7 +160,7 @@ class _ViewCommentsPageState extends State { item['title'], style: TextStyle( fontSize: BaseStyle.fontSize24, - color: BaseStyle.color333333, + color: ktextPrimary, ), ), ), diff --git a/lib/pages/goods_details/widget/goods_comments_card.dart b/lib/pages/goods_details/widget/goods_comments_card.dart index 2485ba81..760ecec9 100644 --- a/lib/pages/goods_details/widget/goods_comments_card.dart +++ b/lib/pages/goods_details/widget/goods_comments_card.dart @@ -57,7 +57,7 @@ class _GoodsCommentsCardState extends State { name, style: TextStyle( fontSize: BaseStyle.fontSize24, - color: BaseStyle.color333333, + color: ktextPrimary, ), ), SizedBox(height: 4.w), @@ -92,7 +92,7 @@ class _GoodsCommentsCardState extends State { maxLines: 3, style: TextStyle( fontSize: BaseStyle.fontSize24, - color: BaseStyle.color333333, + color: ktextPrimary, ), expand: false, ), @@ -122,14 +122,14 @@ class _GoodsCommentsCardState extends State { Icon( Feather.triangle, size: BaseStyle.fontSize22, - color: BaseStyle.color333333, + color: ktextPrimary, ), SizedBox(width: 10.w), Text( '有用', style: TextStyle( fontSize: BaseStyle.fontSize22, - color: BaseStyle.color333333, + color: ktextPrimary, ), ), ], diff --git a/lib/pages/goods_deto_page/deto_create_page/widget/common_radio.dart b/lib/pages/goods_deto_page/deto_create_page/widget/common_radio.dart index 1570049a..9687a738 100644 --- a/lib/pages/goods_deto_page/deto_create_page/widget/common_radio.dart +++ b/lib/pages/goods_deto_page/deto_create_page/widget/common_radio.dart @@ -33,7 +33,7 @@ class _CommonRadioState extends State { Text( title, style: TextStyle( - fontSize: BaseStyle.fontSize28, color: BaseStyle.color333333), + fontSize: BaseStyle.fontSize28, color: ktextPrimary), ), ], ), diff --git a/lib/pages/life_pay/life_pay_bill_page/widget/bill_card.dart b/lib/pages/life_pay/life_pay_bill_page/widget/bill_card.dart index 0b501970..70dcf918 100644 --- a/lib/pages/life_pay/life_pay_bill_page/widget/bill_card.dart +++ b/lib/pages/life_pay/life_pay_bill_page/widget/bill_card.dart @@ -26,7 +26,7 @@ class BillCard extends StatelessWidget { title, style: TextStyle( fontSize: BaseStyle.fontSize28, - color: BaseStyle.color666666, + color: ktextSubColor, ), ), Text( @@ -34,7 +34,7 @@ class BillCard extends StatelessWidget { style: TextStyle( fontWeight: FontWeight.w600, fontSize: BaseStyle.fontSize28, - color: BaseStyle.color333333, + color: ktextPrimary, ), ), ], diff --git a/lib/pages/life_pay/life_pay_info_page/widget/details_card.dart b/lib/pages/life_pay/life_pay_info_page/widget/details_card.dart index 3a8d3c1c..758b5bad 100644 --- a/lib/pages/life_pay/life_pay_info_page/widget/details_card.dart +++ b/lib/pages/life_pay/life_pay_info_page/widget/details_card.dart @@ -28,14 +28,14 @@ class _DetailsCardState extends State { style: TextStyle( fontWeight: FontWeight.w600, fontSize: BaseStyle.fontSize30, - color: BaseStyle.color333333, + color: ktextPrimary, ), ), Text( '宁波华茂悦峰 1幢-1单元-702室', style: TextStyle( fontSize: BaseStyle.fontSize30, - color: BaseStyle.color333333, + color: ktextPrimary, ), ), ], @@ -63,7 +63,7 @@ class _DetailsCardState extends State { '2019上半年', style: TextStyle( fontSize: BaseStyle.fontSize28, - color: BaseStyle.color333333, + color: ktextPrimary, ), ), ], diff --git a/lib/pages/life_pay/life_pay_record_page/widget/record_card.dart b/lib/pages/life_pay/life_pay_record_page/widget/record_card.dart index 042386a9..7bb637fd 100644 --- a/lib/pages/life_pay/life_pay_record_page/widget/record_card.dart +++ b/lib/pages/life_pay/life_pay_record_page/widget/record_card.dart @@ -15,7 +15,7 @@ class RecordCard extends StatelessWidget { 'titleStyle': TextStyle( fontWeight: FontWeight.w600, fontSize: BaseStyle.fontSize30, - color: BaseStyle.color333333, + color: ktextPrimary, ), 'valueStyle': TextStyle( fontSize: BaseStyle.fontSize24, @@ -29,7 +29,7 @@ class RecordCard extends StatelessWidget { 'value': '- ¥1000.00', 'titleStyle': TextStyle( fontSize: BaseStyle.fontSize28, - color: BaseStyle.color666666, + color: ktextSubColor, ), 'valueStyle': TextStyle( fontSize: BaseStyle.fontSize28, @@ -43,11 +43,11 @@ class RecordCard extends StatelessWidget { 'value': '2020/08/01 10:00', 'titleStyle': TextStyle( fontSize: BaseStyle.fontSize28, - color: BaseStyle.color666666, + color: ktextSubColor, ), 'valueStyle': TextStyle( fontSize: BaseStyle.fontSize28, - color: BaseStyle.color333333, + color: ktextPrimary, ), 'top': 30, 'isShow': false, @@ -57,11 +57,11 @@ class RecordCard extends StatelessWidget { 'value': '支付宝', 'titleStyle': TextStyle( fontSize: BaseStyle.fontSize28, - color: BaseStyle.color666666, + color: ktextSubColor, ), 'valueStyle': TextStyle( fontSize: BaseStyle.fontSize28, - color: BaseStyle.color333333, + color: ktextPrimary, ), 'top': 30, 'isShow': false, @@ -71,11 +71,11 @@ class RecordCard extends StatelessWidget { 'value': '2020080100030001433244', 'titleStyle': TextStyle( fontSize: BaseStyle.fontSize28, - color: BaseStyle.color666666, + color: ktextSubColor, ), 'valueStyle': TextStyle( fontSize: BaseStyle.fontSize28, - color: BaseStyle.color333333, + color: ktextPrimary, ), 'top': 30, 'isShow': false, diff --git a/lib/pages/life_pay/widget/order_card.dart b/lib/pages/life_pay/widget/order_card.dart index b250e276..0bb8b1bf 100644 --- a/lib/pages/life_pay/widget/order_card.dart +++ b/lib/pages/life_pay/widget/order_card.dart @@ -27,7 +27,7 @@ class _OrderCardState extends State { '去年（2019年）', style: TextStyle( fontSize: BaseStyle.fontSize28, - color: BaseStyle.color666666, + color: ktextSubColor, ), ), Container( @@ -38,7 +38,7 @@ class _OrderCardState extends State { '待缴：4项', style: TextStyle( fontSize: BaseStyle.fontSize28, - color: BaseStyle.color333333, + color: ktextPrimary, ), ), SizedBox(width: 40.w), @@ -46,7 +46,7 @@ class _OrderCardState extends State { '已选：4项', style: TextStyle( fontSize: BaseStyle.fontSize28, - color: BaseStyle.color333333, + color: ktextPrimary, ), ), ], @@ -60,7 +60,7 @@ class _OrderCardState extends State { children: [ TextSpan( text: '合计：', - style: TextStyle(color: BaseStyle.color333333), + style: TextStyle(color: ktextPrimary), ), TextSpan( text: '¥${747.98}', diff --git a/lib/pages/life_pay/widget/submit_bar.dart b/lib/pages/life_pay/widget/submit_bar.dart index d0e1888f..8d1ebcc1 100644 --- a/lib/pages/life_pay/widget/submit_bar.dart +++ b/lib/pages/life_pay/widget/submit_bar.dart @@ -28,7 +28,7 @@ class _SubmitBarState extends State { Text( '全选', style: TextStyle( - fontSize: BaseStyle.fontSize24, color: BaseStyle.color666666), + fontSize: BaseStyle.fontSize24, color: ktextSubColor), ), ], ), @@ -52,7 +52,7 @@ class _SubmitBarState extends State { text: '合计：', style: TextStyle( fontSize: BaseStyle.fontSize26, - color: BaseStyle.color333333), + color: ktextPrimary), ), TextSpan( text: '¥${3009.84}', @@ -89,7 +89,7 @@ class _SubmitBarState extends State { title, style: TextStyle( fontSize: BaseStyle.fontSize32, - color: BaseStyle.color333333, + color: ktextPrimary, fontWeight: FontWeight.w600, ), ), diff --git a/lib/pages/market_class/market_class_page.dart b/lib/pages/market_class/market_class_page.dart index 8f48dc1a..5dca447e 100644 --- a/lib/pages/market_class/market_class_page.dart +++ b/lib/pages/market_class/market_class_page.dart @@ -75,7 +75,7 @@ class _MarketClassPageState extends State { fontSize: BaseStyle.fontSize28, color: _currentIndex == index ? BaseStyle.colorffc40c - : BaseStyle.color333333, + : ktextPrimary, ), ), ), @@ -128,7 +128,7 @@ class _MarketClassPageState extends State { infoList[index].sonName, style: TextStyle( fontSize: BaseStyle.fontSize24, - color: BaseStyle.color333333, + color: ktextPrimary, ), ), ), @@ -164,7 +164,7 @@ class _MarketClassPageState extends State { style: TextStyle( fontWeight: FontWeight.bold, fontSize: BaseStyle.fontSize26, - color: BaseStyle.color333333, + color: ktextPrimary, ), ), ), diff --git a/lib/pages/message_center_page/refund_details.dart b/lib/pages/message_center_page/refund_details.dart index e785d2bc..f61d6a4c 100644 --- a/lib/pages/message_center_page/refund_details.dart +++ b/lib/pages/message_center_page/refund_details.dart @@ -24,7 +24,7 @@ class RefundDetails extends StatelessWidget { style: TextStyle( fontWeight: FontWeight.w600, fontSize: BaseStyle.fontSize32, - color: BaseStyle.color333333, + color: ktextPrimary, ), ), SizedBox(height: 10.w), @@ -32,7 +32,7 @@ class RefundDetails extends StatelessWidget { '2020年7月8日 13:28', style: TextStyle( fontSize: BaseStyle.fontSize24, - color: BaseStyle.color333333, + color: ktextPrimary, ), ), ], @@ -56,7 +56,7 @@ class RefundDetails extends StatelessWidget { '退款总金额', style: TextStyle( fontSize: BaseStyle.fontSize24, - color: BaseStyle.color333333, + color: ktextPrimary, ), ), Text( @@ -64,7 +64,7 @@ class RefundDetails extends StatelessWidget { style: TextStyle( fontWeight: FontWeight.w600, fontSize: BaseStyle.fontSize28, - color: BaseStyle.color333333, + color: ktextPrimary, ), ), ], @@ -89,7 +89,7 @@ class RefundDetails extends StatelessWidget { '退款信息', style: TextStyle( fontSize: BaseStyle.fontSize24, - color: BaseStyle.color333333, + color: ktextPrimary, ), ), ), diff --git a/lib/pages/one_alarm/widget/explain_template.dart b/lib/pages/one_alarm/widget/explain_template.dart index 2e19d1b2..da8ad605 100644 --- a/lib/pages/one_alarm/widget/explain_template.dart +++ b/lib/pages/one_alarm/widget/explain_template.dart @@ -66,7 +66,7 @@ class ExplainTemplate extends BeautifulPopupTemplate { // '一键报警', // style: TextStyle( // fontSize: BaseStyle.fontSize32, -// color: BaseStyle.color333333, +// color: ktextPrimary, // fontWeight: FontWeight.bold, // ), // ), @@ -76,7 +76,7 @@ class ExplainTemplate extends BeautifulPopupTemplate { // '点击“呼叫110”后，您可以直接拨打本地110。页面中提供了您当前所在位置，以便您与警方沟通。（GPS信号弱时，位置可能存在偏移）', // style: TextStyle( // fontSize: BaseStyle.fontSize28, -// color: BaseStyle.color666666, +// color: ktextSubColor, // ), // ), // ), diff --git a/lib/pages/personal/evaluate_good_page.dart b/lib/pages/personal/evaluate_good_page.dart index 0cd1d05f..7e6eb6a2 100644 --- a/lib/pages/personal/evaluate_good_page.dart +++ b/lib/pages/personal/evaluate_good_page.dart @@ -40,7 +40,7 @@ class _EvaluateGoodPageState extends State { style: TextStyle( fontWeight: FontWeight.w600, fontSize: BaseStyle.fontSize32, - color: BaseStyle.color333333, + color: ktextPrimary, ), ), ); @@ -73,7 +73,7 @@ class _EvaluateGoodPageState extends State { Text( '描述相符', style: TextStyle( - fontSize: BaseStyle.fontSize28, color: BaseStyle.color333333), + fontSize: BaseStyle.fontSize28, color: ktextPrimary), ), SizedBox(width: 34.w), Row( @@ -178,7 +178,7 @@ class _EvaluateGoodPageState extends State { Text( '添加图片信息(0/9)', style: TextStyle( - fontSize: BaseStyle.fontSize28, color: BaseStyle.color333333), + fontSize: BaseStyle.fontSize28, color: ktextPrimary), ), SizedBox(height: 24.w), InkWell( @@ -218,7 +218,7 @@ class _EvaluateGoodPageState extends State { style: TextStyle( fontWeight: FontWeight.w600, fontSize: BaseStyle.fontSize32, - color: BaseStyle.color333333), + color: ktextPrimary), ), ), ); diff --git a/lib/pages/personal/look_logistics_page.dart b/lib/pages/personal/look_logistics_page.dart index 182332c7..369e7344 100644 --- a/lib/pages/personal/look_logistics_page.dart +++ b/lib/pages/personal/look_logistics_page.dart @@ -85,7 +85,7 @@ class _LookLogisticsPageState extends State { '已签收', style: TextStyle( fontSize: BaseStyle.fontSize28, - color: BaseStyle.color333333), + color: ktextPrimary), ), ), ], @@ -109,7 +109,7 @@ class _LookLogisticsPageState extends State { children: [ Icon( Feather.alert_circle, - color: BaseStyle.color333333, + color: ktextPrimary, size: BaseStyle.fontSize28, ), Container( @@ -119,7 +119,7 @@ class _LookLogisticsPageState extends State { '物流投诉', style: TextStyle( fontSize: BaseStyle.fontSize22, - color: BaseStyle.color333333), + color: ktextPrimary), ), ) ], @@ -158,7 +158,7 @@ class _LookLogisticsPageState extends State { '中通快递 3072035702394120', style: TextStyle( fontSize: BaseStyle.fontSize22, - color: BaseStyle.color333333), + color: ktextPrimary), ), ), SizedBox( diff --git a/lib/pages/personal/order_details_page.dart b/lib/pages/personal/order_details_page.dart index 0f970cde..842a405b 100644 --- a/lib/pages/personal/order_details_page.dart +++ b/lib/pages/personal/order_details_page.dart @@ -32,7 +32,7 @@ class _OrderDetailsPageState extends State { style: TextStyle( fontWeight: FontWeight.w600, fontSize: BaseStyle.fontSize32, - color: BaseStyle.color333333, + color: ktextPrimary, ), ), ); @@ -55,7 +55,7 @@ class _OrderDetailsPageState extends State { style: TextStyle( fontWeight: FontWeight.w600, fontSize: BaseStyle.fontSize32, - color: BaseStyle.color333333, + color: ktextPrimary, ), ), SizedBox(height: 10.w), @@ -63,7 +63,7 @@ class _OrderDetailsPageState extends State { '还剩9小时33分自动确认', style: TextStyle( fontSize: BaseStyle.fontSize24, - color: BaseStyle.color333333, + color: ktextPrimary, ), ), ], @@ -98,7 +98,7 @@ class _OrderDetailsPageState extends State { '马泽鹏', style: TextStyle( fontSize: BaseStyle.fontSize28, - color: BaseStyle.color333333, + color: ktextPrimary, ), ), SizedBox(width: 16.w), @@ -159,7 +159,7 @@ class _OrderDetailsPageState extends State { child: Text( '退款', style: TextStyle( - fontSize: BaseStyle.fontSize28, color: BaseStyle.color333333), + fontSize: BaseStyle.fontSize28, color: ktextPrimary), ), ), ); @@ -201,7 +201,7 @@ class _OrderDetailsPageState extends State { maxLines: 2, style: TextStyle( fontSize: BaseStyle.fontSize28, - color: BaseStyle.color333333, + color: ktextPrimary, ), ), ), @@ -248,7 +248,7 @@ class _OrderDetailsPageState extends State { style: TextStyle( fontWeight: FontWeight.w600, fontSize: BaseStyle.fontSize28, - color: BaseStyle.color333333, + color: ktextPrimary, ), ), Text( @@ -316,7 +316,7 @@ class _OrderDetailsPageState extends State { style: TextStyle( fontWeight: FontWeight.w600, fontSize: BaseStyle.fontSize28, - color: BaseStyle.color333333), + color: ktextPrimary), ), Column( children: listOrderDetail diff --git a/lib/pages/personal/order_page.dart b/lib/pages/personal/order_page.dart index c5323d5b..488e2194 100644 --- a/lib/pages/personal/order_page.dart +++ b/lib/pages/personal/order_page.dart @@ -44,7 +44,7 @@ class _OrderPageState extends State isScrollable: true, indicator: BoxDecoration(), labelColor: BaseStyle.colorff8500, - unselectedLabelColor: BaseStyle.color333333, + unselectedLabelColor: ktextPrimary, labelStyle: TextStyle( fontSize: 28.sp, fontWeight: FontWeight.w600, diff --git a/lib/pages/personal/personal_page.dart b/lib/pages/personal/personal_page.dart index d588d47b..27d75cda 100644 --- a/lib/pages/personal/personal_page.dart +++ b/lib/pages/personal/personal_page.dart @@ -132,7 +132,7 @@ class _PersonalIndexState extends State style: TextStyle( fontWeight: FontWeight.w600, fontSize: BaseStyle.fontSize34, - color: BaseStyle.color333333, + color: ktextPrimary, ), ), title == '我的物业' @@ -150,7 +150,7 @@ class _PersonalIndexState extends State '查看全部', style: TextStyle( fontSize: BaseStyle.fontSize22, - color: BaseStyle.color333333, + color: ktextPrimary, ), ), SizedBox(width: 8.w), diff --git a/lib/pages/personal/refund_apply_page.dart b/lib/pages/personal/refund_apply_page.dart index eab18387..fdb30376 100644 --- a/lib/pages/personal/refund_apply_page.dart +++ b/lib/pages/personal/refund_apply_page.dart @@ -36,7 +36,7 @@ class _RefundApplyPageState extends State { style: TextStyle( fontWeight: FontWeight.w600, fontSize: BaseStyle.fontSize32, - color: BaseStyle.color333333, + color: ktextPrimary, ), ), ); @@ -77,7 +77,7 @@ class _RefundApplyPageState extends State { '退款金额', style: TextStyle( fontSize: BaseStyle.fontSize34, - color: BaseStyle.color333333, + color: ktextPrimary, ), ), Text( @@ -115,7 +115,7 @@ class _RefundApplyPageState extends State { '退款说明', style: TextStyle( fontSize: BaseStyle.fontSize34, - color: BaseStyle.color333333, + color: ktextPrimary, ), ), SizedBox(height: 23.w), @@ -163,7 +163,7 @@ class _RefundApplyPageState extends State { '提交', style: TextStyle( fontSize: BaseStyle.fontSize32, - color: BaseStyle.color333333, + color: ktextPrimary, ), ), ), diff --git a/lib/pages/personal/refund_select_page.dart b/lib/pages/personal/refund_select_page.dart index 4be8ffe0..7484ddf7 100644 --- a/lib/pages/personal/refund_select_page.dart +++ b/lib/pages/personal/refund_select_page.dart @@ -33,7 +33,7 @@ class _RefundSelectPageState extends State { style: TextStyle( fontWeight: FontWeight.w600, fontSize: BaseStyle.fontSize32, - color: BaseStyle.color333333, + color: ktextPrimary, ), ), ); diff --git a/lib/pages/personal/widget/order_card.dart b/lib/pages/personal/widget/order_card.dart index c33ae848..b9a47628 100644 --- a/lib/pages/personal/widget/order_card.dart +++ b/lib/pages/personal/widget/order_card.dart @@ -36,7 +36,7 @@ class _OrderCardState extends State { style: TextStyle( fontWeight: FontWeight.w600, fontSize: BaseStyle.fontSize28, - color: BaseStyle.color333333, + color: ktextPrimary, ), ), ); @@ -70,7 +70,7 @@ class _OrderCardState extends State { maxLines: 2, style: TextStyle( fontSize: BaseStyle.fontSize28, - color: BaseStyle.color333333, + color: ktextPrimary, ), ), ), @@ -98,7 +98,7 @@ class _OrderCardState extends State { style: TextStyle( fontWeight: FontWeight.w600, fontSize: BaseStyle.fontSize28, - color: BaseStyle.color333333, + color: ktextPrimary, ), ), Text( @@ -151,7 +151,7 @@ class _OrderCardState extends State { style: TextStyle( fontWeight: FontWeight.w600, fontSize: BaseStyle.fontSize28, - color: BaseStyle.color333333, + color: ktextPrimary, ), ), ], diff --git a/lib/pages/personal/widget/refund_shop_card.dart b/lib/pages/personal/widget/refund_shop_card.dart index edb308b2..bcec6141 100644 --- a/lib/pages/personal/widget/refund_shop_card.dart +++ b/lib/pages/personal/widget/refund_shop_card.dart @@ -39,7 +39,7 @@ class RefundShopCard extends StatelessWidget { maxLines: 2, style: TextStyle( fontSize: BaseStyle.fontSize28, - color: BaseStyle.color333333, + color: ktextPrimary, ), ), ), diff --git a/lib/pages/personal/widget/refund_tile_card.dart b/lib/pages/personal/widget/refund_tile_card.dart index 100ada1a..3c1533e6 100644 --- a/lib/pages/personal/widget/refund_tile_card.dart +++ b/lib/pages/personal/widget/refund_tile_card.dart @@ -28,7 +28,7 @@ class _RefundTileCardState extends State { title, style: TextStyle( fontSize: BaseStyle.fontSize34, - color: BaseStyle.color333333, + color: ktextPrimary, ), ), SizedBox(height: 24.w), diff --git a/lib/pages/questionnaire_page/questionnaire_details_page/questionnaire_details_page.dart b/lib/pages/questionnaire_page/questionnaire_details_page/questionnaire_details_page.dart index 37ce3c64..456bb28d 100644 --- a/lib/pages/questionnaire_page/questionnaire_details_page/questionnaire_details_page.dart +++ b/lib/pages/questionnaire_page/questionnaire_details_page/questionnaire_details_page.dart @@ -195,7 +195,7 @@ class _QuestionnaireDetailsPageState extends State { style: TextStyle( fontWeight: FontWeight.w600, fontSize: BaseStyle.fontSize32, - color: BaseStyle.color333333, + color: ktextPrimary, ), ), ), @@ -273,7 +273,7 @@ class _QuestionnaireDetailsPageState extends State { '您的觉得我们需要改进的地方', style: TextStyle( fontSize: BaseStyle.fontSize28, - color: BaseStyle.color333333), + color: ktextPrimary), ), ), _containerTextField(), diff --git a/lib/pages/setting_page/settings_page.dart b/lib/pages/setting_page/settings_page.dart index 398d51ab..69fd35d5 100644 --- a/lib/pages/setting_page/settings_page.dart +++ b/lib/pages/setting_page/settings_page.dart @@ -101,7 +101,7 @@ class _SettingsPageState extends State { style: TextStyle( fontWeight: FontWeight.w600, fontSize: BaseStyle.fontSize32, - color: BaseStyle.color333333, + color: ktextPrimary, ), ), ) @@ -120,7 +120,7 @@ class _SettingsPageState extends State { style: TextStyle( fontWeight: FontWeight.w600, fontSize: BaseStyle.fontSize28, - color: BaseStyle.color333333, + color: ktextPrimary, ), ), ), diff --git a/lib/pages/sign/sign_in_page.dart b/lib/pages/sign/sign_in_page.dart index 48348af7..ffaaefa1 100644 --- a/lib/pages/sign/sign_in_page.dart +++ b/lib/pages/sign/sign_in_page.dart @@ -185,7 +185,7 @@ class _SignInPageState extends State { style: TextStyle( fontWeight: FontWeight.w600, fontSize: BaseStyle.fontSize28, - color: BaseStyle.color333333, + color: ktextPrimary, ), ), ), @@ -221,7 +221,7 @@ class _SignInPageState extends State { style: TextStyle( fontWeight: FontWeight.w600, fontSize: BaseStyle.fontSize38, - color: BaseStyle.color333333), + color: ktextPrimary), ), ), SizedBox(height: 89.w), diff --git a/lib/pages/sign/user_authentication_page.dart b/lib/pages/sign/user_authentication_page.dart index dfc4328d..838d83ee 100644 --- a/lib/pages/sign/user_authentication_page.dart +++ b/lib/pages/sign/user_authentication_page.dart @@ -100,7 +100,7 @@ class _UserAuthenticationPageState extends State { : FontWeight.normal, fontSize: BaseStyle.fontSize28, color: item['isCheck'] - ? BaseStyle.color333333 + ? ktextPrimary : BaseStyle.color999999), ), ], @@ -174,7 +174,7 @@ class _UserAuthenticationPageState extends State { item['title'], style: TextStyle( fontSize: BaseStyle.fontSize28, - color: BaseStyle.color333333), + color: ktextPrimary), ), SizedBox(height: 25.w), item['widget'], @@ -209,7 +209,7 @@ class _UserAuthenticationPageState extends State { style: TextStyle( fontWeight: FontWeight.w600, fontSize: BaseStyle.fontSize38, - color: BaseStyle.color333333), + color: ktextPrimary), ), SizedBox(height: 8.w), Column( diff --git a/lib/pages/things_page/fixed_submit_page.dart b/lib/pages/things_page/fixed_submit_page.dart index 1cbdb11f..a9716c17 100644 --- a/lib/pages/things_page/fixed_submit_page.dart +++ b/lib/pages/things_page/fixed_submit_page.dart @@ -1,4 +1,12 @@ +import 'package:akuCommunity/base/base_style.dart'; +import 'package:akuCommunity/pages/things_page/widget/image_grid.dart'; +import 'package:akuCommunity/utils/bee_map.dart'; +import 'package:akuCommunity/widget/bee_scaffold.dart'; import 'package:flutter/material.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:velocity_x/velocity_x.dart'; +import 'package:akuCommunity/extensions/num_ext.dart'; +import 'package:akuCommunity/extensions/widget_list_ext.dart'; class FixedSubmitPage extends StatefulWidget { FixedSubmitPage({Key key}) : super(key: key); @@ -7,11 +15,113 @@ class FixedSubmitPage extends StatefulWidget { _FixedSubmitPageState createState() => _FixedSubmitPageState(); } +class FixedSubmitMode { + int tag; + int state; + String text; + List images; + FixedSubmitMode(this.tag, this.state, this.text, this.images); +} + class _FixedSubmitPageState extends State { + List _model = [ + FixedSubmitMode(1, 0, '家里的冰箱坏了，师傅赶紧来看看', [ + 'https://ss1.bdstatic.com/70cFuXSh_Q1YnxGkpoWK1HF6hhy/it/u=466219337,2269488732&fm=15&gp=0.jpg', + 'https://ss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=907707978,1526051881&fm=26&gp=0.jpg', + ]), + FixedSubmitMode(0, 3, '我觉得我们小区的绿化可以再多一点', [ + 'https://dss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=111636878,534819054&fm=26&gp=0.jpg', + 'https://dss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=3834533673,769780989&fm=26&gp=0.jpg', + 'https://dss1.bdstatic.com/70cFuXSh_Q1YnxGkpoWK1HF6hhy/it/u=1683501076,3787404077&fm=26&gp=0.jpg', + 'https://dss0.bdstatic.com/70cFuHSh_Q1YnxGkpoWK1HF6hhy/it/u=1040644610,2290865162&fm=26&gp=0.jpg', + ]), + ]; + Color _getColor(int state) { + switch (state) { + case 0: + case 1: + return kDarkPrimaryColor; + case 2: + case 3: + case 4: + return ktextSubColor; + default: + return kPrimaryColor; + } + } + + Widget _buildCard(int fixedTag, int state, String text, List images) { + return Container( + decoration: BoxDecoration( + color: kForeGroundColor, borderRadius: BorderRadius.circular(8.w)), + padding: EdgeInsets.symmetric(horizontal: 24.w, vertical: 24.w), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + BeeMap() + .fixTag[fixedTag] + .text + .color(ktextPrimary) + .bold + .size(32.sp) + .make(), + Spacer(), + BeeMap() + .fixState[state] + .text + .color(_getColor(state)) + .size(24.sp) + .make(), + ], + ), + 24.hb, + Divider( + thickness: 1.w, + height: 0, + ), + 24.hb, + text.text.color(ktextSubColor).size(28.sp).ellipsis.make(), + 16.hb, + images.length != 0 ? ImageGrid(images) : SizedBox(), + ], + ), + ); + } + @override Widget build(BuildContext context) { - return Scaffold( - + return BeeScaffold( + title: '报事报修', + body: Column( + children: [ + Expanded( + child: ListView( + padding: EdgeInsets.all(32.w), + children: [ + ..._model + .map((e) => _buildCard(e.tag, e.state, e.text, e.images)) + .toList() + ].sepWidget(separate: 24.hb), + ), + ), + Padding( + padding: + EdgeInsets.only(bottom: MediaQuery.of(context).padding.bottom), + child: MaterialButton( + color: kPrimaryColor, + onPressed: () {}, + child: '新增'.text.bold.color(ktextPrimary).size(32.sp).make(), + minWidth: double.infinity, + height: 98.w, + elevation: 0, + materialTapTargetSize: MaterialTapTargetSize.shrinkWrap, + padding: EdgeInsets.zero, + ), + ) + ], + ), ); } -} \ No newline at end of file +} diff --git a/lib/utils/bee_map.dart b/lib/utils/bee_map.dart new file mode 100644 index 00000000..726b48db --- /dev/null +++ b/lib/utils/bee_map.dart @@ -0,0 +1,8 @@ +class BeeMap { + Map fixTag = { + 0: '公区报修', + 1: '家庭报修', + }; + + Map fixState = {0: '待分配', 1: '维修中', 2: '已处理',3:'已完成',4:'已取消'}; +} diff --git a/lib/widget/activity_card.dart b/lib/widget/activity_card.dart index e7862555..61214154 100644 --- a/lib/widget/activity_card.dart +++ b/lib/widget/activity_card.dart @@ -98,7 +98,7 @@ class ActivityCard extends StatelessWidget { text: subtitleFirst, style: TextStyle( fontSize: BaseStyle.fontSize24, - color: BaseStyle.color333333), + color: ktextPrimary), ), ]), ), @@ -118,7 +118,7 @@ class ActivityCard extends StatelessWidget { text: subtitleSecond, style: TextStyle( fontSize: BaseStyle.fontSize24, - color: BaseStyle.color333333), + color: ktextPrimary), ), ]), ), diff --git a/lib/widget/bottom_button.dart b/lib/widget/bottom_button.dart index 3c1fd819..2a9b68ed 100644 --- a/lib/widget/bottom_button.dart +++ b/lib/widget/bottom_button.dart @@ -34,7 +34,7 @@ class _BottomButtonState extends State { style: TextStyle( fontWeight: FontWeight.w600, fontSize: BaseStyle.fontSize32, - color: BaseStyle.color333333, + color: ktextPrimary, ), ), ), diff --git a/lib/widget/common_input.dart b/lib/widget/common_input.dart index 4c812571..fa5bb5de 100644 --- a/lib/widget/common_input.dart +++ b/lib/widget/common_input.dart @@ -20,7 +20,7 @@ class _CommonInputState extends State { cursorColor: Color(0xffffc40c), style: TextStyle( fontWeight: FontWeight.w600, - color: BaseStyle.color333333, + color: ktextPrimary, fontSize: BaseStyle.fontSize36, ), controller: widget.inputController, diff --git a/lib/widget/community_card.dart b/lib/widget/community_card.dart index 085d9472..1395bc1f 100644 --- a/lib/widget/community_card.dart +++ b/lib/widget/community_card.dart @@ -126,7 +126,7 @@ class _CommunityCardState extends State { '$peopleNum人已参加', style: TextStyle( fontSize: BaseStyle.fontSize22, - color: BaseStyle.color333333), + color: ktextPrimary), ), ], ), diff --git a/lib/widget/home_gride_button.dart b/lib/widget/home_gride_button.dart index 95444018..f8bd9135 100644 --- a/lib/widget/home_gride_button.dart +++ b/lib/widget/home_gride_button.dart @@ -2,6 +2,7 @@ import 'package:akuCommunity/pages/convenient_phone/convenient_phone_page.dart'; import 'package:akuCommunity/pages/industry_committee/industry_committee_page.dart'; import 'package:akuCommunity/pages/life_pay/life_pay_page.dart'; import 'package:akuCommunity/pages/open_door_page/open_door_page.dart'; +import 'package:akuCommunity/pages/things_page/fixed_submit_page.dart'; import 'package:akuCommunity/pages/things_page/things_page.dart'; import 'package:akuCommunity/pages/total_application_page/total_applications_page.dart'; import 'package:akuCommunity/pages/visitor_access_page/visitor_access_page.dart'; @@ -34,7 +35,7 @@ class _HomeGridButtonState extends State { Get.to(VisitorAccessPage()); }), GridButton('报事报修', R.ASSETS_ICONS_TOOL_BSBX_PNG, () { - Get.to(ThingsPage()); + Get.to(FixedSubmitPage()); }), GridButton('生活缴费', R.ASSETS_ICONS_TOOL_SHJF_PNG, () { Get.to(LifePayPage()); From 2c3190cf467ec8918ac050b40558cf617682226d Mon Sep 17 00:00:00 2001 From: zhang <494089941@qq.com> Date: Wed, 13 Jan 2021 15:47:26 +0800 Subject: [PATCH 3/3] update router --- lib/routers/page_routers.dart | 1 - lib/widget/home_gride_button.dart | 12 +++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/lib/routers/page_routers.dart b/lib/routers/page_routers.dart index d3b3a421..36efccfd 100644 --- a/lib/routers/page_routers.dart +++ b/lib/routers/page_routers.dart @@ -30,7 +30,6 @@ import 'package:akuCommunity/pages/message_center_page/comment_message_page/comm import 'package:akuCommunity/pages/message_center_page/shop_message_page/shop_message_page.dart'; import 'package:akuCommunity/pages/message_center_page/system_message_page/system_details_page/system_details_page.dart'; -import 'package:akuCommunity/pages/open_door_page/open_door_page.dart'; import 'package:akuCommunity/pages/certification_page/certification_page.dart'; import 'package:akuCommunity/pages/visitor_access_page/visitor_access_page.dart'; diff --git a/lib/widget/home_gride_button.dart b/lib/widget/home_gride_button.dart index f8bd9135..fe2e871c 100644 --- a/lib/widget/home_gride_button.dart +++ b/lib/widget/home_gride_button.dart @@ -6,6 +6,7 @@ import 'package:akuCommunity/pages/things_page/fixed_submit_page.dart'; import 'package:akuCommunity/pages/things_page/things_page.dart'; import 'package:akuCommunity/pages/total_application_page/total_applications_page.dart'; import 'package:akuCommunity/pages/visitor_access_page/visitor_access_page.dart'; +import 'package:akuCommunity/routers/page_routers.dart'; import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:akuCommunity/const/resource.dart'; @@ -44,7 +45,16 @@ class _HomeGridButtonState extends State { Get.to(IndustryCommitteePage()); }), GridButton('建议咨询', R.ASSETS_ICONS_TOOL_JYTS_PNG, () { - Get.to(ThingsPage()); + Get.to(ThingsPage( + bundle: Bundle() + ..putMap('things', { + 'title': '建议咨询', + 'treeList': >[ + {'name': '您的建议'}, + {'name': '您的咨询'}, + ] + }), + )); }), GridButton('便民电话', R.ASSETS_ICONS_TOOL_BMDH_PNG, () { Get.to(ConvenientPhonePage());