订单列表与订单详情页，支付弹窗关闭时，页面不应该跳转

RainbowPlanet/RainbowPlanet/AppDelegate/AppDelegate.swift

@@ -16,13 +16,16 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         //初始化窗口
         initWindow()
-        //初始化友盟
-        UMManager.shared().initUM(launchOptions: launchOptions)
-        IQKeyboardManagerSwiftManager.shared().initIQKeyboardManagerSwift()
+        
         DispatchQueue.global(qos: .default).async {
             //初始化百度地图
             BaiduMapManager.shared.initBaiduMap()
             //初始化键盘
+            DispatchQueue.main.async {
+                //初始化友盟
+                UMManager.shared().initUM(launchOptions: launchOptions)
+                IQKeyboardManagerSwiftManager.shared().initIQKeyboardManagerSwift()
+            }
         }
     
         return true

RainbowPlanet/RainbowPlanet/Modules/OrderModule/Order/ViewController/OrderListViewController.swift

@@ -101,30 +101,6 @@ class OrderListViewController: UIViewController {
         }
     }
     
-    /// 订单列表
-    ///
-    /// - Parameter page: <#page description#>
-    func orderPurchaseOrderListApiAll(page:Int = 1) {
-        
-        SwiftMoyaNetWorkServiceOrder.shared().orderPurchaseOrderListApi(page: page, status: -1) {
-            [weak self] (orderListModel) -> (Void) in
-            let orderListModel = orderListModel as? OrderListModel
-            if orderListModel?.pagination?.currentPage ?? 1  <= orderListModel?.pagination?.totalPages ?? 1 {
-                if orderListModel?.pagination?.currentPage == 1{
-                    self?.orderModelArray.removeAll()
-                    self?.orderListView.tableView.resetNoMoreData()
-                }
-                self?.orderModelArray = (self?.orderModelArray)! + (orderListModel?.data!)!
-                self?.orderListView.tableView.reloadData()
-                if self?.orderModelArray.isEmpty ?? true {
-                    self?.orderListView.tableView.isHiddenFooter(true)
-                }
-            }else {
-                self?.orderListView.tableView.endFooterNoMoreData()
-            }
-        }
-    }
-    
     func setButton(button:UIButton,orderModel:OrderModel) {
         if let setButtonBlock = setButtonBlock {
             setButtonBlock(button,orderModel)

RainbowPlanet/RainbowPlanet/Tools/AlertSheetView/AlertSheetView.swift

@@ -100,7 +100,7 @@ class AlertSheetView: NSObject {
         vProperty.maskViewColor = UIColor(white: 0, alpha: 0.5)
         vProperty.touchWildToHide = "0"
         vProperty.popupViewEdgeInsets = UIEdgeInsets(top: 0, left: 0, bottom: 0, right: 0)
-        vProperty.animationDuration = 0.5
+        vProperty.animationDuration = 0.3
         payView.vProperty = vProperty
         payView.show()
         payView.disTransBlock = {