diff --git a/assets/icons/borrow_failure.png b/assets/icons/borrow_failure.png new file mode 100644 index 00000000..6f58b2f9 Binary files /dev/null and b/assets/icons/borrow_failure.png differ diff --git a/assets/icons/borrow_success.png b/assets/icons/borrow_success.png new file mode 100644 index 00000000..db6074cc Binary files /dev/null and b/assets/icons/borrow_success.png differ diff --git a/lib/const/resource.dart b/lib/const/resource.dart index fdebb2a4..d728bd1b 100644 --- a/lib/const/resource.dart +++ b/lib/const/resource.dart @@ -124,10 +124,18 @@ class R { static const String ASSETS_ICONS_ARTICLE_NAME_PNG = 'assets/icons/article_name.png'; + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/borrow_failure.png) + static const String ASSETS_ICONS_BORROW_FAILURE_PNG = + 'assets/icons/borrow_failure.png'; + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/borrow_status.png) static const String ASSETS_ICONS_BORROW_STATUS_PNG = 'assets/icons/borrow_status.png'; + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/borrow_success.png) + static const String ASSETS_ICONS_BORROW_SUCCESS_PNG = + 'assets/icons/borrow_success.png'; + /// ![preview](file:///Users/zhangmeng/akuCommunity/assets/icons/comment_notice.png) static const String ASSETS_ICONS_COMMENT_NOTICE_PNG = 'assets/icons/comment_notice.png'; diff --git a/lib/constants/api.dart b/lib/constants/api.dart index d9b0a5c6..e6b26687 100644 --- a/lib/constants/api.dart +++ b/lib/constants/api.dart @@ -166,6 +166,9 @@ class _Manager { ///借还管理：借取物品 String get articleBorrowGoods => '/user/articleBorrow/borrow'; + ///借还管理：根据用户主键id查询需要归还物品信息（归还界面） + String get articleReturnList => '/articleBorrow/findBorrowByUserId'; + ///生活缴费：查询生活缴费信息list String get dailyPaymentList => '/user/dailyPayment/list'; diff --git a/lib/pages/goods_manage_page/borrow/borrow_finsh_page.dart b/lib/pages/goods_manage_page/borrow/borrow_finsh_page.dart new file mode 100644 index 00000000..bc969b73 --- /dev/null +++ b/lib/pages/goods_manage_page/borrow/borrow_finsh_page.dart @@ -0,0 +1,80 @@ +import 'package:akuCommunity/base/base_style.dart'; +import 'package:akuCommunity/pages/home/home_page.dart'; +import 'package:akuCommunity/widget/bee_scaffold.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:get/get.dart'; +import 'package:velocity_x/velocity_x.dart'; +import 'package:akuCommunity/const/resource.dart'; + +class BorrowFinshPage extends StatefulWidget { + final bool isSuccess; + final String failText; + BorrowFinshPage({Key key, this.isSuccess, this.failText}) : super(key: key); + + @override + _BorrowFinshPageState createState() => _BorrowFinshPageState(); +} + +class _BorrowFinshPageState extends State { + @override + Widget build(BuildContext context) { + return BeeScaffold( + title: '出借结果', + body: Center( + child: Column( + children: [ + 75.w.heightBox, + SizedBox( + width: 110.w, + height: 110.w, + child: Image.asset(widget.isSuccess + ? R.ASSETS_ICONS_BORROW_SUCCESS_PNG + : R.ASSETS_ICONS_BORROW_FAILURE_PNG), + ), + 48.w.heightBox, + '${widget.isSuccess ? '出借成功' : '出借失败'}' + .text + .color(ktextPrimary) + .size(36.sp) + .bold + .make(), + 16.w.heightBox, + '${widget.isSuccess ? '使用后请记得归还' : widget.failText}' + .text + .color(ktextSubColor) + .size(26.sp) + .make(), + 95.w.heightBox, + MaterialButton( + color: kPrimaryColor, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(8.w)), + elevation: 0, + hoverElevation: 0, + highlightElevation: 0, + focusElevation: 0, + disabledElevation: 0, + padding: EdgeInsets.symmetric(vertical: 24.w), + minWidth: double.infinity, + onPressed: widget.isSuccess + ? () { + Get.offAll(HomePage()); + } + : () { + Get.back(); + }, + child: '${widget.isSuccess ? '返回首页' : '重新提交'}' + .text + .color(widget.isSuccess ? ktextPrimary : Colors.white) + .size(36.sp) + .make(), + ) + ], + ), + ).pSymmetric( + h: 24.w, + ), + ); + } +} diff --git a/lib/pages/goods_manage_page/borrow_goods_detail_page.dart b/lib/pages/goods_manage_page/borrow/borrow_goods_detail_page.dart similarity index 100% rename from lib/pages/goods_manage_page/borrow_goods_detail_page.dart rename to lib/pages/goods_manage_page/borrow/borrow_goods_detail_page.dart diff --git a/lib/pages/goods_manage_page/borrow/borrow_goods_page.dart b/lib/pages/goods_manage_page/borrow/borrow_goods_page.dart index 0f880fb0..c067720e 100644 --- a/lib/pages/goods_manage_page/borrow/borrow_goods_page.dart +++ b/lib/pages/goods_manage_page/borrow/borrow_goods_page.dart @@ -2,7 +2,8 @@ import 'package:akuCommunity/base/base_style.dart'; import 'package:akuCommunity/constants/api.dart'; import 'package:akuCommunity/model/common/img_model.dart'; import 'package:akuCommunity/model/manager/article_borrow_model.dart'; -import 'package:akuCommunity/pages/goods_manage_page/borrow_goods_detail_page.dart'; +import 'package:akuCommunity/pages/goods_manage_page/borrow/borrow_finsh_page.dart'; +import 'package:akuCommunity/pages/goods_manage_page/borrow/borrow_goods_detail_page.dart'; import 'package:akuCommunity/pages/things_page/widget/bee_list_view.dart'; import 'package:akuCommunity/utils/network/base_model.dart'; import 'package:akuCommunity/utils/network/net_util.dart'; @@ -94,10 +95,11 @@ class _BorrowGoodsPageState extends State { BaseModel baseModel = await NetUtil().post( API.manager.articleBorrowGoods, params: {"ids": _submitIds}, - showMessage: true); - if (baseModel.status) { - Get.back(); - } + showMessage: false); + Get.to(BorrowFinshPage( + isSuccess: baseModel.status, + failText: baseModel.message, + )); }, child: '借出'.text.black.size(32.sp).bold.make(), ),