@@ -7,6 +7,10 @@ import 'package:zhiying_comm/util/base_bloc.dart'; | |||||
import 'package:zhiying_comm/zhiying_comm.dart'; | import 'package:zhiying_comm/zhiying_comm.dart'; | ||||
class OrderContentBloc extends BlocBase { | class OrderContentBloc extends BlocBase { | ||||
final String skipIdentifier; | |||||
OrderContentBloc({this.skipIdentifier}); | |||||
List<OrderModel> _orders = List(); | List<OrderModel> _orders = List(); | ||||
StreamController<List<OrderModel>> _ordersController = | StreamController<List<OrderModel>> _ordersController = | ||||
@@ -35,7 +39,8 @@ class OrderContentBloc extends BlocBase { | |||||
Map<String, dynamic> params = _filter.toJson(); | Map<String, dynamic> params = _filter.toJson(); | ||||
params.removeWhere((key, value) => value == null || value == ''); | params.removeWhere((key, value) => value == null || value == ''); | ||||
params['state'] = _state; | params['state'] = _state; | ||||
NetUtil.request('/api/v1/order', method: NetMethod.POST, params: params, | |||||
String reqUrl = skipIdentifier == 'pub.flutter.order_by_userlvup' ? '/api/v1/order_by_userlvup' : '/api/v1/order'; | |||||
NetUtil.request(reqUrl, method: NetMethod.POST, params: params, | |||||
onCache: (data) { | onCache: (data) { | ||||
//_parseData(data); | //_parseData(data); | ||||
}, onSuccess: (data) { | }, onSuccess: (data) { | ||||
@@ -17,9 +17,10 @@ class OrderContentPage extends StatefulWidget { | |||||
final OrderFilterModel filter; | final OrderFilterModel filter; | ||||
final int index; | final int index; | ||||
final EventBus eventBus; | final EventBus eventBus; | ||||
final String skipIdentifier; | |||||
const OrderContentPage(this.state, | const OrderContentPage(this.state, | ||||
{Key key, this.filter, this.style, this.index, this.eventBus}) | |||||
{Key key, this.filter, this.style, this.index, this.eventBus, this.skipIdentifier}) | |||||
: super(key: key); | : super(key: key); | ||||
@override | @override | ||||
@@ -30,7 +31,7 @@ class _OrderContentPageState extends State<OrderContentPage> { | |||||
@override | @override | ||||
Widget build(BuildContext context) { | Widget build(BuildContext context) { | ||||
return BlocProvider<OrderContentBloc>( | return BlocProvider<OrderContentBloc>( | ||||
bloc: OrderContentBloc(), | |||||
bloc: OrderContentBloc(skipIdentifier: widget?.skipIdentifier), | |||||
child: OrderContentContainer( | child: OrderContentContainer( | ||||
widget.state, | widget.state, | ||||
widget.filter, | widget.filter, | ||||
@@ -142,20 +142,27 @@ class _OrdersContainerState extends State<_OrdersContainer> | |||||
filter: _filter, | filter: _filter, | ||||
index: index, | index: index, | ||||
eventBus: _eventBus, | eventBus: _eventBus, | ||||
skipIdentifier: widget.data['skip_identifier'], | |||||
), | ), | ||||
); | ); | ||||
return Column( | return Column( | ||||
children: <Widget>[ | children: <Widget>[ | ||||
GestureDetector( | |||||
child: OrderSearchWidget(model), | |||||
onTap: () { | |||||
Navigator.of(context) | |||||
.push(CupertinoPageRoute(builder: (BuildContext context) { | |||||
return OrderSearchPage(model); | |||||
})); | |||||
}, | |||||
/// TODO 只有我的订单才显示搜索 | |||||
/// 搜索框 | |||||
Visibility( | |||||
visible: widget.data['skip_identifier'] == 'pub.flutter.my_order', | |||||
child: GestureDetector( | |||||
child: OrderSearchWidget(model), | |||||
onTap: () { | |||||
Navigator.of(context) | |||||
.push(CupertinoPageRoute(builder: (BuildContext context) { | |||||
return OrderSearchPage(model); | |||||
})); | |||||
}, | |||||
), | |||||
), | ), | ||||
/// TabBar 分类导航 | |||||
OrderTabbarWidget( | OrderTabbarWidget( | ||||
model, | model, | ||||
_tabController, | _tabController, | ||||
@@ -167,6 +174,7 @@ class _OrdersContainerState extends State<_OrdersContainer> | |||||
}); | }); | ||||
}, | }, | ||||
), | ), | ||||
/// TabView 子视图 | |||||
Expanded( | Expanded( | ||||
child: Stack( | child: Stack( | ||||
children: <Widget>[ | children: <Widget>[ | ||||
@@ -174,6 +182,7 @@ class _OrdersContainerState extends State<_OrdersContainer> | |||||
children: _contents, | children: _contents, | ||||
controller: _tabController, | controller: _tabController, | ||||
), | ), | ||||
/// 筛选视图 | |||||
Visibility( | Visibility( | ||||
visible: _isFilterShow, | visible: _isFilterShow, | ||||
child: OrderFilterWidget( | child: OrderFilterWidget( | ||||
@@ -262,7 +262,11 @@ class BaseWidgetRegister { | |||||
/// 订单页面 | /// 订单页面 | ||||
PageFactory.regist('pub.flutter.my_order', (model) => OrdersPage(model)); | PageFactory.regist('pub.flutter.my_order', (model) => OrdersPage(model)); | ||||
/// 会员订单页面 | |||||
PageFactory.regist('pub.flutter.order_by_userlvup', (model) => OrdersPage(model)); | |||||
/// 账号安全页面 | |||||
PageFactory.regist('pub.flutter.account_security', (model) => SecurityPage(model)); | PageFactory.regist('pub.flutter.account_security', (model) => SecurityPage(model)); | ||||
/// 绑定支付宝页面 | |||||
PageFactory.regist('pub.flutter.account_security_alipay', (model) => SecurityBindAlipayPage(model)); | PageFactory.regist('pub.flutter.account_security_alipay', (model) => SecurityBindAlipayPage(model)); | ||||
/// 登录密码 | /// 登录密码 | ||||