From 7d2cbdc4b7c5249d67f94fd674bd05b6e2be16bc Mon Sep 17 00:00:00 2001 From: zhangmeng <494089941@qq.com> Date: Fri, 16 Jul 2021 09:39:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E7=94=9F=E6=B4=BB=E7=BC=B4?= =?UTF-8?q?=E8=B4=B9=20=E9=A2=84=E7=BC=B4=E5=85=85=E5=80=BC=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/icons/alipay_round.png | Bin 0 -> 15231 bytes lib/const/resource.dart | 4 + lib/constants/api.dart | 11 ++ lib/pages/life_pay/life_pay_page.dart | 19 ++- lib/pages/life_pay/life_pre_pay_page.dart | 111 +++++++++++------- .../pay_mothod_bottom_sheet.dart | 2 +- 6 files changed, 104 insertions(+), 43 deletions(-) create mode 100644 assets/icons/alipay_round.png diff --git a/assets/icons/alipay_round.png b/assets/icons/alipay_round.png new file mode 100644 index 0000000000000000000000000000000000000000..7fbe0730d5b31f848ceb034bb61d02b0d1774f9d GIT binary patch literal 15231 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 '/user/dailyPayment/findEstateIsPayment'; + ///生活缴费：根据房产id查询对应的预付款充值金额 + String get dailyPaymentPrePay => + '/user/dailyPayment/findAdvancePaymentPriceByEstateId'; + ///活动投票：app查询所有活动投票信息 String get enventVotingList => '/user/eventVoting/list'; @@ -501,6 +505,13 @@ class _Pay { ///我的房屋-合同终止：app 房屋租赁-剩余需结清租金支付(当剩余需结清租金 小于等于 0 时调用)： String get leaseRentOrderNegative => '/user/myHouse/leaseRentOrderAlipay'; + + ///支付宝支付：app 生活缴费-预充值支付 完成订单支付宝支付(生成 APP 支付订单信息) + String get dailPaymentPrePay => '/user/alipay/advancePaymentOrderAlipay'; + + ///支付宝支付：生活缴费-预充值支付 向支付宝发起订单查询请求 + String get dailPaymentPrePayCheck => + '/user/alipay/advancePaymentOrderCheckAlipay'; } class _House { diff --git a/lib/pages/life_pay/life_pay_page.dart b/lib/pages/life_pay/life_pay_page.dart index 90372392..dc52832f 100644 --- a/lib/pages/life_pay/life_pay_page.dart +++ b/lib/pages/life_pay/life_pay_page.dart @@ -1,4 +1,5 @@ import 'package:aku_community/pages/life_pay/life_pre_pay_page.dart'; +import 'package:aku_community/widget/others/user_tool.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; @@ -47,6 +48,7 @@ class _LifePayPageState extends State { List _models = []; //原model,禁止修改 int _page = 0; int _size = 10; + double _prePrice = 0; List _selectModels = []; //选中的models @@ -232,7 +234,7 @@ class _LifePayPageState extends State { children: [ '¥'.text.size(28.sp).black.make(), 16.w.widthBox, - '2300'.text.size(40.sp).black.bold.make(), + _prePrice.text.size(40.sp).black.bold.make(), Spacer(), MaterialButton( elevation: 0, @@ -243,7 +245,7 @@ class _LifePayPageState extends State { side: BorderSide(color: Color(0xFF979797), width: 1.w)), color: Colors.white, onPressed: () { - Get.to(() => LifePrePayPage()); + Get.to(() => LifePrePayPage(prePay: _prePrice,)); }, child: '预缴充值'.text.size(28.sp).black.make(), ) @@ -254,6 +256,18 @@ class _LifePayPageState extends State { ); } + Future _dailyPaymentPrePay() async { + BaseModel baseModel = + await NetUtil().get(API.manager.dailyPaymentPrePay, params: { + "estateId": UserTool.appProveider.selectedHouse!.estateId, + }); + if (baseModel.status ?? false) { + return (baseModel.data as num).toDouble(); + } else { + return 0; + } + } + @override Widget build(BuildContext context) { final appProvider = Provider.of(context); @@ -295,6 +309,7 @@ class _LifePayPageState extends State { for (var i = 0; i < _selectModels.length; i++) { _selectYears.add(i); } + _prePrice = await _dailyPaymentPrePay(); if (mounted) setState(() {}); }, child: Column( diff --git a/lib/pages/life_pay/life_pre_pay_page.dart b/lib/pages/life_pay/life_pre_pay_page.dart index 8188b735..de2277b6 100644 --- a/lib/pages/life_pay/life_pre_pay_page.dart +++ b/lib/pages/life_pay/life_pre_pay_page.dart @@ -1,18 +1,26 @@ import 'package:aku_community/base/base_style.dart'; +import 'package:aku_community/constants/api.dart'; +import 'package:aku_community/pages/life_pay/pay_finish_page.dart'; +import 'package:aku_community/pages/life_pay/pay_util.dart'; +import 'package:aku_community/utils/network/base_model.dart'; +import 'package:aku_community/utils/network/net_util.dart'; import 'package:aku_community/widget/bee_divider.dart'; import 'package:aku_community/widget/bee_scaffold.dart'; import 'package:aku_community/widget/bottom_sheets/pay_mothod_bottom_sheet.dart'; import 'package:aku_community/widget/buttons/bottom_button.dart'; -import 'package:aku_community/widget/others/bee_input_row.dart'; import 'package:aku_community/widget/others/house_head_card.dart'; +import 'package:aku_community/widget/others/user_tool.dart'; +import 'package:bot_toast/bot_toast.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:aku_community/utils/headers.dart'; import 'package:flutter/services.dart'; import 'package:get/get.dart'; +import 'package:power_logger/power_logger.dart'; class LifePrePayPage extends StatefulWidget { - LifePrePayPage({Key? key}) : super(key: key); + final double prePay; + LifePrePayPage({Key? key, required this.prePay}) : super(key: key); @override _LifePrePayPageState createState() => _LifePrePayPageState(); @@ -72,7 +80,10 @@ class _LifePrePayPageState extends State { fontWeight: FontWeight.bold, color: Colors.black, ), - inputFormatters: [FilteringTextInputFormatter.digitsOnly], + inputFormatters: [ + FilteringTextInputFormatter.allow( + RegExp(r"^[0-9][\.\d]*(,\d+)?$")) + ], keyboardType: TextInputType.number, ).expand(), ], @@ -83,7 +94,8 @@ class _LifePrePayPageState extends State { '当前房屋下的预缴金额为 ' .richText .withTextSpanChildren([ - '2300' + widget.prePay + .toDoubleStringAsFixed() .textSpan .bold .size(28.sp) @@ -104,45 +116,64 @@ class _LifePrePayPageState extends State { ), ), 16.w.heightBox, - // Container( - // width: double.infinity, - // color: Colors.white, - // padding: EdgeInsets.symmetric(vertical: 32.w, horizontal: 32.w), - // child: Row( - // children: [ - // '缴费方式'.text.size(28.sp).black.make(), - // Spacer(), - // TextButton( - // onPressed: () async { - // Get.bottomSheet(PayMethodBottomSheet(onChoose: (value) { - // _paymethod = value; - // Get.back(); - // setState(() {}); - // })); - // }, - // child: _paymethod.text.size(28.sp).black.make()), - // 24.w.widthBox, - // Icon( - // CupertinoIcons.chevron_right, - // size: 40.w, - // ), - // ], - // ), - // ), - BeeInputRow.button( - title: '支付方式', - hintText: _payMethod, - onPressed: () { - Get.bottomSheet(PayMethodBottomSheet(onChoose: (value) { - _payMethod = value; - Get.back(); - setState(() {}); - })); - }), + Container( + width: double.infinity, + color: Colors.white, + padding: EdgeInsets.symmetric(vertical: 32.w, horizontal: 32.w), + child: Row( + children: [ + '缴费方式'.text.size(28.sp).black.make(), + Spacer(), + Image.asset( + R.ASSETS_ICONS_ALIPAY_ROUND_PNG, + width: 48.w, + height: 48.w, + ), + 16.w.widthBox, + TextButton( + onPressed: () async { + Get.bottomSheet(PayMethodBottomSheet(onChoose: (value) { + _payMethod = value; + Get.back(); + setState(() {}); + })); + }, + child: _payMethod.text.size(28.sp).black.make()), + 24.w.widthBox, + Icon( + CupertinoIcons.chevron_right, + size: 40.w, + ), + ], + ), + ), ], ), bottomNavi: BottomButton( - onPressed: () {}, child: '立即充值'.text.size(32.sp).bold.black.make()), + onPressed: () async { + Function cancel = BotToast.showLoading(); + try { + BaseModel baseModel = + await NetUtil().post(API.pay.dailPaymentPrePay, params: { + "estateId": UserTool.appProveider.selectedHouse!.estateId, + "payType": 1, + "payPrice": _editingController.text + }); + if (baseModel.status ?? false) { + bool result = await PayUtil().callAliPay( + baseModel.message!, API.pay.dailPaymentPrePayCheck); + if (result) { + Get.off(() => PayFinishPage()); + } + } else { + BotToast.showText(text: baseModel.message??""); + } + } catch (e) { + LoggerData.addData(e); + } + cancel(); + }, + child: '立即充值'.text.size(32.sp).bold.black.make()), ); } } diff --git a/lib/widget/bottom_sheets/pay_mothod_bottom_sheet.dart b/lib/widget/bottom_sheets/pay_mothod_bottom_sheet.dart index f4474c4f..127392b8 100644 --- a/lib/widget/bottom_sheets/pay_mothod_bottom_sheet.dart +++ b/lib/widget/bottom_sheets/pay_mothod_bottom_sheet.dart @@ -18,7 +18,7 @@ class PayMethodBottomSheet extends StatelessWidget { '支付方式'.text.size(32.sp).bold.color(ktextPrimary).isIntrinsic.make(), actions: [ CupertinoActionSheetAction( - onPressed: onChoose('支付宝'), + onPressed:()=> onChoose('支付宝'), child: '支付宝'.text.size(32.sp).color(ktextPrimary).isIntrinsic.make()) ],