Browse Source

[fix]会员取消支付去除挽留弹窗

zk 3 months ago
parent
commit
eae7d0fd1c
1 changed files with 19 additions and 18 deletions
  1. 19 18
      lib/module/member/member_controller.dart

+ 19 - 18
lib/module/member/member_controller.dart

@@ -309,18 +309,21 @@ class MemberController extends BaseController implements PaymentStatusCallback {
   ///支付错误的时候调用
   void showRetainDialog(
       {bool isBack = false, int? errno, VoidCallback? onCancelClick}) {
-    errorPayToast(errno);
-    // _isShowPayFailedDialog = true;
-    // MemberRetainDialog.show(payClick: () {
-    //   onBuyClick();
-    // }, cancelClick: () {
-    //   errorPayToast(errno);
-    //   if (Platform.isAndroid && isBack) back();
-    //   // 新增:如果传入了 onCancelClick,则调用
-    //   if (onCancelClick != null) {
-    //     onCancelClick();
-    //   }
-    // });
+    if (isBack == false) {
+      errorPayToast(errno);
+      return;
+    }
+    _isShowPayFailedDialog = true;
+    MemberRetainDialog.show(payClick: () {
+      onBuyClick();
+    }, cancelClick: () {
+      errorPayToast(errno);
+      if (Platform.isAndroid && isBack) back();
+      // 新增:如果传入了 onCancelClick,则调用
+      if (onCancelClick != null) {
+        onCancelClick();
+      }
+    });
   }
 
   void onBuyClick() async {
@@ -398,12 +401,10 @@ class MemberController extends BaseController implements PaymentStatusCallback {
   }
 
   ///发起购买请求
-  Future<void> _onApplePay(
-    String outTradeNo,
-    String appAccountToken,
-    PayItemBean payWayInfo,
-    GoodsBean goodsInfo,
-  ) async {
+  Future<void> _onApplePay(String outTradeNo,
+      String appAccountToken,
+      PayItemBean payWayInfo,
+      GoodsBean goodsInfo,) async {
     final result = await ApplePay().purchase(
       productId: goodsInfo.appleGoodsId ?? "",
       appAccountToken: appAccountToken,