1281228557
/
aku_new_community
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of 192.168.2.201:laiiihz/akuCommunity

Browse Source 
* 'master' of 192.168.2.201:laiiihz/akuCommunity:
  fixed some issues
  隐藏商城相关内容
hmxc
小赖 4 years ago
parent 5ad1afedf3 d41867f281
commit 047b657aeb
11 changed files with 76 additions and 85 deletions
Show Stats Download Patch File Download Diff File

43
lib/pages/common/common_page.dart
Unescape View File

@ -1,10 +1,10 @@
import 'package:akuCommunity/widget/search_bar_delegate.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter_icons/flutter_icons.dart'; import 'package:flutter_icons/flutter_icons.dart';
import 'package:akuCommunity/utils/screenutil.dart'; import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/routers/page_routers.dart'; import 'package:akuCommunity/routers/page_routers.dart';
import 'package:akuCommunity/base/base_style.dart'; import 'package:akuCommunity/base/base_style.dart';
import 'package:akuCommunity/widget/search_bar_delegate.dart';
// import 'visitor_invitation/visitor_invitation.dart'; // import 'visitor_invitation/visitor_invitation.dart';
// import 'visitor_invitation/visitor_record.dart'; // import 'visitor_invitation/visitor_record.dart';
@ -141,14 +141,11 @@ class _CommonPageState extends State<CommonPage> {
InkWell _inkWellSearch() { InkWell _inkWellSearch() {
return InkWell( return InkWell(
onTap: () { onTap: () {
showSearch(context: context, delegate: searchBarDelegate()); showSearch(context: context, delegate: SearchBarDelegate());
}, },
child: Container( child: Container(
margin: EdgeInsets.only(right: 32.w), margin: EdgeInsets.only(right: 32.w),
padding: EdgeInsets.only( padding: EdgeInsets.only(left: 40.w, top: 15.w, bottom: 15.w),
left: 40.w,
top: 15.w,
bottom: 15.w),
decoration: BoxDecoration( decoration: BoxDecoration(
color: BaseStyle.colorf3f3f3, color: BaseStyle.colorf3f3f3,
borderRadius: BorderRadius.all(Radius.circular(36)), borderRadius: BorderRadius.all(Radius.circular(36)),
@ -324,9 +321,9 @@ class _CommonPageState extends State<CommonPage> {
// case '访客通行证': // case '访客通行证':
// return VisitorPass(); // return VisitorPass();
case '便民电话': case '便民电话':
// return ComplaintCall(); // return ComplaintCall();
case '业委会': case '业委会':
// return IndustryCommittee(); // return IndustryCommittee();
case '建议咨询': case '建议咨询':
case '报事报修': case '报事报修':
// case '我的报修': // case '我的报修':
@ -396,21 +393,21 @@ class _CommonPageState extends State<CommonPage> {
// case '意见反馈': // case '意见反馈':
// return FeedBack(statusHeight: _statusHeight); // return FeedBack(statusHeight: _statusHeight);
case '活动投票': case '活动投票':
// return ActivityMain(isVote: true); // return ActivityMain(isVote: true);
case '更多活动': case '更多活动':
case '社区活动': case '社区活动':
// return ActivityMain(isVote: false); // return ActivityMain(isVote: false);
case '活动详情': case '活动详情':
// return ActivityDetails( // return ActivityDetails(
// title: widget.bundle.getMap('commentMap')['name'], // title: widget.bundle.getMap('commentMap')['name'],
// imagePath: widget.bundle.getMap('commentMap')['imagePath'], // imagePath: widget.bundle.getMap('commentMap')['imagePath'],
// isVote: widget.bundle.getMap('commentMap')['isVote'], // isVote: widget.bundle.getMap('commentMap')['isVote'],
// isOver: widget.bundle.getMap('commentMap')['isOver'], // isOver: widget.bundle.getMap('commentMap')['isOver'],
// isVoteOver: widget.bundle.getMap('commentMap')['isVoteOver'], // isVoteOver: widget.bundle.getMap('commentMap')['isVoteOver'],
// memberList: widget.bundle.getMap('commentMap')['memberList'], // memberList: widget.bundle.getMap('commentMap')['memberList'],
// ); // );
case '参与人员': case '参与人员':
// return ActivityMemberList(); // return ActivityMemberList();
// case '问卷调查': // case '问卷调查':
// return widget.bundle.getMap('commentMap')['imagePath'] != null // return widget.bundle.getMap('commentMap')['imagePath'] != null
// ? QuestionnaireDetails( // ? QuestionnaireDetails(
@ -453,15 +450,15 @@ class _CommonPageState extends State<CommonPage> {
// case '付款方式': // case '付款方式':
// return PayOrder(); // return PayOrder();
case '全部应用': case '全部应用':
// return TotalApplicationsMain(); // return TotalApplicationsMain();
case '分类': case '分类':
// return ShopClassMain(statusHeight: _statusHeight); // return ShopClassMain(statusHeight: _statusHeight);
case '一键报警': case '一键报警':
// return OneAlarmMain(); // return OneAlarmMain();
// case '一键开门': // case '一键开门':
// return OpenDoorMain(); // return OpenDoorMain();
case '实名认证': case '实名认证':
// return CertificationMain(); // return CertificationMain();
// case '功能说明': // case '功能说明':
// return Explain(); // return Explain();
default: default:

2
lib/pages/convenient_phone/convenient_phone_page.dart
Unescape View File

@ -20,7 +20,7 @@ class _ConvenientPhonePageState extends State<ConvenientPhonePage> {
color: Colors.white, color: Colors.white,
child: InkWell( child: InkWell(
onTap: () { onTap: () {
showSearch(context: context, delegate: searchBarDelegate()); showSearch(context: context, delegate: SearchBarDelegate());
}, },
child: Container( child: Container(
margin: EdgeInsets.only( margin: EdgeInsets.only(

84
lib/pages/home/home_page.dart
Unescape View File

@ -14,10 +14,8 @@ import 'widget/home_tag_bar.dart';
import 'package:akuCommunity/widget/container_comment.dart'; import 'package:akuCommunity/widget/container_comment.dart';
import 'package:akuCommunity/widget/single_ad_space.dart'; import 'package:akuCommunity/widget/single_ad_space.dart';
import 'package:akuCommunity/widget/grid_button.dart'; import 'package:akuCommunity/widget/grid_button.dart';
import 'package:akuCommunity/widget/sliver_goods_card.dart';
import 'package:akuCommunity/service/base_model.dart'; import 'package:akuCommunity/service/base_model.dart';
import 'package:akuCommunity/model/aku_shop_model.dart'; import 'package:akuCommunity/model/aku_shop_model.dart';
import 'package:akuCommunity/widget/goods_card_skeleton.dart';
import 'package:akuCommunity/routers/page_routers.dart'; import 'package:akuCommunity/routers/page_routers.dart';
class HomePage extends StatefulWidget { class HomePage extends StatefulWidget {
@ -138,50 +136,50 @@ class _HomePageState extends State<HomePage>
], ],
), ),
SizedBox(height: 24.w), SizedBox(height: 24.w),
Column( // Column(
children: [ // children: [
HomeTagBar( // HomeTagBar(
title: '社区团购', // title: '社区团购',
tag: '团购', // tag: '团购',
isShowImage: false, // isShowImage: false,
), // ),
HomeCard( // HomeCard(
isActivity: false, // isActivity: false,
title: '新疆库尔阿勒4.5斤,仙人蕉 香甜可口', // title: '新疆库尔阿勒4.5斤,仙人蕉 香甜可口',
subtitleOne: '中国新疆', // subtitleOne: '中国新疆',
subtitleTwo: '2020年07月03日', // subtitleTwo: '2020年07月03日',
imagePath: // imagePath:
'http://news.eastday.com/d/file/tga/2013-02-17/c2e7bd7fca1ed2ecf5d50dc9fb30275d.jpg', // 'http://news.eastday.com/d/file/tga/2013-02-17/c2e7bd7fca1ed2ecf5d50dc9fb30275d.jpg',
), // ),
HomeCard( // HomeCard(
isActivity: false, // isActivity: false,
title: '刚果柠檬大果4盒 鲜果新鲜采摘15斤', // title: '刚果柠檬大果4盒 鲜果新鲜采摘15斤',
subtitleOne: '非洲刚果', // subtitleOne: '非洲刚果',
subtitleTwo: '2020年08月09日', // subtitleTwo: '2020年08月09日',
imagePath: // imagePath:
'http://5b0988e595225.cdn.sohucs.com/images/20180203/328e145f84c54dd08d1b11b890109862.jpeg', // 'http://5b0988e595225.cdn.sohucs.com/images/20180203/328e145f84c54dd08d1b11b890109862.jpeg',
), // ),
], // ],
), // ),
SizedBox(height: 30.w), // SizedBox(height: 30.w),
HomeTagBar( // HomeTagBar(
title: '社区商城', // title: '社区商城',
tag: '团购', // tag: '团购',
isShowImage: false, // isShowImage: false,
isShowTitle: true, // isShowTitle: true,
), // ),
], ],
), ),
), ),
SliverPadding( // SliverPadding(
padding: EdgeInsets.only( // padding: EdgeInsets.only(
top: 30.w, // top: 30.w,
left: 32.w, // left: 32.w,
right: 32.w, // right: 32.w,
), // ),
sliver: _shopList.length == 0 // sliver: _shopList.length == 0
? SliverToBoxAdapter(child: GoodsCardSkeleton()) // ? SliverToBoxAdapter(child: GoodsCardSkeleton())
: SliverGoodsCard(shoplist: _shopList)), // : SliverGoodsCard(shoplist: _shopList)),
], ],
), ),
), ),

4
lib/pages/home/widget/home_search.dart
Unescape View File

@ -1,8 +1,8 @@
import 'package:akuCommunity/widget/search_bar_delegate.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter_icons/flutter_icons.dart'; import 'package:flutter_icons/flutter_icons.dart';
import 'package:akuCommunity/utils/screenutil.dart'; import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/widget/search_bar_delegate.dart';
class HomeSearch extends StatefulWidget { class HomeSearch extends StatefulWidget {
HomeSearch({Key key}) : super(key: key); HomeSearch({Key key}) : super(key: key);
@ -30,7 +30,7 @@ class _HomeSearchState extends State<HomeSearch> {
), ),
child: InkWell( child: InkWell(
onTap: () { onTap: () {
showSearch(context: context, delegate: searchBarDelegate()); showSearch(context: context, delegate: SearchBarDelegate());
}, },
child: Container( child: Container(
width: 686.w, width: 686.w,

4
lib/pages/market/market_page.dart
Unescape View File

@ -1,3 +1,4 @@
import 'package:akuCommunity/widget/search_bar_delegate.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter_icons/flutter_icons.dart'; import 'package:flutter_icons/flutter_icons.dart';
@ -8,7 +9,6 @@ import 'package:akuCommunity/widget/app_bar_action.dart';
import 'package:akuCommunity/widget/single_ad_space.dart'; import 'package:akuCommunity/widget/single_ad_space.dart';
import 'package:akuCommunity/widget/grid_button.dart'; import 'package:akuCommunity/widget/grid_button.dart';
import 'package:akuCommunity/utils/screenutil.dart'; import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/widget/search_bar_delegate.dart';
import 'widget/market_sticky_bar.dart'; import 'widget/market_sticky_bar.dart';
import 'widget/market_list.dart'; import 'widget/market_list.dart';
@ -88,7 +88,7 @@ class _MarketPageState extends State<MarketPage>
), ),
child: InkWell( child: InkWell(
onTap: () { onTap: () {
showSearch(context: context, delegate: searchBarDelegate()); showSearch(context: context, delegate: SearchBarDelegate());
}, },
child: Container( child: Container(
child: Row(children: [ child: Row(children: [

2
lib/pages/market_class/widget/market_class_bar.dart
Unescape View File

@ -8,7 +8,7 @@ class MarketClassBar extends StatelessWidget {
Widget _inkWellSearch(BuildContext context) { Widget _inkWellSearch(BuildContext context) {
return InkWell( return InkWell(
onTap: () { onTap: () {
showSearch(context: context, delegate: searchBarDelegate()); showSearch(context: context, delegate: SearchBarDelegate());
}, },
child: Container( child: Container(
margin: EdgeInsets.only(right: 32.w), margin: EdgeInsets.only(right: 32.w),

1
lib/pages/personal/personal_page.dart
Unescape View File

@ -1,6 +1,5 @@
import 'package:akuCommunity/pages/sign/sign_in_page.dart'; import 'package:akuCommunity/pages/sign/sign_in_page.dart';
import 'package:akuCommunity/provider/user_provider.dart'; import 'package:akuCommunity/provider/user_provider.dart';
import 'package:akuCommunity/service/net.dart';
import 'package:akuCommunity/utils/net_util.dart'; import 'package:akuCommunity/utils/net_util.dart';
import 'package:ani_route/ani_route.dart'; import 'package:ani_route/ani_route.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';

8
lib/pages/tab_navigator.dart
Unescape View File

@ -4,7 +4,6 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:akuCommunity/base/assets_image.dart'; import 'package:akuCommunity/base/assets_image.dart';
import 'home/home_page.dart'; import 'home/home_page.dart';
import 'market/market_page.dart';
import 'property/property_index.dart'; import 'property/property_index.dart';
import 'community/community_index.dart'; import 'community/community_index.dart';
import 'personal/personal_page.dart'; import 'personal/personal_page.dart';
@ -30,7 +29,7 @@ class _TabNavigatorState extends State<TabNavigator> {
super.initState(); super.initState();
_pages = [ _pages = [
HomePage(), HomePage(),
MarketPage(), // MarketPage(),
PropertyIndex(), PropertyIndex(),
CommunityIndex(), CommunityIndex(),
PersonalIndex() PersonalIndex()
@ -62,13 +61,12 @@ class _TabNavigatorState extends State<TabNavigator> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
ScreenUtil.init(context, ScreenUtil.init(context,
designSize: Size(750, 1334), allowFontScaling: true); designSize: Size(750, 1334), allowFontScaling: true);
double iconSize = ScreenUtil().setWidth(44);
//底部导航来 //底部导航来
List<BottomNavigationBarItem> _bottomNav = <BottomNavigationBarItem>[ List<BottomNavigationBarItem> _bottomNav = <BottomNavigationBarItem>[
_buildBottomBar( _buildBottomBar(
'首页', AssetsImage.TAB_HOME_UNSELECT, AssetsImage.TAB_HOME_SELECT), '首页', AssetsImage.TAB_HOME_UNSELECT, AssetsImage.TAB_HOME_SELECT),
_buildBottomBar( // _buildBottomBar(
'商城', AssetsImage.TAB_MARKET_UNSELECT, AssetsImage.TAB_MARKET_SELECT), // '商城', AssetsImage.TAB_MARKET_UNSELECT, AssetsImage.TAB_MARKET_SELECT),
_buildBottomBar( _buildBottomBar(
'物业', AssetsImage.TAB_HOUSE_UNSELECT, AssetsImage.TAB_HOUSE_SELECT), '物业', AssetsImage.TAB_HOUSE_UNSELECT, AssetsImage.TAB_HOUSE_SELECT),
_buildBottomBar('社区', AssetsImage.TAB_MESSAGE_UNSELECT, _buildBottomBar('社区', AssetsImage.TAB_MESSAGE_UNSELECT,

4
lib/pages/total_application_page/widget/applications_bar.dart
Unescape View File

@ -1,8 +1,8 @@
import 'package:akuCommunity/widget/search_bar_delegate.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter_icons/flutter_icons.dart'; import 'package:flutter_icons/flutter_icons.dart';
import 'package:akuCommunity/utils/screenutil.dart'; import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/widget/search_bar_delegate.dart';
class ApplicationsBar extends StatelessWidget { class ApplicationsBar extends StatelessWidget {
const ApplicationsBar({Key key}) : super(key: key); const ApplicationsBar({Key key}) : super(key: key);
@ -25,7 +25,7 @@ class ApplicationsBar extends StatelessWidget {
centerTitle: true, centerTitle: true,
title: InkWell( title: InkWell(
onTap: () { onTap: () {
showSearch(context: context, delegate: searchBarDelegate()); showSearch(context: context, delegate: SearchBarDelegate());
}, },
child: Container( child: Container(
margin: EdgeInsets.only(right: 32.w), margin: EdgeInsets.only(right: 32.w),

5
lib/widget/goods_specs_sheet.dart
Unescape View File

@ -4,7 +4,6 @@ import 'package:flutter_icons/flutter_icons.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:akuCommunity/utils/screenutil.dart'; import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/toast.dart'; import 'package:akuCommunity/utils/toast.dart';
import 'package:akuCommunity/widget/cart_count.dart';
import 'package:akuCommunity/routers/page_routers.dart'; import 'package:akuCommunity/routers/page_routers.dart';
import 'package:akuCommunity/provider/cart.dart'; import 'package:akuCommunity/provider/cart.dart';
import 'cached_image_wrapper.dart'; import 'cached_image_wrapper.dart';
@ -100,7 +99,7 @@ class _GoodsSpecsSheetState extends State<GoodsSpecsSheet> {
alignment: Alignment.center, alignment: Alignment.center,
color: Colors.white, color: Colors.white,
child: Text( child: Text(
'${count}', '$count',
style: TextStyle( style: TextStyle(
fontSize: 24.sp, fontSize: 24.sp,
color: Color(0xff333333), color: Color(0xff333333),
@ -134,7 +133,7 @@ class _GoodsSpecsSheetState extends State<GoodsSpecsSheet> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text( Text(
'价格：￥${price}', '价格：￥$price',
style: TextStyle( style: TextStyle(
color: Color(0xffe60e0e), color: Color(0xffe60e0e),
fontSize: 28.sp, fontSize: 28.sp,

4
lib/widget/search_bar_delegate.dart
Unescape View File

@ -13,7 +13,7 @@ class _SearchBarDemoState extends State<SearchBarDemo> {
IconButton( IconButton(
icon: Icon(Icons.search), icon: Icon(Icons.search),
onPressed: () { onPressed: () {
showSearch(context: context, delegate: searchBarDelegate()); showSearch(context: context, delegate: SearchBarDelegate());
} }
// showSearch(context:context,delegate: searchBarDelegate()), // showSearch(context:context,delegate: searchBarDelegate()),
), ),
@ -21,7 +21,7 @@ class _SearchBarDemoState extends State<SearchBarDemo> {
} }
} }
class searchBarDelegate extends SearchDelegate<String> { class SearchBarDelegate extends SearchDelegate<String> {
@override @override
List<Widget> buildActions(BuildContext context) { List<Widget> buildActions(BuildContext context) {
return [ return [

Write Preview
Loading…
Cancel
Save