From ef734a97fbcbad90319dd26848a2200f3a055a3e Mon Sep 17 00:00:00 2001 From: zhang <494089941@qq.com> Date: Sat, 16 Jan 2021 15:56:08 +0800 Subject: [PATCH] update sacffold --- lib/pages/community/note_create_page.dart | 118 ++++++++---------- .../confirm_order_page.dart | 9 +- .../confirm_order_page/pay_order_page.dart | 8 +- .../convenient_phone_page.dart | 10 +- lib/pages/fitup_manage/fitup_manage_page.dart | 16 +-- .../deto_code_page/deto_code_page.dart | 16 +-- .../deto_create_page/deto_create_page.dart | 17 +-- .../goods_deto_page/goods_deto_page.dart | 10 +- .../goods_manage_page/goods_manage_page.dart | 21 ++-- .../mine_goods_page/mine_goods_page.dart | 10 +- lib/pages/home/home_page.dart | 2 - .../committee_mailbox_page.dart | 18 +-- .../industry_committee_page.dart | 13 +- lib/pages/invoice/invoice_page.dart | 32 ++--- .../life_pay_bill_page.dart | 15 +-- .../life_pay_info_page.dart | 11 +- lib/pages/life_pay/life_pay_page.dart | 24 ++-- .../life_pay_record_page.dart | 13 +- 18 files changed, 139 insertions(+), 224 deletions(-) diff --git a/lib/pages/community/note_create_page.dart b/lib/pages/community/note_create_page.dart index 703b1e73..bd6943f4 100644 --- a/lib/pages/community/note_create_page.dart +++ b/lib/pages/community/note_create_page.dart @@ -1,3 +1,4 @@ +import 'package:akuCommunity/widget/bee_scaffold.dart'; import 'package:flutter/material.dart'; import 'package:flutter/cupertino.dart'; import 'package:akuCommunity/utils/headers.dart'; @@ -27,59 +28,7 @@ class _NoteCreatePageState extends State { {'title': "#运动会", 'isSelect': false}, ]; - AppBar _appBar() { - return AppBar( - elevation: 0, - backgroundColor: Color(0xffffffff), - centerTitle: true, - title: Text( - '社区', - style: TextStyle( - fontSize: 36.sp, - color: Color(0xff333333), - ), - ), - leading: InkWell( - onTap: () => Get.back(), - child: Container( - padding: EdgeInsets.only(left: 32.w), - alignment: Alignment.center, - child: Text( - '取消', - style: TextStyle( - fontSize: 34.sp, - color: Color(0xff030303), - ), - ), - ), - ), - actions: [ - Container( - alignment: Alignment.center, - padding: EdgeInsets.only(right: 32.w), - child: InkWell( - onTap: () {}, - child: Container( - height: 64.w, - width: 116.w, - alignment: Alignment.center, - decoration: BoxDecoration( - color: Color(0xffffd000), - borderRadius: BorderRadius.all(Radius.circular(4)), - ), - child: Text( - '发表', - style: TextStyle( - fontSize: 34.sp, - color: Color(0xff030303), - ), - ), - ), - ), - ), - ], - ); - } + Container _containerTextField() { return Container( @@ -185,17 +134,17 @@ class _NoteCreatePageState extends State { .keys .map((index) => index == 0 ? Container( - padding: EdgeInsets.only(top: 10.w), - width: 156.w, - alignment: Alignment.centerLeft, - child: Text( - _themeList[index]['title'], - style: TextStyle( - fontSize: 34.sp, - color: Color(0xff333333), + padding: EdgeInsets.only(top: 10.w), + width: 156.w, + alignment: Alignment.centerLeft, + child: Text( + _themeList[index]['title'], + style: TextStyle( + fontSize: 34.sp, + color: Color(0xff333333), + ), ), - ), - ) + ) : InkWell( onTap: () { _themeList.forEach((item) { @@ -237,8 +186,47 @@ class _NoteCreatePageState extends State { @override Widget build(BuildContext context) { double _statusHeight = MediaQuery.of(context).padding.top; - return Scaffold( - appBar: _appBar(), + return BeeScaffold( + title: '社区', + leading: InkWell( + onTap: () => Get.back(), + child: Container( + padding: EdgeInsets.only(left: 32.w), + alignment: Alignment.center, + child: Text( + '取消', + style: TextStyle( + fontSize: 34.sp, + color: Color(0xff030303), + ), + ), + ), + ), + actions: [ + Container( + alignment: Alignment.center, + padding: EdgeInsets.only(right: 32.w), + child: InkWell( + onTap: () {}, + child: Container( + height: 64.w, + width: 116.w, + alignment: Alignment.center, + decoration: BoxDecoration( + color: Color(0xffffd000), + borderRadius: BorderRadius.all(Radius.circular(4)), + ), + child: Text( + '发表', + style: TextStyle( + fontSize: 34.sp, + color: Color(0xff030303), + ), + ), + ), + ), + ), + ], body: SingleChildScrollView( child: Container( height: MediaQuery.of(context).size.height - diff --git a/lib/pages/confirm_order_page/confirm_order_page.dart b/lib/pages/confirm_order_page/confirm_order_page.dart index 60d06a50..49d3a03e 100644 --- a/lib/pages/confirm_order_page/confirm_order_page.dart +++ b/lib/pages/confirm_order_page/confirm_order_page.dart @@ -1,8 +1,8 @@ +import 'package:akuCommunity/widget/bee_scaffold.dart'; import 'package:flutter/material.dart'; import 'package:flutter/cupertino.dart'; import 'package:akuCommunity/utils/headers.dart'; import 'package:akuCommunity/routers/page_routers.dart'; -import 'package:akuCommunity/widget/common_app_bar.dart'; import 'widget/confirm_address.dart'; import 'widget/confirm_content.dart'; import 'widget/confirm_bottom_bar.dart'; @@ -13,11 +13,8 @@ class ConfirmOrderPage extends StatelessWidget { @override Widget build(BuildContext context) { - return Scaffold( - appBar: PreferredSize( - child: CommonAppBar(title: '确认订单'), - preferredSize: Size.fromHeight(kToolbarHeight), - ), + return BeeScaffold( + title: '确认订单', body: Stack( children: [ ListView( diff --git a/lib/pages/confirm_order_page/pay_order_page.dart b/lib/pages/confirm_order_page/pay_order_page.dart index 890aa35d..a7472b68 100644 --- a/lib/pages/confirm_order_page/pay_order_page.dart +++ b/lib/pages/confirm_order_page/pay_order_page.dart @@ -1,3 +1,4 @@ +import 'package:akuCommunity/widget/bee_scaffold.dart'; import 'package:flutter/material.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter_icons/flutter_icons.dart'; @@ -125,11 +126,8 @@ class PayOrderPage extends StatelessWidget { @override Widget build(BuildContext context) { - return Scaffold( - appBar: PreferredSize( - child: CommonAppBar(title: '付款方式'), - preferredSize: Size.fromHeight(kToolbarHeight), - ), + return BeeScaffold( + title: '付款方式', body: Container( color: Colors.white, child: ListView( diff --git a/lib/pages/convenient_phone/convenient_phone_page.dart b/lib/pages/convenient_phone/convenient_phone_page.dart index 4951da2b..ab00ad31 100644 --- a/lib/pages/convenient_phone/convenient_phone_page.dart +++ b/lib/pages/convenient_phone/convenient_phone_page.dart @@ -1,3 +1,4 @@ +import 'package:akuCommunity/widget/bee_scaffold.dart'; import 'package:flutter/material.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter_icons/flutter_icons.dart'; @@ -92,13 +93,8 @@ class _ConvenientPhonePageState extends State { @override Widget build(BuildContext context) { - return Scaffold( - appBar: PreferredSize( - child: CommonAppBar( - title: '便民电话', - ), - preferredSize: Size.fromHeight(kToolbarHeight), - ), + return BeeScaffold( + title: '便民电话', body: Container( color: Colors.white, child: NestedScrollView( diff --git a/lib/pages/fitup_manage/fitup_manage_page.dart b/lib/pages/fitup_manage/fitup_manage_page.dart index 2e35694d..9d99a1f4 100644 --- a/lib/pages/fitup_manage/fitup_manage_page.dart +++ b/lib/pages/fitup_manage/fitup_manage_page.dart @@ -1,3 +1,4 @@ +import 'package:akuCommunity/widget/bee_scaffold.dart'; import 'package:flutter/material.dart'; import 'package:flutter/cupertino.dart'; import 'package:akuCommunity/utils/headers.dart'; @@ -52,12 +53,10 @@ class _FitupManagePageState extends State fontWeight: FontWeight.w600, fontSize: BaseStyle.fontSize28, ), - labelPadding: - EdgeInsets.symmetric(horizontal: (131.5).w), + labelPadding: EdgeInsets.symmetric(horizontal: (131.5).w), indicatorColor: Color(0xffffc40c), indicatorSize: TabBarIndicatorSize.label, - indicatorPadding: - EdgeInsets.symmetric(horizontal: 21.w), + indicatorPadding: EdgeInsets.symmetric(horizontal: 21.w), isScrollable: true, controller: _controller, tabs: List.generate( @@ -73,13 +72,8 @@ class _FitupManagePageState extends State @override Widget build(BuildContext context) { - return Scaffold( - appBar: PreferredSize( - child: CommonAppBar( - title: '装修管理', - ), - preferredSize: Size.fromHeight(kToolbarHeight), - ), + return BeeScaffold( + title: '装修管理', body: NestedScrollView( headerSliverBuilder: _silverBuilder, body: TabBarView( diff --git a/lib/pages/goods_deto_page/deto_code_page/deto_code_page.dart b/lib/pages/goods_deto_page/deto_code_page/deto_code_page.dart index 6048250b..95c5bbb1 100644 --- a/lib/pages/goods_deto_page/deto_code_page/deto_code_page.dart +++ b/lib/pages/goods_deto_page/deto_code_page/deto_code_page.dart @@ -1,3 +1,4 @@ +import 'package:akuCommunity/widget/bee_scaffold.dart'; import 'package:flutter/material.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter_icons/flutter_icons.dart'; @@ -17,14 +18,12 @@ class DetoCodePage extends StatelessWidget { children: [ Text( '宁波华茂悦峰', - style: TextStyle( - fontSize: 40.sp, color: Color(0xffffffff)), + style: TextStyle(fontSize: 40.sp, color: Color(0xffffffff)), ), SizedBox(height: 10.w), Text( '1幢-1单元-702室', - style: TextStyle( - fontSize: 26.sp, color: Color(0xffffffff)), + style: TextStyle(fontSize: 26.sp, color: Color(0xffffffff)), ), ], ), @@ -136,13 +135,8 @@ class DetoCodePage extends StatelessWidget { @override Widget build(BuildContext context) { - return Scaffold( - appBar: PreferredSize( - child: CommonAppBar( - title: '出户二维码', - ), - preferredSize: Size.fromHeight(kToolbarHeight), - ), + return BeeScaffold( + title: '出户二维码', body: Container( color: Color(0xff333333), child: Stack( diff --git a/lib/pages/goods_deto_page/deto_create_page/deto_create_page.dart b/lib/pages/goods_deto_page/deto_create_page/deto_create_page.dart index c317d9e3..4bd9c61d 100644 --- a/lib/pages/goods_deto_page/deto_create_page/deto_create_page.dart +++ b/lib/pages/goods_deto_page/deto_create_page/deto_create_page.dart @@ -1,3 +1,4 @@ +import 'package:akuCommunity/widget/bee_scaffold.dart'; import 'package:flutter/material.dart'; import 'package:flutter/cupertino.dart'; import 'package:akuCommunity/utils/headers.dart'; @@ -136,8 +137,7 @@ class _DetoCreatePageState extends State { margin: EdgeInsets.only(right: 30.w), child: Text( title, - style: TextStyle( - fontSize: 28.sp, color: Color(0xff333333)), + style: TextStyle(fontSize: 28.sp, color: Color(0xff333333)), ), ), CommonRadio( @@ -158,13 +158,8 @@ class _DetoCreatePageState extends State { @override Widget build(BuildContext context) { - return Scaffold( - appBar: PreferredSize( - child: CommonAppBar( - title: '物品出户', - ), - preferredSize: Size.fromHeight(kToolbarHeight), - ), + return BeeScaffold( + title: '物品出户', body: Container( color: Colors.white, child: Stack( @@ -184,9 +179,7 @@ class _DetoCreatePageState extends State { _checkCard('搬运方式', _listMode), _inkWellCheckbox(), Container( - margin: EdgeInsets.only( - top: 54.w, - bottom: 24.w), + margin: EdgeInsets.only(top: 54.w, bottom: 24.w), child: Text( '添加图片信息(0/9)', style: TextStyle( diff --git a/lib/pages/goods_deto_page/goods_deto_page.dart b/lib/pages/goods_deto_page/goods_deto_page.dart index a7bc59db..404919c9 100644 --- a/lib/pages/goods_deto_page/goods_deto_page.dart +++ b/lib/pages/goods_deto_page/goods_deto_page.dart @@ -1,5 +1,6 @@ import 'package:akuCommunity/pages/goods_deto_page/deto_create_page/deto_create_page.dart'; import 'package:akuCommunity/utils/headers.dart'; +import 'package:akuCommunity/widget/bee_scaffold.dart'; import 'package:flutter/material.dart'; import 'package:flutter/cupertino.dart'; import 'package:get/get.dart'; @@ -87,13 +88,8 @@ class _GoodsDetoPageState extends State { @override Widget build(BuildContext context) { - return Scaffold( - appBar: PreferredSize( - child: CommonAppBar( - title: '物品出户', - ), - preferredSize: Size.fromHeight(kToolbarHeight), - ), + return BeeScaffold( + title: '物品出户', body: Stack( children: [ Padding( diff --git a/lib/pages/goods_manage_page/goods_manage_page.dart b/lib/pages/goods_manage_page/goods_manage_page.dart index 30770c0b..8208b01d 100644 --- a/lib/pages/goods_manage_page/goods_manage_page.dart +++ b/lib/pages/goods_manage_page/goods_manage_page.dart @@ -1,9 +1,10 @@ +import 'package:akuCommunity/widget/bee_scaffold.dart'; import 'package:flutter/material.dart'; import 'package:flutter/cupertino.dart'; import 'package:akuCommunity/utils/headers.dart'; import 'package:akuCommunity/widget/bottom_button.dart'; import 'package:akuCommunity/widget/cached_image_wrapper.dart'; -import 'package:akuCommunity/widget/common_app_bar.dart'; +import 'package:velocity_x/velocity_x.dart'; class GoodsManagePage extends StatefulWidget { GoodsManagePage({Key key}) : super(key: key); @@ -111,14 +112,16 @@ class _GoodsManagePageState extends State { @override Widget build(BuildContext context) { - return Scaffold( - appBar: PreferredSize( - child: CommonAppBar( - title: '借还管理', - subtitle: '我的借还物品', - ), - preferredSize: Size.fromHeight(kToolbarHeight), - ), + return BeeScaffold( + title: '借还管理', + actions: [ + InkWell( + onTap: () {}, + child: Container( + padding: EdgeInsets.fromLTRB(32.w, 28.w, 32.w, 20.w), + alignment: Alignment.center, + child: '我的借还物品'.text.black.size(28.sp).make())) + ], body: Stack( children: [ Column( 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 ad2bed90..048f8e36 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 @@ -1,3 +1,4 @@ +import 'package:akuCommunity/widget/bee_scaffold.dart'; import 'package:flutter/material.dart'; import 'package:flutter/cupertino.dart'; import 'package:pull_to_refresh/pull_to_refresh.dart'; @@ -207,13 +208,8 @@ class _MineGoodsPageState extends State { @override Widget build(BuildContext context) { - return Scaffold( - appBar: PreferredSize( - child: CommonAppBar( - title: '我的借还物品', - ), - preferredSize: Size.fromHeight(kToolbarHeight), - ), + return BeeScaffold( + title: '我的借还物品', body: RefreshConfiguration( child: SmartRefresher( controller: _refreshController, diff --git a/lib/pages/home/home_page.dart b/lib/pages/home/home_page.dart index f608665e..bf7cbb19 100644 --- a/lib/pages/home/home_page.dart +++ b/lib/pages/home/home_page.dart @@ -1,6 +1,5 @@ import 'dart:async'; import 'dart:convert'; -import 'package:akuCommunity/base/base_style.dart'; import 'package:akuCommunity/const/resource.dart'; import 'package:akuCommunity/pages/activities_page/activities_page.dart'; import 'package:akuCommunity/pages/convenient_phone/convenient_phone_page.dart'; @@ -14,7 +13,6 @@ 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/widget/bee_scaffold.dart'; import 'package:akuCommunity/extensions/num_ext.dart'; import 'package:akuCommunity/widget/grid_buttons.dart'; import 'package:flutter/material.dart'; diff --git a/lib/pages/industry_committee/committee_mailbox/committee_mailbox_page.dart b/lib/pages/industry_committee/committee_mailbox/committee_mailbox_page.dart index c2d5433b..4f43206a 100644 --- a/lib/pages/industry_committee/committee_mailbox/committee_mailbox_page.dart +++ b/lib/pages/industry_committee/committee_mailbox/committee_mailbox_page.dart @@ -1,3 +1,4 @@ +import 'package:akuCommunity/widget/bee_scaffold.dart'; import 'package:flutter/material.dart'; import 'package:flutter/cupertino.dart'; import 'package:akuCommunity/utils/headers.dart'; @@ -14,10 +15,7 @@ class _CommitteeMailboxPageState extends State { TextEditingController _thingsContent = new TextEditingController(); Widget _input() { return Container( - padding: EdgeInsets.only( - top: 32.w, - left: 22.w, - right: 35.w), + padding: EdgeInsets.only(top: 32.w, left: 22.w, right: 35.w), decoration: BoxDecoration( borderRadius: BorderRadius.all(Radius.circular(8)), border: Border.all(color: Color(0xffd4cfbe), width: 1.0), @@ -63,8 +61,7 @@ class _CommitteeMailboxPageState extends State { margin: EdgeInsets.only(top: 40.w), decoration: BoxDecoration( color: Color(0xffffc40c), - borderRadius: - BorderRadius.all(Radius.circular(48.w))), + borderRadius: BorderRadius.all(Radius.circular(48.w))), child: Text( '确认提交', style: TextStyle( @@ -78,13 +75,8 @@ class _CommitteeMailboxPageState extends State { @override Widget build(BuildContext context) { - return Scaffold( - appBar: PreferredSize( - child: CommonAppBar( - title: '业委会信箱', - ), - preferredSize: Size.fromHeight(kToolbarHeight), - ), + return BeeScaffold( + title: '业委会信箱', body: Container( color: Colors.white, child: ListView( diff --git a/lib/pages/industry_committee/industry_committee_page.dart b/lib/pages/industry_committee/industry_committee_page.dart index 86197f58..dbf8721d 100644 --- a/lib/pages/industry_committee/industry_committee_page.dart +++ b/lib/pages/industry_committee/industry_committee_page.dart @@ -1,4 +1,5 @@ import 'package:akuCommunity/pages/industry_committee/committee_mailbox/committee_mailbox_page.dart'; +import 'package:akuCommunity/widget/bee_scaffold.dart'; import 'package:flutter/material.dart'; import 'package:flutter/cupertino.dart'; import 'package:get/get.dart'; @@ -114,8 +115,7 @@ class _IndustryCommitteePageState extends State { return Positioned( bottom: 0, child: Container( - height: - 98.w + MediaQuery.of(context).viewPadding.bottom, + height: 98.w + MediaQuery.of(context).viewPadding.bottom, width: MediaQuery.of(context).size.width, child: Row( children: _listBottom @@ -133,13 +133,8 @@ class _IndustryCommitteePageState extends State { } Widget build(BuildContext context) { - return Scaffold( - appBar: PreferredSize( - child: CommonAppBar( - title: '业委会', - ), - preferredSize: Size.fromHeight(kToolbarHeight), - ), + return BeeScaffold( + title: '业委会', body: Stack( children: [ StaffList(), diff --git a/lib/pages/invoice/invoice_page.dart b/lib/pages/invoice/invoice_page.dart index a95387b0..6bd909b3 100644 --- a/lib/pages/invoice/invoice_page.dart +++ b/lib/pages/invoice/invoice_page.dart @@ -1,3 +1,4 @@ +import 'package:akuCommunity/widget/bee_scaffold.dart'; import 'package:flutter/material.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter_icons/flutter_icons.dart'; @@ -33,27 +34,6 @@ class _InvoicePageState extends State { }); } - AppBar _appBar() { - return AppBar( - elevation: 0, - backgroundColor: Color(0xffffffff), - leading: IconButton( - icon: Icon(AntDesign.left, size: 40.sp), - onPressed: () { - Get.back(); - }, - ), - centerTitle: true, - title: Text( - '开具发票', - style: TextStyle( - fontWeight: FontWeight.w600, - fontSize: 32.sp, - color: Color(0xff333333), - ), - ), - ); - } Container _containerInvoiceDetailCheck() { return Container( @@ -231,9 +211,15 @@ class _InvoicePageState extends State { ); } - return Scaffold( + return BeeScaffold( key: _scaffoldKey, - appBar: _appBar(), + title: '开具发票', + leading:IconButton( + icon: Icon(AntDesign.left, size: 40.sp), + onPressed: () { + Get.back(); + }, + ), body: SingleChildScrollView( child: Container( height: 1334.w, diff --git a/lib/pages/life_pay/life_pay_bill_page/life_pay_bill_page.dart b/lib/pages/life_pay/life_pay_bill_page/life_pay_bill_page.dart index 820b3464..71aa3e02 100644 --- a/lib/pages/life_pay/life_pay_bill_page/life_pay_bill_page.dart +++ b/lib/pages/life_pay/life_pay_bill_page/life_pay_bill_page.dart @@ -1,3 +1,4 @@ +import 'package:akuCommunity/widget/bee_scaffold.dart'; import 'package:flutter/material.dart'; import 'package:flutter/cupertino.dart'; import 'package:akuCommunity/utils/headers.dart'; @@ -37,20 +38,12 @@ class _LifePayBillPageState extends State { @override Widget build(BuildContext context) { - return Scaffold( - appBar: PreferredSize( - child: CommonAppBar( - title: '账单详情', - ), - preferredSize: Size.fromHeight(kToolbarHeight), - ), + return BeeScaffold( + title: '账单详情', body: ListView( children: [ Container( - margin: EdgeInsets.only( - top: 32.w, - left: 32.w, - right: 32.w), + margin: EdgeInsets.only(top: 32.w, left: 32.w, right: 32.w), decoration: BoxDecoration( color: Colors.white, borderRadius: BorderRadius.all(Radius.circular(6)), diff --git a/lib/pages/life_pay/life_pay_info_page/life_pay_info_page.dart b/lib/pages/life_pay/life_pay_info_page/life_pay_info_page.dart index c8ba59c9..1376797b 100644 --- a/lib/pages/life_pay/life_pay_info_page/life_pay_info_page.dart +++ b/lib/pages/life_pay/life_pay_info_page/life_pay_info_page.dart @@ -1,4 +1,5 @@ import 'package:akuCommunity/pages/life_pay/life_pay_bill_page/life_pay_bill_page.dart'; +import 'package:akuCommunity/widget/bee_scaffold.dart'; import 'package:flutter/material.dart'; import 'package:flutter/cupertino.dart'; import 'package:akuCommunity/utils/headers.dart'; @@ -16,16 +17,10 @@ class LifePayInfoPage extends StatefulWidget { } class _LifePayInfoPageState extends State { - @override Widget build(BuildContext context) { - return Scaffold( - appBar: PreferredSize( - child: CommonAppBar( - title:' ${widget.bundle.getMap('detailMap')['title']}明细', - ), - preferredSize: Size.fromHeight(kToolbarHeight), - ), + return BeeScaffold( + title: ' ${widget.bundle.getMap('detailMap')['title']}明细', body: Stack( children: [ ListView( diff --git a/lib/pages/life_pay/life_pay_page.dart b/lib/pages/life_pay/life_pay_page.dart index 4501ca9a..aa8dce46 100644 --- a/lib/pages/life_pay/life_pay_page.dart +++ b/lib/pages/life_pay/life_pay_page.dart @@ -1,11 +1,13 @@ import 'package:akuCommunity/pages/life_pay/life_pay_info_page/life_pay_info_page.dart'; +import 'package:akuCommunity/pages/life_pay/life_pay_record_page/life_pay_record_page.dart'; +import 'package:akuCommunity/widget/bee_scaffold.dart'; import 'package:flutter/material.dart'; import 'package:flutter/cupertino.dart'; import 'package:akuCommunity/utils/headers.dart'; import 'package:akuCommunity/routers/page_routers.dart'; -import 'package:akuCommunity/widget/common_app_bar.dart'; import 'widget/order_card.dart'; import 'widget/submit_bar.dart'; +import 'package:velocity_x/velocity_x.dart'; class LifePayPage extends StatefulWidget { LifePayPage({Key key}) : super(key: key); @@ -17,14 +19,20 @@ class LifePayPage extends StatefulWidget { class _LifePayPageState extends State { @override Widget build(BuildContext context) { - return Scaffold( - appBar: PreferredSize( - child: CommonAppBar( - title: '生活缴费', - subtitle: '缴费记录', + return BeeScaffold( + title: '生活缴费', + actions: [ + InkWell( + onTap: () { + LifePayRecordPage().to(); + }, + child: Container( + padding: EdgeInsets.fromLTRB(32.w, 28.w, 32.w, 20.w), + alignment: Alignment.center, + child: '缴费记录'.text.black.size(28.sp).make(), + ), ), - preferredSize: Size.fromHeight(kToolbarHeight), - ), + ], body: Stack( children: [ ListView( diff --git a/lib/pages/life_pay/life_pay_record_page/life_pay_record_page.dart b/lib/pages/life_pay/life_pay_record_page/life_pay_record_page.dart index 88c3bb44..702aa442 100644 --- a/lib/pages/life_pay/life_pay_record_page/life_pay_record_page.dart +++ b/lib/pages/life_pay/life_pay_record_page/life_pay_record_page.dart @@ -1,10 +1,9 @@ import 'package:akuCommunity/pages/life_pay/life_pay_bill_page/life_pay_bill_page.dart'; +import 'package:akuCommunity/widget/bee_scaffold.dart'; import 'package:flutter/material.dart'; import 'package:flutter/cupertino.dart'; import 'package:pull_to_refresh/pull_to_refresh.dart'; import 'package:akuCommunity/utils/headers.dart'; -import 'package:akuCommunity/routers/page_routers.dart'; -import 'package:akuCommunity/widget/common_app_bar.dart'; import 'widget/record_card.dart'; class LifePayRecordPage extends StatefulWidget { @@ -36,7 +35,6 @@ class _LifePayRecordPageState extends State { _refreshController.loadComplete(); } - @override void dispose() { super.dispose(); @@ -45,13 +43,8 @@ class _LifePayRecordPageState extends State { @override Widget build(BuildContext context) { - return Scaffold( - appBar: PreferredSize( - child: CommonAppBar( - title: '缴费记录', - ), - preferredSize: Size.fromHeight(kToolbarHeight), - ), + return BeeScaffold( + title: '缴费记录', body: RefreshConfiguration( hideFooterWhenNotFull: true, child: SmartRefresher(