Merge branch 'master' of 192.168.2.201:laiiihz/akuCommunity

* 'master' of 192.168.2.201:laiiihz/akuCommunity:
  update scaffold
  update sacffold

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<NoteCreatePage> {
     {'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(
@@ -237,8 +186,47 @@ class _NoteCreatePageState extends State<NoteCreatePage> {
   @override
   Widget build(BuildContext context) {
     double _statusHeight = MediaQuery.of(context).padding.top;
-    return Scaffold(
+    return BeeScaffold(
-      appBar: _appBar(),
+      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 -

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(
+    return BeeScaffold(
-      appBar: PreferredSize(
+      title: '确认订单',
-        child: CommonAppBar(title: '确认订单'),
-        preferredSize: Size.fromHeight(kToolbarHeight),
-      ),
       body: Stack(
         children: [
           ListView(

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(
+    return BeeScaffold(
-      appBar: PreferredSize(
+      title: '付款方式',
-        child: CommonAppBar(title: '付款方式'),
-        preferredSize: Size.fromHeight(kToolbarHeight),
-      ),
       body: Container(
         color: Colors.white,
         child: ListView(

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<ConvenientPhonePage> {
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
+    return BeeScaffold(
-      appBar: PreferredSize(
-        child: CommonAppBar(
         title: '便民电话',
-        ),
-        preferredSize: Size.fromHeight(kToolbarHeight),
-      ),
       body: Container(
         color: Colors.white,
         child: NestedScrollView(

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<FitupManagePage>
                 fontWeight: FontWeight.w600,
                 fontSize: BaseStyle.fontSize28,
               ),
-              labelPadding:
+              labelPadding: EdgeInsets.symmetric(horizontal: (131.5).w),
-                  EdgeInsets.symmetric(horizontal: (131.5).w),
               indicatorColor: Color(0xffffc40c),
               indicatorSize: TabBarIndicatorSize.label,
-              indicatorPadding:
+              indicatorPadding: EdgeInsets.symmetric(horizontal: 21.w),
-                  EdgeInsets.symmetric(horizontal: 21.w),
               isScrollable: true,
               controller: _controller,
               tabs: List.generate(
@@ -73,13 +72,8 @@ class _FitupManagePageState extends State<FitupManagePage>
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
+    return BeeScaffold(
-      appBar: PreferredSize(
-        child: CommonAppBar(
       title: '装修管理',
-        ),
-        preferredSize: Size.fromHeight(kToolbarHeight),
-      ),
       body: NestedScrollView(
         headerSliverBuilder: _silverBuilder,
         body: TabBarView(

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(
+            style: TextStyle(fontSize: 40.sp, color: Color(0xffffffff)),
-                fontSize: 40.sp, color: Color(0xffffffff)),
           ),
           SizedBox(height: 10.w),
           Text(
             '1幢-1单元-702室',
-            style: TextStyle(
+            style: TextStyle(fontSize: 26.sp, color: Color(0xffffffff)),
-                fontSize: 26.sp, color: Color(0xffffffff)),
           ),
         ],
       ),
@@ -136,13 +135,8 @@ class DetoCodePage extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
+    return BeeScaffold(
-      appBar: PreferredSize(
-        child: CommonAppBar(
       title: '出户二维码',
-        ),
-        preferredSize: Size.fromHeight(kToolbarHeight),
-      ),
       body: Container(
         color: Color(0xff333333),
         child: Stack(

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<DetoCreatePage> {
             margin: EdgeInsets.only(right: 30.w),
             child: Text(
               title,
-              style: TextStyle(
+              style: TextStyle(fontSize: 28.sp, color: Color(0xff333333)),
-                  fontSize: 28.sp, color: Color(0xff333333)),
             ),
           ),
           CommonRadio(
@@ -158,13 +158,8 @@ class _DetoCreatePageState extends State<DetoCreatePage> {
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
+    return BeeScaffold(
-      appBar: PreferredSize(
-        child: CommonAppBar(
       title: '物品出户',
-        ),
-        preferredSize: Size.fromHeight(kToolbarHeight),
-      ),
       body: Container(
         color: Colors.white,
         child: Stack(
@@ -184,9 +179,7 @@ class _DetoCreatePageState extends State<DetoCreatePage> {
                   _checkCard('搬运方式', _listMode),
                   _inkWellCheckbox(),
                   Container(
-                    margin: EdgeInsets.only(
+                    margin: EdgeInsets.only(top: 54.w, bottom: 24.w),
-                        top: 54.w,
-                        bottom: 24.w),
                     child: Text(
                       '添加图片信息(0/9)',
                       style: TextStyle(

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<GoodsDetoPage> {
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
+    return BeeScaffold(
-      appBar: PreferredSize(
-        child: CommonAppBar(
       title: '物品出户',
-        ),
-        preferredSize: Size.fromHeight(kToolbarHeight),
-      ),
       body: Stack(
         children: [
           Padding(

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<GoodsManagePage> {
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
+    return BeeScaffold(
-      appBar: PreferredSize(
-        child: CommonAppBar(
       title: '借还管理',
-          subtitle: '我的借还物品',
+      actions: [
-        ),
+        InkWell(
-        preferredSize: Size.fromHeight(kToolbarHeight),
+            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(

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<MineGoodsPage> {
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
+    return BeeScaffold(
-      appBar: PreferredSize(
-        child: CommonAppBar(
       title: '我的借还物品',
-        ),
-        preferredSize: Size.fromHeight(kToolbarHeight),
-      ),
       body: RefreshConfiguration(
         child: SmartRefresher(
           controller: _refreshController,

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

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<CommitteeMailboxPage> {
   TextEditingController _thingsContent = new TextEditingController();
   Widget _input() {
     return Container(
-      padding: EdgeInsets.only(
+      padding: EdgeInsets.only(top: 32.w, left: 22.w, right: 35.w),
-          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<CommitteeMailboxPage> {
         margin: EdgeInsets.only(top: 40.w),
         decoration: BoxDecoration(
             color: Color(0xffffc40c),
-            borderRadius:
+            borderRadius: BorderRadius.all(Radius.circular(48.w))),
-                BorderRadius.all(Radius.circular(48.w))),
         child: Text(
           '确认提交',
           style: TextStyle(
@@ -78,13 +75,8 @@ class _CommitteeMailboxPageState extends State<CommitteeMailboxPage> {
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
+    return BeeScaffold(
-      appBar: PreferredSize(
-        child: CommonAppBar(
       title: '业委会信箱',
-        ),
-        preferredSize: Size.fromHeight(kToolbarHeight),
-      ),
       body: Container(
         color: Colors.white,
         child: ListView(

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<IndustryCommitteePage> {
     return Positioned(
       bottom: 0,
       child: Container(
-        height:
+        height: 98.w + MediaQuery.of(context).viewPadding.bottom,
-            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<IndustryCommitteePage> {
   }
 
   Widget build(BuildContext context) {
-    return Scaffold(
+    return BeeScaffold(
-      appBar: PreferredSize(
-        child: CommonAppBar(
       title: '业委会',
-        ),
-        preferredSize: Size.fromHeight(kToolbarHeight),
-      ),
       body: Stack(
         children: [
           StaffList(),

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

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<LifePayBillPage> {
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
+    return BeeScaffold(
-      appBar: PreferredSize(
-        child: CommonAppBar(
       title: '账单详情',
-        ),
-        preferredSize: Size.fromHeight(kToolbarHeight),
-      ),
       body: ListView(
         children: [
           Container(
-            margin: EdgeInsets.only(
+            margin: EdgeInsets.only(top: 32.w, left: 32.w, right: 32.w),
-                top: 32.w,
-                left: 32.w,
-                right: 32.w),
             decoration: BoxDecoration(
               color: Colors.white,
               borderRadius: BorderRadius.all(Radius.circular(6)),

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<LifePayInfoPage> {
-
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
+    return BeeScaffold(
-      appBar: PreferredSize(
-        child: CommonAppBar(
       title: ' ${widget.bundle.getMap('detailMap')['title']}明细',
-        ),
-        preferredSize: Size.fromHeight(kToolbarHeight),
-      ),
       body: Stack(
         children: [
           ListView(

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<LifePayPage> {
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
+    return BeeScaffold(
-      appBar: PreferredSize(
-        child: CommonAppBar(
       title: '生活缴费',
-          subtitle: '缴费记录',
+      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(

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<LifePayRecordPage> {
     _refreshController.loadComplete();
   }
 
-
   @override
   void dispose() {
     super.dispose();
@@ -45,13 +43,8 @@ class _LifePayRecordPageState extends State<LifePayRecordPage> {
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
+    return BeeScaffold(
-      appBar: PreferredSize(
-        child: CommonAppBar(
       title: '缴费记录',
-        ),
-        preferredSize: Size.fromHeight(kToolbarHeight),
-      ),
       body: RefreshConfiguration(
         hideFooterWhenNotFull: true,
         child: SmartRefresher(

lib/pages/message_center_page/comment_message_page/comment_message_page.dart

@@ -1,8 +1,9 @@
+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/widget/common_app_bar.dart';
+import 'package:velocity_x/velocity_x.dart';
 
 class CommentMessagePage extends StatefulWidget {
   CommentMessagePage({Key key}) : super(key: key);
@@ -49,8 +50,6 @@ class _CommentMessagePageState extends State<CommentMessagePage> {
     super.initState();
   }
 
-
-
   void _onRefresh() async {
     await Future.delayed(Duration(milliseconds: 1500));
 
@@ -146,14 +145,18 @@ class _CommentMessagePageState extends State<CommentMessagePage> {
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
+    return BeeScaffold(
-      appBar: PreferredSize(
-        child: CommonAppBar(
       title: '评论通知',
-          subtitle: '清空',
+      actions: [
-        ),
+        InkWell(
-        preferredSize: Size.fromHeight(kToolbarHeight),
+          onTap: () {},
-      ),
+          child: Container(
+            padding: EdgeInsets.fromLTRB(32.w, 28.w, 32.w, 20.w),
+            child: '清空'.text.black.size(28.sp).make(),
+            alignment: Alignment.center,
+          ),
+        )
+      ],
       body: Container(
         color: Colors.white,
         child: RefreshConfiguration(

lib/pages/message_center_page/message_center_page.dart

@@ -1,12 +1,12 @@
 import 'package:akuCommunity/pages/message_center_page/comment_message_page/comment_message_page.dart';
 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_message_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/base/assets_image.dart';
-import 'package:akuCommunity/routers/page_routers.dart';
+import 'package:velocity_x/velocity_x.dart';
-import 'package:akuCommunity/widget/common_app_bar.dart';
 
 class MessageCenterPage extends StatefulWidget {
   MessageCenterPage({Key key}) : super(key: key);
@@ -51,14 +51,18 @@ class _MessageCenterPageState extends State<MessageCenterPage> {
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
+    return BeeScaffold(
-      appBar: PreferredSize(
-        child: CommonAppBar(
       title: '消息中心',
-          subtitle: '全部已读',
+      actions: [
-        ),
+        InkWell(
-        preferredSize: Size.fromHeight(kToolbarHeight),
+          onTap: () {},
+          child: Container(
+            padding: EdgeInsets.fromLTRB(32.w, 28.w, 32.w, 20.w),
+            child: '全部已读'.text.black.size(28.sp).make(),
+            alignment: Alignment.center,
           ),
+        )
+      ],
       body: Container(
         color: Colors.white,
         child: ListView(

lib/pages/message_center_page/shop_message_page/shop_message_page.dart

@@ -1,10 +1,11 @@
 // import 'package:akuCommunity/pages/common/common_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';
 import 'package:pull_to_refresh/pull_to_refresh.dart';
 import 'package:akuCommunity/utils/headers.dart';
-import 'package:akuCommunity/widget/common_app_bar.dart';
+import 'package:velocity_x/velocity_x.dart';
 
 class ShopMessagePage extends StatefulWidget {
   ShopMessagePage({Key key}) : super(key: key);
@@ -176,14 +177,18 @@ class _ShopMessagePageState extends State<ShopMessagePage> {
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
+    return BeeScaffold(
-      appBar: PreferredSize(
-        child: CommonAppBar(
       title: '商城通知',
-          subtitle: '清空',
+      actions: [
-        ),
+        InkWell(
-        preferredSize: Size.fromHeight(kToolbarHeight),
+          onTap: () {},
-      ),
+          child: Container(
+            padding: EdgeInsets.fromLTRB(32.w, 28.w, 32.w, 20.w),
+            child: '清空'.text.black.size(28.sp).make(),
+            alignment: Alignment.center,
+          ),
+        )
+      ],
       body: RefreshConfiguration(
         hideFooterWhenNotFull: true,
         child: SmartRefresher(

lib/pages/message_center_page/system_message_page/system_details_page/system_details_page.dart

@@ -1,7 +1,7 @@
+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/common_app_bar.dart';
 import 'package:akuCommunity/routers/page_routers.dart';
 
 class SystemDetailsPage extends StatelessWidget {
@@ -10,13 +10,8 @@ class SystemDetailsPage extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
+    return BeeScaffold(
-      appBar: PreferredSize(
-        child: CommonAppBar(
       title: '查看详情',
-        ),
-        preferredSize: Size.fromHeight(kToolbarHeight),
-      ),
       body: Container(
         color: Colors.white,
         child: ListView(

lib/pages/message_center_page/system_message_page/system_message_page.dart

@@ -1,11 +1,12 @@
 import 'package:akuCommunity/pages/message_center_page/system_message_page/system_details_page/system_details_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';
 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 'package:velocity_x/velocity_x.dart';
 
 class SystemMessagePage extends StatefulWidget {
   SystemMessagePage({Key key}) : super(key: key);
@@ -145,14 +146,18 @@ class _SystemMessagePageState extends State<SystemMessagePage> {
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
+    return BeeScaffold(
-      appBar: PreferredSize(
-        child: CommonAppBar(
       title: '系统通知',
-          subtitle: '清空',
+      actions: [
-        ),
+        InkWell(
-        preferredSize: Size.fromHeight(kToolbarHeight),
+          onTap: () {},
-      ),
+          child: Container(
+            padding: EdgeInsets.fromLTRB(32.w, 28.w, 32.w, 20.w),
+            child: '清空'.text.black.size(28.sp).make(),
+            alignment: Alignment.center,
+          ),
+        )
+      ],
       body: RefreshConfiguration(
         hideFooterWhenNotFull: true,
         child: SmartRefresher(

lib/pages/mine_car_page/car_add_page/car_add_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';
@@ -47,13 +48,8 @@ class _CarAddPageState extends State<CarAddPage> {
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
+    return BeeScaffold(
-      appBar: PreferredSize(
-        child: CommonAppBar(
       title: '添加车辆',
-        ),
-        preferredSize: Size.fromHeight(kToolbarHeight),
-      ),
       body: SingleChildScrollView(
         child: Container(
           color: Colors.white,

lib/pages/mine_car_page/select_community_page/select_community_page.dart

@@ -1,10 +1,10 @@
 import 'package:akuCommunity/pages/mine_car_page/select_parking_page/select_parking_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';
 import 'package:akuCommunity/utils/headers.dart';
 import 'package:akuCommunity/routers/page_routers.dart';
-import 'package:akuCommunity/widget/common_app_bar.dart';
 
 class SelectCommunityPage extends StatefulWidget {
   SelectCommunityPage({Key key}) : super(key: key);
@@ -18,13 +18,8 @@ class _SelectCommunityPageState extends State<SelectCommunityPage> {
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
+    return BeeScaffold(
-      appBar: PreferredSize(
-        child: CommonAppBar(
       title: '选择小区',
-        ),
-        preferredSize: Size.fromHeight(kToolbarHeight),
-      ),
       body: ListView(
         children: [
           Container(

lib/pages/mine_car_page/select_parking_page/select_parking_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';
 
 class SelectParkingPage extends StatefulWidget {
   final Bundle bundle;
@@ -15,13 +15,8 @@ class SelectParkingPage extends StatefulWidget {
 class _SelectParkingPageState extends State<SelectParkingPage> {
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
+    return BeeScaffold(
-      appBar: PreferredSize(
-        child: CommonAppBar(
       title: '车位列表',
-        ),
-        preferredSize: Size.fromHeight(kToolbarHeight),
-      ),
       body: ListView(
         children: [
           Container(

lib/pages/mine_house_page/house_authenticate_page/house_authenticate_page.dart

@@ -1,7 +1,7 @@
+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/common_app_bar.dart';
 import 'package:akuCommunity/widget/common_input.dart';
 
 class HouseAuthenticatePage extends StatefulWidget {
@@ -61,13 +61,8 @@ class _HouseAuthenticatePageState extends State<HouseAuthenticatePage> {
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
+    return BeeScaffold(
-      appBar: PreferredSize(
-        child: CommonAppBar(
       title: '房屋认证',
-        ),
-        preferredSize: Size.fromHeight(kToolbarHeight),
-      ),
       body: Container(
         color: Colors.white,
         child: SingleChildScrollView(

lib/pages/notice_page/notice_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_html/flutter_html.dart';
@@ -109,13 +110,8 @@ class NoticePage extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
+    return BeeScaffold(
-      appBar: PreferredSize(
-        child: CommonAppBar(
       title: '社区公告',
-        ),
-        preferredSize: Size.fromHeight(kToolbarHeight),
-      ),
       body: Stack(
       children: [
         Container(

lib/pages/one_alarm/widget/alarm_page.dart

@@ -1,12 +1,15 @@
+import 'package:akuCommunity/pages/one_alarm/widget/explain_template.dart';
 import 'package:akuCommunity/utils/headers.dart';
-import 'package:akuCommunity/widget/common_app_bar.dart';
+import 'package:akuCommunity/widget/bee_scaffold.dart';
 import 'package:flutter/material.dart';
 import 'package:amap_map_fluttify/amap_map_fluttify.dart';
 import 'package:amap_location_fluttify/amap_location_fluttify.dart';
+import 'package:flutter_beautiful_popup/main.dart';
 import 'package:flutter_icons/flutter_icons.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:url_launcher/url_launcher.dart';
+import 'package:velocity_x/velocity_x.dart';
 
 class PermissionUtil {
   static Future<bool> getLocationPermission() async {
@@ -32,6 +35,42 @@ class _AlarmPageState extends State<AlarmPage> {
 
   AmapController _amapController;
   Location _location;
+
+  void showExplain(BuildContext context) {
+    final popup = BeautifulPopup.customize(
+      context: context,
+      build: (options) => ExplainTemplate(options),
+    );
+    popup.show(
+        title: Text(
+          '功能说明',
+          style: TextStyle(
+            fontWeight: FontWeight.bold,
+            fontSize: 32.sp,
+            color: Color(0xff15c0ec),
+          ),
+        ),
+        content: Text(
+          '点击“呼叫110”后,您可以直接拨打本地110。页面中提供了您当前所在位置,以便您与警方沟通。(GPS信号弱时，位置可能存在偏移)',
+          style: TextStyle(
+            fontSize: 28.sp,
+            color: Color(0xff666666),
+          ),
+        ),
+        actions: [
+          MaterialButton(
+            color: Color(0xff15c0ec),
+            textColor: Colors.white,
+            shape: RoundedRectangleBorder(
+                side: BorderSide.none,
+                borderRadius: BorderRadius.all(Radius.circular(50))),
+            child: Text('关闭'),
+            onPressed: Navigator.of(context).pop,
+          )
+        ],
+        close: SizedBox());
+  }
+
   @override
   void initState() {
     super.initState();
@@ -49,14 +88,20 @@ class _AlarmPageState extends State<AlarmPage> {
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
+    return BeeScaffold(
-      appBar: PreferredSize(
-        child: CommonAppBar(
       title: '一键报警',
-          subtitle: '功能说明',
+      actions: [
-        ),
+        InkWell(
-        preferredSize: Size.fromHeight(kToolbarHeight),
+          onTap: () {
+            showExplain(context);
+          },
+          child: Container(
+            padding: EdgeInsets.fromLTRB(32.w, 28.w, 32.w, 20.w),
+            child: '全部已读'.text.black.size(28.sp).make(),
+            alignment: Alignment.center,
           ),
+        )
+      ],
       body: Stack(
         alignment: Alignment.topCenter,
         children: [
@@ -90,9 +135,7 @@ class _AlarmPageState extends State<AlarmPage> {
                     children: [
                       SizedBox(height: 24.w),
                       Container(
-                        margin: EdgeInsets.only(
+                        margin: EdgeInsets.only(top: 24.w, left: 32.w),
-                            top: 24.w,
-                            left: 32.w),
                         child: Text(
                           '当前位置(仅供参考)',
                           style: TextStyle(
@@ -102,9 +145,7 @@ class _AlarmPageState extends State<AlarmPage> {
                         ),
                       ),
                       Container(
-                        margin: EdgeInsets.only(
+                        margin: EdgeInsets.only(top: 20.w, left: 32.w),
-                            top: 20.w,
-                            left: 32.w),
                         child: Row(
                           mainAxisAlignment: MainAxisAlignment.start,
                           children: [
@@ -114,8 +155,7 @@ class _AlarmPageState extends State<AlarmPage> {
                               size: 29.sp,
                             ),
                             Container(
-                              margin:
+                              margin: EdgeInsets.only(left: 5.w),
-                                  EdgeInsets.only(left: 5.w),
                               child: Text(
                                 (_location == null)
                                     ? '加载中……'
@@ -140,8 +180,7 @@ class _AlarmPageState extends State<AlarmPage> {
                     width: 66.w,
                     height: 66.w,
                     decoration: BoxDecoration(
-                        borderRadius:
+                        borderRadius: BorderRadius.circular(66.w),
-                            BorderRadius.circular(66.w),
                         boxShadow: <BoxShadow>[
                           BoxShadow(
                             color: Color(0x1F000000),
@@ -153,12 +192,10 @@ class _AlarmPageState extends State<AlarmPage> {
                     child: FlatButton(
                       padding: EdgeInsets.zero,
                       shape: RoundedRectangleBorder(
-                          borderRadius:
+                          borderRadius: BorderRadius.circular(66.w)),
-                              BorderRadius.circular(66.w)),
                       color: Color(0xFFFFFFFF),
                       onPressed: () {
-                        _amapController?.setCenterCoordinate(
+                        _amapController?.setCenterCoordinate(_location.latLng);
-                            _location.latLng);
                         Future.delayed(Duration(milliseconds: 500), () {
                           if (mounted) _amapController.setZoomLevel(16);
                         });
@@ -193,8 +230,8 @@ class _AlarmPageState extends State<AlarmPage> {
                         width: 196.w,
                         decoration: BoxDecoration(
                           color: Colors.white,
-                          borderRadius: BorderRadius.all(
+                          borderRadius:
-                              Radius.circular(196.w)),
+                              BorderRadius.all(Radius.circular(196.w)),
                         ),
                         child: Container(
                           height: 172.w,
@@ -205,8 +242,8 @@ class _AlarmPageState extends State<AlarmPage> {
                               end: Alignment.topLeft,
                               colors: [Color(0xffef0909), Color(0xffff8880)],
                             ),
-                            borderRadius: BorderRadius.all(
+                            borderRadius:
-                                Radius.circular(172.w)),
+                                BorderRadius.all(Radius.circular(172.w)),
                             boxShadow: <BoxShadow>[
                               BoxShadow(
                                 color: Color(0xfffd7770).withOpacity(0.33),
@@ -218,8 +255,7 @@ class _AlarmPageState extends State<AlarmPage> {
                           ),
                           child: FlatButton(
                             shape: RoundedRectangleBorder(
-                                borderRadius: BorderRadius.circular(
+                                borderRadius: BorderRadius.circular(172.w)),
-                                    172.w)),
                             onPressed: () {
                               setState(() {
                                 _makephonenum('tel:110');

lib/pages/opening_code_page/opening_code_page.dart

@@ -1,9 +1,9 @@
+import 'package:akuCommunity/widget/bee_scaffold.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter_icons/flutter_icons.dart';
 import 'package:qr_flutter/qr_flutter.dart';
 import 'package:akuCommunity/utils/headers.dart';
-import 'package:akuCommunity/widget/common_app_bar.dart';
 
 class OpeningCodePage extends StatefulWidget {
   OpeningCodePage({Key key}) : super(key: key);
@@ -15,13 +15,8 @@ class OpeningCodePage extends StatefulWidget {
 class _OpeningCodePageState extends State<OpeningCodePage> {
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
+    return BeeScaffold(
-      appBar: PreferredSize(
-        child: CommonAppBar(
       title: '开门码',
-        ),
-        preferredSize: Size.fromHeight(kToolbarHeight),
-      ),
       body: Container(
         color: Color(0xfff9f9f9),
         child: ListView(

lib/pages/personal/evaluate_good_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';
@@ -25,28 +26,6 @@ class _EvaluateGoodPageState extends State<EvaluateGoodPage> {
     {'radioName': '差评', 'isCheck': false}
   ];
 
-  AppBar _appBar() {
-    return AppBar(
-      elevation: 0,
-      backgroundColor: Colors.white,
-      leading: IconButton(
-        icon: Icon(AntDesign.left, size: 40.sp),
-        onPressed: () {
-          Get.back();
-        },
-      ),
-      centerTitle: true,
-      title: Text(
-        '发表评价',
-        style: TextStyle(
-          fontWeight: FontWeight.w600,
-          fontSize: BaseStyle.fontSize32,
-          color: ktextPrimary,
-        ),
-      ),
-    );
-  }
-
   Container _containerContentList(List<Map<String, dynamic>> listContent) {
     return Container(
       child: Column(
@@ -73,8 +52,8 @@ class _EvaluateGoodPageState extends State<EvaluateGoodPage> {
         children: [
           Text(
             '描述相符',
-            style: TextStyle(
+            style:
-                fontSize: BaseStyle.fontSize28, color: ktextPrimary),
+                TextStyle(fontSize: BaseStyle.fontSize28, color: ktextPrimary),
           ),
           SizedBox(width: 34.w),
           Row(
@@ -168,18 +147,15 @@ class _EvaluateGoodPageState extends State<EvaluateGoodPage> {
 
   Container _containerAddImage() {
     return Container(
-      padding: EdgeInsets.only(
+      padding:
-          left: 36.w,
+          EdgeInsets.only(left: 36.w, right: 36.w, top: 32.w, bottom: 24.w),
-          right: 36.w,
-          top: 32.w,
-          bottom: 24.w),
       child: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
           Text(
             '添加图片信息(0/9)',
-            style: TextStyle(
+            style:
-                fontSize: BaseStyle.fontSize28, color: ktextPrimary),
+                TextStyle(fontSize: BaseStyle.fontSize28, color: ktextPrimary),
           ),
           SizedBox(height: 24.w),
           InkWell(
@@ -228,8 +204,14 @@ class _EvaluateGoodPageState extends State<EvaluateGoodPage> {
   @override
   Widget build(BuildContext context) {
     double _statusHeight = MediaQuery.of(context).padding.top;
-    return Scaffold(
+    return BeeScaffold(
-      appBar: _appBar(),
+      leading: IconButton(
+        icon: Icon(AntDesign.left, size: 40.sp),
+        onPressed: () {
+          Get.back();
+        },
+      ),
+      title: '发表评价',
       body: SingleChildScrollView(
         child: Container(
           height: MediaQuery.of(context).size.height -

lib/pages/personal/order_details_page.dart

@@ -1,4 +1,5 @@
 import 'package:akuCommunity/pages/personal/refund_select_page.dart';
+import 'package:akuCommunity/widget/bee_scaffold.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:extended_text/extended_text.dart';
@@ -18,28 +19,6 @@ class OrderDetailsPage extends StatefulWidget {
 }
 
 class _OrderDetailsPageState extends State<OrderDetailsPage> {
-  AppBar _appBar() {
-    return AppBar(
-      elevation: 0,
-      backgroundColor: BaseStyle.colorffd000,
-      leading: IconButton(
-        icon: Icon(AntDesign.left, size: 40.sp),
-        onPressed: () {
-          Get.back();
-        },
-      ),
-      centerTitle: true,
-      title: Text(
-        '订单详情',
-        style: TextStyle(
-          fontWeight: FontWeight.w600,
-          fontSize: BaseStyle.fontSize32,
-          color: ktextPrimary,
-        ),
-      ),
-    );
-  }
-
   Container _containerHeader(String status) {
     return Container(
       width: double.infinity,
@@ -459,8 +438,14 @@ class _OrderDetailsPageState extends State<OrderDetailsPage> {
   @override
   Widget build(BuildContext context) {
     double statusHeight = MediaQuery.of(context).padding.top;
-    return Scaffold(
+    return BeeScaffold(
-      appBar: _appBar(),
+      leading: IconButton(
+        icon: Icon(AntDesign.left, size: 40.sp),
+        onPressed: () {
+          Get.back();
+        },
+      ),
+      title: '订单详情',
       body: SingleChildScrollView(
         child: Container(
           height: MediaQuery.of(context).size.height -

lib/pages/personal/refund_apply_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';
@@ -21,28 +22,6 @@ class _RefundApplyPageState extends State<RefundApplyPage> {
 
   String hintText = '选填';
 
-  AppBar _appBar() {
-    return AppBar(
-      elevation: 0,
-      backgroundColor: BaseStyle.colorffd000,
-      leading: IconButton(
-        icon: Icon(AntDesign.left, size: 40.sp),
-        onPressed: () {
-          Get.back();
-        },
-      ),
-      centerTitle: true,
-      title: Text(
-        '申请退款',
-        style: TextStyle(
-          fontWeight: FontWeight.w600,
-          fontSize: BaseStyle.fontSize32,
-          color: ktextPrimary,
-        ),
-      ),
-    );
-  }
-
   Container _containerContentList(List<Map<String, dynamic>> listContent) {
     return Container(
       child: Column(
@@ -178,8 +157,14 @@ class _RefundApplyPageState extends State<RefundApplyPage> {
       {'title': '退款原因', 'subtitle': '请选择', 'fun': null, 'isRight': true},
       {'title': '退款方式', 'subtitle': '物业上门取件', 'fun': null, 'isRight': false}
     ];
-    return Scaffold(
+    return BeeScaffold(
-      appBar: _appBar(),
+      title: '申请退款',
+      leading: IconButton(
+        icon: Icon(AntDesign.left, size: 40.sp),
+        onPressed: () {
+          Get.back();
+        },
+      ),
       body: SingleChildScrollView(
         child: Container(
           height: MediaQuery.of(context).size.height -

lib/pages/personal/refund_select_page.dart

@@ -1,4 +1,5 @@
 import 'package:akuCommunity/pages/personal/refund_apply_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';
@@ -18,27 +19,7 @@ class RefundSelectPage extends StatefulWidget {
 }
 
 class _RefundSelectPageState extends State<RefundSelectPage> {
-  AppBar _appBar() {
+  
-    return AppBar(
-      elevation: 0,
-      backgroundColor: BaseStyle.colorffd000,
-      leading: IconButton(
-        icon: Icon(AntDesign.left, size: 40.sp),
-        onPressed: () {
-          Get.back();
-        },
-      ),
-      centerTitle: true,
-      title: Text(
-        '选择服务类型',
-        style: TextStyle(
-          fontWeight: FontWeight.w600,
-          fontSize: BaseStyle.fontSize32,
-          color: ktextPrimary,
-        ),
-      ),
-    );
-  }
 
   Container _containerContentList(List<Map<String, dynamic>> listContent) {
     return Container(
@@ -88,8 +69,14 @@ class _RefundSelectPageState extends State<RefundSelectPage> {
         'isRight': true
       }
     ];
-    return Scaffold(
+    return BeeScaffold(
-      appBar: _appBar(),
+      leading: IconButton(
+        icon: Icon(AntDesign.left, size: 40.sp),
+        onPressed: () {
+          Get.back();
+        },
+      ),
+      title: '选择服务类型',
       body: ListView(
         children: [
           SizedBox(height: 24.w),

lib/pages/questionnaire_page/questionnaire_details_page/questionnaire_details_page.dart

@@ -1,10 +1,10 @@
+import 'package:akuCommunity/widget/bee_scaffold.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter_html/flutter_html.dart';
 import 'package:akuCommunity/utils/headers.dart';
 import 'package:akuCommunity/base/base_style.dart';
 import 'package:akuCommunity/widget/cached_image_wrapper.dart';
-import 'package:akuCommunity/widget/common_app_bar.dart';
 import 'package:akuCommunity/routers/page_routers.dart';
 
 class QuestionnaireDetailsPage extends StatefulWidget {
@@ -109,8 +109,7 @@ class _QuestionnaireDetailsPageState extends State<QuestionnaireDetailsPage> {
                                 size: 32.w,
                               ),
                               Container(
-                                margin: EdgeInsets.only(
+                                margin: EdgeInsets.only(left: 16.w),
-                                    left: 16.w),
                                 width: MediaQuery.of(context).size.width / 3.2,
                                 child: Text(
                                   item['title'],
@@ -138,10 +137,7 @@ class _QuestionnaireDetailsPageState extends State<QuestionnaireDetailsPage> {
 
   Widget _containerTextField() {
     return Container(
-      padding: EdgeInsets.only(
+      padding: EdgeInsets.only(top: 24.w, left: 24.w, right: 32.w),
-          top: 24.w,
-          left: 24.w,
-          right: 32.w),
       decoration: BoxDecoration(
         borderRadius: BorderRadius.all(Radius.circular(6)),
         border: Border.all(color: Color(0xffd4cfbe), width: 1.0),
@@ -206,13 +202,8 @@ class _QuestionnaireDetailsPageState extends State<QuestionnaireDetailsPage> {
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
+    return BeeScaffold(
-      appBar: PreferredSize(
-        child: CommonAppBar(
       title: '问卷调查',
-        ),
-        preferredSize: Size.fromHeight(kToolbarHeight),
-      ),
       body: Container(
         color: Colors.white,
         child: Stack(
@@ -266,14 +257,11 @@ class _QuestionnaireDetailsPageState extends State<QuestionnaireDetailsPage> {
                     ),
                   ),
                   Container(
-                    margin: EdgeInsets.only(
+                    margin: EdgeInsets.only(top: 80.w, bottom: 24.w),
-                        top: 80.w,
-                        bottom: 24.w),
                     child: Text(
                       '您的觉得我们需要改进的地方',
                       style: TextStyle(
-                          fontSize: BaseStyle.fontSize28,
+                          fontSize: BaseStyle.fontSize28, color: ktextPrimary),
-                          color: ktextPrimary),
                     ),
                   ),
                   _containerTextField(),

lib/pages/questionnaire_page/questionnaire_page.dart

@@ -1,4 +1,5 @@
 import 'package:akuCommunity/pages/questionnaire_page/questionnaire_details_page/questionnaire_details_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';
@@ -83,13 +84,8 @@ class _QuestionnairePageState extends State<QuestionnairePage> {
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
+    return BeeScaffold(
-      appBar: PreferredSize(
-        child: CommonAppBar(
       title: '问卷调查',
-        ),
-        preferredSize: Size.fromHeight(kToolbarHeight),
-      ),
       body: RefreshConfiguration(
         hideFooterWhenNotFull: true,
         child: SmartRefresher(

lib/pages/setting_page/about_page/about_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';
@@ -16,13 +17,8 @@ class AboutPage extends StatelessWidget {
       color: Color(0xff575757),
     );
 
-    return Scaffold(
+    return BeeScaffold(
-      appBar: PreferredSize(
-        child: CommonAppBar(
       title: '关于小蜜蜂智慧社区',
-        ),
-        preferredSize: Size.fromHeight(kToolbarHeight),
-      ),
       body: Container(
       color: Colors.white,
       padding: EdgeInsets.only(

lib/pages/setting_page/agreement_page/agreement_page.dart

@@ -1,4 +1,5 @@
 import 'package:akuCommunity/utils/headers.dart';
+import 'package:akuCommunity/widget/bee_scaffold.dart';
 import 'package:flutter/material.dart';
 
 class AgreementPage extends StatefulWidget {
@@ -9,18 +10,15 @@ class AgreementPage extends StatefulWidget {
 class _AgreementPageState extends State<AgreementPage> {
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
+    return BeeScaffold(
-      appBar: AppBar(
+      title: '用户协议',
-        title: Text('用户协议'),
-      ),
       body: SingleChildScrollView(
         padding: EdgeInsets.all(16.w),
         child: Column(
           children: [
             Text(
               '《用户协议》',
-              style: TextStyle(
+              style: TextStyle(fontWeight: FontWeight.w600, fontSize: 35.w),
-                  fontWeight: FontWeight.w600, fontSize: 35.w),
             ),
             Text(
               '''

lib/pages/setting_page/agreement_page/privacy_page.dart

@@ -1,4 +1,5 @@
 import 'package:akuCommunity/utils/headers.dart';
+import 'package:akuCommunity/widget/bee_scaffold.dart';
 import 'package:flutter/material.dart';
 
 class PrivacyPage extends StatefulWidget {
@@ -10,17 +11,15 @@ class PrivacyPage extends StatefulWidget {
 class _PrivacyPageState extends State<PrivacyPage> {
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
+    return BeeScaffold(
-      appBar: AppBar(
+      title: '隐私政策',
-        title: Text('隐私政策'),
-      ),
       body: SingleChildScrollView(
         padding: EdgeInsets.all(16.sp),
         child: Column(
-          children: [Text(
+          children: [
+            Text(
               '小蜜蜂智慧社区隐私政策',
-              style: TextStyle(
+              style: TextStyle(fontWeight: FontWeight.w600, fontSize: 35.w),
-                  fontWeight: FontWeight.w600, fontSize: 35.w),
             ),
             Text(
               '''

lib/pages/setting_page/feedback_page/feedback_page.dart

@@ -1,5 +1,6 @@
 import 'dart:math';
 
+import 'package:akuCommunity/widget/bee_scaffold.dart';
 import 'package:bot_toast/bot_toast.dart';
 import 'package:flustars/flustars.dart';
 import 'package:flutter/material.dart';
@@ -101,13 +102,8 @@ class _FeedBackPageState extends State<FeedBackPage> {
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
+    return BeeScaffold(
-      appBar: PreferredSize(
-        child: CommonAppBar(
       title: '意见反馈',
-        ),
-        preferredSize: Size.fromHeight(kToolbarHeight),
-      ),
       body: SingleChildScrollView(
         child: Container(
           color: Colors.white,

lib/pages/setting_page/invite_page/invite_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:qr_flutter/qr_flutter.dart';
@@ -20,13 +21,8 @@ class InvitePage extends StatelessWidget {
       );
     }
 
-    return Scaffold(
+    return BeeScaffold(
-      appBar: PreferredSize(
-        child: CommonAppBar(
       title: '邀请注册',
-        ),
-        preferredSize: Size.fromHeight(kToolbarHeight),
-      ),
       body: Container(
         color: Colors.white,
         padding: EdgeInsets.only(top: 146.w),

lib/pages/things_page/things_create_page/things_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';
@@ -268,13 +269,8 @@ class _ThingsCreatePageState extends State<ThingsCreatePage> {
     //       .toList();
     // }
 
-    return Scaffold(
+    return BeeScaffold(
-      appBar: PreferredSize(
-        child: CommonAppBar(
       title: '${widget.bundle.getMap('create')['title']}',
-        ),
-        preferredSize: Size.fromHeight(kToolbarHeight),
-      ),
       body: Container(
         color: Colors.white,
         child: Stack(

lib/pages/things_page/things_detail_page/things_detail_page.dart

@@ -1,12 +1,13 @@
 import 'package:akuCommunity/pages/things_page/things_evaluate_page/things_evaluate_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/widget/expandable_text.dart';
 import 'package:akuCommunity/routers/page_routers.dart';
-import 'package:akuCommunity/widget/common_app_bar.dart';
 import '../widget/image_grid.dart';
 import 'widget/goods_info_card.dart';
+import 'package:velocity_x/velocity_x.dart';
 
 class ThingsDetailPage extends StatefulWidget {
   final Bundle bundle;
@@ -101,14 +102,20 @@ class _ThingsDetailPageState extends State<ThingsDetailPage> {
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
+    return BeeScaffold(
-      appBar: PreferredSize(
-        child: CommonAppBar(
       title: '查看详情',
-          subtitle: widget.bundle.getMap('things')['isRepair'] ? '' : '评价',
+      actions: [
-        ),
+        widget.bundle.getMap('things')['isRepair']
-        preferredSize: Size.fromHeight(kToolbarHeight),
+            ? SizedBox()
+            : InkWell(
+                onTap: () {},
+                child: Container(
+                  padding: EdgeInsets.fromLTRB(32.w, 28.w, 32.w, 20.w),
+                  child: '评价'.text.black.size(28.sp).make(),
+                  alignment: Alignment.center,
                 ),
+              )
+      ],
       body: Container(
         color: Colors.white,
         child: Stack(

lib/pages/things_page/things_evaluate_page/things_evaluate_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';
@@ -137,13 +138,8 @@ class _ThingsEvaluatePageState extends State<ThingsEvaluatePage> {
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
+    return BeeScaffold(
-      appBar: PreferredSize(
-        child: CommonAppBar(
       title: '${widget.bundle.getMap('details')['title']}',
-        ),
-        preferredSize: Size.fromHeight(kToolbarHeight),
-      ),
       body: SingleChildScrollView(
         child: Container(
           color: Colors.white,

lib/pages/visitor_access_page/visitor_access_page.dart

@@ -1,11 +1,13 @@
+import 'package:akuCommunity/pages/visitor_access_page/visitor_record_page.dart';
+import 'package:akuCommunity/widget/bee_scaffold.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter_datetime_picker/flutter_datetime_picker.dart';
 import 'package:akuCommunity/base/assets_image.dart';
 import 'package:flutter_icons/flutter_icons.dart';
 import 'package:akuCommunity/utils/headers.dart';
-import 'package:akuCommunity/widget/common_app_bar.dart';
 import 'package:akuCommunity/widget/common_input.dart';
+import 'package:velocity_x/velocity_x.dart';
 
 class VisitorAccessPage extends StatefulWidget {
   VisitorAccessPage({Key key}) : super(key: key);
@@ -35,8 +37,7 @@ class _VisitorAccessPageState extends State<VisitorAccessPage> {
         children: [
           Text(
             '来访房屋',
-            style: TextStyle(
+            style: TextStyle(fontSize: 28.sp, color: Color(0xff333333)),
-                fontSize: 28.sp, color: Color(0xff333333)),
           ),
           SizedBox(height: 32.w),
           Container(
@@ -120,8 +121,7 @@ class _VisitorAccessPageState extends State<VisitorAccessPage> {
         children: [
           Text(
             title,
-            style: TextStyle(
+            style: TextStyle(fontSize: 28.sp, color: Color(0xff333333)),
-                fontSize: 28.sp, color: Color(0xff333333)),
           ),
           SizedBox(height: 25.w),
           CommonInput(inputController: controller, hintText: hintText)
@@ -184,8 +184,7 @@ class _VisitorAccessPageState extends State<VisitorAccessPage> {
         children: [
           Text(
             '访客性别',
-            style: TextStyle(
+            style: TextStyle(fontSize: 28.sp, color: Color(0xff333333)),
-                fontSize: 28.sp, color: Color(0xff333333)),
           ),
           SizedBox(height: 32.w),
           Container(
@@ -229,8 +228,7 @@ class _VisitorAccessPageState extends State<VisitorAccessPage> {
           children: [
             Text(
               '到访时间',
-              style: TextStyle(
+              style: TextStyle(fontSize: 28.sp, color: Color(0xff333333)),
-                  fontSize: 28.sp, color: Color(0xff333333)),
             ),
             SizedBox(height: 32.w),
             Container(
@@ -291,22 +289,27 @@ class _VisitorAccessPageState extends State<VisitorAccessPage> {
         ),
         child: Text(
           '通行证只在到访当天单次有效,逾期或超次需要重新生成',
-          style: TextStyle(
+          style: TextStyle(fontSize: 20.sp, color: Color(0xff999999)),
-              fontSize: 20.sp, color: Color(0xff999999)),
         ),
       ),
     );
   }
 
   Widget build(BuildContext context) {
-    return Scaffold(
+    return BeeScaffold(
-      appBar: PreferredSize(
-        child: CommonAppBar(
       title: '访客通行',
-          subtitle: '访客记录',
+      actions: [
-        ),
+        InkWell(
-        preferredSize: Size.fromHeight(kToolbarHeight),
+          onTap: () {
+            VisitorRecordPage().to;
+          },
+          child: Container(
+            padding: EdgeInsets.fromLTRB(32.w, 28.w, 32.w, 20.w),
+            child: '访客记录'.text.black.size(28.sp).make(),
+            alignment: Alignment.center,
           ),
+        )
+      ],
       body: Container(
         color: Colors.white,
         child: ListView(

lib/pages/visitor_access_page/visitor_pass_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';
@@ -21,14 +22,12 @@ class _VisitorPassPageState extends State<VisitorPassPage> {
         children: [
           Text(
             '宁波华茂悦峰',
-            style: TextStyle(
+            style: TextStyle(fontSize: 40.sp, color: Color(0xffffffff)),
-                fontSize: 40.sp, color: Color(0xffffffff)),
           ),
           SizedBox(height: 10.w),
           Text(
             '1幢-1单元-702室',
-            style: TextStyle(
+            style: TextStyle(fontSize: 26.sp, color: Color(0xffffffff)),
-                fontSize: 26.sp, color: Color(0xffffffff)),
           ),
         ],
       ),
@@ -183,13 +182,8 @@ class _VisitorPassPageState extends State<VisitorPassPage> {
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
+    return BeeScaffold(
-      appBar: PreferredSize(
-        child: CommonAppBar(
       title: '访客通行证',
-        ),
-        preferredSize: Size.fromHeight(kToolbarHeight),
-      ),
       body: Container(
         color: Color(0xff333333),
         child: Stack(

lib/utils/logger/logger_view.dart

@@ -1,6 +1,7 @@
 import 'package:akuCommunity/utils/logger/logger_card.dart';
 import 'package:akuCommunity/utils/logger/logger_data.dart';
 import 'package:akuCommunity/extensions/page_router.dart';
+import 'package:akuCommunity/widget/bee_scaffold.dart';
 
 import 'package:flutter/material.dart';
 import 'package:velocity_x/velocity_x.dart';
@@ -88,13 +89,11 @@ class _LoggerViewState extends State<LoggerView> {
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
+    return BeeScaffold(
-      appBar: AppBar(
+      title: 'Logger',
-        title: 'Logger'.text.make(),
       actions: [
         IconButton(icon: Icon(Icons.list), onPressed: () {}),
       ],
-      ),
       body: ListView.builder(
         itemBuilder: (context, index) =>
             LoggerCard(data: LoggerData.data[index]),

lib/widget/search_bar_delegate.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'asset.dart';
+import 'bee_scaffold.dart';
 
 class SearchBarDemo extends StatefulWidget {
   _SearchBarDemoState createState() => _SearchBarDemoState();
@@ -8,8 +9,9 @@ class SearchBarDemo extends StatefulWidget {
 class _SearchBarDemoState extends State<SearchBarDemo> {
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
+    return BeeScaffold(
-        appBar: AppBar(title: Text('SearchBarDemo'), actions: <Widget>[
+      title: 'SearchBarDemo',
+      actions: [
         IconButton(
             icon: Icon(Icons.search),
             onPressed: () {
@@ -17,7 +19,8 @@ class _SearchBarDemoState extends State<SearchBarDemo> {
             }
             // showSearch(context:context,delegate: searchBarDelegate()),
             ),
-    ]));
+      ],
+    );
   }
 }