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

@@ -321,14 +321,11 @@ class MemberController extends BaseController implements PaymentStatusCallback {
   ///用户取消支付展示
   void userCancelsPaymentDisplay() {
     if (Platform.isAndroid) {
-      back();
-    } else if (Platform.isIOS) {
-      // 要执行的代码
+      showRetainDialog(isBack: true);
+    } else {
       Future.delayed(Duration(milliseconds: 500), () {
         showRetainDialog(isBack: true);
       });
-    } else {
-      showRetainDialog(isBack: true);
     }
   }