From 61acbff24653297de668397dc6853125ba85bc1b Mon Sep 17 00:00:00 2001 From: Weller <1812208341@qq.com> Date: Fri, 16 Oct 2020 14:55:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=A1=B5=E9=9D=A2=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=20=E6=9B=B4=E6=96=B0=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .dart_tool/package_config.json | 6 +- .../goods_share_image/goods_share_image.dart | 2 +- .../goods_share_link/goods_share_link.dart | 2 +- lib/pages/launch_page/launch_page.dart | 5 +- .../models/order_filter_model.dart | 21 +++++ lib/pages/orders_page/order_content_page.dart | 34 +++++++ lib/pages/orders_page/orders_page.dart | 86 +++++++++++------- .../security_mobile_unbind.dart | 2 +- .../security_unbin_alipay.dart | 2 +- .../footer/goods_details_footer_widget.dart | 5 +- .../home_quick_entry_widget.dart | 88 +++++++++++++------ .../home_slide_banner/home_slide_banner.dart | 8 +- lib/widgets/others/normal_nav/normal_nav.dart | 2 +- .../search/input/search_input_widget.dart | 76 ++++++++++------ pubspec.yaml | 2 +- 15 files changed, 237 insertions(+), 104 deletions(-) create mode 100644 lib/pages/orders_page/models/order_filter_model.dart create mode 100644 lib/pages/orders_page/order_content_page.dart diff --git a/.dart_tool/package_config.json b/.dart_tool/package_config.json index 041b4fd..fffaf3b 100644 --- a/.dart_tool/package_config.json +++ b/.dart_tool/package_config.json @@ -537,7 +537,7 @@ }, { "name": "url_launcher", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/url_launcher-5.7.4", + "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/url_launcher-5.7.5", "packageUri": "lib/", "languageVersion": "2.1" }, @@ -617,10 +617,10 @@ "name": "zhiying_base_widget", "rootUri": "../", "packageUri": "lib/", - "languageVersion": "2.1" + "languageVersion": "2.8" } ], - "generated": "2020-10-15T12:19:28.149342Z", + "generated": "2020-10-16T06:45:33.016683Z", "generator": "pub", "generatorVersion": "2.8.2" } diff --git a/lib/pages/goods_share_page/goods_share_image/goods_share_image.dart b/lib/pages/goods_share_page/goods_share_image/goods_share_image.dart index 22b3715..a2ce587 100644 --- a/lib/pages/goods_share_page/goods_share_image/goods_share_image.dart +++ b/lib/pages/goods_share_page/goods_share_image/goods_share_image.dart @@ -85,7 +85,7 @@ class _GoodsShareImageState extends State return; Navigator.push( context, - MaterialPageRoute( + CupertinoPageRoute( builder: (context) => GoodsShareEditor(_style))); }, onTempChange: (temp) { diff --git a/lib/pages/goods_share_page/goods_share_link/goods_share_link.dart b/lib/pages/goods_share_page/goods_share_link/goods_share_link.dart index 0f855b7..f94a57b 100644 --- a/lib/pages/goods_share_page/goods_share_link/goods_share_link.dart +++ b/lib/pages/goods_share_page/goods_share_link/goods_share_link.dart @@ -86,7 +86,7 @@ class _GoodsShareLinkState extends State return; Navigator.push( context, - MaterialPageRoute( + CupertinoPageRoute( builder: (context) => GoodsShareEditor(_style))); }, onTempChange: (temp) { diff --git a/lib/pages/launch_page/launch_page.dart b/lib/pages/launch_page/launch_page.dart index 0c085bf..7c706a7 100644 --- a/lib/pages/launch_page/launch_page.dart +++ b/lib/pages/launch_page/launch_page.dart @@ -1,4 +1,5 @@ import 'package:connectivity/connectivity.dart'; +import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:zhiying_base_widget/pages/home_page/home_page.dart'; import 'package:zhiying_comm/util/application.dart'; @@ -26,10 +27,10 @@ class _LaunchPageState extends State { Application.init().then((_) { if (widget.builder != null) { Navigator.of(context) - .pushReplacement(MaterialPageRoute(builder: widget.builder)); + .pushReplacement(CupertinoPageRoute(builder: widget.builder)); } else { Navigator.of(context).pushReplacement( - MaterialPageRoute(builder: (context) => HomePage())); + CupertinoPageRoute(builder: (context) => HomePage())); } }).catchError((err) { Logger.error(err); diff --git a/lib/pages/orders_page/models/order_filter_model.dart b/lib/pages/orders_page/models/order_filter_model.dart new file mode 100644 index 0000000..1508809 --- /dev/null +++ b/lib/pages/orders_page/models/order_filter_model.dart @@ -0,0 +1,21 @@ +// 订单筛选条件 +class OrderFilterModel { + final String state; // 否 string 订单状态0已付款,1已收货,2成功,3失效 + final String keyword; // 否 string 关键字 + final String start_time; // 否 string 开始时间 + final String end_time; // 否 string 结束时间 + final String type; // 否 string 订单类型self自购, share分享, fans粉丝 + final String provider; // 否 string 供应商taobao, jd, pdd, vip, kaola,suning,own自营 + final String page_no; // 否 string 页码 + final String page_size; + + OrderFilterModel( + {this.state, + this.keyword, + this.start_time, + this.end_time, + this.type, + this.provider, + this.page_no, + this.page_size}); // 否 string 页数 +} diff --git a/lib/pages/orders_page/order_content_page.dart b/lib/pages/orders_page/order_content_page.dart new file mode 100644 index 0000000..0e061ac --- /dev/null +++ b/lib/pages/orders_page/order_content_page.dart @@ -0,0 +1,34 @@ +import 'package:event_bus/event_bus.dart'; +import 'package:flutter/material.dart'; +import 'package:zhiying_base_widget/pages/orders_page/views/order_item_widget.dart'; +import 'package:zhiying_comm/zhiying_comm.dart'; + +class OrderContentPage extends StatefulWidget { + final EventBus filter; + + const OrderContentPage({Key key, this.filter}) : super(key: key); + + @override + _OrderContentPageState createState() => _OrderContentPageState(); +} + +class _OrderContentPageState extends State { + @override + void initState() { + // 每次滑动刷新数据 + widget.filter?.streamController?.add((filter) { + Logger.debug(filter.toString()); + }); + super.initState(); + } + + @override + Widget build(BuildContext context) { + print(context.toString()); + return ListView.builder( + itemCount: 20, + itemBuilder: (context, index) { + return OrderItemWidget(); + }); + } +} diff --git a/lib/pages/orders_page/orders_page.dart b/lib/pages/orders_page/orders_page.dart index 50b1870..ca6df4a 100644 --- a/lib/pages/orders_page/orders_page.dart +++ b/lib/pages/orders_page/orders_page.dart @@ -1,8 +1,10 @@ +import 'package:event_bus/event_bus.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; +import 'package:zhiying_base_widget/pages/orders_page/models/order_filter_model.dart'; +import 'package:zhiying_base_widget/pages/orders_page/order_content_page.dart'; import 'package:zhiying_base_widget/pages/orders_page/order_search_page.dart'; import 'package:zhiying_base_widget/pages/orders_page/views/order_filter.dart'; -import 'package:zhiying_base_widget/pages/orders_page/views/order_item_widget.dart'; import 'package:zhiying_base_widget/pages/orders_page/views/order_serch_widget.dart'; import 'package:zhiying_base_widget/pages/orders_page/views/order_tabbar_widget.dart'; @@ -10,7 +12,8 @@ import 'package:zhiying_base_widget/pages/orders_page/views/order_tabbar_widget. class OrdersPage extends StatefulWidget { final Map data; - const OrdersPage(this.data, { + const OrdersPage( + this.data, { Key key, }) : super(key: key); @@ -42,19 +45,19 @@ class _OrdersPageState extends State { backgroundColor: Colors.white, leading: Navigator.canPop(context) ? GestureDetector( - child: Container( - padding: EdgeInsets.zero, - child: Icon( - Icons.arrow_back_ios, - size: 20, - ), - ), - onTap: () { - if (Navigator.canPop(context)) { - Navigator.pop(context); - } - }, - ) + child: Container( + padding: EdgeInsets.zero, + child: Icon( + Icons.arrow_back_ios, + size: 20, + ), + ), + onTap: () { + if (Navigator.canPop(context)) { + Navigator.pop(context); + } + }, + ) : Container(), middle: Text( '我的订单', @@ -75,14 +78,45 @@ class _OrdersContainer extends StatefulWidget { class _OrdersContainerState extends State<_OrdersContainer> with TickerProviderStateMixin { TabController _tabController; - GlobalKey _tabKey = GlobalKey(); + final EventBus _eventBus = EventBus(); + final OrderFilterModel _filter = OrderFilterModel(); + bool _isFilterShow = false; + List _titles = [ + '全部', + '已付款', + '已结算', + '已失效', + '全部', + '已付款', + ]; + List _contents = []; @override void initState() { _tabController = TabController(length: 6, vsync: this); + _contents = [ + OrderContentPage( + filter: _eventBus, + ), + OrderContentPage( + filter: _eventBus, + ), + OrderContentPage( + filter: _eventBus, + ), + OrderContentPage( + filter: _eventBus, + ), + OrderContentPage( + filter: _eventBus, + ), + OrderContentPage( + filter: _eventBus, + ), + ]; super.initState(); } @@ -94,21 +128,14 @@ class _OrdersContainerState extends State<_OrdersContainer> child: OrderSearchWidget(), onTap: () { Navigator.of(context) - .push(MaterialPageRoute(builder: (BuildContext context) { + .push(CupertinoPageRoute(builder: (BuildContext context) { return OrderSearchPage(); })); }, ), OrderTabbarWidget( _tabController, - [ - '全部', - '已付款', - '已结算', - '已失效', - '全部', - '已付款', - ], + _titles, key: _tabKey, onMoreClick: () { setState(() { @@ -119,11 +146,10 @@ class _OrdersContainerState extends State<_OrdersContainer> Expanded( child: Stack( children: [ - ListView.builder( - itemCount: 20, - itemBuilder: (context, index) { - return OrderItemWidget(); - }), + TabBarView( + children: _contents, + controller: _tabController, + ), Visibility( visible: _isFilterShow, child: OrderFilterWidget(), diff --git a/lib/pages/security_page/security_mobile/security_mobile_unbind.dart b/lib/pages/security_page/security_mobile/security_mobile_unbind.dart index bc7c244..30bc892 100644 --- a/lib/pages/security_page/security_mobile/security_mobile_unbind.dart +++ b/lib/pages/security_page/security_mobile/security_mobile_unbind.dart @@ -160,7 +160,7 @@ class _SecurityMobileUnbindState extends State { method: NetMethod.POST, onSuccess: (result) { _status['mobile_setting'] = '0'; _status['code'] = _codeController.text; - Navigator.of(context).pushReplacement(MaterialPageRoute( + Navigator.of(context).pushReplacement(CupertinoPageRoute( builder: (context) => SecurityMobile(widget.model))); }); } diff --git a/lib/pages/security_page/security_unbind_alipay/security_unbin_alipay.dart b/lib/pages/security_page/security_unbind_alipay/security_unbin_alipay.dart index def44e9..84f5dd7 100644 --- a/lib/pages/security_page/security_unbind_alipay/security_unbin_alipay.dart +++ b/lib/pages/security_page/security_unbind_alipay/security_unbin_alipay.dart @@ -150,7 +150,7 @@ class _SecurityUnbinAlipayState extends State { Logger.debug(result); Fluttertoast.showToast(msg: '解绑成功'); _status['alipay_setting'] = '0'; - Navigator.of(context).pushReplacement(MaterialPageRoute( + Navigator.of(context).pushReplacement(CupertinoPageRoute( builder: (context) => SecurityBindAlipayPage(widget.model))); }); } diff --git a/lib/widgets/goods_details/footer/goods_details_footer_widget.dart b/lib/widgets/goods_details/footer/goods_details_footer_widget.dart index 28d3163..45c2a22 100644 --- a/lib/widgets/goods_details/footer/goods_details_footer_widget.dart +++ b/lib/widgets/goods_details/footer/goods_details_footer_widget.dart @@ -1,6 +1,7 @@ import 'dart:convert'; import 'package:cached_network_image/cached_network_image.dart'; +import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_alibc/alibc_model.dart'; import 'package:flutter_alibc/flutter_alibc.dart'; @@ -55,7 +56,7 @@ class _GooddsDetailsFooterContainerState void _openHome() { Navigator.pushAndRemoveUntil( context, - MaterialPageRoute( + CupertinoPageRoute( builder: (BuildContext context) => PageFactory.create('homePage', null)), (Route route) => false, @@ -93,7 +94,7 @@ class _GooddsDetailsFooterContainerState return; } } - Navigator.of(context).push(MaterialPageRoute( + Navigator.of(context).push(CupertinoPageRoute( builder: (context) => GoodsSharePage(widget.model))); } } diff --git a/lib/widgets/home/home_quick_entry/home_quick_entry_widget.dart b/lib/widgets/home/home_quick_entry/home_quick_entry_widget.dart index 28d9a46..b091790 100644 --- a/lib/widgets/home/home_quick_entry/home_quick_entry_widget.dart +++ b/lib/widgets/home/home_quick_entry/home_quick_entry_widget.dart @@ -1,12 +1,13 @@ -import 'package:flutter/material.dart'; import 'package:cached_network_image/cached_network_image.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_swiper/flutter_swiper.dart'; import 'package:zhiying_base_widget/widgets/home/home_quick_entry/bloc/bloc.dart'; import 'package:zhiying_base_widget/widgets/home/home_quick_entry/bloc/home_quick_entry_repository.dart'; import 'package:zhiying_base_widget/widgets/home/home_quick_entry/home_quick_entry_sk.dart'; import 'package:zhiying_base_widget/widgets/home/home_quick_entry/model/home_quick_entry_model.dart'; import 'package:zhiying_comm/zhiying_comm.dart'; -import 'package:flutter_bloc/flutter_bloc.dart'; /// /// 首页的快速入口widget @@ -19,7 +20,8 @@ class HomeQuickEntryWidget extends StatelessWidget { @override Widget build(BuildContext context) { return BlocProvider( - create: (_) => HomeQuickEntryBloc(repository: HomeQuickEntryRepository())..add(HomeQuickEntryInitEvent(model: model)), + create: (_) => HomeQuickEntryBloc(repository: HomeQuickEntryRepository()) + ..add(HomeQuickEntryInitEvent(model: model)), child: HomeQuickEntryWidgetContianer(), ); } @@ -27,10 +29,12 @@ class HomeQuickEntryWidget extends StatelessWidget { class HomeQuickEntryWidgetContianer extends StatefulWidget { @override - _HomeQuickEntryWidgetContianerState createState() => _HomeQuickEntryWidgetContianerState(); + _HomeQuickEntryWidgetContianerState createState() => + _HomeQuickEntryWidgetContianerState(); } -class _HomeQuickEntryWidgetContianerState extends State { +class _HomeQuickEntryWidgetContianerState + extends State { @override Widget build(BuildContext context) { return BlocConsumer( @@ -55,15 +59,20 @@ class _HomeQuickEntryWidgetContianerState extends State= showDataSize ? showDataSize : (data.length - page * showDataSize); - int itemCount = (dataSize - page * showDataSize) >= showDataSize ? showDataSize : (dataSize - page * showDataSize); + int itemCount = (dataSize - page * showDataSize) >= showDataSize + ? showDataSize + : (dataSize - page * showDataSize); print('${itemCount}'); return Container( // color: Colors.cyan, @@ -203,8 +230,12 @@ class HomeQuickEntrySwiperItem extends StatelessWidget { itemBuilder: (context, i) { // return HomeQuickEntryItem(data: data[itemCount == showDataSize ? page * showDataSize + i : page == 0 ? page + i : page * showDataSize + i], itemPaddding: itemPadding,); // 最后一行 - bool isLast = i >= (rowSize -1) * columSize; - return HomeQuickEntryItem(data: null, itemPaddding: itemPadding, isLastRow: isLast,); + bool isLast = i >= (rowSize - 1) * columSize; + return HomeQuickEntryItem( + data: null, + itemPaddding: itemPadding, + isLastRow: isLast, + ); }), ); } @@ -222,7 +253,7 @@ class HomeQuickEntryItem extends StatelessWidget { /// 子图标的点击 _itemOnClick(context) { - Navigator.push(context, MaterialPageRoute(builder: (context) { + Navigator.push(context, CupertinoPageRoute(builder: (context) { return PageFactory.create('login', null); })); } @@ -232,27 +263,30 @@ class HomeQuickEntryItem extends StatelessWidget { return GestureDetector( onTap: () => _itemOnClick(context), child: Container( - margin: EdgeInsets.only(bottom: isLastRow ? 0 :0), + margin: EdgeInsets.only(bottom: isLastRow ? 0 : 0), color: Colors.red, child: Column( crossAxisAlignment: CrossAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.start, children: [ // 图片 - MyNetWorkImage(data?.img?? 'https://profile.csdnimg.cn/3/3/0/3_canhuashu'), + MyNetWorkImage( + data?.img ?? 'https://profile.csdnimg.cn/3/3/0/3_canhuashu'), Padding( padding: const EdgeInsets.only(top: 5), child: Text( data?.title_1 ?? '京东', - style: TextStyle(color: HexColor.fromHex('#666666'), fontSize: 20.sp), + style: TextStyle( + color: HexColor.fromHex('#666666'), fontSize: 20.sp), )), Padding( padding: const EdgeInsets.only(top: 5), child: Text( data?.title_1 ?? '京东', - style: TextStyle(color: HexColor.fromHex('#666666'), fontSize: 20.sp), + style: TextStyle( + color: HexColor.fromHex('#666666'), fontSize: 20.sp), )), // SizedBox(height: 25.h,) ], @@ -266,8 +300,8 @@ class HomeQuickEntryItem extends StatelessWidget { /// 图片build 优化 /// class MyNetWorkImage extends StatelessWidget { - final String imgUrl; + const MyNetWorkImage(this.imgUrl); @override diff --git a/lib/widgets/home/home_slide_banner/home_slide_banner.dart b/lib/widgets/home/home_slide_banner/home_slide_banner.dart index 7129a8f..f084a9c 100644 --- a/lib/widgets/home/home_slide_banner/home_slide_banner.dart +++ b/lib/widgets/home/home_slide_banner/home_slide_banner.dart @@ -6,7 +6,6 @@ import 'package:flutter_swiper/flutter_swiper.dart'; import 'package:provider/provider.dart'; import 'package:zhiying_base_widget/pages/main_page/notifier/main_page_bg_notifier.dart'; import 'package:zhiying_base_widget/pages/team_details_page/team_details_page.dart'; -import 'package:zhiying_base_widget/pages/team_page/team_page.dart'; import 'package:zhiying_comm/zhiying_comm.dart'; import 'bloc/bloc.dart'; @@ -49,13 +48,12 @@ class _HomeSlideBannerContainerState extends State { void _itemOnClick(IndexCarousel model) { print('点击了 $model'); // RouterUtil.route(model, model.toJson(), context); - // Navigator.push(context, MaterialPageRoute( + // Navigator.push(context, CupertinoPageRoute( // builder: (_) => PageFactory.create('goods_details', null) // )); // Navigator.push(context, CupertinoPageRoute(builder: (_)=> TeamPage())); - Navigator.push(context, MaterialPageRoute( - builder: (_)=> TeamDetailsPage() - )); + Navigator.push( + context, CupertinoPageRoute(builder: (_) => TeamDetailsPage())); } @override diff --git a/lib/widgets/others/normal_nav/normal_nav.dart b/lib/widgets/others/normal_nav/normal_nav.dart index ffc8cf6..5d64c2e 100644 --- a/lib/widgets/others/normal_nav/normal_nav.dart +++ b/lib/widgets/others/normal_nav/normal_nav.dart @@ -90,7 +90,7 @@ class NormalNav extends StatelessWidget { ), onTap: () { Navigator.push(context, - MaterialPageRoute(builder: (context) { + CupertinoPageRoute(builder: (context) { return MinePage(); })); }, diff --git a/lib/widgets/search/input/search_input_widget.dart b/lib/widgets/search/input/search_input_widget.dart index 2794444..50b0373 100644 --- a/lib/widgets/search/input/search_input_widget.dart +++ b/lib/widgets/search/input/search_input_widget.dart @@ -1,19 +1,19 @@ import 'dart:convert'; import 'dart:ui'; + +import 'package:cached_network_image/cached_network_image.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:fluttertoast/fluttertoast.dart'; +import 'package:provider/provider.dart'; import 'package:zhiying_base_widget/pages/search_page/notifier/search_tag_notifier.dart'; import 'package:zhiying_base_widget/pages/search_result_page/search_result_page.dart'; import 'package:zhiying_base_widget/pages/search_think_page/bloc/search_think_bloc.dart'; import 'package:zhiying_base_widget/pages/search_think_page/search_think_page.dart'; -import 'package:zhiying_base_widget/widgets/home/home_quick_entry/cached_network_image_util.dart'; import 'package:zhiying_base_widget/widgets/search/input/model/search_input_model.dart'; import 'package:zhiying_base_widget/widgets/search/input/search_input_sk.dart'; import 'package:zhiying_comm/zhiying_comm.dart'; -import 'package:provider/provider.dart'; -import 'package:cached_network_image/cached_network_image.dart'; -import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:fluttertoast/fluttertoast.dart'; /// /// 搜索页的搜索框 @@ -38,31 +38,38 @@ class _SearchInputWidgetState extends State { /// 点击搜索按钮 void _onSearchButtomClick() async { String content = _editingController?.text?.toString()?.trim() ?? ''; + /// TODO 保存历史标签 if (!EmptyUtil.isEmpty(content)) { - await Provider.of(context, listen: false).addTag(content); - Navigator.push(context, CupertinoPageRoute(builder: (_) => SearchResultPage({'keywords': content, 'tag': 'search_page'}))); - }else{ + await Provider.of(context, listen: false) + .addTag(content); + Navigator.push( + context, + CupertinoPageRoute( + builder: (_) => SearchResultPage( + {'keywords': content, 'tag': 'search_page'}))); + } else { Fluttertoast.showToast(msg: '输入内容不能为空!'); } } /// 【弃用】打开搜索联想页面 - void _openSearchThinkPage(){ - Navigator.push(context, MaterialPageRoute( - builder: (_)=> SearchThinkPage({}) - )); + void _openSearchThinkPage() { + Navigator.push( + context, CupertinoPageRoute(builder: (_) => SearchThinkPage({}))); } /// 搜索框值改变 - void _searchInputChange(String text){ - if(!EmptyUtil.isEmpty(text)){ + void _searchInputChange(String text) { + if (!EmptyUtil.isEmpty(text)) { // 进行网络更新 print('输入框的内容是 $text'); - BlocProvider.of(context).add(SearchThinkKeyWrodsChangeEvent(text)); - }else{ + BlocProvider.of(context) + .add(SearchThinkKeyWrodsChangeEvent(text)); + } else { /// 输入框为空的时候，隐藏联想视图，显示原本的视图 - BlocProvider.of(context).add(SearchThinkShowBaseViewEvent()); + BlocProvider.of(context) + .add(SearchThinkShowBaseViewEvent()); } } @@ -103,12 +110,16 @@ class _SearchInputWidgetState extends State { return Container( color: Colors.white, width: double.infinity, - margin: EdgeInsets.only(top: MediaQueryData.fromWindow(window).padding.top + 7.5, left: 12.5, right: 12.5), + margin: EdgeInsets.only( + top: MediaQueryData.fromWindow(window).padding.top + 7.5, + left: 12.5, + right: 12.5), child: Row( children: [ /// 返回键 _getReturnWidget(), const SizedBox(width: 8.5), + /// 输入框 Expanded( child: Container( @@ -143,9 +154,9 @@ class _SearchInputWidgetState extends State { } /// 返回键 - Widget _getReturnWidget(){ + Widget _getReturnWidget() { return GestureDetector( - onTap: ()=> Navigator.maybePop(context), + onTap: () => Navigator.maybePop(context), child: Container( child: Icon( Icons.arrow_back_ios, @@ -157,7 +168,6 @@ class _SearchInputWidgetState extends State { ); } - /// 搜索icon Widget _getSearchIconWidget(SearchInputModel model) { return Container( @@ -176,19 +186,24 @@ class _SearchInputWidgetState extends State { return Container( height: double.infinity, alignment: Alignment.centerLeft, - decoration: BoxDecoration(borderRadius: BorderRadius.circular(30), color: HexColor.fromHex('#F9F9F9')), + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(30), + color: HexColor.fromHex('#F9F9F9')), // padding: const EdgeInsets.symmetric(vertical: 6), child: TextField( showCursor: true, // readOnly: true, // onTap: ()=> _openSearchThinkPage(), - onChanged: (val)=> _searchInputChange(val), + onChanged: (val) => _searchInputChange(val), cursorWidth: 1, onSubmitted: (text) => _onSearchButtomClick(), controller: _editingController, focusNode: _focusNode, cursorColor: Colors.transparent, - style: TextStyle(fontSize: 14, color: HexColor.fromHex('#333333'), textBaseline: TextBaseline.alphabetic), + style: TextStyle( + fontSize: 14, + color: HexColor.fromHex('#333333'), + textBaseline: TextBaseline.alphabetic), decoration: InputDecoration( filled: true, isDense: true, @@ -203,7 +218,10 @@ class _SearchInputWidgetState extends State { disabledBorder: InputBorder.none, enabledBorder: InputBorder.none, hintText: model?.search_inpu_hint_text ?? '搜索更多优惠商品', - hintStyle: TextStyle(color: HexColor.fromHex('#999999'), fontSize: 14, textBaseline: TextBaseline.alphabetic), + hintStyle: TextStyle( + color: HexColor.fromHex('#999999'), + fontSize: 14, + textBaseline: TextBaseline.alphabetic), ), ), ); @@ -217,10 +235,10 @@ class _SearchInputWidgetState extends State { child: Container( padding: const EdgeInsets.symmetric(horizontal: 17.5, vertical: 6), decoration: BoxDecoration( - gradient: LinearGradient( - colors: [HexColor.fromHex(model?.search_button_color ?? '#FD5E5E'), HexColor.fromHex(model?.search_button_t ?? '#FF0100')], - begin: Alignment.centerLeft, - end: Alignment.centerRight), + gradient: LinearGradient(colors: [ + HexColor.fromHex(model?.search_button_color ?? '#FD5E5E'), + HexColor.fromHex(model?.search_button_t ?? '#FF0100') + ], begin: Alignment.centerLeft, end: Alignment.centerRight), borderRadius: BorderRadius.circular(30), ), child: Text( diff --git a/pubspec.yaml b/pubspec.yaml index d97efac..3caca50 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -5,7 +5,7 @@ author: homepage: environment: - sdk: ">=2.1.0 <3.0.0" + sdk: ">=2.8.0 <3.0.0" dependencies: flutter: