// 活动

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

@@ -92,8 +92,8 @@ enum YHActivityStatus: Int {
             return UIColor.successColor2
         case .end: // 活动结束
             return UIColor.brandGrayColor5
-        case .canceled: // 已取消
-            return UIColor.brandGrayColor5
+        case .canceled: // 已取消 立即报名
+            return UIColor.brandMainColor
         case .soldout: // 已下架
             return UIColor.brandGrayColor5
         case .scanSign: // 去签到
@@ -113,8 +113,8 @@ enum YHActivityStatus: Int {
             return UIColor.successColor2
         case .end: // 活动结束
             return UIColor.brandGrayColor5
-        case .canceled: // 已取消
-            return UIColor.brandGrayColor5
+        case .canceled: // 已取消 立即报名
+            return UIColor.brandMainColor
         case .soldout: // 已下架
             return UIColor.brandGrayColor5
         case .scanSign: // 去签到

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

@@ -121,6 +121,9 @@ class YHActivitySignSuccessViewController: YHBaseViewController {
             }
             self.tableView.isHidden = !success
             self.signFailBgView.isHidden = success
+            backImgV.isHidden = !success
+            gk_navTitle = success ? "" : "签到结果"
+            
             self.result = self.viewModel.signActivityModel
             self.hasPrize = false
             if let _ = self.viewModel.signActivityModel?.gift {

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

@@ -37,7 +37,7 @@ class YHApplyActivityResultViewController: YHBaseViewController {
     
     lazy var nameLabel: UILabel = {
         let lable = UILabel()
-        lable.textColor = UIColor.mainTextColor30
+        lable.textColor = UIColor.brandGrayColor5
         lable.textAlignment = .center
         lable.font = UIFont.PFSC_R(ofSize: 14)
         lable.text = "已报名成功活动【哈佛爸爸线下教育沙龙】，记得准时参加哦"
@@ -47,17 +47,14 @@ class YHApplyActivityResultViewController: YHBaseViewController {
     
     lazy var submitButton: UIButton = {
         let button = UIButton(type: .custom)
-        button.titleLabel?.font = UIFont.PFSC_R(ofSize: 16)
+        button.titleLabel?.font = UIFont.PFSC_M(ofSize: 15)
         button.contentHorizontalAlignment = .center
         button.setTitle("查看行程单", for: .normal)
-        button.setTitle("查看行程单", for: .highlighted)
-        button.setTitleColor( UIColor(hex: 0xffffff), for: .normal)
-        button.setTitleColor( UIColor(hex: 0xffffff), for: .highlighted)
+        button.setTitleColor( UIColor.brandGrayColor8, for: .normal)
         button.layer.cornerRadius = kCornerRadius3
         button.addTarget(self, action: #selector(clickSubmitBtn), for: .touchUpInside)
-        button.layer.cornerRadius = kCornerRadius3
         button.clipsToBounds = true
-        button.backgroundColor = .brandMainColor
+        button.backgroundColor = .brandGrayColor2
         return button
     }()
     
@@ -77,7 +74,7 @@ extension YHApplyActivityResultViewController {
         
         view.addSubview(statusImageV)
         statusImageV.snp.makeConstraints { make in
-            make.top.equalTo(180)
+            make.top.equalTo(k_Height_NavigationtBarAndStatuBar+93)
             make.centerX.equalToSuperview()
             make.height.width.equalTo(128)
         }