Merge remote-tracking branch 'refs/remotes/origin/v1.1.5' into v1.1.5-iOS

# Conflicts:
#	lib/module/member/member_controller.dart

lib/module/member/member_controller.dart

@@ -96,7 +96,6 @@ class MemberController extends BaseController implements PaymentStatusCallback {
 
   Duration? get activityDuration => memberRepository.activityDuration.value;
 
-  bool _isShowPayFailedDialog = false; // 是否已经展示过支付失败弹窗
 
   ///检查续订的状态
   final Rx<SubscriptionCheckResponse> _checkResponse =
@@ -321,16 +320,20 @@ class MemberController extends BaseController implements PaymentStatusCallback {
 
   ///用户取消支付展示
   void userCancelsPaymentDisplay() {
-    if (_isShowPayFailedDialog) {
-      if (Platform.isAndroid) back();
+    if (Platform.isAndroid) {
+      back();
+    } else if (Platform.isIOS) {
+      // 要执行的代码
+      Future.delayed(Duration(milliseconds: 500), () {
+        showRetainDialog(isBack: true);
+      });
     } else {
       showRetainDialog(isBack: true);
     }
   }
 
   ///支付错误的时候调用
-  void showRetainDialog({bool isBack = false, int? errno, VoidCallback? onCancelClick, }) {
-    _isShowPayFailedDialog = true;
+  void showRetainDialog({bool isBack = false, int? errno}) {
     MemberRetainDialog.show(
         payClick: () {
           onBuyClick();