Skip to content

B
book-app
提交 a9a48cfe authored 作者: yueweilu's avatar yueweilu
浏览文件
操作

更改 返回刷新方式

上级 0d02b31f
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 308 行增加 和 363 行删除
lib/pages/book_shop/widgets/count.dart
浏览文件 @ a9a48cfe
...@@ -52,10 +52,9 @@ class BuildCounter extends StatelessWidget { ...@@ -52,10 +52,9 @@ class BuildCounter extends StatelessWidget {
GestureDetector( GestureDetector(
onTap: () async { onTap: () async {
if (controller.num > 0){ if (controller.num > 0){
final result = await context.pushNamed(Routes.bookPay,extra: controller.buy); context.pushNamed(Routes.bookPay,extra: controller.buy).then((value){
if (result == true) {
controller.onRefresh(); controller.onRefresh();
} });
} }
}, },
child: Container( child: Container(
......
lib/pages/course/view.dart
浏览文件 @ a9a48cfe
...@@ -38,10 +38,9 @@ class _CoursePageState extends State<CoursePage> { ...@@ -38,10 +38,9 @@ class _CoursePageState extends State<CoursePage> {
), ),
GestureDetector( GestureDetector(
onTap: () async{ onTap: () async{
final result = await context.pushNamed(Routes.msgs); context.pushNamed(Routes.msgs).then((value){
if (result == true) {
controller.getNums(); controller.getNums();
} });
}, },
child: badges.Badge( child: badges.Badge(
position: badges.BadgePosition.topEnd(top: -5.w, end: 0), position: badges.BadgePosition.topEnd(top: -5.w, end: 0),
...@@ -112,10 +111,9 @@ class _CoursePageState extends State<CoursePage> { ...@@ -112,10 +111,9 @@ class _CoursePageState extends State<CoursePage> {
onTapContinue: () async{ onTapContinue: () async{
BookDetailModel bookDetails = await controller.getBookDetails(model.bookId.toString()); BookDetailModel bookDetails = await controller.getBookDetails(model.bookId.toString());
if(context.mounted){ if(context.mounted){
final result = await context.pushNamed(Routes.web,queryParameters: {'book_id': bookDetails.bookId.toString(),'chapter_id': bookDetails.chapterId.toString(),'chapter_name':bookDetails.chapterName.toString()},extra:bookDetails); context.pushNamed(Routes.web,queryParameters: {'book_id': bookDetails.bookId.toString(),'chapter_id': bookDetails.chapterId.toString(),'chapter_name':bookDetails.chapterName.toString()},extra:bookDetails).then((value){
if (result == true){
controller.getNums(); controller.getNums();
} });
} }
}, },
), ),
......
lib/pages/mine/view.dart
浏览文件 @ a9a48cfe
...@@ -43,11 +43,9 @@ class _MinePageState extends State<MinePage> { ...@@ -43,11 +43,9 @@ class _MinePageState extends State<MinePage> {
), ),
GestureDetector( GestureDetector(
onTap: () async{ onTap: () async{
final result = await context.pushNamed(Routes.msgs); context.pushNamed(Routes.msgs).then((value) {
print('---------------------------------1111$result');
if (result == true){
controller.getNums(); controller.getNums();
} });
}, },
child: badges.Badge( child: badges.Badge(
position: badges.BadgePosition.topEnd(top: -5.w, end: 0), position: badges.BadgePosition.topEnd(top: -5.w, end: 0),
...@@ -78,20 +76,18 @@ class _MinePageState extends State<MinePage> { ...@@ -78,20 +76,18 @@ class _MinePageState extends State<MinePage> {
Container( Container(
margin: EdgeInsets.symmetric(horizontal: 10.w), margin: EdgeInsets.symmetric(horizontal: 10.w),
child: BuildUser(userInfo:controller.userInfo,onTap: () async{ child: BuildUser(userInfo:controller.userInfo,onTap: () async{
final result = await context.pushNamed(Routes.userInfo,extra: controller.userInfo); context.pushNamed(Routes.userInfo,extra: controller.userInfo).then((value){
if (result == true){
controller.getInfo(); controller.getInfo();
} });
},), },),
), ),
Gaps.vGaps10, Gaps.vGaps10,
Container( Container(
margin: EdgeInsets.symmetric(horizontal: 2.2.w), margin: EdgeInsets.symmetric(horizontal: 2.2.w),
child: BuildRead(items: controller.reads,onTap: (ReadModel model) async{ child: BuildRead(items: controller.reads,onTap: (ReadModel model) async{
final result = await context.pushNamed(model.link??''); context.pushNamed(model.link??'').then((value){
if (result == true){
controller.getInfo(); controller.getInfo();
} });
}), }),
), ),
controller.ads.isNotEmpty?Gaps.vGaps5:const SizedBox(), controller.ads.isNotEmpty?Gaps.vGaps5:const SizedBox(),
...@@ -108,10 +104,9 @@ class _MinePageState extends State<MinePage> { ...@@ -108,10 +104,9 @@ class _MinePageState extends State<MinePage> {
):const SizedBox(), ):const SizedBox(),
Gaps.vGaps15, Gaps.vGaps15,
BuildAccount(items:controller.accounts,onTap: (ReadModel model) async{ BuildAccount(items:controller.accounts,onTap: (ReadModel model) async{
final result = await context.pushNamed(model.link??''); context.pushNamed(model.link??'').then((value){
if (result == true){
controller.getInfo(); controller.getInfo();
} });
},), },),
Gaps.vGaps10, Gaps.vGaps10,
Container( Container(
...@@ -134,10 +129,9 @@ class _MinePageState extends State<MinePage> { ...@@ -134,10 +129,9 @@ class _MinePageState extends State<MinePage> {
children: [ children: [
GestureDetector( GestureDetector(
onTap:() async { onTap:() async {
final result = await context.pushNamed(Routes.security,extra: controller.userInfo); context.pushNamed(Routes.security,extra: controller.userInfo).then((value){
if (result == true){
controller.getInfo(); controller.getInfo();
} });
}, child: _buildItem('账户安全') }, child: _buildItem('账户安全')
), ),
Container(color: Colours.cLine,margin: EdgeInsets.symmetric(horizontal: 15.w),height: 1.w,), Container(color: Colours.cLine,margin: EdgeInsets.symmetric(horizontal: 15.w),height: 1.w,),
......
lib/pages/user_coin/view.dart
浏览文件 @ a9a48cfe
...@@ -10,70 +10,64 @@ class UserCoinPage extends StatefulWidget { ...@@ -10,70 +10,64 @@ class UserCoinPage extends StatefulWidget {
class _UserCoinPageState extends State<UserCoinPage> { class _UserCoinPageState extends State<UserCoinPage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return WillPopScope( return GetBuilder<UserCoinController>(
onWillPop: () async { init: UserCoinController(),
context.pop(true); builder: (controller) => Scaffold(
return false; appBar: CustomAppBar(
}, title: const Text('紫荆币'),
child: GetBuilder<UserCoinController>( actions: [
init: UserCoinController(), GestureDetector(
builder: (controller) => Scaffold( onTap: (){
appBar: CustomAppBar( showModalBottomSheet(
title: const Text('紫荆币'), context: context,
actions: [ shape: RoundedRectangleBorder(
GestureDetector( borderRadius: BorderRadius.vertical(top: Radius.circular(8.w)),
onTap: (){
showModalBottomSheet(
context: context,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.vertical(top: Radius.circular(8.w)),
),
builder: (BuildContext context) {
return const CoinRechargePage();
},
).then((value) {
controller.onRefresh();
});
},
child: Text('充值',style: TextStyle(color: Colours.c3,fontSize: 14.w,height: 1.5,fontWeight: Fonts.medium),)
)
],
),
body: CustomPullScrollView(
controller: controller.refreshController,
onRefresh: controller.onRefresh,
onLoading: controller.onLoading,
child: controller.coins.isEmpty?Container(
padding: EdgeInsets.only(top: 110.w),
alignment: Alignment.center,
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
SizedBox(height: 152.w, width: 195.w,
child: Image.asset( 'assets/images/none.png',),),
SizedBox(height: 13.w,),
],
),
):Container(
margin: EdgeInsets.all(10.w),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(8.w),
color: Colors.white,
boxShadow: [
BoxShadow(
color: const Color(0xFFC7C7C7).withOpacity(0.5),
offset: Offset(3.w, 0),
blurRadius: 10.w,
spreadRadius: 0.w,
), ),
], builder: (BuildContext context) {
), return const CoinRechargePage();
child: ListView.builder( },
itemBuilder: (BuildContext context, int index){ ).then((value) {
return BuildCell(model: controller.coins[index],); controller.onRefresh();
}, });
itemCount: controller.coins.length, },
), child: Text('充值',style: TextStyle(color: Colours.c3,fontSize: 14.w,height: 1.5,fontWeight: Fonts.medium),)
)
],
),
body: CustomPullScrollView(
controller: controller.refreshController,
onRefresh: controller.onRefresh,
onLoading: controller.onLoading,
child: controller.coins.isEmpty?Container(
padding: EdgeInsets.only(top: 110.w),
alignment: Alignment.center,
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
SizedBox(height: 152.w, width: 195.w,
child: Image.asset( 'assets/images/none.png',),),
SizedBox(height: 13.w,),
],
),
):Container(
margin: EdgeInsets.all(10.w),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(8.w),
color: Colors.white,
boxShadow: [
BoxShadow(
color: const Color(0xFFC7C7C7).withOpacity(0.5),
offset: Offset(3.w, 0),
blurRadius: 10.w,
spreadRadius: 0.w,
),
],
),
child: ListView.builder(
itemBuilder: (BuildContext context, int index){
return BuildCell(model: controller.coins[index],);
},
itemCount: controller.coins.length,
), ),
), ),
), ),
......
lib/pages/user_coupon/view.dart
浏览文件 @ a9a48cfe
...@@ -11,56 +11,50 @@ class UserCouponPage extends StatefulWidget { ...@@ -11,56 +11,50 @@ class UserCouponPage extends StatefulWidget {
class _UserCouponPageState extends State<UserCouponPage> { class _UserCouponPageState extends State<UserCouponPage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return WillPopScope( return GetBuilder<UserCouponController>(
onWillPop: () async { init: UserCouponController(),
context.pop(true); builder:(controller) => Scaffold(
return false; appBar: AppBar(
}, centerTitle: true,
child: GetBuilder<UserCouponController>( title: const Text('优惠券'),
init: UserCouponController(), ),
builder:(controller) => Scaffold( body: CustomPullScrollView(
appBar: AppBar( controller: controller.refreshController,
centerTitle: true, onRefresh: controller.onRefresh,
title: const Text('优惠券'), onLoading: controller.onLoading,
), child: controller.coupons.isEmpty?Container(
body: CustomPullScrollView( padding: EdgeInsets.only(top: 110.w),
controller: controller.refreshController, alignment: Alignment.center,
onRefresh: controller.onRefresh, child: Column(
onLoading: controller.onLoading, crossAxisAlignment: CrossAxisAlignment.center,
child: controller.coupons.isEmpty?Container( children: [
padding: EdgeInsets.only(top: 110.w), SizedBox(height: 152.w, width: 195.w,
alignment: Alignment.center, child: Image.asset( 'assets/images/none.png',),),
child: Column( SizedBox(height: 13.w,),
crossAxisAlignment: CrossAxisAlignment.center, ],
children: [
SizedBox(height: 152.w, width: 195.w,
child: Image.asset( 'assets/images/none.png',),),
SizedBox(height: 13.w,),
],
),
):ListView.builder(
itemBuilder: (BuildContext context, int index){
return BuildItem(model: controller.coupons[index],);
// if (index == controller.coupons.length){
// return GestureDetector(
// onTap: (){
// // controller.getOverCoupons();
// },
// child: Container(
// alignment: Alignment.center,
// height: 40.w,
// // color: Colors.cyan,
// child: Text('过期优惠券'),
// ),
// );
// }
// else {
// return BuildItem(model: controller.coupons[index],);
// }
},
// itemCount: controller.coupons.length +1,
itemCount: controller.coupons.length,
), ),
):ListView.builder(
itemBuilder: (BuildContext context, int index){
return BuildItem(model: controller.coupons[index],);
// if (index == controller.coupons.length){
// return GestureDetector(
// onTap: (){
// // controller.getOverCoupons();
// },
// child: Container(
// alignment: Alignment.center,
// height: 40.w,
// // color: Colors.cyan,
// child: Text('过期优惠券'),
// ),
// );
// }
// else {
// return BuildItem(model: controller.coupons[index],);
// }
},
// itemCount: controller.coupons.length +1,
itemCount: controller.coupons.length,
), ),
), ),
), ),
......
lib/pages/user_discuss/view.dart
浏览文件 @ a9a48cfe
...@@ -10,45 +10,39 @@ class UserDiscussPage extends StatefulWidget { ...@@ -10,45 +10,39 @@ class UserDiscussPage extends StatefulWidget {
class _UserDiscussPageState extends State<UserDiscussPage> { class _UserDiscussPageState extends State<UserDiscussPage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return WillPopScope( return GetBuilder<UserDiscussController>(
onWillPop: () async { init: UserDiscussController(),
context.pop(true); builder:(controller)=> Scaffold(
return false; appBar: AppBar(
}, centerTitle: true,
child: GetBuilder<UserDiscussController>( title: const Text('讨论'),
init: UserDiscussController(), ),
builder:(controller)=> Scaffold( body: Column(
appBar: AppBar( crossAxisAlignment: CrossAxisAlignment.start,
centerTitle: true, children: [
title: const Text('讨论'), Container(
), margin: EdgeInsets.only(left: 22.5.w,top: 16.w),
body: Column( child: Text('共${controller.discuss.length}本书',style: TextStyle(fontSize: 13.w,height: 1.5,color: Colours.c6,fontWeight: Fonts.medium),)
crossAxisAlignment: CrossAxisAlignment.start, ),
children: [ Expanded(
Container( child: CustomPullScrollView(
margin: EdgeInsets.only(left: 22.5.w,top: 16.w), controller: controller.refreshController,
child: Text('共${controller.discuss.length}本书',style: TextStyle(fontSize: 13.w,height: 1.5,color: Colours.c6,fontWeight: Fonts.medium),) onRefresh: controller.onRefresh,
), onLoading: controller.onLoading,
Expanded( child:ListView.builder(
child: CustomPullScrollView( itemBuilder: (BuildContext context, int index){
controller: controller.refreshController, return GestureDetector(
onRefresh: controller.onRefresh, onTap: (){
onLoading: controller.onLoading, context.pushNamed(Routes.discussDes,extra: controller.discuss[index]);
child:ListView.builder( },
itemBuilder: (BuildContext context, int index){ child: BuildItem(model: controller.discuss[index],index: index,num: controller.discuss.length,)
return GestureDetector( );
onTap: (){ },
context.pushNamed(Routes.discussDes,extra: controller.discuss[index]); itemCount: controller.discuss.length,
}, )
child: BuildItem(model: controller.discuss[index],index: index,num: controller.discuss.length,)
);
},
itemCount: controller.discuss.length,
)
),
), ),
], ),
), ],
), ),
), ),
); );
......
lib/pages/user_love/view.dart
浏览文件 @ a9a48cfe
...@@ -10,54 +10,48 @@ class UserLovePage extends StatefulWidget { ...@@ -10,54 +10,48 @@ class UserLovePage extends StatefulWidget {
class _UserLovePageState extends State<UserLovePage> { class _UserLovePageState extends State<UserLovePage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return WillPopScope( return GetBuilder<UserLoveController>(
onWillPop: () async { init: UserLoveController(),
context.pop(true); builder:(controller) => Scaffold(
return false; appBar: AppBar(
}, centerTitle: true,
child: GetBuilder<UserLoveController>( title: const Text('我的收藏'),
init: UserLoveController(), ),
builder:(controller) => Scaffold( body: Container(
appBar: AppBar( color: Colours.cF9,
centerTitle: true, child: CustomPullScrollView(
title: const Text('我的收藏'), controller: controller.refreshController,
), onRefresh: controller.onRefresh,
body: Container( onLoading: controller.onLoading,
color: Colours.cF9, child: controller.loves.isEmpty?Container(
child: CustomPullScrollView( padding: EdgeInsets.only(top: 110.w),
controller: controller.refreshController, alignment: Alignment.center,
onRefresh: controller.onRefresh, child: Column(
onLoading: controller.onLoading, crossAxisAlignment: CrossAxisAlignment.center,
child: controller.loves.isEmpty?Container( children: [
padding: EdgeInsets.only(top: 110.w), SizedBox(height: 152.w, width: 195.w,
alignment: Alignment.center, child: Image.asset( 'assets/images/none.png',),),
child: Column( SizedBox(height: 13.w,),
crossAxisAlignment: CrossAxisAlignment.center, ],
children: [
SizedBox(height: 152.w, width: 195.w,
child: Image.asset( 'assets/images/none.png',),),
SizedBox(height: 13.w,),
],
),
):ListView.builder(
itemBuilder: (BuildContext context, int index){
CourseModel model = controller.loves[index];
return GestureDetector(
onTap: (){
if(model.status == 0 && model.isHave == 0){
Toast.show('书籍已下架');
}
else{
context.pushNamed(Routes.bookDetail,queryParameters: {'book_id':model.bookId.toString()});
}
},
child: BuildItem(model: model,onTap: (){
controller.unLoved(bookId: model.bookId.toString());
},),
);
},
itemCount: controller.loves.length,
), ),
):ListView.builder(
itemBuilder: (BuildContext context, int index){
CourseModel model = controller.loves[index];
return GestureDetector(
onTap: (){
if(model.status == 0 && model.isHave == 0){
Toast.show('书籍已下架');
}
else{
context.pushNamed(Routes.bookDetail,queryParameters: {'book_id':model.bookId.toString()});
}
},
child: BuildItem(model: model,onTap: (){
controller.unLoved(bookId: model.bookId.toString());
},),
);
},
itemCount: controller.loves.length,
), ),
), ),
), ),
......
lib/pages/user_notes/view.dart
浏览文件 @ a9a48cfe
...@@ -10,50 +10,44 @@ class UserNotePage extends StatefulWidget { ...@@ -10,50 +10,44 @@ class UserNotePage extends StatefulWidget {
class _UserNotePageState extends State<UserNotePage> { class _UserNotePageState extends State<UserNotePage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return WillPopScope( return GetBuilder<UserNoteController>(
onWillPop: () async { init: UserNoteController(),
context.pop(true); builder:(controller)=> Scaffold(
return false; appBar: AppBar(
}, centerTitle: true,
child: GetBuilder<UserNoteController>( title: const Text('笔记'),
init: UserNoteController(), ),
builder:(controller)=> Scaffold( body: Column(
appBar: AppBar( crossAxisAlignment: CrossAxisAlignment.start,
centerTitle: true, children: [
title: const Text('笔记'), Container(
), margin: EdgeInsets.only(left: 22.5.w,top: 16.w),
body: Column( child: Text('共${controller.notes.length}本书',style: TextStyle(fontSize: 13.w,height: 1.5,color: Colours.c6,fontWeight: Fonts.medium),)
crossAxisAlignment: CrossAxisAlignment.start, ),
children: [ Expanded(
Container( child: CustomPullScrollView(
margin: EdgeInsets.only(left: 22.5.w,top: 16.w), controller: controller.refreshController,
child: Text('共${controller.notes.length}本书',style: TextStyle(fontSize: 13.w,height: 1.5,color: Colours.c6,fontWeight: Fonts.medium),) onRefresh: controller.onRefresh,
), onLoading: controller.onLoading,
Expanded( child:ListView.builder(
child: CustomPullScrollView( // physics: const NeverScrollableScrollPhysics(),
controller: controller.refreshController, // shrinkWrap: true,
onRefresh: controller.onRefresh, itemBuilder: (BuildContext context, int index){
onLoading: controller.onLoading, return GestureDetector(
child:ListView.builder( onTap: () async {
// physics: const NeverScrollableScrollPhysics(), final result = await context.pushNamed(Routes.noteDes,extra: controller.notes[index]);
// shrinkWrap: true, if(result == true){
itemBuilder: (BuildContext context, int index){ controller.onRefresh;
return GestureDetector( }
onTap: () async { },
final result = await context.pushNamed(Routes.noteDes,extra: controller.notes[index]); child: BuildItem(model: controller.notes[index],)
if(result == true){ );
controller.onRefresh; },
} itemCount: controller.notes.length,
}, )
child: BuildItem(model: controller.notes[index],)
);
},
itemCount: controller.notes.length,
)
),
), ),
], ),
), ],
), ),
), ),
); );
......
lib/pages/user_notes_des/view.dart
浏览文件 @ a9a48cfe
...@@ -22,57 +22,51 @@ class _UserNotesDesPageState extends State<UserNotesDesPage> { ...@@ -22,57 +22,51 @@ class _UserNotesDesPageState extends State<UserNotesDesPage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return WillPopScope( return Scaffold(
onWillPop: () async { appBar: AppBar(
context.pop(true); centerTitle: true,
return false; title: const Text('笔记详情'),
}, ),
child: Scaffold( body: DefaultTabController(
appBar: AppBar( length: tabs.length,
centerTitle: true, child: Column(
title: const Text('笔记详情'), crossAxisAlignment: CrossAxisAlignment.start,
), children: [
body: DefaultTabController( BuildItem(model: widget.model),
length: tabs.length, ClipRRect(
child: Column( borderRadius:const BorderRadius.only(topLeft: Radius.circular(5),topRight: Radius.circular(5)),
crossAxisAlignment: CrossAxisAlignment.start, child: Container(
children: [ width: double.infinity,
BuildItem(model: widget.model), color: Colors.white,
ClipRRect( height: 35.w,
borderRadius:const BorderRadius.only(topLeft: Radius.circular(5),topRight: Radius.circular(5)), child: TabBar(
child: Container( indicator: UnderlineTabIndicator(
width: double.infinity, borderRadius: BorderRadius.circular(0.75),
color: Colors.white, borderSide: BorderSide(width: 1.5.w,color: AppTheme.primary),
height: 35.w, insets: EdgeInsets.symmetric(horizontal: 22.w), // 设置标签下面指示器的水平内边距
child: TabBar( ),
indicator: UnderlineTabIndicator( labelPadding: EdgeInsets.symmetric(horizontal: 20.w),
borderRadius: BorderRadius.circular(0.75), indicatorSize: TabBarIndicatorSize.label,
borderSide: BorderSide(width: 1.5.w,color: AppTheme.primary), indicatorColor: AppTheme.primary,
insets: EdgeInsets.symmetric(horizontal: 22.w), // 设置标签下面指示器的水平内边距 indicatorWeight: 1.5,
), labelStyle: TextStyle(color: AppTheme.primary,fontSize: 15.w,height: 1.5,fontWeight: Fonts.medium),
labelPadding: EdgeInsets.symmetric(horizontal: 20.w), unselectedLabelColor: Colours.c9,
indicatorSize: TabBarIndicatorSize.label, unselectedLabelStyle: TextStyle(color: Colours.c9,fontSize: 15.w,height: 1.5),
indicatorColor: AppTheme.primary, isScrollable: true,
indicatorWeight: 1.5, tabs: tabs
labelStyle: TextStyle(color: AppTheme.primary,fontSize: 15.w,height: 1.5,fontWeight: Fonts.medium),
unselectedLabelColor: Colours.c9,
unselectedLabelStyle: TextStyle(color: Colours.c9,fontSize: 15.w,height: 1.5),
isScrollable: true,
tabs: tabs
),
), ),
), ),
Expanded( ),
child: TabBarView( Expanded(
children: List.generate(tabs.length, (index){ child: TabBarView(
return BuildListPage(tag:'$index',model:widget.model); children: List.generate(tabs.length, (index){
}) return BuildListPage(tag:'$index',model:widget.model);
), })
) ),
], )
) ],
), )
), ),
); );
} }
} }
lib/pages/user_order/view.dart
浏览文件 @ a9a48cfe
...@@ -43,29 +43,23 @@ class _UserOrderState extends State<UserOrderPage> ...@@ -43,29 +43,23 @@ class _UserOrderState extends State<UserOrderPage>
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return WillPopScope( return Scaffold(
onWillPop: () async { appBar: AppBar(
context.pop(true); title: Container(
return false; padding: EdgeInsets.only(right: 10.w),
}, child: CustomInputSearch(
child: Scaffold( controller: searchController,
appBar: AppBar( readOnly: true,
title: Container( hintText: '搜索我的订单',
padding: EdgeInsets.only(right: 10.w), onTap: () {
child: CustomInputSearch( context.pushNamed(Routes.orderSearch);
controller: searchController, },
readOnly: true,
hintText: '搜索我的订单',
onTap: () {
context.pushNamed(Routes.orderSearch);
},
),
), ),
titleSpacing: 0,
), ),
body: _buildBody(),
titleSpacing: 0,
), ),
body: _buildBody(),
); );
} }
......
lib/pages/user_order/widgets/awaiting.dart
浏览文件 @ a9a48cfe
...@@ -12,10 +12,10 @@ class BuiltAwaiting extends StatelessWidget { ...@@ -12,10 +12,10 @@ class BuiltAwaiting extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return GestureDetector( return GestureDetector(
onTap: () async { onTap: () async {
final result = await context.pushNamed(Routes.orderAwaiting, context.pushNamed(Routes.orderAwaiting,
queryParameters: {'orderNum': model.ordersnum}); queryParameters: {'orderNum': model.ordersnum}).then((value){
if (result == true) { controller.onRefresh();
controller.onRefresh(); } });
}, },
child: Container( child: Container(
margin: EdgeInsets.only(left: 10.w, right: 10.w, top: 10.w), margin: EdgeInsets.only(left: 10.w, right: 10.w, top: 10.w),
......
lib/pages/user_order/widgets/coin.dart
浏览文件 @ a9a48cfe
...@@ -18,25 +18,22 @@ class BuiltCoin extends StatelessWidget { ...@@ -18,25 +18,22 @@ class BuiltCoin extends StatelessWidget {
return GestureDetector( return GestureDetector(
onTap: () async { onTap: () async {
if(model.status == 1){ if(model.status == 1){
final result = await context.pushNamed(Routes.orderCoinAwaiting, context.pushNamed(Routes.orderCoinAwaiting,
queryParameters: {'orderNum': model.ordersnum}); queryParameters: {'orderNum': model.ordersnum}).then((value){
if(result==true){
controller.onRefresh(); controller.onRefresh();
} });
} }
else if(model.status == 2){ else if(model.status == 2){
final result = await context.pushNamed(Routes.orderCoinCancel, context.pushNamed(Routes.orderCoinCancel,
queryParameters: {'orderNum': model.ordersnum}); queryParameters: {'orderNum': model.ordersnum}).then((value){
if(result==true){
controller.onRefresh(); controller.onRefresh();
} });
} }
else if(model.status == 3){ else if(model.status == 3){
final result = await context.pushNamed(Routes.orderCoinCompleted, context.pushNamed(Routes.orderCoinCompleted,
queryParameters: {'orderNum': model.ordersnum}); queryParameters: {'orderNum': model.ordersnum}).then((value){
if(result==true){
controller.onRefresh(); controller.onRefresh();
} });
} }
}, },
child: Container( child: Container(
......
lib/pages/user_order/widgets/completed.dart
浏览文件 @ a9a48cfe
...@@ -15,10 +15,10 @@ class BuiltCompleted extends StatelessWidget { ...@@ -15,10 +15,10 @@ class BuiltCompleted extends StatelessWidget {
return GestureDetector( return GestureDetector(
onTap: () onTap: ()
async { async {
final result = await context.pushNamed(Routes.orderCompleted, context.pushNamed(Routes.orderCompleted,
queryParameters: {'orderNum': model.ordersnum}); queryParameters: {'orderNum': model.ordersnum}).then((value){
if (result == true) { controller.onRefresh();
controller.onRefresh(); } });
}, },
child: Container( child: Container(
margin: EdgeInsets.only(left: 10.w, right: 10.w, top: 10.w), margin: EdgeInsets.only(left: 10.w, right: 10.w, top: 10.w),
...@@ -165,14 +165,13 @@ class BuiltCompleted extends StatelessWidget { ...@@ -165,14 +165,13 @@ class BuiltCompleted extends StatelessWidget {
child: Center( child: Center(
child: GestureDetector( child: GestureDetector(
onTap: () async { onTap: () async {
final result = await context.pushNamed(Routes.orderEvaluate, context.pushNamed(Routes.orderEvaluate,
extra: OrderInfoModel(), extra: OrderInfoModel(),
queryParameters: { queryParameters: {
'orderNum': model.ordersnum 'orderNum': model.ordersnum
}); }).then((value){
if (result == true) {
controller.onRefresh(); controller.onRefresh();
} });
}, },
child: Text( child: Text(
judgeComments() == 1 ? '去评价' : "继续评价", judgeComments() == 1 ? '去评价' : "继续评价",
...@@ -307,14 +306,14 @@ class BuiltCompleted extends StatelessWidget { ...@@ -307,14 +306,14 @@ class BuiltCompleted extends StatelessWidget {
child: Center( child: Center(
child: GestureDetector( child: GestureDetector(
onTap: () async { onTap: () async {
final result = await context.pushNamed(Routes.orderEvaluate, context.pushNamed(Routes.orderEvaluate,
extra: OrderInfoModel(), extra: OrderInfoModel(),
queryParameters: { queryParameters: {
'orderNum': model.ordersnum 'orderNum': model.ordersnum
}); }).then((value){
if (result == true) { controller.onRefresh();
controller.onRefresh(); });
}
}, },
child: Text( child: Text(
judgeComments() == 1 ? '去评价' : "继续评价", judgeComments() == 1 ? '去评价' : "继续评价",
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论