Преглед на файлове

fix:优化支付完成之后的弹窗。

zhoukun преди 6 месеца
родител
ревизия
2847d27ba4
променени са 2 файла, в които са добавени 23 реда и са изтрити 9 реда
  1. 22 9
      lib/module/member/member_controller.dart
  2. 1 0
      lib/module/member/member_payment_completed_dialog.dart

+ 22 - 9
lib/module/member/member_controller.dart

@@ -606,16 +606,9 @@ class MemberController extends BaseController implements PaymentStatusCallback {
     if (pageType == MemberPageType.addFriendToEnter) {
       ///购买成功之后弹出
       afterTheFirstPurchasePromptSharingBoxPops();
+    } else {
+      onPaySucessShow();
     }
-    try {
-      WechatQrCodeDialog.dismiss();
-      AlipayQrCodeDialog.dismiss();
-      CustomLoadingDialog.hide();
-      LoadingDialog.hide();
-    } catch (e) {
-      debugPrint('zk---onPaymentSuccess error: $e');
-    }
-    showPaymentSuccessDialog(onConfirm: back, onCancel: back);
   }
 
   ///第一次购买之后弹出提示分享框
@@ -626,8 +619,28 @@ class MemberController extends BaseController implements PaymentStatusCallback {
           WechatShareUtil.shareWebPage().catchError((error) {
             ToastUtil.show(error);
           });
+          onPaySucessShow();
+        },cancelOnTap: () {
+          onPaySucessShow();
         });
+      } else {
+        onPaySucessShow();
       }
+    }).catchError((erro) {
+      onPaySucessShow();
     });
   }
+
+  ///支付成功之后展示
+  void onPaySucessShow() {
+    try {
+      WechatQrCodeDialog.dismiss();
+      AlipayQrCodeDialog.dismiss();
+      CustomLoadingDialog.hide();
+      LoadingDialog.hide();
+    } catch (e) {
+      debugPrint('zk---onPaymentSuccess error: $e');
+    }
+    showPaymentSuccessDialog(onConfirm: back, onCancel: back);
+  }
 }

+ 1 - 0
lib/module/member/member_payment_completed_dialog.dart

@@ -23,6 +23,7 @@ class MemberPaymentCompletedDialog {
             MemberPaymentCompletedTipView(
                 cancelOnTap: () {
                   Get.back();
+                  cancelOnTap!();
                 },
                 confirmOnTap: confirmOnTap)
           ],