报名优化

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

@@ -181,7 +181,7 @@ extension YHActivityDetailViewController {
                 DispatchQueue.main.async {
                     let vc = YHApplyActivityResultViewController()
                     vc.isSuccessFlag = true
-                    vc.activityTravelId = String(self.viewModel.activityTravelModel?.id ?? 0)
+                    vc.activityTravelId = self.viewModel.travelModel?.id ?? ""
                     self.navigationController?.pushViewController(vc)
                 }
             } else {

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

@@ -36,7 +36,6 @@ enum YHActivityStatus: Int {
         }
     }
     
-    
     var titleForMyApplyList : String {
         switch self {
         case .notApply:
@@ -83,6 +82,22 @@ enum YHActivityStatus: Int {
             return UIColor.clear
         }
     }
+    
+    
+    var activityColorForMyApplyList : UIColor {
+        switch self {
+        case .notApply:
+            return UIColor.brandMainColor
+        case .applied:
+            return UIColor.successColor
+        case .end:
+            return UIColor.mainTextColor30
+        case .canceled:
+            return UIColor.mainTextColor30
+        default:
+            return UIColor.clear
+        }
+    }
 }
 
 
@@ -169,7 +184,7 @@ class YHActivityListViewController: YHBaseViewController {
 
 extension YHActivityListViewController {
     func loadMoreData() {
-        self.viewModel.getActivityList(firstFlag : false) {[weak self] success, error in
+        self.viewModel.getActivityList(firstFlag : false,type : type) {[weak self] success, error in
             guard let self = self else { return }
             DispatchQueue.main.asyncAfter(wallDeadline: .now() + 0.35, execute: {
                 self.tableView.es.stopLoadingMore()
@@ -184,7 +199,7 @@ extension YHActivityListViewController {
     }
     
     func loadFirstData() {
-        self.viewModel.getActivityList(firstFlag : true) {[weak self] success, error in
+        self.viewModel.getActivityList(firstFlag : true,type: type) {[weak self] success, error in
             guard let self = self else { return }
             
             DispatchQueue.main.asyncAfter(deadline: .now()+0.5, execute: {
@@ -219,6 +234,7 @@ extension YHActivityListViewController: UITableViewDelegate, UITableViewDataSour
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell = tableView.dequeueReusableCell(withIdentifier: YHActivityListCell.cellReuseIdentifier, for: indexPath) as! YHActivityListCell
         cell.sessionIndex = indexPath.section
+        cell.type = type
         
         if indexPath.section < viewModel.arrActivityListData.count {
             cell.dataModel = viewModel.arrActivityListData[indexPath.section]
@@ -234,6 +250,14 @@ extension YHActivityListViewController: UITableViewDelegate, UITableViewDataSour
         if indexPath.section < viewModel.arrActivityListData.count {
             let model = viewModel.arrActivityListData[indexPath.section]
             
+            if type == 1 && model.status.int == 2 {
+                
+                let vc = YHActivityTravelViewController()
+                vc.travelId = model.checkId
+                navigationController?.pushViewController(vc)
+                return
+            }
+            
             let vc = YHActivityDetailViewController()
             vc.activityId = String(model.id) 
             navigationController?.pushViewController(vc)

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

@@ -61,7 +61,6 @@ class YHActivityTravelViewController: YHBaseViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         setupUI()
-        loadData()
     }
     
     

galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/M/YHActivityDetailModel.swift

@@ -23,5 +23,5 @@ class YHActivityDetailModel: YHActivityModel {
     var introduce : String = "" //活动介绍
     var posters : [String] = [] //活动海报
     
-    var checkId : String = ""   //活动行程ID 仅当活动状态为2（已报名）时才大于0
+   
 }

galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/M/YHActivityModel.swift

@@ -17,4 +17,7 @@ class YHActivityModel: YHBaseModel {
     var endTime : String = ""   //结束时间戳
     var place : String = ""     //活动地点
     var status : String = ""    //活动的状态 1：立即报名 2：已报名 3：活动结束 4：已取消报名
+    
+    
+    var checkId : String = ""   //活动行程ID 仅当活动状态为2（已报名）时才大于0
 }

galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/V/YHActivityListCell.swift

@@ -18,6 +18,8 @@ class YHActivityListCell: UITableViewCell {
         }
     }
     
+    var type : Int = 0
+    
     
     var sessionIndex : Int = 0 {
         didSet {
@@ -126,6 +128,8 @@ extension YHActivityListCell {
         
         if let url = URL(string: model.cover) {
             activityImgV.kf.setImage(with: url, placeholder: UIImage(named: "global_default_image"))
+        } else {
+            activityImgV.image = UIImage(named: "global_default_image")
         }
         
         //
@@ -135,8 +139,13 @@ extension YHActivityListCell {
         detailLabel.text = model.place
         
         if let status = Int(model.status) {
-            statusLabel.text = YHActivityStatus.init(rawValue: status)?.titleForList
-            statusLabel.textColor = YHActivityStatus.init(rawValue: status)?.activityColor
+            if type == 0 {
+                statusLabel.text = YHActivityStatus.init(rawValue: status)?.titleForList
+                statusLabel.textColor = YHActivityStatus.init(rawValue: status)?.activityColor
+            } else {
+                statusLabel.text = YHActivityStatus.init(rawValue: status)?.titleForMyApplyList
+                statusLabel.textColor = YHActivityStatus.init(rawValue: status)?.activityColorForMyApplyList
+            }
         } else {
             statusLabel.text = ""
         }

galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/V/YHActivityTravelitemView.swift

@@ -106,9 +106,12 @@ extension YHActivityTravelitemView {
         
         if let url = URL(string: model.cover) {
             activityImgV.kf.setImage(with: url, placeholder: UIImage(named: "global_default_image"))
+        } else {
+            activityImgV.image = UIImage(named: "global_default_image")
         }
         
         
+        
         timeLable.text = String(model.beginTime)
         addressLable.text = model.place
         navAddressLable.text = model.guidance

galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/VM/YHActivityViewModel.swift

@@ -9,15 +9,11 @@
 import UIKit
 
 class YHActivityViewModel: YHBaseViewModel {
-    
-    
-    
-    
-    //1、活动列表
+    //1、活动列表 、 我的报名活动列表
     var hasMoreForActivityList : Bool = true
     var isRequestActivityListDataFlag : Bool = false
     private var curPageIndex : Int = 1
-    private var page_Size : Int = 3 //for test hjl
+    private var page_Size : Int = 20
     private var totalCount : Int = 0
     var arrActivityListData : [YHActivityModel] = []
     
@@ -162,8 +158,9 @@ extension YHActivityViewModel {
     /*
      *活动列表
      firstFlag  true - 首次  false - 更多
+     type 0-活动列表  1-我的报名活动列表
      */
-    func getActivityList(firstFlag : Bool,callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) {
+    func getActivityList(firstFlag : Bool,type : Int = 0,callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) {
         
         if firstFlag == false {
             guard hasMoreForActivityList == true  else {
@@ -189,7 +186,13 @@ extension YHActivityViewModel {
             params = ["page": curPageIndex + 1,
                       "page_size": page_Size]
         }
-        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Activity.listApi
+        var strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Activity.listApi
+        if type == 1 {
+            strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Activity.myListApi
+        } else if  type == 0 {
+            
+        }
+        
         
         let _ = YHNetRequest.getRequest(url: strUrl,params: params) { [weak self] json, code in
             guard let self = self else { return }

galaxy/galaxy/Classes/Tools/NetWork/YHAllApiName.swift

@@ -14,6 +14,9 @@ class YHAllApiName {
         //活动列表
         static let listApi = "super-app/activity/list"
         
+        //我的活动列表
+        static let myListApi = "super-app/activity/mine"
+        
         //活动详情
         static let detailApi = "super-app/activity/detail"