我的活动报名列表 处理已下架状态的 及点击事件

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

@@ -19,6 +19,7 @@ enum YHActivityStatus: Int {
     case applied = 2 // 已报名
     case end = 3 // 活动结束
     case canceled = 4 // 已取消报名
+    case soldout = 5 //商品下架
     
     
     var titleForList : String {
@@ -31,6 +32,8 @@ enum YHActivityStatus: Int {
             return "活动结束"
         case .canceled:
             return "立即报名"
+        case .soldout:
+            return "已下架"
         default:
             return ""
         }
@@ -46,6 +49,8 @@ enum YHActivityStatus: Int {
             return "活动结束"
         case .canceled:
             return "已取消"
+        case .soldout:
+            return "已下架"
         default:
             return ""
         }
@@ -78,6 +83,8 @@ enum YHActivityStatus: Int {
             return UIColor.mainTextColor30
         case .canceled:
             return UIColor.brandMainColor
+        case .soldout:
+            return UIColor.mainTextColor30
         default:
             return UIColor.clear
         }
@@ -260,11 +267,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)
+            if type == 1 {
+                if model.status.int == 2 {
+                    let vc = YHActivityTravelViewController()
+                    vc.travelId = model.checkId
+                    navigationController?.pushViewController(vc)
+                } else if model.status.int == 5 {
+                    YHHUD.flash(message: "活动已下架")
+                }
                 return
             }
             

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

@@ -133,7 +133,7 @@ extension YHActivityListCell {
         }
         
         //
-        dateLabel.text = model.getDateString()//String(model.beginTime)
+        dateLabel.text = model.getDateString()
         
         //
         detailLabel.text = model.place