'.'

lib/pages/withdrawal/index.dart

@@ -1,6 +1,8 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:flutter_picker/Picker.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:fluttertoast/fluttertoast.dart';
 import 'package:get/get.dart';
 import 'package:worker_client/models/entities/BankCard.dart';
 import 'package:worker_client/services/bank.dart';
@@ -20,8 +22,32 @@ class MyWithdrawal extends BasicPage {
   int index = 0;
   final bankCardList = Rx<List<BankCardModel>>([]);
 
-  void headleWithdrawal(){
-
+  void headleWithdrawal() {
+    if (withdrawal.value['money'] != null &&
+        double.parse(withdrawal.value['money'].toString()) <
+            amounts.value / 100) {
+      if (withdrawal.value['accountCardNo'] != null) {
+        EasyLoading.show(
+          status: '申请中...',
+          maskType: EasyLoadingMaskType.black,
+        );
+        var data = {...withdrawal.value};
+        data.remove('ownerBank');
+        data['money'] = double.parse(data['money'].toString()) * 100;
+        addWithdrawal(data).then((value) {
+          EasyLoading.dismiss();
+          Fluttertoast.showToast(msg: '提交成功，平台审核后1到3个工作日到账！');
+          Get.back();
+        }).catchError((onError) {
+          EasyLoading.dismiss();
+          Fluttertoast.showToast(msg: onError.error['message']);
+        });
+      } else {
+        Fluttertoast.showToast(msg: '请选择您的银行卡！');
+      }
+    } else {
+      Fluttertoast.showToast(msg: '请输入正确的金额！');
+    }
   }
 
   @override
@@ -50,118 +76,128 @@ class MyWithdrawal extends BasicPage {
 
   @override
   Widget builder(BuildContext context) {
-    return Container(
-      margin: EdgeInsets.all(15.w),
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          MoneyCard(
-            type: true,
-            amounts: amounts.value,
-            goWithDrawal: () {},
-          ),
-          const MyTitle(title: '选择银行卡'),
-          GestureDetector(
-            child: Container(
-              height: 54.h,
-              padding: EdgeInsets.symmetric(horizontal: 15.w),
-              margin: EdgeInsets.only(top: 15.h),
-              decoration: BoxDecoration(
-                borderRadius: BorderRadius.circular(20.w),
-                border: Border.all(
-                  color: const Color(0xffF2F2F2),
-                  width: 1.w,
+    return Column(
+      children: [
+        Expanded(
+            flex: 1,
+            child: ListView(
+              padding: EdgeInsets.only(top: 15.h, left: 15.w, right: 15.w),
+              children: [
+                MoneyCard(
+                  type: true,
+                  amounts: amounts.value,
+                  goWithDrawal: () {},
                 ),
-              ),
-              child: Row(
-                mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                children: [
-                  Obx(
-                    () => Text(
-                      withdrawal.value['ownerBank'] == null
-                          ? '请选择银行'
-                          : withdrawal.value['ownerBank'].toString() +
-                              '(' +
-                              withdrawal.value['accountCardNo'].toString().substring(
-                                  withdrawal.value['accountCardNo'].toString().length -
-                                      4,
-                                  withdrawal.value['accountCardNo'].toString().length) +
-                              ')',
-                      style: TextStyle(
-                        fontSize: 16.sp,
-                        fontWeight: FontWeight.w500,
-                        color: const Color(0xff333333),
+                const MyTitle(title: '选择银行卡'),
+                GestureDetector(
+                  child: Container(
+                    height: 54.h,
+                    padding: EdgeInsets.symmetric(horizontal: 15.w),
+                    margin: EdgeInsets.only(top: 15.h),
+                    decoration: BoxDecoration(
+                      borderRadius: BorderRadius.circular(20.w),
+                      border: Border.all(
+                        color: const Color(0xffF2F2F2),
+                        width: 1.w,
                       ),
                     ),
-                  ),
-                  Image.asset(
-                    'images/main/goto.png',
-                    height: 18.h,
-                    fit: BoxFit.cover,
-                  )
-                ],
-              ),
-            ),
-            onTap: () {
-              showPicker(context);
-            },
-          ),
-          const MyTitle(title: '提取金额'),
-          Container(
-            height: 54.h,
-            padding: EdgeInsets.symmetric(horizontal: 15.w),
-            margin: EdgeInsets.only(top: 15.h),
-            decoration: BoxDecoration(
-              borderRadius: BorderRadius.circular(20.w),
-              border: Border.all(
-                color: const Color(0xffF2F2F2),
-                width: 1.w,
-              ),
-            ),
-            child: Row(
-              children: [
-                Padding(
-                  padding: EdgeInsets.only(right: 10.w),
-                  child: Text(
-                    '￥',
-                    style: TextStyle(
-                      fontSize: 24.sp,
-                      fontWeight: FontWeight.w500,
-                      color: Color(0xff333333),
+                    child: Row(
+                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                      children: [
+                        Obx(
+                          () => Text(
+                            withdrawal.value['ownerBank'] == null
+                                ? '请选择银行'
+                                : withdrawal.value['ownerBank'].toString() +
+                                    '(' +
+                                    withdrawal.value['accountCardNo']
+                                        .toString()
+                                        .substring(
+                                            withdrawal.value['accountCardNo']
+                                                    .toString()
+                                                    .length -
+                                                4,
+                                            withdrawal.value['accountCardNo']
+                                                .toString()
+                                                .length) +
+                                    ')',
+                            style: TextStyle(
+                              fontSize: 16.sp,
+                              fontWeight: FontWeight.w500,
+                              color: const Color(0xff333333),
+                            ),
+                          ),
+                        ),
+                        Image.asset(
+                          'images/main/goto.png',
+                          height: 18.h,
+                          fit: BoxFit.cover,
+                        )
+                      ],
                     ),
                   ),
+                  onTap: () {
+                    showPicker(context);
+                  },
                 ),
-                Expanded(
-                  child: TextField(
-                    keyboardType: TextInputType.number,
-                    decoration: const InputDecoration(
-                      contentPadding: EdgeInsets.symmetric(vertical: 1),
-                      hintText: '请输入提现金额',
-                      border: OutlineInputBorder(borderSide: BorderSide.none),
+                const MyTitle(title: '提取金额'),
+                Container(
+                  height: 54.h,
+                  padding: EdgeInsets.symmetric(horizontal: 15.w),
+                  margin: EdgeInsets.only(top: 15.h),
+                  decoration: BoxDecoration(
+                    borderRadius: BorderRadius.circular(20.w),
+                    border: Border.all(
+                      color: const Color(0xffF2F2F2),
+                      width: 1.w,
                     ),
-                    onChanged: (e) {
-                      withdrawal.value['money']=e;
-                    },
+                  ),
+                  child: Row(
+                    children: [
+                      Padding(
+                        padding: EdgeInsets.only(right: 10.w),
+                        child: Text(
+                          '￥',
+                          style: TextStyle(
+                            fontSize: 24.sp,
+                            fontWeight: FontWeight.w500,
+                            color: const Color(0xff333333),
+                          ),
+                        ),
+                      ),
+                      Expanded(
+                        child: TextField(
+                          keyboardType: TextInputType.number,
+                          decoration: const InputDecoration(
+                            contentPadding: EdgeInsets.symmetric(vertical: 1),
+                            hintText: '请输入提现金额',
+                            border:
+                                OutlineInputBorder(borderSide: BorderSide.none),
+                          ),
+                          onChanged: (e) {
+                            withdrawal.value['money'] = e;
+                          },
+                        ),
+                      ),
+                    ],
                   ),
                 ),
               ],
             ),
+        ),
+        Padding(
+          padding: EdgeInsets.only(bottom: 16.h + 15.w),
+          child: MyButton(
+            pwith: 30.w,
+            text: '提现',
+            type: 0,
+            disable: false,
+            onClick: () {
+              headleWithdrawal();
+            },
           ),
-          const Spacer(),
-          Padding(
-            padding: EdgeInsets.only(bottom: 16.h),
-            child: MyButton(
-              pwith: 30.w,
-              text: '提现',
-              type: 0,
-              disable: false,
-              onClick: () {
-                headleWithdrawal();
-              },
-            ),
-          ),
-        ],
-      ),
+        ),
+      ],
     );
   }
 
@@ -187,7 +223,7 @@ class MyWithdrawal extends BasicPage {
           withdrawal({
             ...withdrawal(),
             'ownerBank': bankCardList.value[index].ownerBank.toString(),
-            'accountCardNo': bankCardList.value[index].cardNo.toString()
+            'accountCardNo': bankCardList.value[index].cardId.toString()
           });
         });
     picker.showModal(context);

lib/services/bank.dart

@@ -52,4 +52,15 @@ Future unbindBankCard(String id) async {
       .catchError((error) => {
     Fluttertoast.showToast(msg: error.error['message']),
   });
-}
+}
+
+/// 添加银行卡
+/// @param {*} data
+/// @returns
+Future addWithdrawal(data) async {
+  return request(
+    '/withdrawal',
+    options: Options(method: 'POST'),
+    data: data,
+  );
+}

lib/widgets/layout/BasicPage.dart

@@ -21,8 +21,10 @@ abstract class BasicPage extends StatefulWidget {
   // 允许滚动 - 不是响应式的
   bool canScroll;
 
+  bool? isPop;
+
   //
-  BasicPage({Key? key, this.canScroll = true, this.tabIndex }) : super(key: key);
+  BasicPage({Key? key, this.canScroll = true,this.isPop=false, this.tabIndex }) : super(key: key);
 
   @protected
   Widget builder(BuildContext context);
@@ -103,12 +105,10 @@ class _BasicPageState extends State<BasicPage> {
   Widget build(BuildContext context) {
 
     return Scaffold(
-      resizeToAvoidBottomInset: true,
+      resizeToAvoidBottomInset: false,
       appBar: _getAppBar(),
       body: SafeArea(
-        // maintainBottomViewPadding:true,
         child: widget.builder(context),
-
       ),
       bottomNavigationBar: widget.tabIndex == null ? null : BottomBar(list: BarList, current: widget.tabIndex!),
     );