From 8529017dff0cc5788c3df9fb3f570cd48903078c Mon Sep 17 00:00:00 2001 From: zhangmeng <494089941@qq.com> Date: Fri, 16 Apr 2021 11:21:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=87=BA=E5=80=9F=E6=88=90?= =?UTF-8?q?=E5=8A=9F=E5=8F=8A=E5=A4=B1=E8=B4=A5=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/icons/borrow_failure.png | Bin 0 -> 3573 bytes assets/icons/borrow_success.png | Bin 0 -> 20393 bytes lib/const/resource.dart | 8 ++ lib/constants/api.dart | 3 + .../borrow/borrow_finsh_page.dart | 80 ++++++++++++++++++ .../borrow_goods_detail_page.dart | 0 .../borrow/borrow_goods_page.dart | 12 +-- 7 files changed, 98 insertions(+), 5 deletions(-) create mode 100644 assets/icons/borrow_failure.png create mode 100644 assets/icons/borrow_success.png create mode 100644 lib/pages/goods_manage_page/borrow/borrow_finsh_page.dart rename lib/pages/goods_manage_page/{ => borrow}/borrow_goods_detail_page.dart (100%) diff --git a/assets/icons/borrow_failure.png b/assets/icons/borrow_failure.png new file mode 100644 index 0000000000000000000000000000000000000000..6f58b2f914d9e1ed085aaf01ed2c0617964f3b64 GIT binary patch literal 3573 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 vLl~`Bk literal 0 HcmV?d00001 diff --git a/assets/icons/borrow_success.png b/assets/icons/borrow_success.png new file mode 100644 index 0000000000000000000000000000000000000000..db6074ccbd979c42116ceb9c4a35658a91c8ee01 GIT binary patch literal 20393 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 literal 0 HcmV?d00001 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(), ),