From 64c7981cc3a5ba687145fc19e04f990f5f14c10c Mon Sep 17 00:00:00 2001 From: zhang <494089941@qq.com> Date: Sat, 16 Jan 2021 14:40:45 +0800 Subject: [PATCH] update scaffold --- .../activities_details_page.dart | 10 +++---- .../activities_page/activities_page.dart | 10 +++---- .../member_list_page/member_list_page.dart | 10 +++---- lib/pages/address_page/address_edit_page.dart | 26 ++++++++++++------- lib/pages/address_page/address_page.dart | 20 +++++++------- .../certification_page.dart | 19 +++++--------- 6 files changed, 43 insertions(+), 52 deletions(-) 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 1914e795..43a9e024 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 @@ -1,4 +1,5 @@ import 'package:akuCommunity/pages/activities_page/member_list_page/member_list_page.dart'; +import 'package:akuCommunity/widget/bee_scaffold.dart'; import 'package:flutter/material.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter_icons/flutter_icons.dart'; @@ -263,13 +264,8 @@ class _ActivitiesDetailsPageState extends State { @override Widget build(BuildContext context) { - return Scaffold( - appBar: PreferredSize( - child: CommonAppBar( - title: '活动详情', - ), - preferredSize: Size.fromHeight(kToolbarHeight), - ), + return BeeScaffold( + title: '活动详情', body: Stack( children: [ Container( diff --git a/lib/pages/activities_page/activities_page.dart b/lib/pages/activities_page/activities_page.dart index fc5b24ae..fcd845ff 100644 --- a/lib/pages/activities_page/activities_page.dart +++ b/lib/pages/activities_page/activities_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:get/get.dart'; @@ -126,13 +127,8 @@ class _ActivitiesPageState 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( 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 9d50deaf..ca7ab9a6 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 @@ -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'; @@ -150,13 +151,8 @@ class _MemberListPageState 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: RefreshConfiguration( diff --git a/lib/pages/address_page/address_edit_page.dart b/lib/pages/address_page/address_edit_page.dart index 132d0d2d..a826a529 100644 --- a/lib/pages/address_page/address_edit_page.dart +++ b/lib/pages/address_page/address_edit_page.dart @@ -1,9 +1,11 @@ +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 'package:get/get.dart'; import 'widget/address_edit_item.dart'; +import 'package:velocity_x/velocity_x.dart'; class AddressEditPage extends StatefulWidget { final Bundle bundle; @@ -80,14 +82,20 @@ class _AddressEditPageState extends State { @override Widget build(BuildContext context) { - return Scaffold( - appBar: PreferredSize( - child: CommonAppBar( - title: '${widget.bundle.getMap('details')['title']}', - subtitle: '保存', - ), - preferredSize: Size.fromHeight(kToolbarHeight), - ), + return BeeScaffold( + title: '${widget.bundle.getMap('details')['title']}', + actions: [ + InkWell( + onTap: () { + Get.back(); + }, + child: Container( + height: 98.w, + width: 48.w + 32.w * 2, + alignment: Alignment.center, + child: '保存'.text.color(Color(0xFFFFC40C)).size(24.sp).make()), + ) + ], body: SingleChildScrollView( physics: NeverScrollableScrollPhysics(), child: Container( diff --git a/lib/pages/address_page/address_page.dart b/lib/pages/address_page/address_page.dart index dfa29333..1187246e 100644 --- a/lib/pages/address_page/address_page.dart +++ b/lib/pages/address_page/address_page.dart @@ -1,7 +1,9 @@ +import 'package:akuCommunity/widget/bee_scaffold.dart'; import 'package:flutter/material.dart'; import 'package:flutter/cupertino.dart'; -import 'package:akuCommunity/widget/common_app_bar.dart'; +import 'package:velocity_x/velocity_x.dart'; import 'widget/address_item.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; class AddressPage extends StatefulWidget { AddressPage({Key key}) : super(key: key); @@ -34,14 +36,14 @@ class _AddressPageState 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: '添加新地址'.text.black.size(24.sp).make(), + ) + ], body: ListView.builder( itemBuilder: (BuildContext context, int index) => AddressItem( name: _addressInfoList[index]['name'], diff --git a/lib/pages/certification_page/certification_page.dart b/lib/pages/certification_page/certification_page.dart index 561538b0..7a786fd9 100644 --- a/lib/pages/certification_page/certification_page.dart +++ b/lib/pages/certification_page/certification_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/base/assets_image.dart'; @@ -49,8 +50,7 @@ class _CertificationPageState extends State { children: [ Text( '证件类型', - style: TextStyle( - fontSize: 28.sp, color: Color(0xff333333)), + style: TextStyle(fontSize: 28.sp, color: Color(0xff333333)), ), SizedBox(height: 25.w), Container( @@ -81,8 +81,7 @@ class _CertificationPageState extends State { children: [ Text( '上传证件照片', - style: TextStyle( - fontSize: 28.sp, color: Color(0xff333333)), + style: TextStyle(fontSize: 28.sp, color: Color(0xff333333)), ), SizedBox(height: 25.w), Row( @@ -116,8 +115,7 @@ class _CertificationPageState extends State { children: [ Text( title, - style: TextStyle( - fontSize: 28.sp, color: Color(0xff333333)), + style: TextStyle(fontSize: 28.sp, color: Color(0xff333333)), ), SizedBox(height: 25.w), CommonInput(inputController: controller, hintText: hintText) @@ -151,13 +149,8 @@ class _CertificationPageState extends State { @override Widget build(BuildContext context) { - return Scaffold( - appBar: PreferredSize( - child: CommonAppBar( - title: '实名认证', - ), - preferredSize: Size.fromHeight(kToolbarHeight), - ), + return BeeScaffold( + title: '实名认证', body: Container( padding: EdgeInsets.only( top: 32.w,