'解绑银行卡'

lib/pages/addBankCard/index.dart

@@ -94,6 +94,44 @@ class AddBankPage extends BasicPage {
     });
   }
 
+  bindCard(){
+    if (handleRule()) {
+      addBankCard(bankCard.value).then(
+            (e) {
+          for (var item in bankList.value) {
+            if (item.name == e['ownerBank']) {
+              e['color1'] = item.color1;
+              e['color2'] = item.color2;
+              e['bankCode'] = item.bankCode;
+            }
+          }
+          List<BankCardModel> list = [];
+          List pickerList = [];
+          for (var e in bankCardListStore.bankCardList()) {
+            list.add(e);
+            pickerList.add(e.ownerBank.toString() +
+                '(' +
+                e.cardNo.toString().substring(
+                    e.cardNo.toString().length - 4,
+                    e.cardNo.toString().length) +
+                ')');
+          }
+          list.add(BankCardModel.fromJson(e));
+          String cardNo = BankCardModel.fromJson(e).cardNo.toString();
+          pickerList.add(
+              BankCardModel.fromJson(e).ownerBank.toString() +
+                  '(' +
+                  cardNo.substring(cardNo.length - 4, cardNo.length) +
+                  ')');
+          bankCardListStore.bankCardList(list);
+          bankPickerListStore.bankPickerList(pickerList);
+          Get.back();
+          Fluttertoast.showToast(msg: '添加成功');
+        },
+      );
+    }
+  }
+
   @override
   Widget builder(BuildContext context) {
     return Column(
@@ -254,43 +292,7 @@ class AddBankPage extends BasicPage {
             text: '绑定',
             type: 0,
             disable: false,
-            onClick: () {
-              if (handleRule()) {
-                addBankCard(bankCard.value).then(
-                  (e) {
-                    for (var item in bankList.value) {
-                      if (item.name == e['ownerBank']) {
-                        e['color1'] = item.color1;
-                        e['color2'] = item.color2;
-                        e['bankCode'] = item.bankCode;
-                      }
-                    }
-                    List<BankCardModel> list = [];
-                    List pickerList = [];
-                    for (var e in bankCardListStore.bankCardList()) {
-                      list.add(e);
-                      pickerList.add(e.ownerBank.toString() +
-                          '(' +
-                          e.cardNo.toString().substring(
-                              e.cardNo.toString().length - 4,
-                              e.cardNo.toString().length) +
-                          ')');
-                    }
-                    list.add(BankCardModel.fromJson(e));
-                    String cardNo = BankCardModel.fromJson(e).cardNo.toString();
-                    pickerList.add(
-                        BankCardModel.fromJson(e).ownerBank.toString() +
-                            '(' +
-                            cardNo.substring(cardNo.length - 4, cardNo.length) +
-                            ')');
-                    bankCardListStore.bankCardList(list);
-                    bankPickerListStore.bankPickerList(pickerList);
-                    Get.back();
-                    Fluttertoast.showToast(msg: '添加成功');
-                  },
-                );
-              }
-            },
+            onClick:bindCard,
           ),
         ),
       ],

lib/pages/bankList/index.dart

@@ -5,18 +5,22 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:dotted_border/dotted_border.dart';
 import 'package:worker_client/models/bankCardList.dart';
+import 'package:worker_client/models/bankPickerList.dart';
 import 'package:worker_client/models/entities/Bank.dart';
 import 'package:worker_client/models/entities/BankCard.dart';
 import 'package:worker_client/pages/bankList/widget/BankCard.dart';
 import 'package:worker_client/services/bank.dart';
 import 'package:worker_client/widgets/NullCard.dart';
 import 'package:worker_client/widgets/layout/BasicPage.dart';
+import '/widgets/MyDialog.dart' as modal;
 
 class BankListPages extends BasicPage {
   BankListPages({Key? key}) : super(key: key) {
     naviTitle = '我的银行卡';
   }
   BankCardListController bankCardListStore = BankCardListController.t;
+  BankPickerListController bankPickerListStore = BankPickerListController.t;
+
   @override
   void beforeShow() {
     super.beforeShow();
@@ -67,11 +71,37 @@ class BankListPages extends BasicPage {
   }
 
   void unBind(id) {
-    // 弹窗
-    unbindBankCard(id).then((value) {
-      Fluttertoast.showToast(msg: '解绑成功');
-      getList();
-    });
+    var list1 = <BankCardModel>[];
+    var list2 = [];
+    var name = '';
+    modal.showAlert(
+        title: '提示',
+        message: '确定要解除绑定该银行卡吗？',
+        onConfirm: () {
+          unbindBankCard(id).then((value) {
+            Fluttertoast.showToast(msg: '解绑成功');
+            for (var item in bankCardListStore.bankCardList.value) {
+              if (item.cardId == id) {
+                name = item.ownerBank.toString() +
+                    '(' +
+                    item.cardNo
+                        .substring(item.cardNo.length - 4, item.cardNo.length) +
+                    ')';
+              } else {
+                list1.add(item);
+              }
+            }
+            bankCardListStore.bankCardList(list1);
+            for (var item in bankPickerListStore.bankPickerList.value) {
+              if (item != name) {
+                list2.add(item);
+              }
+            }
+            bankPickerListStore.bankPickerList(list2);
+          });
+          return true;
+        },
+        onCancel: () => true);
   }
 
   @override

lib/services/bank.dart

@@ -45,13 +45,13 @@ Future addBankCard(data) async {
 /// @param {*}
 /// @returns
 Future unbindBankCard(String id) async {
-  return request('/bankcard/$id/pause', options: Options(method: 'DELETE'))
+  return request('/bankcard/$id', options: Options(method: 'DELETE'))
       .catchError((error) => {
             Fluttertoast.showToast(msg: error.error['message']),
           });
 }
 
-/// 添加银行卡
+/// 提现申请
 /// @param {*} data
 /// @returns
 Future addWithdrawal(data) async {

lib/utils/Request.dart

@@ -30,7 +30,7 @@ final client = GetPlatform.isAndroid ? 'android' : 'ios';
 Dio createRequest() {
   const isProd = bool.fromEnvironment('dart.vm.product');
   const host =
-      isProd ? 'https://machine.njyunzhi.com' : 'http://192.168.89.147:7080';
+      isProd ? 'https://machine.njyunzhi.com' : 'http://192.168.89.25:7080';
   final baseUrl = '$host/api/$client/worker';
 
   var options = BaseOptions(

pubspec.lock

@@ -112,7 +112,7 @@ packages:
       name: collection
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.16.0"
+    version: "1.15.0"
   convert:
     dependency: transitive
     description:
@@ -161,7 +161,7 @@ packages:
       name: fake_async
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.3.0"
+    version: "1.2.0"
   ffi:
     dependency: transitive
     description:
@@ -281,7 +281,7 @@ packages:
       name: js
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.6.4"
+    version: "0.6.3"
   json_annotation:
     dependency: transitive
     description:
@@ -323,7 +323,7 @@ packages:
       name: material_color_utilities
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.1.4"
+    version: "0.1.3"
   meta:
     dependency: transitive
     description:
@@ -344,7 +344,7 @@ packages:
       name: path
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.8.1"
+    version: "1.8.0"
   path_drawing:
     dependency: transitive
     description:
@@ -503,7 +503,7 @@ packages:
       name: source_span
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.8.2"
+    version: "1.8.1"
   stack_trace:
     dependency: transitive
     description:
@@ -545,7 +545,7 @@ packages:
       name: test_api
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.4.9"
+    version: "0.4.8"
   typed_data:
     dependency: transitive
     description:
@@ -559,7 +559,7 @@ packages:
       name: vector_math
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.1"
   watcher:
     dependency: transitive
     description:
@@ -589,5 +589,5 @@ packages:
     source: hosted
     version: "3.1.1"
 sdks:
-  dart: ">=2.17.0-0 <3.0.0"
+  dart: ">=2.16.1 <3.0.0"
   flutter: ">=2.8.1"