报名逻辑完善

galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/C/YHActivityDetailViewController.swift

@@ -51,10 +51,8 @@ class YHActivityDetailViewController: YHBaseViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         setupUI()
-//        loadData()
     }
     
-    
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         loadData()

galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/C/YHActivityListViewController.swift

@@ -173,6 +173,10 @@ class YHActivityListViewController: YHBaseViewController {
         }
         
         emptyDataTipsView.isHidden = viewModel.arrActivityListData.count > 0 ? true : false
+        
+        
+       
+    
     }
     
     

galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/C/YHActivityTravelViewController.swift

@@ -135,8 +135,30 @@ extension YHActivityTravelViewController {
             }
             
         } else if self.viewModel.activityTravelModel?.status.int == 4 {
-            //报名
-            self.showApplyUI()
+            
+            if let nav = self.navigationController {
+                let rrr = nav.viewControllers.contains { $0.isKind(of: YHActivityDetailViewController.self) }
+                if rrr {
+                    
+                    var  targetVc : UIViewController?
+                    for(_,value) in nav.viewControllers.enumerated() {
+                        if value.isKind(of: YHActivityDetailViewController.self) {
+                            targetVc = value
+                            break
+                        }
+                    }
+                    
+                    if let vc = targetVc {
+                        navigationController?.popToViewController(vc, animated: true)
+                    }
+                    return
+                }
+            }
+            
+            
+            let vc = YHActivityDetailViewController()
+            vc.activityId = String(self.viewModel.activityTravelModel?.id ?? 0)
+            navigationController?.pushViewController(vc)
         }
     }
     
@@ -167,13 +189,12 @@ extension YHActivityTravelViewController {
         viewModel.applyActivity(param: param) { success, error in
             if success {
                 YHHUD.flash(message: "报名成功")
-//                self.loadData()
-//                DispatchQueue.main.async {
-//                    let vc = YHApplyActivityResultViewController()
-//                    vc.activityTravelId = String(self.viewModel.activityTravelModel?.id ?? 0)
-//                    self.navigationController?.pushViewController(vc)
-//                }
-                self.navigationController?.popToRootViewController(animated: true)
+                self.loadData()
+                DispatchQueue.main.async {
+                    let vc = YHApplyActivityResultViewController()
+                    vc.activityTravelId = String(self.viewModel.activityTravelModel?.id ?? 0)
+                    self.navigationController?.pushViewController(vc)
+                }
             } else {
                 let msg = error?.errorMsg ?? "报名失败,请重试"
                 YHHUD.flash(message: msg)