// 活动

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

@@ -86,20 +86,20 @@ enum YHActivityStatus: Int {
 
     var activityColor: UIColor {
         switch self {
-        case .notApply:
+        case .notApply: // 立即报名
             return UIColor.brandMainColor
-        case .applied:
-            return UIColor.successColor
-        case .end:
-            return UIColor.mainTextColor30
-        case .canceled:
+        case .applied: // 已报名
+            return UIColor.successColor2
+        case .end: // 活动结束
+            return UIColor.brandGrayColor5
+        case .canceled: // 已取消
+            return UIColor.brandGrayColor5
+        case .soldout: // 已下架
+            return UIColor.brandGrayColor5
+        case .scanSign: // 去签到
             return UIColor.brandMainColor
-        case .soldout:
-            return UIColor.mainTextColor30
-        case .scanSign:
-            return UIColor.successColor
-        case .signed:
-            return UIColor.mainTextColor30
+        case .signed: // 已签到
+            return UIColor.successColor2
         default:
             return UIColor.clear
         }
@@ -107,20 +107,20 @@ enum YHActivityStatus: Int {
 
     var activityColorForMyApplyList: UIColor {
         switch self {
-        case .notApply:
+        case .notApply: // 立即报名
             return UIColor.brandMainColor
-        case .applied:
-            return UIColor.successColor
-        case .end:
-            return UIColor.mainTextColor30
-        case .canceled:
-            return UIColor.mainTextColor30
-        case .soldout:
-            return UIColor.mainTextColor30
-        case .scanSign:
-            return UIColor.successColor
-        case .signed:
-            return UIColor.mainTextColor30
+        case .applied: // 已报名
+            return UIColor.successColor2
+        case .end: // 活动结束
+            return UIColor.brandGrayColor5
+        case .canceled: // 已取消
+            return UIColor.brandGrayColor5
+        case .soldout: // 已下架
+            return UIColor.brandGrayColor5
+        case .scanSign: // 去签到
+            return UIColor.brandMainColor
+        case .signed: // 已签到
+            return UIColor.successColor2
         default:
             return UIColor.clear
         }
@@ -131,17 +131,17 @@ enum YHActivityStatus: Int {
         case .notApply:
             return UIColor.brandGrayColor8
         case .applied:
-            return UIColor.successColor
+            return UIColor.successColor2
         case .end:
-            return UIColor.mainTextColor30
+            return UIColor.brandGrayColor4
         case .canceled:
             return UIColor.brandGrayColor8
         case .soldout:
-            return UIColor.mainTextColor30
+            return UIColor.brandGrayColor4
         case .scanSign:
             return UIColor.brandGrayColor8
         case .signed:
-            return UIColor.mainTextColor30
+            return UIColor.brandGrayColor4
         default:
             return UIColor.clear
         }

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

@@ -324,15 +324,16 @@ extension YHActivityTravelViewController {
     }
     
     @objc func clickleftButton() {
-        if self.viewModel.activityTravelModel?.status.int == 2 {
-            // 取消
+        if self.viewModel.activityTravelModel?.status.int == YHActivityStatus.applied.rawValue { //
+            // 已报名
             YHCommonAlertView.show("", "是否取消报名?", "是", "否", fullGuestureEnable: false) {
                 self.cancelActivityApply()
+                
             } callBack: {
             }
             
-        } else if self.viewModel.activityTravelModel?.status.int == 4 {
-            
+        } else if self.viewModel.activityTravelModel?.status.int == YHActivityStatus.canceled.rawValue {
+            // 已取消
             if let nav = self.navigationController {
                 let rrr = nav.viewControllers.contains { $0.isKind(of: YHActivityDetailViewController.self) }
                 if rrr {

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

@@ -63,20 +63,12 @@ extension YHActivityViewModel {
             
             // 1. json字符串 转 对象
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String: Any], let result = YHActivityTravelModel.deserialize(from: dic) else {
-                    self.activityTravelModel = nil
-                    callBackBlock(false, nil)
-                    return
-                }
-                self.activityTravelModel = result
                 callBackBlock(true, nil)
             } else {
-//                self.activityTravelModel = nil
                 let error: YHErrorModel = YHErrorModel(errorCode: Int32(json.code), errorMsg: json.msg)
                 callBackBlock(false, error)
             }
         } failBlock: { err in
-//            self.activityTravelModel = nil
             callBackBlock(false, err)
         }
     }