From 9bd7696aa00a78b9730bb5b00e3c31361919ae72 Mon Sep 17 00:00:00 2001 From: laiiihz Date: Mon, 22 Mar 2021 15:14:46 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=86=99=E8=AE=BF=E5=AE=A2=E8=AE=B0?= =?UTF-8?q?=E5=BD=95action=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/constants/app_theme.dart | 8 ++ lib/pages/home/widget/animate_app_bar.dart | 1 - lib/pages/home/widget/home_search.dart | 2 +- lib/pages/tab_navigator.dart | 6 +- .../visitor_access_page.dart | 89 +------------------ 5 files changed, 14 insertions(+), 92 deletions(-) diff --git a/lib/constants/app_theme.dart b/lib/constants/app_theme.dart index d8f8e734..2c8fdf90 100644 --- a/lib/constants/app_theme.dart +++ b/lib/constants/app_theme.dart @@ -32,6 +32,14 @@ class AppTheme { ), indicatorSize: TabBarIndicatorSize.label, ), + bottomNavigationBarTheme: BottomNavigationBarThemeData( + selectedItemColor: Color(0xFF333333), + selectedLabelStyle: TextStyle( + fontWeight: FontWeight.bold, + ), + type: BottomNavigationBarType.fixed, + unselectedLabelStyle: TextStyle(), + ), ); } } diff --git a/lib/pages/home/widget/animate_app_bar.dart b/lib/pages/home/widget/animate_app_bar.dart index 55103e53..9842c3fa 100644 --- a/lib/pages/home/widget/animate_app_bar.dart +++ b/lib/pages/home/widget/animate_app_bar.dart @@ -2,7 +2,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:provider/provider.dart'; -import 'package:velocity_x/velocity_x.dart'; import 'package:akuCommunity/provider/app_provider.dart'; diff --git a/lib/pages/home/widget/home_search.dart b/lib/pages/home/widget/home_search.dart index 8743acd9..d04014b9 100644 --- a/lib/pages/home/widget/home_search.dart +++ b/lib/pages/home/widget/home_search.dart @@ -29,7 +29,7 @@ class _HomeSearchState extends State { top: 127.w + ScreenUtil().statusBarHeight, left: 32.w, right: 32.w, - bottom: 17.w, + bottom: 16.w, ), child: MaterialButton( materialTapTargetSize: MaterialTapTargetSize.shrinkWrap, diff --git a/lib/pages/tab_navigator.dart b/lib/pages/tab_navigator.dart index 0e54069f..872fbf2f 100644 --- a/lib/pages/tab_navigator.dart +++ b/lib/pages/tab_navigator.dart @@ -100,14 +100,10 @@ class _TabNavigatorState extends State { ), ), bottomNavigationBar: BottomNavigationBar( - type: BottomNavigationBarType.fixed, items: _bottomNav, currentIndex: _currentIndex, selectedFontSize: 20.sp, - unselectedFontSize: 16.sp, - selectedItemColor: Colors.black, - unselectedItemColor: Colors.black38, - selectedLabelStyle: TextStyle(fontWeight: FontWeight.bold), + unselectedFontSize: 20.sp, onTap: (index) { _pageController.jumpToPage(index); }, diff --git a/lib/pages/visitor_access_page/visitor_access_page.dart b/lib/pages/visitor_access_page/visitor_access_page.dart index 8be37b58..bd7b8fcd 100644 --- a/lib/pages/visitor_access_page/visitor_access_page.dart +++ b/lib/pages/visitor_access_page/visitor_access_page.dart @@ -7,7 +7,6 @@ import 'package:get/get.dart'; import 'package:provider/provider.dart'; import 'package:velocity_x/velocity_x.dart'; -import 'package:akuCommunity/base/assets_image.dart'; import 'package:akuCommunity/base/base_style.dart'; import 'package:akuCommunity/pages/life_pay/widget/my_house_page.dart'; import 'package:akuCommunity/pages/manager_func.dart'; @@ -31,84 +30,7 @@ class _VisitorAccessPageState extends State { TextEditingController _userName = new TextEditingController(); TextEditingController _userCarNum = new TextEditingController(); DateTime dateTime; - int _selectSex; - // Widget _house() { - // return Container( - // padding: EdgeInsets.only( - // left: 36.w, - // right: 36.w, - // top: 32.w, - // ), - // child: Column( - // crossAxisAlignment: CrossAxisAlignment.start, - // children: [ - // Text( - // '来访房屋', - // style: TextStyle(fontSize: 28.sp, color: Color(0xff333333)), - // ), - // SizedBox(height: 32.w), - // Container( - // child: Row( - // mainAxisAlignment: MainAxisAlignment.spaceBetween, - // children: [ - // Row( - // mainAxisAlignment: MainAxisAlignment.start, - // children: [ - // Image.asset( - // AssetsImage.HOUSE, - // height: 60.w, - // width: 60.w, - // ), - // SizedBox(width: 40.w), - // Column( - // crossAxisAlignment: CrossAxisAlignment.start, - // children: [ - // Text( - // '宁波华茂悦峰', - // style: TextStyle( - // fontWeight: FontWeight.w600, - // fontSize: 34.sp, - // color: Color(0xff333333)), - // ), - // SizedBox(height: 10.w), - // Text( - // '1幢-1单元-702室', - // style: TextStyle( - // fontWeight: FontWeight.w600, - // fontSize: 34.sp, - // color: Color(0xff333333)), - // ) - // ], - // ), - // ], - // ), - // Container( - // alignment: Alignment.center, - // padding: EdgeInsets.symmetric( - // vertical: 14.w, - // horizontal: 21.w, - // ), - // decoration: BoxDecoration( - // color: Color(0xffFEC200), - // borderRadius: BorderRadius.all(Radius.circular(4)), - // ), - // child: Text( - // '邀请客户填写', - // style: TextStyle( - // fontWeight: FontWeight.w600, - // fontSize: 28.sp, - // color: Color(0xff333333)), - // ), - // ), - // ], - // ), - // ), - // SizedBox(height: 26.w), - // Divider(), - // ], - // ), - // ); - // } + int _selectSex = 1; Widget _buildHouseCard( String title, @@ -119,7 +41,7 @@ class _VisitorAccessPageState extends State { child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - '报修房屋'.text.black.size(28.sp).make(), + '来访房屋'.text.black.size(28.sp).make(), 32.w.heightBox, GestureDetector( onTap: () { @@ -365,14 +287,11 @@ class _VisitorAccessPageState extends State { title: '访客通行', actions: [ MaterialButton( + padding: EdgeInsets.symmetric(horizontal: 20.w), onPressed: () { 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, - ), + child: '访客记录'.text.black.size(28.sp).make(), ) ], body: Container(