Merge branch 'refs/heads/v1.1.5' into v1.1.5-iOS

lib/module/member/member_controller.dart

@@ -103,6 +103,8 @@ class MemberController extends BaseController implements PaymentStatusCallback {
 
   SubscriptionCheckResponse? get requestCheckResponse => _checkResponse.value;
 
+  bool _isShowPayFailedDialog = false; // 是否已经展示过支付失败弹窗
+
   final List<MemberFunBean> funList = [
     MemberFunBean(1, Assets.images.iconMemberFun1.path,
         StringName.memberFunName1, StringName.memberFunName1Desc),
@@ -320,6 +322,10 @@ class MemberController extends BaseController implements PaymentStatusCallback {
 
   ///用户取消支付展示
   void userCancelsPaymentDisplay() {
+    if (_isShowPayFailedDialog) {
+      if (Platform.isAndroid) back();
+      return;
+    }
     if (Platform.isAndroid) {
       showRetainDialog(isBack: true);
     } else {
@@ -331,6 +337,7 @@ class MemberController extends BaseController implements PaymentStatusCallback {
 
   ///支付错误的时候调用
   void showRetainDialog({bool isBack = false, int? errno}) {
+    _isShowPayFailedDialog = true;
     MemberRetainDialog.show(
         payClick: () {
           onBuyClick();