xiongzhu 7 gadi atpakaļ
vecāks
revīzija
bc717e5697
40 mainītis faili ar 1221 papildinājumiem un 338 dzēšanām
  1. 40 20
      model.xcodeproj/project.pbxproj
  2. 23 0
      model/Assets.xcassets/icon_didian.imageset/Contents.json
  3. BIN
      model/Assets.xcassets/icon_didian.imageset/icon_didian.png
  4. BIN
      model/Assets.xcassets/icon_didian.imageset/icon_didian@2x.png
  5. BIN
      model/Assets.xcassets/icon_didian.imageset/icon_didian@3x.png
  6. 23 0
      model/Assets.xcassets/icon_renshu.imageset/Contents.json
  7. BIN
      model/Assets.xcassets/icon_renshu.imageset/icon_renshu.png
  8. BIN
      model/Assets.xcassets/icon_renshu.imageset/icon_renshu@2x.png
  9. BIN
      model/Assets.xcassets/icon_renshu.imageset/icon_renshu@3x.png
  10. 23 0
      model/Assets.xcassets/icon_share.imageset/Contents.json
  11. BIN
      model/Assets.xcassets/icon_share.imageset/icon_fenxiang_baise.png
  12. BIN
      model/Assets.xcassets/icon_share.imageset/icon_fenxiang_baise@2x.png
  13. BIN
      model/Assets.xcassets/icon_share.imageset/icon_fenxiang_baise@3x.png
  14. 23 0
      model/Assets.xcassets/icon_shijian.imageset/Contents.json
  15. BIN
      model/Assets.xcassets/icon_shijian.imageset/icon_shijian.png
  16. BIN
      model/Assets.xcassets/icon_shijian.imageset/icon_shijian@2x.png
  17. BIN
      model/Assets.xcassets/icon_shijian.imageset/icon_shijian@3x.png
  18. 23 0
      model/Assets.xcassets/个人中心/icon_back.imageset/Contents.json
  19. BIN
      model/Assets.xcassets/个人中心/icon_back.imageset/icon_back.png
  20. BIN
      model/Assets.xcassets/个人中心/icon_back.imageset/icon_back@2x.png
  21. BIN
      model/Assets.xcassets/个人中心/icon_back.imageset/icon_back@3x.png
  22. 5 7
      model/Classes/Application/ModelHeader.h
  23. BIN
      model/Classes/Controllers/.DS_Store
  24. 8 4
      model/Classes/Controllers/ActivityVC/ActivityDetailViewController.h
  25. 85 117
      model/Classes/Controllers/ActivityVC/ActivityDetailViewController.m
  26. 390 47
      model/Classes/Controllers/ActivityVC/ActivityDetailViewController.xib
  27. 20 0
      model/Classes/Controllers/ActivityVC/ModelFansTableViewCell.h
  28. 46 0
      model/Classes/Controllers/ActivityVC/ModelFansTableViewCell.m
  29. 109 0
      model/Classes/Controllers/ActivityVC/ModelFansTableViewCell.xib
  30. 40 38
      model/Classes/Controllers/ActivityVC/PlatformActivityController.m
  31. 10 9
      model/Classes/Controllers/ActivityVC/SignInfoCell.m
  32. 7 6
      model/Classes/Controllers/ActivityVC/SignInfoCell.xib
  33. 17 0
      model/Classes/Controllers/ActivityVC/SignListViewController.h
  34. 108 0
      model/Classes/Controllers/ActivityVC/SignListViewController.m
  35. 39 0
      model/Classes/Controllers/ActivityVC/SignListViewController.xib
  36. 2 1
      model/Classes/Controllers/ActivityVC/SignUpViewController.h
  37. 129 43
      model/Classes/Controllers/ActivityVC/SignUpViewController.m
  38. 30 29
      model/Classes/Controllers/ActivityVC/SignUpViewController.xib
  39. 17 13
      model/Classes/Controllers/Model/ActivityModel.h
  40. 4 4
      model/Classes/Controllers/Model/ActivityModel.m

+ 40 - 20
model.xcodeproj/project.pbxproj

@@ -40,12 +40,10 @@
 		2F4A8956211ADB56006D7DD3 /* PingLunModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 2F4A8955211ADB56006D7DD3 /* PingLunModel.m */; };
 		2F4A896B211D9F04006D7DD3 /* PlatformActivityController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2F4A895D211D9F03006D7DD3 /* PlatformActivityController.m */; };
 		2F4A896C211D9F04006D7DD3 /* SignViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 2F4A895E211D9F03006D7DD3 /* SignViewCell.m */; };
-		2F4A896D211D9F04006D7DD3 /* ActivityDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2F4A895F211D9F03006D7DD3 /* ActivityDetailViewController.m */; };
+		2F4A896D211D9F04006D7DD3 /* SignUpViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2F4A895F211D9F03006D7DD3 /* SignUpViewController.m */; };
 		2F4A896E211D9F04006D7DD3 /* SignViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2F4A8960211D9F03006D7DD3 /* SignViewCell.xib */; };
-		2F4A896F211D9F04006D7DD3 /* ActivityDetailViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2F4A8961211D9F03006D7DD3 /* ActivityDetailViewController.xib */; };
+		2F4A896F211D9F04006D7DD3 /* SignUpViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2F4A8961211D9F03006D7DD3 /* SignUpViewController.xib */; };
 		2F4A8970211D9F04006D7DD3 /* SignInfoCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 2F4A8962211D9F03006D7DD3 /* SignInfoCell.m */; };
-		2F4A8971211D9F04006D7DD3 /* SignUpViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2F4A8963211D9F03006D7DD3 /* SignUpViewController.m */; };
-		2F4A8972211D9F04006D7DD3 /* SignUpViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2F4A8968211D9F03006D7DD3 /* SignUpViewController.xib */; };
 		2F4A8973211D9F04006D7DD3 /* SignInfoCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2F4A8969211D9F03006D7DD3 /* SignInfoCell.xib */; };
 		2F4A8976211D9F16006D7DD3 /* ActivityModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 2F4A8974211D9F16006D7DD3 /* ActivityModel.m */; };
 		2F7FC05521242E4700492F0C /* NTESMediaPreviewViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2F7FC04721242E4600492F0C /* NTESMediaPreviewViewController.m */; };
@@ -373,6 +371,12 @@
 		3A5EC75B2186FBED00A9438E /* MyTeamHeader.m in Sources */ = {isa = PBXBuildFile; fileRef = 3A5EC75A2186FBED00A9438E /* MyTeamHeader.m */; };
 		3A5EC760218707E800A9438E /* PromoteController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3A5EC75E218707E800A9438E /* PromoteController.m */; };
 		3A5EC761218707E800A9438E /* PromoteController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3A5EC75F218707E800A9438E /* PromoteController.xib */; };
+		3A9D325B21DCB6960002E00E /* ActivityDetailViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3A9D325821DCB6950002E00E /* ActivityDetailViewController.xib */; };
+		3A9D325C21DCB6960002E00E /* ActivityDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3A9D325A21DCB6950002E00E /* ActivityDetailViewController.m */; };
+		3A9D326021DCB7140002E00E /* SignListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3A9D325E21DCB7130002E00E /* SignListViewController.m */; };
+		3A9D326121DCB7140002E00E /* SignListViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3A9D325F21DCB7140002E00E /* SignListViewController.xib */; };
+		3A9D326521DCB74D0002E00E /* ModelFansTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3A9D326221DCB74C0002E00E /* ModelFansTableViewCell.xib */; };
+		3A9D326621DCB74D0002E00E /* ModelFansTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 3A9D326421DCB74D0002E00E /* ModelFansTableViewCell.m */; };
 		3AC5C9FE218BD9A600D4ACAC /* RankChildController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3AC5C9FC218BD9A600D4ACAC /* RankChildController.m */; };
 		3AC5C9FF218BD9A600D4ACAC /* RankChildController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3AC5C9FD218BD9A600D4ACAC /* RankChildController.xib */; };
 		3AC5CA03218BDDC700D4ACAC /* RankCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 3AC5CA01218BDDC700D4ACAC /* RankCell.m */; };
@@ -510,18 +514,15 @@
 		2F4A8955211ADB56006D7DD3 /* PingLunModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PingLunModel.m; sourceTree = "<group>"; };
 		2F4A895D211D9F03006D7DD3 /* PlatformActivityController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PlatformActivityController.m; sourceTree = "<group>"; };
 		2F4A895E211D9F03006D7DD3 /* SignViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SignViewCell.m; sourceTree = "<group>"; };
-		2F4A895F211D9F03006D7DD3 /* ActivityDetailViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ActivityDetailViewController.m; sourceTree = "<group>"; };
+		2F4A895F211D9F03006D7DD3 /* SignUpViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SignUpViewController.m; sourceTree = "<group>"; };
 		2F4A8960211D9F03006D7DD3 /* SignViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SignViewCell.xib; sourceTree = "<group>"; };
-		2F4A8961211D9F03006D7DD3 /* ActivityDetailViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ActivityDetailViewController.xib; sourceTree = "<group>"; };
+		2F4A8961211D9F03006D7DD3 /* SignUpViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SignUpViewController.xib; sourceTree = "<group>"; };
 		2F4A8962211D9F03006D7DD3 /* SignInfoCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SignInfoCell.m; sourceTree = "<group>"; };
-		2F4A8963211D9F03006D7DD3 /* SignUpViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SignUpViewController.m; sourceTree = "<group>"; };
 		2F4A8964211D9F03006D7DD3 /* PlatformActivityController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformActivityController.h; sourceTree = "<group>"; };
 		2F4A8965211D9F03006D7DD3 /* SignViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SignViewCell.h; sourceTree = "<group>"; };
-		2F4A8966211D9F03006D7DD3 /* ActivityDetailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ActivityDetailViewController.h; sourceTree = "<group>"; };
+		2F4A8966211D9F03006D7DD3 /* SignUpViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SignUpViewController.h; sourceTree = "<group>"; };
 		2F4A8967211D9F03006D7DD3 /* SignInfoCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SignInfoCell.h; sourceTree = "<group>"; };
-		2F4A8968211D9F03006D7DD3 /* SignUpViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SignUpViewController.xib; sourceTree = "<group>"; };
 		2F4A8969211D9F03006D7DD3 /* SignInfoCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SignInfoCell.xib; sourceTree = "<group>"; };
-		2F4A896A211D9F03006D7DD3 /* SignUpViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SignUpViewController.h; sourceTree = "<group>"; };
 		2F4A8974211D9F16006D7DD3 /* ActivityModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ActivityModel.m; sourceTree = "<group>"; };
 		2F4A8975211D9F16006D7DD3 /* ActivityModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ActivityModel.h; sourceTree = "<group>"; };
 		2F7FC04721242E4600492F0C /* NTESMediaPreviewViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NTESMediaPreviewViewController.m; sourceTree = "<group>"; };
@@ -1165,6 +1166,15 @@
 		3A5EC75D218707E800A9438E /* PromoteController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PromoteController.h; sourceTree = "<group>"; };
 		3A5EC75E218707E800A9438E /* PromoteController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PromoteController.m; sourceTree = "<group>"; };
 		3A5EC75F218707E800A9438E /* PromoteController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PromoteController.xib; sourceTree = "<group>"; };
+		3A9D325821DCB6950002E00E /* ActivityDetailViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ActivityDetailViewController.xib; sourceTree = "<group>"; };
+		3A9D325921DCB6950002E00E /* ActivityDetailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ActivityDetailViewController.h; sourceTree = "<group>"; };
+		3A9D325A21DCB6950002E00E /* ActivityDetailViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ActivityDetailViewController.m; sourceTree = "<group>"; };
+		3A9D325D21DCB7130002E00E /* SignListViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SignListViewController.h; sourceTree = "<group>"; };
+		3A9D325E21DCB7130002E00E /* SignListViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SignListViewController.m; sourceTree = "<group>"; };
+		3A9D325F21DCB7140002E00E /* SignListViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SignListViewController.xib; sourceTree = "<group>"; };
+		3A9D326221DCB74C0002E00E /* ModelFansTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ModelFansTableViewCell.xib; sourceTree = "<group>"; };
+		3A9D326321DCB74D0002E00E /* ModelFansTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ModelFansTableViewCell.h; sourceTree = "<group>"; };
+		3A9D326421DCB74D0002E00E /* ModelFansTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ModelFansTableViewCell.m; sourceTree = "<group>"; };
 		3AC5C9FB218BD9A600D4ACAC /* RankChildController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RankChildController.h; sourceTree = "<group>"; };
 		3AC5C9FC218BD9A600D4ACAC /* RankChildController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RankChildController.m; sourceTree = "<group>"; };
 		3AC5C9FD218BD9A600D4ACAC /* RankChildController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = RankChildController.xib; sourceTree = "<group>"; };
@@ -1376,18 +1386,24 @@
 			children = (
 				2F4A8964211D9F03006D7DD3 /* PlatformActivityController.h */,
 				2F4A895D211D9F03006D7DD3 /* PlatformActivityController.m */,
-				2F4A896A211D9F03006D7DD3 /* SignUpViewController.h */,
-				2F4A8963211D9F03006D7DD3 /* SignUpViewController.m */,
-				2F4A8968211D9F03006D7DD3 /* SignUpViewController.xib */,
-				2F4A8966211D9F03006D7DD3 /* ActivityDetailViewController.h */,
-				2F4A895F211D9F03006D7DD3 /* ActivityDetailViewController.m */,
-				2F4A8961211D9F03006D7DD3 /* ActivityDetailViewController.xib */,
+				3A9D325921DCB6950002E00E /* ActivityDetailViewController.h */,
+				3A9D325A21DCB6950002E00E /* ActivityDetailViewController.m */,
+				3A9D325821DCB6950002E00E /* ActivityDetailViewController.xib */,
+				2F4A8966211D9F03006D7DD3 /* SignUpViewController.h */,
+				2F4A895F211D9F03006D7DD3 /* SignUpViewController.m */,
+				2F4A8961211D9F03006D7DD3 /* SignUpViewController.xib */,
 				2F4A8965211D9F03006D7DD3 /* SignViewCell.h */,
 				2F4A895E211D9F03006D7DD3 /* SignViewCell.m */,
 				2F4A8960211D9F03006D7DD3 /* SignViewCell.xib */,
 				2F4A8967211D9F03006D7DD3 /* SignInfoCell.h */,
 				2F4A8962211D9F03006D7DD3 /* SignInfoCell.m */,
 				2F4A8969211D9F03006D7DD3 /* SignInfoCell.xib */,
+				3A9D325D21DCB7130002E00E /* SignListViewController.h */,
+				3A9D325E21DCB7130002E00E /* SignListViewController.m */,
+				3A9D325F21DCB7140002E00E /* SignListViewController.xib */,
+				3A9D326321DCB74D0002E00E /* ModelFansTableViewCell.h */,
+				3A9D326421DCB74D0002E00E /* ModelFansTableViewCell.m */,
+				3A9D326221DCB74C0002E00E /* ModelFansTableViewCell.xib */,
 			);
 			path = ActivityVC;
 			sourceTree = "<group>";
@@ -3014,6 +3030,7 @@
 				2F4A894F211ADB00006D7DD3 /* OnlyTextCell.xib in Resources */,
 				8848C6942108529B00EDB121 /* HonorTableViewCell.xib in Resources */,
 				3AED5D3E21C359FC00B7AA6C /* SwitchClientAlertController.xib in Resources */,
+				3A9D325B21DCB6960002E00E /* ActivityDetailViewController.xib in Resources */,
 				2F4A8945211ADB00006D7DD3 /* TwoImageCell.xib in Resources */,
 				3AF450032185BD2E00ABEAEB /* SettingsViewController.xib in Resources */,
 				2FA1AF99212ACDEF005F12CA /* AgreementViewController.xib in Resources */,
@@ -3028,7 +3045,7 @@
 				3A5EC7562186F66500A9438E /* MyTeamCell.xib in Resources */,
 				3A54C9FE218D960400EA297E /* ShareCardController.xib in Resources */,
 				2F4A8950211ADB00006D7DD3 /* DetailOnlyTextCell.xib in Resources */,
-				2F4A896F211D9F04006D7DD3 /* ActivityDetailViewController.xib in Resources */,
+				2F4A896F211D9F04006D7DD3 /* SignUpViewController.xib in Resources */,
 				8848C66B210813D300EDB121 /* PhotoCollectionViewCell.xib in Resources */,
 				2F4A8973211D9F04006D7DD3 /* SignInfoCell.xib in Resources */,
 				2F4A8949211ADB00006D7DD3 /* OneImageCell.xib in Resources */,
@@ -3050,9 +3067,9 @@
 				2F4A8947211ADB00006D7DD3 /* PingLunCell.xib in Resources */,
 				3A5EC761218707E800A9438E /* PromoteController.xib in Resources */,
 				2F4A894E211ADB00006D7DD3 /* FourImageCell.xib in Resources */,
+				3A9D326521DCB74D0002E00E /* ModelFansTableViewCell.xib in Resources */,
 				3AC5CA09218BEB4B00D4ACAC /* RankHeader.xib in Resources */,
 				2FA1AF5C2127F92A005F12CA /* ForgetViewController.xib in Resources */,
-				2F4A8972211D9F04006D7DD3 /* SignUpViewController.xib in Resources */,
 				3AF44FDB21856E1600ABEAEB /* MineNewViewController.xib in Resources */,
 				3AF44FEB21856F0700ABEAEB /* ShadowView.xib in Resources */,
 				2F8D27BA21183DEF00CD7347 /* LICENSE in Resources */,
@@ -3078,6 +3095,7 @@
 				2F7FC05821242E4700492F0C /* NTESVideoViewController.xib in Resources */,
 				2F7FC08A21242E6300492F0C /* SVProgressHUD.bundle in Resources */,
 				3AF44FEC21856F0700ABEAEB /* MineItemView.xib in Resources */,
+				3A9D326121DCB7140002E00E /* SignListViewController.xib in Resources */,
 				3A44C12B218A0E7A0021DA3F /* MyModelController.xib in Resources */,
 				2F8D25402114691C00CD7347 /* PGDatePicker.bundle in Resources */,
 				2FA1AF8521280AE9005F12CA /* video_chat_tip_receiver.aac in Resources */,
@@ -3156,6 +3174,7 @@
 				2F8D27BF21183DEF00CD7347 /* NSBundle+TZImagePicker.m in Sources */,
 				2F8D27C321183DEF00CD7347 /* TZProgressView.m in Sources */,
 				2F8D271A21183D7400CD7347 /* NIMSessionConfigurator.m in Sources */,
+				3A9D325C21DCB6960002E00E /* ActivityDetailViewController.m in Sources */,
 				EF812F7120FF0E51004A6A35 /* ModelUser.m in Sources */,
 				2F8D27C121183DEF00CD7347 /* TZPhotoPreviewController.m in Sources */,
 				2F8D278621183D9000CD7347 /* renderer_yuv420sp.c in Sources */,
@@ -3170,7 +3189,6 @@
 				2F8D25332114691C00CD7347 /* PGDatePickerView.m in Sources */,
 				2F8D24F121144AF400CD7347 /* NSLayoutConstraint+MASDebugAdditions.m in Sources */,
 				9EC8713B20FB42930087746C /* MyWalletCell.m in Sources */,
-				2F4A8971211D9F04006D7DD3 /* SignUpViewController.m in Sources */,
 				2F8D278821183D9000CD7347 /* renderer.c in Sources */,
 				2F8D253F2114691C00CD7347 /* PGDatePicker+DateHour.m in Sources */,
 				2F8D271521183D7400CD7347 /* NIMSessionDataSourceImpl.m in Sources */,
@@ -3314,6 +3332,7 @@
 				2F8D26D321183D7300CD7347 /* NIMKitRobotDefaultTemplateParser.m in Sources */,
 				2F8D253C2114691C00CD7347 /* PGDatePicker+MonthDayHourMinuteSecond.m in Sources */,
 				2F7FC08F21242E6300492F0C /* UITextView+NTES.m in Sources */,
+				3A9D326021DCB7140002E00E /* SignListViewController.m in Sources */,
 				2F8D272621183D7400CD7347 /* NIMSessionNetChatNotifyContentView.m in Sources */,
 				EF4A657420FDB8C700FFCD3C /* ModelTitleView.m in Sources */,
 				2F8D26F821183D7400CD7347 /* NIMTeamAnnouncementListViewController.m in Sources */,
@@ -3411,7 +3430,7 @@
 				EF4A657120FD9D6200FFCD3C /* SkillOrderController.m in Sources */,
 				2F8D270521183D7400CD7347 /* NIMMessageModel.m in Sources */,
 				2F8D27EE21183E2B00CD7347 /* NTESVideoChatViewController.m in Sources */,
-				2F4A896D211D9F04006D7DD3 /* ActivityDetailViewController.m in Sources */,
+				2F4A896D211D9F04006D7DD3 /* SignUpViewController.m in Sources */,
 				2F7FC08D21242E6300492F0C /* UIView+NTES.m in Sources */,
 				2F8D25422114691C00CD7347 /* PGDatePicker+DateAndTime.m in Sources */,
 				3A5EC760218707E800A9438E /* PromoteController.m in Sources */,
@@ -3436,6 +3455,7 @@
 				2F8D272921183D7400CD7347 /* NIMSessionTextContentView.m in Sources */,
 				EF7B0C2320FC73100078781D /* ModelBaseViewController.m in Sources */,
 				2F8D273B21183D7400CD7347 /* NIMCommonTableData.m in Sources */,
+				3A9D326621DCB74D0002E00E /* ModelFansTableViewCell.m in Sources */,
 				2F8D248721131A7A00CD7347 /* JSONKeyMapper.m in Sources */,
 				EF7B0C2920FCA7C50078781D /* MySkillsController.m in Sources */,
 				2F8D272821183D7400CD7347 /* NIMSessionFileTransContentView.m in Sources */,

+ 23 - 0
model/Assets.xcassets/icon_didian.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "icon_didian.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "icon_didian@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "icon_didian@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
model/Assets.xcassets/icon_didian.imageset/icon_didian.png


BIN
model/Assets.xcassets/icon_didian.imageset/icon_didian@2x.png


BIN
model/Assets.xcassets/icon_didian.imageset/icon_didian@3x.png


+ 23 - 0
model/Assets.xcassets/icon_renshu.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "icon_renshu.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "icon_renshu@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "icon_renshu@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
model/Assets.xcassets/icon_renshu.imageset/icon_renshu.png


BIN
model/Assets.xcassets/icon_renshu.imageset/icon_renshu@2x.png


BIN
model/Assets.xcassets/icon_renshu.imageset/icon_renshu@3x.png


+ 23 - 0
model/Assets.xcassets/icon_share.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "icon_fenxiang_baise.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "icon_fenxiang_baise@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "icon_fenxiang_baise@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
model/Assets.xcassets/icon_share.imageset/icon_fenxiang_baise.png


BIN
model/Assets.xcassets/icon_share.imageset/icon_fenxiang_baise@2x.png


BIN
model/Assets.xcassets/icon_share.imageset/icon_fenxiang_baise@3x.png


+ 23 - 0
model/Assets.xcassets/icon_shijian.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "icon_shijian.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "icon_shijian@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "icon_shijian@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
model/Assets.xcassets/icon_shijian.imageset/icon_shijian.png


BIN
model/Assets.xcassets/icon_shijian.imageset/icon_shijian@2x.png


BIN
model/Assets.xcassets/icon_shijian.imageset/icon_shijian@3x.png


+ 23 - 0
model/Assets.xcassets/个人中心/icon_back.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "icon_back.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "icon_back@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "icon_back@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
model/Assets.xcassets/个人中心/icon_back.imageset/icon_back.png


BIN
model/Assets.xcassets/个人中心/icon_back.imageset/icon_back@2x.png


BIN
model/Assets.xcassets/个人中心/icon_back.imageset/icon_back@3x.png


+ 5 - 7
model/Classes/Application/ModelHeader.h

@@ -11,14 +11,14 @@
 /* ------前置平台接口请求地址, 拼接 PublicUrl---------- */
 
 ///公共url
-//#define PublicUrl @"http://app.chmo.net/thmodel"
-//#define imageURl @"http://app.chmo.net/thmodel/"
-//#define apnsCernameStr @"model"
-
-#define PublicUrl @"http://192.168.123.234:8080"
+#define PublicUrl @"http://app.chmo.net/thmodel"
 #define imageURl @"http://app.chmo.net/thmodel/"
 #define apnsCernameStr @"model"
 
+// #define PublicUrl @"http://192.168.123.234:8080"
+// #define imageURl @"http://app.chmo.net/thmodel/"
+// #define apnsCernameStr @"model"
+
 //#define PublicUrl @"http://192.168.50.132:8081"
 //#define imageURl @"http://192.168.50.132:8081/"
 //#define apnsCernameStr @"modelDev"
@@ -65,8 +65,6 @@
 #define Url_doEnroll(x) [NSString stringWithFormat:@"%@/activity?action=doEnroll",x]
 /// 13 获取我收到的红包列表
 #define Url_getreceiveredlist(x) [NSString stringWithFormat:@"%@/pay?action=getreceiveredlist",x]
-/// 14.1 我已参加的活动
-#define Url_doqrypartty(x) [NSString stringWithFormat:@"%@/activity?action=doqrypartty",x]
 /// 14.2 我未参加的活动
 #define Url_doqrynotpartt(x) [NSString stringWithFormat:@"%@/activity?action=doqrynotpartty",x]
 /// 15 上传工作照片

BIN
model/Classes/Controllers/.DS_Store


+ 8 - 4
model/Classes/Controllers/ActivityVC/ActivityDetailViewController.h

@@ -2,13 +2,17 @@
 //  ActivityDetailViewController.h
 //  千模
 //
-//  Created by MUMEI on 2018/5/18.
-//  Copyright © 2018 MUMEI. All rights reserved.
+//  Created by Drew on 2018/12/24.
+//  Copyright © 2018 MUMEI. All rights reserved.
 //
 
-
+#import <UIKit/UIKit.h>
 #import "ActivityModel.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
 @interface ActivityDetailViewController : UIViewController
-@property (weak, nonatomic) IBOutlet UIImageView *headView;
 @property (strong, nonatomic) ActivityModel *model;
 @end
+
+NS_ASSUME_NONNULL_END

+ 85 - 117
model/Classes/Controllers/ActivityVC/ActivityDetailViewController.m

@@ -2,142 +2,110 @@
 //  ActivityDetailViewController.m
 //  千模
 //
-//  Created by MUMEI on 2018/5/18.
-//  Copyright © 2018 MUMEI. All rights reserved.
+//  Created by Drew on 2018/12/24.
+//  Copyright © 2018 MUMEI. All rights reserved.
 //
 
 #import "ActivityDetailViewController.h"
-#import "SignInfoCell.h"
-#import "PlatformActivityController.h"
-@interface ActivityDetailViewController ()<UITextFieldDelegate>
-@property (weak, nonatomic) IBOutlet UITableView *tableView;
-
+#import "ActivityModel.h"
+#import "SignUpViewController.h"
+#import "SignListViewController.h"
+
+@interface ActivityDetailViewController ()
+@property(weak, nonatomic) IBOutlet UIImageView *headImg;
+@property(weak, nonatomic) IBOutlet UILabel *activityTitle;
+@property(weak, nonatomic) IBOutlet UILabel *activityTime;
+@property(weak, nonatomic) IBOutlet UILabel *signNum;
+@property(weak, nonatomic) IBOutlet UILabel *price;
+@property(weak, nonatomic) IBOutlet UILabel *intro;
+@property(weak, nonatomic) IBOutlet UIView *signListContainer;
+@property(weak, nonatomic) IBOutlet UIImageView *icon1;
+@property(weak, nonatomic) IBOutlet UIImageView *icon2;
+@property(weak, nonatomic) IBOutlet UIImageView *icon3;
+@property(weak, nonatomic) IBOutlet UIImageView *icon4;
+@property(weak, nonatomic) IBOutlet UIImageView *icon5;
+@property(weak, nonatomic) IBOutlet UILabel *name1;
+@property(weak, nonatomic) IBOutlet UILabel *name2;
+@property(weak, nonatomic) IBOutlet UILabel *name3;
+@property(weak, nonatomic) IBOutlet UILabel *name4;
+@property(weak, nonatomic) IBOutlet UILabel *name5;
+@property(nonatomic, strong) NSArray *iconArr;
+@property(nonatomic, strong) NSArray *nameArr;
 @end
 
 @implementation ActivityDetailViewController
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-    self.tableView.tableHeaderView = self.headView;
-    _tableView.showsVerticalScrollIndicator = NO;
-    self.navigationItem.title = @"活动报名";
-    UIButton * btn = [UIButton buttonWithType:UIButtonTypeCustom];
-    btn.frame = CGRectMake(0, 0, 40, 40);
-    [btn setImage:[UIImage imageNamed:@"fanhui2"] forState:UIControlStateNormal];
-    btn.imageEdgeInsets =  UIEdgeInsetsMake(0, -20, 0, 0);
-    [btn addTarget:self action:@selector(backClick) forControlEvents:UIControlEventTouchUpInside];
-    UIBarButtonItem *leftItem = [[UIBarButtonItem alloc] initWithCustomView:btn];
-    UIBarButtonItem *nagetiveSpacer = [[UIBarButtonItem alloc]initWithBarButtonSystemItem:UIBarButtonSystemItemFixedSpace target:nil action:nil];
-    nagetiveSpacer.width = -12;//这个值可以根据自己需要自己调整
-    self.navigationItem.leftBarButtonItems = @[nagetiveSpacer, leftItem];
-    [_headView sd_setImageWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@%@",imageURl,_model.pic]] placeholderImage:[UIImage imageNamed:@"jiazai"]];
-    
-    // Do any additional setup after loading the view.
-}
-
-- (IBAction)sign:(UIButton*)sender {
-    SignInfoCell *cell = [self.tableView cellForRowAtIndexPath:[NSIndexPath indexPathForRow:0 inSection:0]];
-    NSString *people = cell.name.text;
-    NSString *tel = cell.phone.text;
-    NSString *pcount = cell.num.text;
-    NSString *fee = [[cell.totoalPrice.text componentsSeparatedByString:@"元"]objectAtIndex:0];
-    NSString *parttypk = cell.model.pk;
-    NSString *pk = [ModelUser user].pk;
-    NSString *str = [NSString stringWithFormat:@"%@/activity?action=doEnroll&PK=%@&ParttyPK=%@&people=%@&Tel=%@&pCount=%@&Fee=%@",PublicUrl,pk,parttypk,people,tel,pcount,fee];
-
-    [[AHHttpManager sharedManager]POST:[str stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding] parameters:nil success:^(id responseObject) {
-        NSLog(@"%@",responseObject);
-        if ([[responseObject objectForKey:@"msg"]isEqualToString:@"success"]) {
-
-            UIAlertController *alertController = [UIAlertController alertControllerWithTitle:@"" message:@"报名成功" preferredStyle:UIAlertControllerStyleAlert];
-            NSMutableAttributedString *hogan = [[NSMutableAttributedString alloc] initWithString:@"报名成功"];
-            int num = (int)hogan.length;
-            [hogan addAttribute:NSFontAttributeName
-                          value:[UIFont systemFontOfSize:16.0]
-                          range:NSMakeRange(0, num)];
-            [alertController setValue:hogan forKey:@"attributedMessage"];
-            
-            UIImageView *alertImg = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"Complete_Img"]];
-            [alertController.view addSubview:alertImg];
-            [alertImg mas_makeConstraints:^(MASConstraintMaker *make)
-             {
-                 make.centerY.equalTo(alertController.view .mas_centerY);
-                 make.left.equalTo(alertController.view.mas_left).offset(num/4);
-             }];            //            [self.tableView reloadData];
-            [self presentViewController:alertController animated:YES completion:nil];
-            [NSTimer scheduledTimerWithTimeInterval:2.0 target:self selector:@selector(backPop:) userInfo:alertController repeats:NO];
-            
-        }else{
-            if ([[responseObject objectForKey:@"desc"] isEqualToString:@"余额不足"]) {
-                [MBProgressHUD showTextHUD:@"余额不足" inView:self.view hideAfterDelay:1];
-            }else{
-                [MBProgressHUD showTextHUD:@"请填写正确报名资料" inView:self.view hideAfterDelay:1];
-            }
-        }
-    } failure:^(NSError *error) {
-        NSLog(@"error = %@",error);
-        [MBProgressHUD showTextHUD:@"超时" inView:self.view hideAfterDelay:1];
-        
-    }];
-}
-
-- (void)backPop:(NSTimer *)timer{
-    UIAlertController *alert = [timer userInfo];
-    [alert dismissViewControllerAnimated:YES completion:^{
-        [self.navigationController popViewControllerAnimated:YES];
-    }];
-    alert = nil;
-}
-
-- (void)getList{
-
+    self.navigationItem.title = @"活动详情";
+    UIBarButtonItem *leftItem = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"icon_back"] style:UIBarButtonItemStylePlain target:self action:@selector(backClick)];
+    self.navigationItem.leftBarButtonItem = leftItem;
+    self.navigationController.navigationBar.tintColor = [UIColor blackColor];
+    [self.headImg sd_setImageWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@%@", imageURl, _model.pic]] placeholderImage:[UIImage imageNamed:@"jiazai"]];
+    self.activityTitle.text = _model.caption;
+    self.activityTime.text = _model.beg;
+    self.signNum.text = _model.signcount;
+    self.price.text = [NSString stringWithFormat:@"¥ %@", _model.meprice];
+    NSString *str = [NSString stringWithFormat:@"<style>body{font-size:14px;}img{width:%fpx;height:auto;}</style>%@", ScreenWidth - 40, _model.intro];
+    NSAttributedString *attributedString = [[NSAttributedString alloc] initWithData:[str dataUsingEncoding:NSUnicodeStringEncoding]
+                                                                            options:@{NSDocumentTypeDocumentAttribute: NSHTMLTextDocumentType}
+                                                                 documentAttributes:nil
+                                                                              error:nil];
+    self.intro.attributedText = attributedString;
+    self.signListContainer.layer.backgroundColor = [UIColor colorWithRed:255 / 255.0f green:255 / 255.0f blue:255 / 255.0f alpha:1.0].CGColor;
+    self.signListContainer.layer.cornerRadius = 8;
+    self.signListContainer.layer.shadowColor = [UIColor colorWithRed:0 / 255.0f green:0 / 255.0f blue:0 / 255.0f alpha:0.08].CGColor;
+    self.signListContainer.layer.shadowOffset = CGSizeMake(0, 6);
+    self.signListContainer.layer.shadowOpacity = 1;
+    self.signListContainer.layer.shadowRadius = 12;
+    self.iconArr = @[self.icon1, self.icon2, self.icon3, self.icon4, self.icon5];
+    self.nameArr = @[self.name1, self.name2, self.name3, self.name4, self.name5];
+    [self getData];
 }
 
--(void)backClick{
+- (void)backClick {
     [self.navigationController popViewControllerAnimated:YES];
 }
 
-- (void)viewWillAppear:(BOOL)animated{
-    [self.navigationController setNavigationBarHidden:NO animated:YES];
-}
-
-#pragma mark - deleDate
--(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section{
-    return 1;
-}
+- (IBAction)signUp:(id)sender {
 
--(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{
-    
-    SignInfoCell * cell = [tableView dequeueReusableCellWithIdentifier:@"SignInfoCell"];
-    if (!cell) {
-        cell = [[[UINib nibWithNibName:@"SignInfoCell" bundle:nil]instantiateWithOwner:self options:nil]lastObject];
-        cell.selectionStyle = UIAccessibilityTraitNone;
-        cell.model = _model;
-        cell.name.delegate = self;
-        cell.phone.delegate = self;
+    SignUpViewController *aVc = [[SignUpViewController alloc] init];
+    if ([_model.issign isEqualToString:@"1"]) {
+        [MBProgressHUD showTextHUD:@"不能重复报名" inView:self.view hideAfterDelay:1];
+    } else if ([_model.issigndate isEqualToString:@"0"]) {
+        [MBProgressHUD showTextHUD:@"不在报名时间内" inView:self.view hideAfterDelay:1];
+    } else {
+        aVc.model = _model;
+        [self.navigationController pushViewController:aVc animated:YES];
     }
-    return cell;
 }
 
--(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section{
-    
-    return 1;
+- (IBAction)signList:(id)sender {
+    SignListViewController *vc = [[SignListViewController alloc] init];
+    vc.pk = self.model.pk;
+    [self.navigationController pushViewController:vc animated:YES];
 }
 
--(CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{
-    return 465;
+- (void)getData {
+    NSString *url = [NSString stringWithFormat:@"%@/activity?action=signlist&pk=%@&page=%d&size=5", PublicUrl, _model.pk, 1];
+    [[AHHttpManager sharedManager]
+            POST:url
+      parameters:nil
+         success:^(id responseObject) {
+             if ([@"success" isEqualToString:responseObject[@"msg"]]) {
+                 NSArray *data = responseObject[@"data"];
+                 for (int i = 0; i < data.count; i++) {
+                     UIImageView *icon = self.iconArr[i];
+                     UILabel *name = self.nameArr[i];
+                     icon.hidden = NO;
+                     name.hidden = NO;
+                     [icon sd_setImageWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@%@", imageURl, data[i][@"hPhoto"]]] placeholderImage:[UIImage imageNamed:@"touxiang_wait"]];
+                     name.text = data[i][@"Pet"];
+                 }
+             }
+         }
+         failure:^(NSError *error) {
+
+         }];
 }
-
-- (BOOL)textFieldShouldReturn:(UITextField *)theTextField {
-
-    [theTextField resignFirstResponder];
-    
-    return YES;
-}
-
-- (void)didReceiveMemoryWarning {
-    [super didReceiveMemoryWarning];
-    // Dispose of any resources that can be recreated.
-}
-
 @end

+ 390 - 47
model/Classes/Controllers/ActivityVC/ActivityDetailViewController.xib

@@ -1,81 +1,424 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14283.14"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="ActivityDetailViewController">
             <connections>
-                <outlet property="headView" destination="88e-sd-55f" id="bNT-a0-Gdw"/>
-                <outlet property="tableView" destination="ery-9I-YtQ" id="EEt-gc-9vp"/>
-                <outlet property="view" destination="iN0-l3-epB" id="aIN-DV-4pe"/>
+                <outlet property="activityTime" destination="lJj-6b-3XD" id="Nda-Kx-15k"/>
+                <outlet property="activityTitle" destination="a0J-SE-rCS" id="2f2-y3-FoV"/>
+                <outlet property="headImg" destination="tF0-vf-JyL" id="OzZ-B7-6WO"/>
+                <outlet property="icon1" destination="IOx-CZ-WDi" id="6kf-V2-clE"/>
+                <outlet property="icon2" destination="nj1-cd-5mt" id="Ri8-Ck-UCL"/>
+                <outlet property="icon3" destination="2G1-Ok-TLL" id="AzY-s4-7fm"/>
+                <outlet property="icon4" destination="WYj-yG-j3o" id="ZHt-QS-kHW"/>
+                <outlet property="icon5" destination="G3x-RI-guf" id="bZ4-8A-n5u"/>
+                <outlet property="intro" destination="Uqs-2A-5Be" id="aTH-50-x16"/>
+                <outlet property="name1" destination="7kN-wz-O1e" id="n3X-N9-ODl"/>
+                <outlet property="name2" destination="ak7-wN-39Y" id="2p3-aV-z8q"/>
+                <outlet property="name3" destination="g4C-Q6-uMx" id="l13-Xd-4jZ"/>
+                <outlet property="name4" destination="faI-T1-jxg" id="efc-Jf-RLk"/>
+                <outlet property="name5" destination="YAr-rD-CUx" id="ip9-fq-79i"/>
+                <outlet property="price" destination="ooo-Or-SeJ" id="r8m-li-17P"/>
+                <outlet property="signListContainer" destination="Ftx-Rn-1ru" id="KVV-tS-Jv8"/>
+                <outlet property="signNum" destination="em5-J0-ATc" id="vXl-aH-l4w"/>
+                <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
             </connections>
         </placeholder>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="iN0-l3-epB">
+        <view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="i5M-Pr-FkT">
             <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="1" sectionFooterHeight="1" translatesAutoresizingMaskIntoConstraints="NO" id="ery-9I-YtQ">
-                    <rect key="frame" x="0.0" y="0.0" width="375" height="574"/>
+                <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" translatesAutoresizingMaskIntoConstraints="NO" id="VVS-04-BI8">
+                    <rect key="frame" x="0.0" y="20" width="375" height="647"/>
+                    <subviews>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="E5R-L8-OiV">
+                            <rect key="frame" x="0.0" y="0.0" width="375" height="599"/>
+                            <subviews>
+                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="jiazai" translatesAutoresizingMaskIntoConstraints="NO" id="tF0-vf-JyL">
+                                    <rect key="frame" x="0.0" y="0.0" width="375" height="210"/>
+                                    <constraints>
+                                        <constraint firstAttribute="height" constant="210" id="h9f-Pc-uGd"/>
+                                    </constraints>
+                                </imageView>
+                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="UNA-5V-zkF">
+                                    <rect key="frame" x="0.0" y="192" width="375" height="36"/>
+                                    <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                    <constraints>
+                                        <constraint firstAttribute="height" constant="36" id="PoV-PS-GYu"/>
+                                    </constraints>
+                                    <userDefinedRuntimeAttributes>
+                                        <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+                                            <integer key="value" value="18"/>
+                                        </userDefinedRuntimeAttribute>
+                                    </userDefinedRuntimeAttributes>
+                                </view>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="活动标题" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="a0J-SE-rCS">
+                                    <rect key="frame" x="20" y="212" width="335" height="21.5"/>
+                                    <fontDescription key="fontDescription" type="system" weight="medium" pointSize="18"/>
+                                    <nil key="textColor"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="¥0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ooo-Or-SeJ">
+                                    <rect key="frame" x="20" y="243.5" width="19.5" height="18"/>
+                                    <fontDescription key="fontDescription" type="system" weight="medium" pointSize="15"/>
+                                    <color key="textColor" red="1" green="0.25098039215686274" blue="0.58431372549019611" alpha="1" colorSpace="calibratedRGB"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
+                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_shijian" translatesAutoresizingMaskIntoConstraints="NO" id="dQ7-qp-alY">
+                                    <rect key="frame" x="20" y="281.5" width="20" height="20"/>
+                                    <constraints>
+                                        <constraint firstAttribute="width" constant="20" id="TaY-3Z-KR7"/>
+                                        <constraint firstAttribute="height" constant="20" id="eps-tr-58n"/>
+                                    </constraints>
+                                </imageView>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2018.09.10 16:30" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lJj-6b-3XD">
+                                    <rect key="frame" x="48" y="283.5" width="107" height="16"/>
+                                    <fontDescription key="fontDescription" type="system" weight="medium" pointSize="13"/>
+                                    <nil key="textColor"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
+                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_renshu" translatesAutoresizingMaskIntoConstraints="NO" id="wkg-Fu-UIX">
+                                    <rect key="frame" x="20" y="307.5" width="20" height="20"/>
+                                    <constraints>
+                                        <constraint firstAttribute="height" constant="20" id="XGq-Wk-Ud7"/>
+                                        <constraint firstAttribute="width" constant="20" id="tbP-CT-y9V"/>
+                                    </constraints>
+                                </imageView>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="10" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="em5-J0-ATc">
+                                    <rect key="frame" x="48" y="309.5" width="15" height="16"/>
+                                    <fontDescription key="fontDescription" type="system" weight="medium" pointSize="13"/>
+                                    <nil key="textColor"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
+                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="lYw-4O-Lpv">
+                                    <rect key="frame" x="20" y="347.5" width="335" height="1"/>
+                                    <color key="backgroundColor" red="0.94901960784313721" green="0.95686274509803915" blue="0.96078431372549022" alpha="1" colorSpace="calibratedRGB"/>
+                                    <constraints>
+                                        <constraint firstAttribute="height" constant="1" id="WAG-NK-isb"/>
+                                    </constraints>
+                                </view>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Uqs-2A-5Be">
+                                    <rect key="frame" x="20" y="368.5" width="335" height="21.5"/>
+                                    <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                    <nil key="textColor"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
+                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ftx-Rn-1ru">
+                                    <rect key="frame" x="20" y="410" width="335" height="125"/>
+                                    <subviews>
+                                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="XeL-Nk-hzg">
+                                            <rect key="frame" x="16" y="19" width="6" height="14"/>
+                                            <color key="backgroundColor" red="1" green="0.25098039220000001" blue="0.58431372550000005" alpha="1" colorSpace="calibratedRGB"/>
+                                            <constraints>
+                                                <constraint firstAttribute="width" constant="6" id="QIN-Dr-Yjk"/>
+                                                <constraint firstAttribute="height" constant="14" id="kMX-MM-rJO"/>
+                                            </constraints>
+                                            <userDefinedRuntimeAttributes>
+                                                <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+                                                    <integer key="value" value="3"/>
+                                                </userDefinedRuntimeAttribute>
+                                            </userDefinedRuntimeAttributes>
+                                        </view>
+                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="已报名" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="e8r-iZ-atp">
+                                            <rect key="frame" x="26" y="17.5" width="43" height="17"/>
+                                            <fontDescription key="fontDescription" type="system" weight="medium" pointSize="14"/>
+                                            <nil key="textColor"/>
+                                            <nil key="highlightedColor"/>
+                                        </label>
+                                        <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_inter" translatesAutoresizingMaskIntoConstraints="NO" id="igm-YG-DOd">
+                                            <rect key="frame" x="307" y="16" width="20" height="20"/>
+                                            <constraints>
+                                                <constraint firstAttribute="width" constant="20" id="Qb2-q9-2uI"/>
+                                                <constraint firstAttribute="height" constant="20" id="lxI-d3-HA0"/>
+                                            </constraints>
+                                        </imageView>
+                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="查看全部" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="48U-at-KL8">
+                                            <rect key="frame" x="257.5" y="19" width="49.5" height="14.5"/>
+                                            <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                                            <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
+                                            <nil key="highlightedColor"/>
+                                        </label>
+                                        <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" translatesAutoresizingMaskIntoConstraints="NO" id="9BA-5f-67o">
+                                            <rect key="frame" x="0.0" y="48.5" width="335" height="76.5"/>
+                                            <subviews>
+                                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="JFE-X2-cBT">
+                                                    <rect key="frame" x="0.0" y="0.0" width="67" height="76.5"/>
+                                                    <subviews>
+                                                        <imageView hidden="YES" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="touxiang_wait" translatesAutoresizingMaskIntoConstraints="NO" id="IOx-CZ-WDi">
+                                                            <rect key="frame" x="15.5" y="0.0" width="36" height="36"/>
+                                                            <constraints>
+                                                                <constraint firstAttribute="height" constant="36" id="W0p-vN-xak"/>
+                                                                <constraint firstAttribute="width" constant="36" id="fOS-8Z-eUH"/>
+                                                            </constraints>
+                                                            <userDefinedRuntimeAttributes>
+                                                                <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+                                                                    <integer key="value" value="18"/>
+                                                                </userDefinedRuntimeAttribute>
+                                                            </userDefinedRuntimeAttributes>
+                                                        </imageView>
+                                                        <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7kN-wz-O1e">
+                                                            <rect key="frame" x="5" y="41" width="57" height="12"/>
+                                                            <fontDescription key="fontDescription" type="system" pointSize="10"/>
+                                                            <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
+                                                            <nil key="highlightedColor"/>
+                                                        </label>
+                                                    </subviews>
+                                                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                    <constraints>
+                                                        <constraint firstItem="7kN-wz-O1e" firstAttribute="leading" secondItem="JFE-X2-cBT" secondAttribute="leading" constant="5" id="0Wz-RE-lGA"/>
+                                                        <constraint firstItem="7kN-wz-O1e" firstAttribute="top" secondItem="IOx-CZ-WDi" secondAttribute="bottom" constant="5" id="Pmk-bw-EkZ"/>
+                                                        <constraint firstItem="IOx-CZ-WDi" firstAttribute="top" secondItem="JFE-X2-cBT" secondAttribute="top" id="fqg-fS-Z8I"/>
+                                                        <constraint firstAttribute="trailing" secondItem="7kN-wz-O1e" secondAttribute="trailing" constant="5" id="hcf-sM-q1X"/>
+                                                        <constraint firstItem="IOx-CZ-WDi" firstAttribute="centerX" secondItem="JFE-X2-cBT" secondAttribute="centerX" id="l0a-Mg-xyV"/>
+                                                    </constraints>
+                                                </view>
+                                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="9i5-py-MpV">
+                                                    <rect key="frame" x="67" y="0.0" width="67" height="76.5"/>
+                                                    <subviews>
+                                                        <imageView hidden="YES" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="touxiang_wait" translatesAutoresizingMaskIntoConstraints="NO" id="nj1-cd-5mt">
+                                                            <rect key="frame" x="15.5" y="0.0" width="36" height="36"/>
+                                                            <constraints>
+                                                                <constraint firstAttribute="width" constant="36" id="2Pm-pu-p9c"/>
+                                                                <constraint firstAttribute="height" constant="36" id="AVu-tb-gfv"/>
+                                                            </constraints>
+                                                            <userDefinedRuntimeAttributes>
+                                                                <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+                                                                    <integer key="value" value="18"/>
+                                                                </userDefinedRuntimeAttribute>
+                                                            </userDefinedRuntimeAttributes>
+                                                        </imageView>
+                                                        <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ak7-wN-39Y">
+                                                            <rect key="frame" x="5" y="41" width="57" height="12"/>
+                                                            <fontDescription key="fontDescription" type="system" pointSize="10"/>
+                                                            <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
+                                                            <nil key="highlightedColor"/>
+                                                        </label>
+                                                    </subviews>
+                                                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                    <constraints>
+                                                        <constraint firstItem="ak7-wN-39Y" firstAttribute="top" secondItem="nj1-cd-5mt" secondAttribute="bottom" constant="5" id="Gjk-hU-T4G"/>
+                                                        <constraint firstItem="nj1-cd-5mt" firstAttribute="centerX" secondItem="9i5-py-MpV" secondAttribute="centerX" id="Qjk-bk-7po"/>
+                                                        <constraint firstItem="nj1-cd-5mt" firstAttribute="top" secondItem="9i5-py-MpV" secondAttribute="top" id="bS5-p5-rxJ"/>
+                                                        <constraint firstItem="ak7-wN-39Y" firstAttribute="leading" secondItem="9i5-py-MpV" secondAttribute="leading" constant="5" id="dga-MA-JpO"/>
+                                                        <constraint firstAttribute="trailing" secondItem="ak7-wN-39Y" secondAttribute="trailing" constant="5" id="r2v-tE-Uv7"/>
+                                                    </constraints>
+                                                </view>
+                                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ptN-cc-1Fr">
+                                                    <rect key="frame" x="134" y="0.0" width="67" height="76.5"/>
+                                                    <subviews>
+                                                        <imageView hidden="YES" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="touxiang_wait" translatesAutoresizingMaskIntoConstraints="NO" id="2G1-Ok-TLL">
+                                                            <rect key="frame" x="15.5" y="0.0" width="36" height="36"/>
+                                                            <constraints>
+                                                                <constraint firstAttribute="height" constant="36" id="Kx4-rx-EqM"/>
+                                                                <constraint firstAttribute="width" constant="36" id="ixZ-0f-tkQ"/>
+                                                            </constraints>
+                                                            <userDefinedRuntimeAttributes>
+                                                                <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+                                                                    <integer key="value" value="18"/>
+                                                                </userDefinedRuntimeAttribute>
+                                                            </userDefinedRuntimeAttributes>
+                                                        </imageView>
+                                                        <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="g4C-Q6-uMx">
+                                                            <rect key="frame" x="5" y="41" width="57" height="12"/>
+                                                            <fontDescription key="fontDescription" type="system" pointSize="10"/>
+                                                            <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
+                                                            <nil key="highlightedColor"/>
+                                                        </label>
+                                                    </subviews>
+                                                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                    <constraints>
+                                                        <constraint firstItem="2G1-Ok-TLL" firstAttribute="top" secondItem="ptN-cc-1Fr" secondAttribute="top" id="28H-Em-9j1"/>
+                                                        <constraint firstItem="g4C-Q6-uMx" firstAttribute="leading" secondItem="ptN-cc-1Fr" secondAttribute="leading" constant="5" id="EeG-GN-vFw"/>
+                                                        <constraint firstAttribute="trailing" secondItem="g4C-Q6-uMx" secondAttribute="trailing" constant="5" id="NHB-1I-xgB"/>
+                                                        <constraint firstItem="2G1-Ok-TLL" firstAttribute="centerX" secondItem="ptN-cc-1Fr" secondAttribute="centerX" id="cDK-My-Ii5"/>
+                                                        <constraint firstItem="g4C-Q6-uMx" firstAttribute="top" secondItem="2G1-Ok-TLL" secondAttribute="bottom" constant="5" id="cUO-JR-5Vf"/>
+                                                    </constraints>
+                                                </view>
+                                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jv2-mw-zKP">
+                                                    <rect key="frame" x="201" y="0.0" width="67" height="76.5"/>
+                                                    <subviews>
+                                                        <imageView hidden="YES" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="touxiang_wait" translatesAutoresizingMaskIntoConstraints="NO" id="WYj-yG-j3o">
+                                                            <rect key="frame" x="15.5" y="0.0" width="36" height="36"/>
+                                                            <constraints>
+                                                                <constraint firstAttribute="width" constant="36" id="4xm-VN-klb"/>
+                                                                <constraint firstAttribute="height" constant="36" id="wBZ-fr-g0T"/>
+                                                            </constraints>
+                                                            <userDefinedRuntimeAttributes>
+                                                                <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+                                                                    <integer key="value" value="18"/>
+                                                                </userDefinedRuntimeAttribute>
+                                                            </userDefinedRuntimeAttributes>
+                                                        </imageView>
+                                                        <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="faI-T1-jxg">
+                                                            <rect key="frame" x="5" y="41" width="57" height="12"/>
+                                                            <fontDescription key="fontDescription" type="system" pointSize="10"/>
+                                                            <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
+                                                            <nil key="highlightedColor"/>
+                                                        </label>
+                                                    </subviews>
+                                                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                    <constraints>
+                                                        <constraint firstItem="faI-T1-jxg" firstAttribute="leading" secondItem="jv2-mw-zKP" secondAttribute="leading" constant="5" id="7BG-R3-iLX"/>
+                                                        <constraint firstItem="WYj-yG-j3o" firstAttribute="top" secondItem="jv2-mw-zKP" secondAttribute="top" id="KvQ-uG-xD3"/>
+                                                        <constraint firstItem="faI-T1-jxg" firstAttribute="top" secondItem="WYj-yG-j3o" secondAttribute="bottom" constant="5" id="eCw-zo-VvU"/>
+                                                        <constraint firstAttribute="trailing" secondItem="faI-T1-jxg" secondAttribute="trailing" constant="5" id="fjq-gL-R8G"/>
+                                                        <constraint firstItem="WYj-yG-j3o" firstAttribute="centerX" secondItem="jv2-mw-zKP" secondAttribute="centerX" id="kyi-hv-XZ3"/>
+                                                    </constraints>
+                                                </view>
+                                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kbg-4u-teL">
+                                                    <rect key="frame" x="268" y="0.0" width="67" height="76.5"/>
+                                                    <subviews>
+                                                        <imageView hidden="YES" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="touxiang_wait" translatesAutoresizingMaskIntoConstraints="NO" id="G3x-RI-guf">
+                                                            <rect key="frame" x="15.5" y="0.0" width="36" height="36"/>
+                                                            <constraints>
+                                                                <constraint firstAttribute="width" constant="36" id="NmD-Vf-QN2"/>
+                                                                <constraint firstAttribute="height" constant="36" id="Qno-UG-3Bn"/>
+                                                            </constraints>
+                                                            <userDefinedRuntimeAttributes>
+                                                                <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+                                                                    <integer key="value" value="18"/>
+                                                                </userDefinedRuntimeAttribute>
+                                                            </userDefinedRuntimeAttributes>
+                                                        </imageView>
+                                                        <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YAr-rD-CUx">
+                                                            <rect key="frame" x="5" y="41" width="57" height="12"/>
+                                                            <fontDescription key="fontDescription" type="system" pointSize="10"/>
+                                                            <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
+                                                            <nil key="highlightedColor"/>
+                                                        </label>
+                                                    </subviews>
+                                                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                    <constraints>
+                                                        <constraint firstItem="G3x-RI-guf" firstAttribute="top" secondItem="kbg-4u-teL" secondAttribute="top" id="4Ue-Aq-AuX"/>
+                                                        <constraint firstItem="YAr-rD-CUx" firstAttribute="leading" secondItem="kbg-4u-teL" secondAttribute="leading" constant="5" id="6Za-ks-zI2"/>
+                                                        <constraint firstAttribute="trailing" secondItem="YAr-rD-CUx" secondAttribute="trailing" constant="5" id="9F1-28-l6Y"/>
+                                                        <constraint firstItem="G3x-RI-guf" firstAttribute="centerX" secondItem="kbg-4u-teL" secondAttribute="centerX" id="NMR-JH-Ocp"/>
+                                                        <constraint firstItem="YAr-rD-CUx" firstAttribute="top" secondItem="G3x-RI-guf" secondAttribute="bottom" constant="5" id="QRb-H1-gNt"/>
+                                                    </constraints>
+                                                </view>
+                                            </subviews>
+                                        </stackView>
+                                    </subviews>
+                                    <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                    <gestureRecognizers/>
+                                    <constraints>
+                                        <constraint firstItem="9BA-5f-67o" firstAttribute="top" secondItem="e8r-iZ-atp" secondAttribute="bottom" constant="14" id="5xs-Yu-kP0"/>
+                                        <constraint firstAttribute="height" constant="125" id="83i-1e-YCV"/>
+                                        <constraint firstAttribute="trailing" secondItem="9BA-5f-67o" secondAttribute="trailing" id="Fxi-t3-RLH"/>
+                                        <constraint firstItem="igm-YG-DOd" firstAttribute="leading" secondItem="48U-at-KL8" secondAttribute="trailing" id="bxH-Co-WZk"/>
+                                        <constraint firstItem="igm-YG-DOd" firstAttribute="centerY" secondItem="XeL-Nk-hzg" secondAttribute="centerY" id="c9O-77-yXq"/>
+                                        <constraint firstAttribute="trailing" secondItem="igm-YG-DOd" secondAttribute="trailing" constant="8" id="dVj-v0-mmx"/>
+                                        <constraint firstItem="48U-at-KL8" firstAttribute="centerY" secondItem="XeL-Nk-hzg" secondAttribute="centerY" id="lKL-66-btG"/>
+                                        <constraint firstItem="9BA-5f-67o" firstAttribute="leading" secondItem="Ftx-Rn-1ru" secondAttribute="leading" id="pGc-MO-hzw"/>
+                                        <constraint firstItem="e8r-iZ-atp" firstAttribute="centerY" secondItem="XeL-Nk-hzg" secondAttribute="centerY" id="s3X-aa-glF"/>
+                                        <constraint firstAttribute="bottom" secondItem="9BA-5f-67o" secondAttribute="bottom" id="uj1-pj-X1N"/>
+                                        <constraint firstItem="e8r-iZ-atp" firstAttribute="leading" secondItem="XeL-Nk-hzg" secondAttribute="trailing" constant="4" id="xF1-BP-Q41"/>
+                                        <constraint firstItem="XeL-Nk-hzg" firstAttribute="leading" secondItem="Ftx-Rn-1ru" secondAttribute="leading" constant="16" id="ybS-1g-V5i"/>
+                                        <constraint firstItem="XeL-Nk-hzg" firstAttribute="top" secondItem="Ftx-Rn-1ru" secondAttribute="top" constant="19" id="zQn-4a-bZJ"/>
+                                    </constraints>
+                                    <connections>
+                                        <outletCollection property="gestureRecognizers" destination="TC1-QE-kQp" appends="YES" id="aVm-A6-vtV"/>
+                                    </connections>
+                                </view>
+                            </subviews>
+                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                            <constraints>
+                                <constraint firstItem="ooo-Or-SeJ" firstAttribute="top" secondItem="a0J-SE-rCS" secondAttribute="bottom" constant="10" id="2Tz-ut-wsy"/>
+                                <constraint firstItem="dQ7-qp-alY" firstAttribute="leading" secondItem="E5R-L8-OiV" secondAttribute="leading" constant="20" id="3Qe-Y5-61r"/>
+                                <constraint firstAttribute="trailing" secondItem="Uqs-2A-5Be" secondAttribute="trailing" constant="20" id="4PQ-Ad-ebO"/>
+                                <constraint firstAttribute="trailing" secondItem="lYw-4O-Lpv" secondAttribute="trailing" constant="20" id="6AI-Jx-Y6Y"/>
+                                <constraint firstItem="tF0-vf-JyL" firstAttribute="leading" secondItem="E5R-L8-OiV" secondAttribute="leading" id="6fj-wC-mWN"/>
+                                <constraint firstItem="em5-J0-ATc" firstAttribute="leading" secondItem="dQ7-qp-alY" secondAttribute="trailing" constant="8" id="8PG-Ut-QVE"/>
+                                <constraint firstItem="lYw-4O-Lpv" firstAttribute="top" secondItem="wkg-Fu-UIX" secondAttribute="bottom" constant="20" id="9l2-g6-pA7"/>
+                                <constraint firstAttribute="trailing" secondItem="Ftx-Rn-1ru" secondAttribute="trailing" constant="20" id="AR2-Gb-gpa"/>
+                                <constraint firstItem="a0J-SE-rCS" firstAttribute="top" secondItem="tF0-vf-JyL" secondAttribute="bottom" constant="2" id="DqL-n6-91l"/>
+                                <constraint firstItem="a0J-SE-rCS" firstAttribute="leading" secondItem="E5R-L8-OiV" secondAttribute="leading" constant="20" id="HZo-HB-hi3"/>
+                                <constraint firstAttribute="bottom" secondItem="Ftx-Rn-1ru" secondAttribute="bottom" constant="64" id="JOX-g2-lh3"/>
+                                <constraint firstAttribute="trailing" secondItem="tF0-vf-JyL" secondAttribute="trailing" id="LcO-0I-Ihd"/>
+                                <constraint firstAttribute="trailing" secondItem="a0J-SE-rCS" secondAttribute="trailing" constant="20" id="M5d-e5-gn4"/>
+                                <constraint firstItem="lYw-4O-Lpv" firstAttribute="leading" secondItem="E5R-L8-OiV" secondAttribute="leading" constant="20" id="TDF-i4-x86"/>
+                                <constraint firstItem="lJj-6b-3XD" firstAttribute="leading" secondItem="dQ7-qp-alY" secondAttribute="trailing" constant="8" id="UTD-RG-pCv"/>
+                                <constraint firstItem="Uqs-2A-5Be" firstAttribute="top" secondItem="lYw-4O-Lpv" secondAttribute="bottom" constant="20" id="ZsC-TB-fOq"/>
+                                <constraint firstItem="lJj-6b-3XD" firstAttribute="centerY" secondItem="dQ7-qp-alY" secondAttribute="centerY" id="ar8-A3-eZE"/>
+                                <constraint firstItem="Ftx-Rn-1ru" firstAttribute="leading" secondItem="E5R-L8-OiV" secondAttribute="leading" constant="20" id="cZG-m5-7Pm"/>
+                                <constraint firstItem="tF0-vf-JyL" firstAttribute="top" secondItem="E5R-L8-OiV" secondAttribute="top" id="cy2-vi-Z37"/>
+                                <constraint firstItem="dQ7-qp-alY" firstAttribute="top" secondItem="ooo-Or-SeJ" secondAttribute="bottom" constant="20" id="eb4-QI-1N6"/>
+                                <constraint firstItem="UNA-5V-zkF" firstAttribute="leading" secondItem="E5R-L8-OiV" secondAttribute="leading" id="eyT-5U-C6o"/>
+                                <constraint firstItem="Ftx-Rn-1ru" firstAttribute="top" secondItem="Uqs-2A-5Be" secondAttribute="bottom" constant="20" id="gwS-rf-HHF"/>
+                                <constraint firstItem="wkg-Fu-UIX" firstAttribute="leading" secondItem="E5R-L8-OiV" secondAttribute="leading" constant="20" id="h47-gV-yCt"/>
+                                <constraint firstItem="UNA-5V-zkF" firstAttribute="top" secondItem="E5R-L8-OiV" secondAttribute="top" constant="192" id="hRR-dW-1Ek"/>
+                                <constraint firstAttribute="trailing" secondItem="UNA-5V-zkF" secondAttribute="trailing" id="jvs-Xa-eLr"/>
+                                <constraint firstItem="ooo-Or-SeJ" firstAttribute="leading" secondItem="a0J-SE-rCS" secondAttribute="leading" id="ma9-5L-kgv"/>
+                                <constraint firstItem="Uqs-2A-5Be" firstAttribute="leading" secondItem="E5R-L8-OiV" secondAttribute="leading" constant="20" id="pCi-aU-88h"/>
+                                <constraint firstItem="wkg-Fu-UIX" firstAttribute="top" secondItem="dQ7-qp-alY" secondAttribute="bottom" constant="6" id="rB2-7t-aDA"/>
+                                <constraint firstItem="em5-J0-ATc" firstAttribute="centerY" secondItem="wkg-Fu-UIX" secondAttribute="centerY" id="yDl-Xn-GTf"/>
+                            </constraints>
+                        </view>
+                    </subviews>
                     <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                    <inset key="separatorInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
-                    <connections>
-                        <outlet property="dataSource" destination="-1" id="duy-tx-I68"/>
-                        <outlet property="delegate" destination="-1" id="rtA-Tw-6Cd"/>
-                    </connections>
-                </tableView>
-                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="1FZ-9n-QPA">
-                    <rect key="frame" x="20.5" y="603" width="334" height="44"/>
                     <constraints>
-                        <constraint firstAttribute="width" constant="334" id="5Vx-Rl-7g1"/>
-                        <constraint firstAttribute="height" constant="44" id="Ugr-39-bSh"/>
+                        <constraint firstItem="E5R-L8-OiV" firstAttribute="leading" secondItem="VVS-04-BI8" secondAttribute="leading" id="7WD-mc-6oC"/>
+                        <constraint firstAttribute="trailing" secondItem="E5R-L8-OiV" secondAttribute="trailing" id="7i5-H1-wte"/>
+                        <constraint firstItem="E5R-L8-OiV" firstAttribute="top" secondItem="VVS-04-BI8" secondAttribute="top" id="AYL-nd-jhY"/>
+                        <constraint firstAttribute="bottom" secondItem="E5R-L8-OiV" secondAttribute="bottom" id="pJJ-M8-ZbN"/>
+                    </constraints>
+                </scrollView>
+                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="KPv-u3-zha">
+                    <rect key="frame" x="20" y="613" width="335" height="44"/>
+                    <color key="backgroundColor" red="1" green="0.25098039220000001" blue="0.58431372550000005" alpha="1" colorSpace="calibratedRGB"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="44" id="6gV-Qs-9WG"/>
                     </constraints>
-                    <state key="normal" image="woyaobaoming"/>
+                    <fontDescription key="fontDescription" type="system" weight="medium" pointSize="16"/>
+                    <state key="normal" title="立即报名">
+                        <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                    </state>
+                    <userDefinedRuntimeAttributes>
+                        <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+                            <integer key="value" value="22"/>
+                        </userDefinedRuntimeAttribute>
+                    </userDefinedRuntimeAttributes>
                     <connections>
-                        <action selector="sign:" destination="-1" eventType="touchUpInside" id="CBk-ZB-TIq"/>
+                        <action selector="signUp:" destination="-1" eventType="touchUpInside" id="haG-h2-v4O"/>
                     </connections>
                 </button>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="立即报名" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KAl-LX-czT">
-                    <rect key="frame" x="137.5" y="615" width="100" height="21"/>
-                    <constraints>
-                        <constraint firstAttribute="width" constant="100" id="C7D-7C-mDf"/>
-                        <constraint firstAttribute="height" constant="21" id="rYF-Q0-CGp"/>
-                    </constraints>
-                    <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                    <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                    <nil key="highlightedColor"/>
-                </label>
-                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="jiazai" translatesAutoresizingMaskIntoConstraints="NO" id="88e-sd-55f">
-                    <rect key="frame" x="0.0" y="0.0" width="375" height="375"/>
-                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
-                </imageView>
             </subviews>
             <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
-                <constraint firstItem="ery-9I-YtQ" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="04m-C2-FNu"/>
-                <constraint firstItem="vUN-kp-3ea" firstAttribute="bottom" secondItem="KAl-LX-czT" secondAttribute="bottom" constant="31" id="2WM-1f-zjV"/>
-                <constraint firstItem="KAl-LX-czT" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="7jR-hb-Xxn"/>
-                <constraint firstItem="ery-9I-YtQ" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" id="A8S-m1-5Db"/>
-                <constraint firstItem="ery-9I-YtQ" firstAttribute="trailing" secondItem="vUN-kp-3ea" secondAttribute="trailing" id="DOd-QI-hbI"/>
-                <constraint firstItem="ery-9I-YtQ" firstAttribute="trailing" secondItem="vUN-kp-3ea" secondAttribute="trailing" id="GST-C3-MwT"/>
-                <constraint firstItem="vUN-kp-3ea" firstAttribute="bottom" secondItem="1FZ-9n-QPA" secondAttribute="bottom" constant="20" id="Hiw-IC-Xb9"/>
-                <constraint firstItem="ery-9I-YtQ" firstAttribute="bottom" secondItem="vUN-kp-3ea" secondAttribute="bottom" constant="-93" id="XYZ-L1-5sf"/>
-                <constraint firstItem="ery-9I-YtQ" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" id="aoF-xh-GwT"/>
-                <constraint firstItem="1FZ-9n-QPA" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="tzH-em-pis"/>
+                <constraint firstItem="VVS-04-BI8" firstAttribute="bottom" secondItem="Q5M-cg-NOt" secondAttribute="bottom" id="7Jd-kX-O9a"/>
+                <constraint firstItem="KPv-u3-zha" firstAttribute="leading" secondItem="Q5M-cg-NOt" secondAttribute="leading" constant="20" id="BIO-sA-u60"/>
+                <constraint firstItem="VVS-04-BI8" firstAttribute="leading" secondItem="Q5M-cg-NOt" secondAttribute="leading" id="ONr-vd-zj2"/>
+                <constraint firstItem="E5R-L8-OiV" firstAttribute="height" secondItem="i5M-Pr-FkT" secondAttribute="height" priority="250" id="UM9-Qy-KPz"/>
+                <constraint firstItem="VVS-04-BI8" firstAttribute="top" secondItem="Q5M-cg-NOt" secondAttribute="top" id="ZVt-Ga-0Gf"/>
+                <constraint firstItem="E5R-L8-OiV" firstAttribute="width" secondItem="i5M-Pr-FkT" secondAttribute="width" id="bJx-Fb-CJJ"/>
+                <constraint firstItem="VVS-04-BI8" firstAttribute="trailing" secondItem="Q5M-cg-NOt" secondAttribute="trailing" id="ccX-tb-GfQ"/>
+                <constraint firstItem="Q5M-cg-NOt" firstAttribute="bottom" secondItem="KPv-u3-zha" secondAttribute="bottom" constant="10" id="uBC-I7-BvP"/>
+                <constraint firstItem="Q5M-cg-NOt" firstAttribute="trailing" secondItem="KPv-u3-zha" secondAttribute="trailing" constant="20" id="zdo-Cw-9Ev"/>
             </constraints>
-            <viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
-            <point key="canvasLocation" x="-152.5" y="90.5"/>
+            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+            <viewLayoutGuide key="safeArea" id="Q5M-cg-NOt"/>
+            <point key="canvasLocation" x="132" y="154.27286356821591"/>
         </view>
+        <tapGestureRecognizer id="TC1-QE-kQp">
+            <connections>
+                <action selector="signList:" destination="-1" id="ABL-Us-mRR"/>
+            </connections>
+        </tapGestureRecognizer>
     </objects>
     <resources>
+        <image name="icon_inter" width="20" height="20"/>
+        <image name="icon_renshu" width="20" height="20"/>
+        <image name="icon_shijian" width="20" height="20"/>
         <image name="jiazai" width="375" height="375"/>
-        <image name="woyaobaoming" width="334" height="44"/>
+        <image name="touxiang_wait" width="45" height="45"/>
     </resources>
 </document>

+ 20 - 0
model/Classes/Controllers/ActivityVC/ModelFansTableViewCell.h

@@ -0,0 +1,20 @@
+//
+//  ModelFansTableViewCell.h
+//  千模
+//
+//  Created by Drew on 2018/12/24.
+//  Copyright © 2018 MUMEI. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface ModelFansTableViewCell : UITableViewCell
+@property (weak, nonatomic) IBOutlet UIImageView *avatar;
+@property (weak, nonatomic) IBOutlet UILabel *name;
+@property (weak, nonatomic) IBOutlet UIView *modelView;
+@property (nonatomic, strong) NSDictionary *data;
+@end
+
+NS_ASSUME_NONNULL_END

+ 46 - 0
model/Classes/Controllers/ActivityVC/ModelFansTableViewCell.m

@@ -0,0 +1,46 @@
+//
+//  ModelFansTableViewCell.m
+//  千模
+//
+//  Created by Drew on 2018/12/24.
+//  Copyright © 2018 MUMEI. All rights reserved.
+//
+
+#import "ModelFansTableViewCell.h"
+
+@implementation ModelFansTableViewCell
+
+- (void)awakeFromNib {
+    [super awakeFromNib];
+    // Initialization code
+    self.contentView.backgroundColor = [UIColor clearColor];
+    self.avatar.layer.cornerRadius = 18;
+    self.avatar.clipsToBounds = YES;
+}
+
+- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
+    [super setSelected:selected animated:animated];
+
+    // Configure the view for the selected state
+}
+
+- (IBAction)tapAvatar:(id)sender {
+}
+
+- (void)setData:(NSDictionary *)data {
+    _data = data;
+    [self.avatar sd_setImageWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@%@", imageURl, data[@"hPhoto"]]] placeholderImage:[UIImage imageNamed:@"default_avatar"]];
+    self.name.text = data[@"Pet"];
+}
+
+- (UINavigationController *)findViewController {
+    id target = self;
+    while (target) {
+        target = ((UIResponder *) target).nextResponder;
+        if ([target isKindOfClass:[UINavigationController class]]) {
+            break;
+        }
+    }
+    return target;
+}
+@end

+ 109 - 0
model/Classes/Controllers/ActivityVC/ModelFansTableViewCell.xib

@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14283.14"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="ModelFansTableViewCell">
+            <rect key="frame" x="0.0" y="0.0" width="375" height="70"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
+                <rect key="frame" x="0.0" y="0.0" width="375" height="69.5"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="EUC-JV-vDn">
+                        <rect key="frame" x="20" y="5" width="335" height="60"/>
+                        <subviews>
+                            <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gdO-0w-z0V">
+                                <rect key="frame" x="284" y="21" width="36" height="18"/>
+                                <subviews>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="模特" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uZ1-aX-roL">
+                                        <rect key="frame" x="7.5" y="3" width="21" height="12"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="10"/>
+                                        <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                </subviews>
+                                <color key="backgroundColor" red="1" green="0.25098039220000001" blue="0.58431372550000005" alpha="1" colorSpace="calibratedRGB"/>
+                                <constraints>
+                                    <constraint firstItem="uZ1-aX-roL" firstAttribute="centerX" secondItem="gdO-0w-z0V" secondAttribute="centerX" id="1VZ-zZ-cLz"/>
+                                    <constraint firstItem="uZ1-aX-roL" firstAttribute="centerY" secondItem="gdO-0w-z0V" secondAttribute="centerY" id="6E0-nY-l4V"/>
+                                    <constraint firstAttribute="height" constant="18" id="H60-6W-oH5"/>
+                                    <constraint firstAttribute="width" constant="36" id="gwI-fP-YRZ"/>
+                                </constraints>
+                                <userDefinedRuntimeAttributes>
+                                    <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+                                        <integer key="value" value="9"/>
+                                    </userDefinedRuntimeAttribute>
+                                </userDefinedRuntimeAttributes>
+                            </view>
+                            <imageView contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="fTm-0Q-Q1X">
+                                <rect key="frame" x="15" y="12" width="36" height="36"/>
+                                <gestureRecognizers/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="36" id="acq-J3-yEc"/>
+                                    <constraint firstAttribute="width" constant="36" id="s04-hi-SWn"/>
+                                </constraints>
+                                <connections>
+                                    <outletCollection property="gestureRecognizers" destination="rYp-JK-TuH" appends="YES" id="ffG-gq-VLx"/>
+                                </connections>
+                            </imageView>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zkj-yG-G5u">
+                                <rect key="frame" x="65" y="21.5" width="36" height="17"/>
+                                <fontDescription key="fontDescription" type="system" weight="medium" pointSize="14"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                        </subviews>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <constraints>
+                            <constraint firstAttribute="trailing" secondItem="gdO-0w-z0V" secondAttribute="trailing" constant="15" id="6UT-tp-wCt"/>
+                            <constraint firstItem="zkj-yG-G5u" firstAttribute="leading" secondItem="fTm-0Q-Q1X" secondAttribute="trailing" constant="14" id="AoB-oY-bhe"/>
+                            <constraint firstItem="fTm-0Q-Q1X" firstAttribute="centerY" secondItem="EUC-JV-vDn" secondAttribute="centerY" id="EVG-ko-u5P"/>
+                            <constraint firstItem="fTm-0Q-Q1X" firstAttribute="leading" secondItem="EUC-JV-vDn" secondAttribute="leading" constant="15" id="UG3-qB-yq5"/>
+                            <constraint firstAttribute="height" constant="60" id="fTv-2K-t7r"/>
+                            <constraint firstItem="gdO-0w-z0V" firstAttribute="centerY" secondItem="EUC-JV-vDn" secondAttribute="centerY" id="tcM-3v-0Be"/>
+                            <constraint firstItem="zkj-yG-G5u" firstAttribute="centerY" secondItem="EUC-JV-vDn" secondAttribute="centerY" id="yED-pU-SuI"/>
+                        </constraints>
+                        <userDefinedRuntimeAttributes>
+                            <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+                                <integer key="value" value="8"/>
+                            </userDefinedRuntimeAttribute>
+                        </userDefinedRuntimeAttributes>
+                    </view>
+                </subviews>
+                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                <constraints>
+                    <constraint firstAttribute="trailing" secondItem="EUC-JV-vDn" secondAttribute="trailing" constant="20" id="1cI-k3-mk1"/>
+                    <constraint firstItem="EUC-JV-vDn" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="20" id="HHF-tt-pIS"/>
+                    <constraint firstItem="EUC-JV-vDn" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="r8l-NO-snL"/>
+                </constraints>
+                <userDefinedRuntimeAttributes>
+                    <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+                        <integer key="value" value="8"/>
+                    </userDefinedRuntimeAttribute>
+                </userDefinedRuntimeAttributes>
+            </tableViewCellContentView>
+            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+            <viewLayoutGuide key="safeArea" id="aW0-zy-SZf"/>
+            <connections>
+                <outlet property="avatar" destination="fTm-0Q-Q1X" id="9F5-9y-f8O"/>
+                <outlet property="modelView" destination="gdO-0w-z0V" id="nEp-EH-saC"/>
+                <outlet property="name" destination="zkj-yG-G5u" id="Oqb-4g-bt5"/>
+            </connections>
+        </tableViewCell>
+        <tapGestureRecognizer id="rYp-JK-TuH">
+            <connections>
+                <action selector="tapAvatar:" destination="KGk-i7-Jjw" id="xp4-oH-E1r"/>
+            </connections>
+        </tapGestureRecognizer>
+    </objects>
+</document>

+ 40 - 38
model/Classes/Controllers/ActivityVC/PlatformActivityController.m

@@ -7,20 +7,20 @@
 //  平台活动
 
 #import "PlatformActivityController.h"
-#import "ActivityDetailViewController.h"
-#import "SignUpViewController.h"
 #import "PlatformActivityCell.h"
 #import "ModelTitleView.h"   // 选择按钮
-@interface PlatformActivityController ()<UITableViewDelegate, UITableViewDataSource>
-@property (nonatomic, strong) UITableView *tableView;
-@property (nonatomic, strong) NSMutableArray *allDataArr;
-@property (nonatomic, strong) NSMutableArray *oneArr;
-@property (nonatomic, strong) NSMutableArray *twoArr;
-
-@property (nonatomic, strong) NSMutableArray *allModelArr;
-@property (nonatomic, strong) NSMutableArray *oneModelArr;
-@property (nonatomic, strong) NSMutableArray *twoModelArr;
-@property (nonatomic, assign) NSInteger selectIndex; //1是已报名,2未报名
+#import "ActivityDetailViewController.h"
+
+@interface PlatformActivityController () <UITableViewDelegate, UITableViewDataSource>
+@property(nonatomic, strong) UITableView *tableView;
+@property(nonatomic, strong) NSMutableArray *allDataArr;
+@property(nonatomic, strong) NSMutableArray *oneArr;
+@property(nonatomic, strong) NSMutableArray *twoArr;
+
+@property(nonatomic, strong) NSMutableArray *allModelArr;
+@property(nonatomic, strong) NSMutableArray *oneModelArr;
+@property(nonatomic, strong) NSMutableArray *twoModelArr;
+@property(nonatomic, assign) NSInteger selectIndex; //1是已报名,2未报名
 @end
 
 @implementation PlatformActivityController
@@ -48,7 +48,7 @@
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-    
+
     self.selectIndex = 0;
     //设置导航条
     [self creatNavBar];
@@ -68,10 +68,10 @@
     UIButton *btn = [UIButton buttonWithType:UIButtonTypeCustom];
     btn.frame = CGRectMake(0, 0, 40, 40);
     [btn setImage:[UIImage imageNamed:@"fanhui2"] forState:UIControlStateNormal];
-    btn.imageEdgeInsets =  UIEdgeInsetsMake(0, -20, 0, 0); // backBtn2
+    btn.imageEdgeInsets = UIEdgeInsetsMake(0, -20, 0, 0); // backBtn2
     [btn addTarget:self action:@selector(backClick) forControlEvents:UIControlEventTouchUpInside];
     UIBarButtonItem *leftItem = [[UIBarButtonItem alloc] initWithCustomView:btn];
-    UIBarButtonItem *nagetiveSpacer = [[UIBarButtonItem alloc]initWithBarButtonSystemItem:UIBarButtonSystemItemFixedSpace target:nil action:nil];
+    UIBarButtonItem *nagetiveSpacer = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFixedSpace target:nil action:nil];
     //    nagetiveSpacer.width = -12;//这个值可以根据自己需要自己调整
     self.navigationItem.leftBarButtonItems = @[nagetiveSpacer, leftItem];
 }
@@ -81,9 +81,10 @@
 }
 
 #pragma mark -- 获取平台活动
+
 - (void)getDataFromNetworking {
     [MBProgressHUD showHUDAddedTo:self.view animated:YES];
-    NSDictionary *dic = [[NSDictionary alloc] initWithObjectsAndKeys:[ModelUser user].pk,@"memberpk", @"true", @"all", nil];
+    NSDictionary *dic = @{@"memberpk": [ModelUser user].pk, @"all": @"true"};
 
     [YanCNetWorkManager requestPostWithURLStr:Url_dogetpartty(PublicUrl) parameters:dic finish:^(id dataDic) {
         [MBProgressHUD hideHUDForView:self.view animated:YES];
@@ -92,24 +93,24 @@
         if ([issuccess isEqualToString:@"success"]) {
             //
             self.allDataArr = dataDic[@"data"];
-            
+
             NSArray *data = dataDic[@"data"];
-            NSArray * array = [ActivityModel arrayOfModelsFromDictionaries:data];
+            NSArray *array = [ActivityModel arrayOfModelsFromDictionaries:data];
             self.allModelArr = [NSMutableArray new];
             [self.allModelArr addObjectsFromArray:array];
             [self.tableView reloadData];
-            
+
         } else {
             [MBProgressHUD showInfo:@"请求失败!"];
         }
-    } enError:^(NSError *error) {
+    }                                 enError:^(NSError *error) {
         [MBProgressHUD hideHUDForView:self.view animated:YES];
     }];
 }
 
 - (void)getParticipateDataFromNetworking {
     [MBProgressHUD showHUDAddedTo:self.view animated:YES];
-    NSDictionary *dic = [[NSDictionary alloc] initWithObjectsAndKeys:[ModelUser user].pk,@"PK", nil];
+    NSDictionary *dic = @{@"PK": [ModelUser user].pk};
     [YanCNetWorkManager requestPostWithURLStr:Url_doqrypartty(PublicUrl) parameters:dic finish:^(id dataDic) {
         [MBProgressHUD hideHUDForView:self.view animated:YES];
 
@@ -117,35 +118,35 @@
         if ([issuccess isEqualToString:@"success"]) {
             self.oneArr = dataDic[@"data"];
             NSArray *data = dataDic[@"data"];
-            NSArray * array = [ActivityModel arrayOfModelsFromDictionaries:data];
+            NSArray *array = [ActivityModel arrayOfModelsFromDictionaries:data];
             self.oneModelArr = [NSMutableArray new];
             [self.oneModelArr addObjectsFromArray:array];
             [self.tableView reloadData];
         } else {
             [MBProgressHUD showInfo:@"请求失败!"];
         }
-    } enError:^(NSError *error) {
+    }                                 enError:^(NSError *error) {
         [MBProgressHUD hideHUDForView:self.view animated:YES];
     }];
 }
 
 - (void)getNoParticipateDataFromNetworking {
     [MBProgressHUD showHUDAddedTo:self.view animated:YES];
-    NSDictionary *dic = [[NSDictionary alloc] initWithObjectsAndKeys:[ModelUser user].pk,@"PK", nil];
+    NSDictionary *dic = @{@"PK": [ModelUser user].pk};
     [YanCNetWorkManager requestPostWithURLStr:Url_doqrynotpartt(PublicUrl) parameters:dic finish:^(id dataDic) {
         [MBProgressHUD hideHUDForView:self.view animated:YES];
         NSString *issuccess = dataDic[@"msg"];
         if ([issuccess isEqualToString:@"success"]) {
             self.twoArr = dataDic[@"data"];
             NSArray *data = dataDic[@"data"];
-            NSArray * array = [ActivityModel arrayOfModelsFromDictionaries:data];
+            NSArray *array = [ActivityModel arrayOfModelsFromDictionaries:data];
             self.twoModelArr = [NSMutableArray new];
             [self.twoModelArr addObjectsFromArray:array];
             [self.tableView reloadData];
         } else {
             [MBProgressHUD showInfo:@"请求失败!"];
         }
-    } enError:^(NSError *error) {
+    }                                 enError:^(NSError *error) {
         [MBProgressHUD hideHUDForView:self.view animated:YES];
     }];
 }
@@ -153,7 +154,7 @@
 - (void)creatSubViews {
     ModelTitleView *titlesView = [[ModelTitleView alloc] initWithFrame:CGRectMake(0, 0, ScreenWidth, 40)];
     titlesView.titleArr = @[@"全部", @"已报名", @"未报名"];
-    __weak typeof (self) weakself = self;
+    __weak typeof(self) weakself = self;
     titlesView.ModelTitleViewBlock = ^(NSInteger tag) {
         NSLog(@"tag %ld", tag);
         weakself.selectIndex = tag;
@@ -166,7 +167,7 @@
         }
     };
     [self.view addSubview:titlesView];
-    self.tableView = [[UITableView alloc] initWithFrame:CGRectMake(0, CGRectGetMaxY(titlesView.frame), ScreenWidth, ScreenResultHeight-40) style:UITableViewStylePlain];
+    self.tableView = [[UITableView alloc] initWithFrame:CGRectMake(0, CGRectGetMaxY(titlesView.frame), ScreenWidth, ScreenResultHeight - 40) style:UITableViewStylePlain];
     self.tableView.backgroundColor = RGBValueColor(0xf7f7f7, 1.0);
     self.tableView.delegate = self;
     self.tableView.dataSource = self;
@@ -175,6 +176,7 @@
 }
 
 #pragma mark -- UITableViewDelegate, UITableViewDataSource
+
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
     if (self.selectIndex == 0) {
         return self.allDataArr.count;
@@ -205,18 +207,18 @@
     return cell;
 }
 
-- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
     ActivityModel *model;
-    if(self.selectIndex == 0){
-        model = [self.allModelArr objectAtIndex:indexPath.section];
-    }else if (self.selectIndex ==1){
-        model = [self.oneModelArr objectAtIndex:indexPath.section];
-    }else{
-        model = [self.twoModelArr objectAtIndex:indexPath.section];
+    if (self.selectIndex == 0) {
+        model = self.allModelArr[indexPath.section];
+    } else if (self.selectIndex == 1) {
+        model = self.oneModelArr[indexPath.section];
+    } else {
+        model = self.twoModelArr[indexPath.section];
     }
-    SignUpViewController *sVc = [[SignUpViewController alloc]init];
-    sVc.model = model;
-    [self.navigationController pushViewController:sVc animated:YES];
+    ActivityDetailViewController *detailVC = [[ActivityDetailViewController alloc] init];
+    detailVC.model = model;
+    [self.navigationController pushViewController:detailVC animated:YES];
 }
 
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {

+ 10 - 9
model/Classes/Controllers/ActivityVC/SignInfoCell.m

@@ -13,28 +13,29 @@
 - (void)awakeFromNib {
     [super awakeFromNib];
     self.phone.keyboardType = UIKeyboardTypeNumberPad;
-    self.intNum=0;
-    self.num.text = [NSString stringWithFormat:@"%d",self.intNum];
+    self.intNum = 0;
+    self.num.text = [NSString stringWithFormat:@"%d", self.intNum];
     // Initialization code
 }
+
 - (IBAction)jian:(id)sender {
-    if (self.intNum>0) {
+    if (self.intNum > 0) {
         self.intNum--;
-        self.num.text = [NSString stringWithFormat:@"%d",self.intNum];
+        self.num.text = [NSString stringWithFormat:@"%d", self.intNum];
     }
-    self.totoalPrice.text = [NSString stringWithFormat:@"%d元",[_model.meprice charValue]*self.intNum];
+    self.totoalPrice.text = [NSString stringWithFormat:@"%d元", [_model.meprice charValue] * self.intNum];
 }
 
 - (IBAction)jia:(id)sender {
     self.intNum++;
-    self.num.text = [NSString stringWithFormat:@"%d",self.intNum];
-    self.totoalPrice.text = [NSString stringWithFormat:@"%d元",[_model.meprice charValue]*self.intNum];
+    self.num.text = [NSString stringWithFormat:@"%d", self.intNum];
+    self.totoalPrice.text = [NSString stringWithFormat:@"%d元", [_model.meprice charValue] * self.intNum];
 
 }
 
-- (void)setModel:(ActivityModel *)model{
+- (void)setModel:(ActivityModel *)model {
     _model = model;
-    self.price.text = [NSString stringWithFormat:@"%d元/人",[model.meprice charValue]];
+    self.price.text = [NSString stringWithFormat:@"%d元/人", [model.meprice charValue]];
     self.captionLabel.text = model.caption;
 }
 

+ 7 - 6
model/Classes/Controllers/ActivityVC/SignInfoCell.xib

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14283.14"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -161,6 +161,7 @@
             </tableViewCellContentView>
             <viewLayoutGuide key="safeArea" id="aW0-zy-SZf"/>
             <connections>
+                <outlet property="captionLabel" destination="C3s-vU-ooP" id="1Wu-6b-5Bw"/>
                 <outlet property="jiaBtn" destination="Xxl-EJ-JL5" id="FbL-ME-BGc"/>
                 <outlet property="jianBtn" destination="PDv-gA-TTN" id="3D4-Ba-be5"/>
                 <outlet property="name" destination="Azp-ga-k6i" id="V2b-ry-DdA"/>
@@ -174,9 +175,9 @@
     </objects>
     <resources>
         <image name="canyurenshu" width="30" height="30"/>
-        <image name="cufengexian" width="374" height="10"/>
-        <image name="jia" width="25" height="25"/>
-        <image name="jian" width="25" height="25"/>
-        <image name="yuanjiaokuang" width="243" height="40"/>
+        <image name="cufengexian" width="374.5" height="10"/>
+        <image name="jia" width="25.5" height="25.5"/>
+        <image name="jian" width="25.5" height="25.5"/>
+        <image name="yuanjiaokuang" width="243.5" height="40"/>
     </resources>
 </document>

+ 17 - 0
model/Classes/Controllers/ActivityVC/SignListViewController.h

@@ -0,0 +1,17 @@
+//
+//  SignListViewController.h
+//  千模
+//
+//  Created by Drew on 2018/12/24.
+//  Copyright © 2018 MUMEI. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface SignListViewController : UIViewController
+@property(nonatomic, strong) NSString *pk;
+@end
+
+NS_ASSUME_NONNULL_END

+ 108 - 0
model/Classes/Controllers/ActivityVC/SignListViewController.m

@@ -0,0 +1,108 @@
+//
+//  SignListViewController.m
+//  千模
+//
+//  Created by Drew on 2018/12/24.
+//  Copyright © 2018 MUMEI. All rights reserved.
+//
+
+#import "SignListViewController.h"
+#import "ModelFansTableViewCell.h"
+
+@interface SignListViewController () <UITableViewDelegate, UITableViewDataSource> {
+    NSInteger page;
+}
+@property(weak, nonatomic) IBOutlet UITableView *tableView;
+@property(nonatomic, strong) NSMutableArray *data;
+@end
+
+@implementation SignListViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    page = 1;
+    self.navigationItem.title = @"报名列表";
+    UIBarButtonItem *leftItem = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"icon_back"] style:UIBarButtonItemStylePlain target:self action:@selector(backClick)];
+    self.navigationItem.leftBarButtonItem = leftItem;
+    self.navigationController.navigationBar.tintColor = [UIColor blackColor];
+
+    self.view.backgroundColor = [UIColor colorWithHexString:@"#F2F4F5"];
+    self.data = [NSMutableArray arrayWithCapacity:0];
+    self.tableView.backgroundColor = [UIColor clearColor];
+    self.tableView.delegate = self;
+    self.tableView.dataSource = self;
+    self.tableView.contentInset = UIEdgeInsetsMake(5, 0, 5, 0);
+    self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
+    self.tableView.mj_header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(refresh)];
+    self.tableView.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingTarget:self refreshingAction:@selector(loadMore)];
+    [self getData];
+}
+
+- (void)viewWillAppear:(BOOL)animated {
+    [super viewWillAppear:animated];
+    self.navigationController.navigationBar.tintColor = [UIColor blackColor];
+}
+
+- (void)backClick {
+    [self.navigationController popViewControllerAnimated:YES];
+}
+
+- (void)getData {
+    NSString *url = [NSString stringWithFormat:@"%@/activity?action=signlist&pk=%@&page=%d&size=5", PublicUrl, self.pk, page];
+    [[AHHttpManager sharedManager]
+            POST:url
+      parameters:nil
+         success:^(id responseObject) {
+             if ([@"success" isEqualToString:responseObject[@"msg"]]) {
+                 [self.tableView reloadData];
+                 NSArray *data = responseObject[@"data"];
+                 if (page == 1) {
+                     [self.data removeAllObjects];
+                 }
+                 [self.data addObjectsFromArray:data];
+                 [self.tableView reloadData];
+                 [self.tableView.mj_header endRefreshing];
+                 if (data.count < 20) {
+                     [self.tableView.mj_footer endRefreshingWithNoMoreData];
+                 } else {
+                     [self.tableView.mj_footer endRefreshing];
+                 }
+             }
+         }
+         failure:^(NSError *error) {
+
+         }];
+}
+
+- (void)refresh {
+    page = 1;
+    [self getData];
+}
+
+- (void)loadMore {
+    page++;
+    [self getData];
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+    return self.data.count;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+    ModelFansTableViewCell *cell = [self.tableView dequeueReusableCellWithIdentifier:@"ModelFansTableViewCell"];
+    if (!cell) {
+        NSArray *nib = [[NSBundle mainBundle] loadNibNamed:@"ModelFansTableViewCell" owner:self options:nil];
+        cell = nib[0];
+        cell.selectionStyle = UITableViewCellSelectionStyleNone;
+        cell.data = self.data[indexPath.row];
+        if ([@"7" isEqualToString:self.data[indexPath.row][@"MembType"]]) {
+            cell.modelView.hidden = NO;
+        }
+    }
+    return cell;
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
+    return 70;
+}
+@end

+ 39 - 0
model/Classes/Controllers/ActivityVC/SignListViewController.xib

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14283.14"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="SignListViewController">
+            <connections>
+                <outlet property="tableView" destination="rRA-TT-hyw" id="xnK-ye-qdP"/>
+                <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
+            </connections>
+        </placeholder>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="i5M-Pr-FkT">
+            <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="rRA-TT-hyw">
+                    <rect key="frame" x="0.0" y="20" width="375" height="647"/>
+                    <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                </tableView>
+            </subviews>
+            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <constraints>
+                <constraint firstItem="rRA-TT-hyw" firstAttribute="top" secondItem="Q5M-cg-NOt" secondAttribute="top" id="7aB-ym-fxT"/>
+                <constraint firstItem="Q5M-cg-NOt" firstAttribute="bottom" secondItem="rRA-TT-hyw" secondAttribute="bottom" id="FnX-z6-37n"/>
+                <constraint firstItem="rRA-TT-hyw" firstAttribute="leading" secondItem="Q5M-cg-NOt" secondAttribute="leading" id="QWZ-2K-YVR"/>
+                <constraint firstItem="Q5M-cg-NOt" firstAttribute="trailing" secondItem="rRA-TT-hyw" secondAttribute="trailing" id="fWw-JW-rwe"/>
+            </constraints>
+            <viewLayoutGuide key="safeArea" id="Q5M-cg-NOt"/>
+        </view>
+    </objects>
+</document>

+ 2 - 1
model/Classes/Controllers/ActivityVC/SignUpViewController.h

@@ -1,11 +1,12 @@
 //
-//  SignUpViewController.h
+//  ActivityDetailViewController.h
 //  千模
 //
 //  Created by MUMEI on 2018/5/18.
 //  Copyright © 2018年 MUMEI. All rights reserved.
 //
 
+
 #import "ActivityModel.h"
 @interface SignUpViewController : UIViewController
 @property (weak, nonatomic) IBOutlet UIImageView *headView;

+ 129 - 43
model/Classes/Controllers/ActivityVC/SignUpViewController.m

@@ -1,5 +1,5 @@
 //
-//  SignUpViewController.m
+//  ActivityDetailViewController.m
 //  千模
 //
 //  Created by MUMEI on 2018/5/18.
@@ -7,10 +7,11 @@
 //
 
 #import "SignUpViewController.h"
-#import "SignViewCell.h"
-#import "ActivityDetailViewController.h"
-@interface SignUpViewController ()
-@property (weak, nonatomic) IBOutlet UITableView *tableView;
+#import "SignInfoCell.h"
+#import "PlatformActivityController.h"
+
+@interface SignUpViewController () <UITextFieldDelegate>
+@property(weak, nonatomic) IBOutlet UITableView *tableView;
 
 @end
 
@@ -19,65 +20,150 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
     self.tableView.tableHeaderView = self.headView;
-    self.navigationItem.title = @"活动详情";
-    UIButton * btn = [UIButton buttonWithType:UIButtonTypeCustom];
+    _tableView.showsVerticalScrollIndicator = NO;
+    self.navigationItem.title = @"活动报名";
+    UIButton *btn = [UIButton buttonWithType:UIButtonTypeCustom];
     btn.frame = CGRectMake(0, 0, 40, 40);
     [btn setImage:[UIImage imageNamed:@"fanhui2"] forState:UIControlStateNormal];
-    btn.imageEdgeInsets =  UIEdgeInsetsMake(0, -20, 0, 0);
+    btn.imageEdgeInsets = UIEdgeInsetsMake(0, -20, 0, 0);
     [btn addTarget:self action:@selector(backClick) forControlEvents:UIControlEventTouchUpInside];
     UIBarButtonItem *leftItem = [[UIBarButtonItem alloc] initWithCustomView:btn];
-    UIBarButtonItem *nagetiveSpacer = [[UIBarButtonItem alloc]initWithBarButtonSystemItem:UIBarButtonSystemItemFixedSpace target:nil action:nil];
+    UIBarButtonItem *nagetiveSpacer = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFixedSpace target:nil action:nil];
     nagetiveSpacer.width = -12;//这个值可以根据自己需要自己调整
     self.navigationItem.leftBarButtonItems = @[nagetiveSpacer, leftItem];
-    _tableView.showsVerticalScrollIndicator = NO;
-    [_headView sd_setImageWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@%@",imageURl,_model.pic]] placeholderImage:[UIImage imageNamed:@"jiazai"]];
+    [_headView sd_setImageWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@%@", imageURl, _model.pic]] placeholderImage:[UIImage imageNamed:@"jiazai"]];
+
     // Do any additional setup after loading the view.
 }
 
--(void)backClick{
+- (IBAction)sign:(UIButton *)sender {
+    SignInfoCell *cell = [self.tableView cellForRowAtIndexPath:[NSIndexPath indexPathForRow:0 inSection:0]];
+    NSString *people = cell.name.text;
+    NSString *tel = cell.phone.text;
+    NSString *pcount = cell.num.text;
+    NSString *fee = [cell.totoalPrice.text componentsSeparatedByString:@"元"][0];
+    NSString *parttypk = cell.model.pk;
+    NSString *pk = [ModelUser user].pk;
+    NSString *str = [NSString stringWithFormat:@"%@/activity?action=doEnroll&PK=%@&ParttyPK=%@&people=%@&Tel=%@&pCount=%@&Fee=%@", PublicUrl, pk, parttypk, people, tel, pcount, fee];
+
+    [[AHHttpManager sharedManager] POST:[str stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding] parameters:nil success:^(id responseObject) {
+        NSLog(@"%@", responseObject);
+        if ([[responseObject objectForKey:@"msg"] isEqualToString:@"success"]) {
+
+            UIAlertController *alertController = [UIAlertController alertControllerWithTitle:@"" message:@"报名成功" preferredStyle:UIAlertControllerStyleAlert];
+            NSMutableAttributedString *hogan = [[NSMutableAttributedString alloc] initWithString:@"报名成功"];
+            int num = (int) hogan.length;
+            [hogan addAttribute:NSFontAttributeName
+                          value:[UIFont systemFontOfSize:16.0]
+                          range:NSMakeRange(0, num)];
+            [alertController setValue:hogan forKey:@"attributedMessage"];
+
+            UIImageView *alertImg = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"Complete_Img"]];
+            [alertController.view addSubview:alertImg];
+            [alertImg mas_makeConstraints:^(MASConstraintMaker *make) {
+                make.centerY.equalTo(alertController.view.mas_centerY);
+                make.left.equalTo(alertController.view.mas_left).offset(num / 4);
+            }];            //            [self.tableView reloadData];
+            [self presentViewController:alertController animated:YES completion:nil];
+            [NSTimer scheduledTimerWithTimeInterval:2.0 target:self selector:@selector(backPop:) userInfo:alertController repeats:NO];
+
+        } else {
+            if ([[responseObject objectForKey:@"desc"] isEqualToString:@"余额不足"]) {
+                [MBProgressHUD showTextHUD:@"余额不足" inView:self.view hideAfterDelay:1];
+            } else {
+                [MBProgressHUD showTextHUD:@"请填写正确报名资料" inView:self.view hideAfterDelay:1];
+            }
+        }
+    }                           failure:^(NSError *error) {
+        NSLog(@"error = %@", error);
+        [MBProgressHUD showTextHUD:@"超时" inView:self.view hideAfterDelay:1];
+
+    }];
+}
+
+- (void)backPop:(NSTimer *)timer {
+    UIAlertController *alert = [timer userInfo];
+    [alert dismissViewControllerAnimated:YES completion:^{
+        [self.navigationController popViewControllerAnimated:YES];
+    }];
+    alert = nil;
+}
+
+- (void)getList {
+
+}
+
+- (void)backClick {
     [self.navigationController popViewControllerAnimated:YES];
 }
 
-//- (void)viewWillAppear:(BOOL)animated{
-//    [self.navigationController setNavigationBarHidden:YES animated:YES];
-//}
-//
-//- (void)viewWillDisappear:(BOOL)animated{
-//    [self.navigationController setNavigationBarHidden:NO animated:YES];
-//
-//}
+- (void)viewWillAppear:(BOOL)animated {
+    [self.navigationController setNavigationBarHidden:NO animated:YES];
+}
+
 #pragma mark - deleDate
--(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section{
-    return 1;
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+    if (self.model.isTop) {
+        return 3;
+    } else {
+        return 1;
+    }
 }
--(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{
-    
-    SignViewCell * cell = [tableView dequeueReusableCellWithIdentifier:@"SignViewCell"];
-    if (!cell) {
-        cell = [[[UINib nibWithNibName:@"SignViewCell" bundle:nil]instantiateWithOwner:self options:nil]lastObject];
-        cell.selectionStyle = UIAccessibilityTraitNone;
-        cell.model = _model;
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+    switch (indexPath.row) {
+        case 1: {
+            SignInfoCell *cell = [tableView dequeueReusableCellWithIdentifier:@"SignInfoCell"];
+            if (!cell) {
+                cell = [[[UINib nibWithNibName:@"SignInfoCell" bundle:nil] instantiateWithOwner:self options:nil] lastObject];
+                cell.selectionStyle = UITableViewCellSelectionStyleNone;
+                cell.model = _model;
+                cell.name.delegate = self;
+                cell.phone.delegate = self;
+            }
+            return cell;
+            break;
+        }
+        case 2: {
+            UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"normalCell"];
+            if (!cell) {
+                cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:@"normalCell"];
+            }
+            cell.textLabel.text = @"选择图片";
+            return cell;
+        }
+        case 3: {
+            UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"normalCell"];
+            if (!cell) {
+                cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:@"normalCell"];
+            }
+            cell.textLabel.text = @"选择视频";
+            return cell;
+        }
+        default:
+            return nil;
     }
-    return cell;
-    
 }
--(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section{
-    
+
+- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section {
     return 1;
 }
 
--(CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{
-    return 695;
-}
-- (IBAction)signUp:(id)sender {
-    ActivityDetailViewController *aVc = [[ActivityDetailViewController alloc]init];
-    if ([_model.issign isEqualToString:@"1"]) {
-        [MBProgressHUD showTextHUD:@"不能重复报名" inView:self.view hideAfterDelay:1];
-    }else{
-        aVc.model = _model;
-        [self.navigationController pushViewController:aVc animated:YES];
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
+    if (indexPath.row == 1) {
+        return 465;
     }
+    return 44;
 }
+
+-selectrow
+
+- (BOOL)textFieldShouldReturn:(UITextField *)theTextField {
+    [theTextField resignFirstResponder];
+    return YES;
+}
+
 - (void)didReceiveMemoryWarning {
     [super didReceiveMemoryWarning];
     // Dispose of any resources that can be recreated.

+ 30 - 29
model/Classes/Controllers/ActivityVC/SignUpViewController.xib

@@ -12,9 +12,9 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="SignUpViewController">
             <connections>
-                <outlet property="headView" destination="Acg-GD-P8I" id="brX-Nn-LcF"/>
-                <outlet property="tableView" destination="UaZ-7v-hju" id="ePm-dN-qDv"/>
-                <outlet property="view" destination="iN0-l3-epB" id="Kad-ez-nRv"/>
+                <outlet property="headView" destination="88e-sd-55f" id="bNT-a0-Gdw"/>
+                <outlet property="tableView" destination="ery-9I-YtQ" id="EEt-gc-9vp"/>
+                <outlet property="view" destination="iN0-l3-epB" id="aIN-DV-4pe"/>
             </connections>
         </placeholder>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
@@ -22,55 +22,56 @@
             <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="1" sectionFooterHeight="1" translatesAutoresizingMaskIntoConstraints="NO" id="UaZ-7v-hju">
-                    <rect key="frame" x="0.0" y="0.0" width="375" height="579"/>
+                <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="1" sectionFooterHeight="1" translatesAutoresizingMaskIntoConstraints="NO" id="ery-9I-YtQ">
+                    <rect key="frame" x="0.0" y="0.0" width="375" height="574"/>
                     <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <inset key="separatorInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
                     <connections>
-                        <outlet property="dataSource" destination="-1" id="5Gy-hU-bxq"/>
-                        <outlet property="delegate" destination="-1" id="CH6-pG-0ok"/>
+                        <outlet property="dataSource" destination="-1" id="duy-tx-I68"/>
+                        <outlet property="delegate" destination="-1" id="rtA-Tw-6Cd"/>
                     </connections>
                 </tableView>
-                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="jiazai" translatesAutoresizingMaskIntoConstraints="NO" id="Acg-GD-P8I">
-                    <rect key="frame" x="0.0" y="-20" width="375" height="375"/>
-                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
-                </imageView>
-                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="e9L-jU-PvF">
+                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="1FZ-9n-QPA">
                     <rect key="frame" x="20.5" y="603" width="334" height="44"/>
                     <constraints>
-                        <constraint firstAttribute="height" constant="44" id="iPb-tM-72V"/>
-                        <constraint firstAttribute="width" constant="334" id="uwe-Wl-UpN"/>
+                        <constraint firstAttribute="width" constant="334" id="5Vx-Rl-7g1"/>
+                        <constraint firstAttribute="height" constant="44" id="Ugr-39-bSh"/>
                     </constraints>
                     <state key="normal" image="woyaobaoming"/>
                     <connections>
-                        <action selector="signUp:" destination="-1" eventType="touchUpInside" id="qGO-iy-Iut"/>
+                        <action selector="sign:" destination="-1" eventType="touchUpInside" id="CBk-ZB-TIq"/>
                     </connections>
                 </button>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="立即报名" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="AHX-4i-iNu">
-                    <rect key="frame" x="126.5" y="615" width="122" height="21"/>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="立即报名" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KAl-LX-czT">
+                    <rect key="frame" x="137.5" y="615" width="100" height="21"/>
                     <constraints>
-                        <constraint firstAttribute="height" constant="21" id="XE8-7A-gjo"/>
-                        <constraint firstAttribute="width" constant="122" id="yrm-ey-sNU"/>
+                        <constraint firstAttribute="width" constant="100" id="C7D-7C-mDf"/>
+                        <constraint firstAttribute="height" constant="21" id="rYF-Q0-CGp"/>
                     </constraints>
                     <fontDescription key="fontDescription" type="system" pointSize="16"/>
                     <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <nil key="highlightedColor"/>
                 </label>
+                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="jiazai" translatesAutoresizingMaskIntoConstraints="NO" id="88e-sd-55f">
+                    <rect key="frame" x="0.0" y="0.0" width="375" height="375"/>
+                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
+                </imageView>
             </subviews>
             <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
-                <constraint firstItem="UaZ-7v-hju" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" id="7DH-HO-I6R"/>
-                <constraint firstItem="vUN-kp-3ea" firstAttribute="bottom" secondItem="e9L-jU-PvF" secondAttribute="bottom" constant="20" id="XWX-Jf-bNF"/>
-                <constraint firstItem="UaZ-7v-hju" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="Zmg-LV-RNY"/>
-                <constraint firstItem="vUN-kp-3ea" firstAttribute="bottom" secondItem="AHX-4i-iNu" secondAttribute="bottom" constant="31" id="bWL-i6-wPR"/>
-                <constraint firstItem="e9L-jU-PvF" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="e95-Ug-qrz"/>
-                <constraint firstItem="UaZ-7v-hju" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="jvb-EE-lgH"/>
-                <constraint firstItem="AHX-4i-iNu" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="vi1-5T-0PV"/>
-                <constraint firstItem="e9L-jU-PvF" firstAttribute="top" secondItem="UaZ-7v-hju" secondAttribute="bottom" constant="24" id="wTu-e8-cT8"/>
-                <constraint firstItem="UaZ-7v-hju" firstAttribute="trailing" secondItem="vUN-kp-3ea" secondAttribute="trailing" id="y3F-7Y-HOM"/>
+                <constraint firstItem="ery-9I-YtQ" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="04m-C2-FNu"/>
+                <constraint firstItem="vUN-kp-3ea" firstAttribute="bottom" secondItem="KAl-LX-czT" secondAttribute="bottom" constant="31" id="2WM-1f-zjV"/>
+                <constraint firstItem="KAl-LX-czT" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="7jR-hb-Xxn"/>
+                <constraint firstItem="ery-9I-YtQ" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" id="A8S-m1-5Db"/>
+                <constraint firstItem="ery-9I-YtQ" firstAttribute="trailing" secondItem="vUN-kp-3ea" secondAttribute="trailing" id="DOd-QI-hbI"/>
+                <constraint firstItem="ery-9I-YtQ" firstAttribute="trailing" secondItem="vUN-kp-3ea" secondAttribute="trailing" id="GST-C3-MwT"/>
+                <constraint firstItem="vUN-kp-3ea" firstAttribute="bottom" secondItem="1FZ-9n-QPA" secondAttribute="bottom" constant="20" id="Hiw-IC-Xb9"/>
+                <constraint firstItem="ery-9I-YtQ" firstAttribute="bottom" secondItem="vUN-kp-3ea" secondAttribute="bottom" constant="-93" id="XYZ-L1-5sf"/>
+                <constraint firstItem="ery-9I-YtQ" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" id="aoF-xh-GwT"/>
+                <constraint firstItem="1FZ-9n-QPA" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="tzH-em-pis"/>
             </constraints>
             <viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
-            <point key="canvasLocation" x="24.5" y="51.5"/>
+            <point key="canvasLocation" x="-152.5" y="90.5"/>
         </view>
     </objects>
     <resources>

+ 17 - 13
model/Classes/Controllers/Model/ActivityModel.h

@@ -9,17 +9,21 @@
 #import "JSONModel.h"
 
 @interface ActivityModel : JSONModel
-@property (nonatomic,copy) NSString *pk;
-@property (nonatomic,copy) NSString *pic;
-@property (nonatomic,copy) NSString *caption;
-@property (nonatomic,copy) NSString *intro;
-@property (nonatomic,copy) NSString *term;
-@property (nonatomic,copy) NSString *sbeg;
-@property (nonatomic,copy) NSString *sendt;
-@property (nonatomic,copy) NSString *beg;
-@property (nonatomic,copy) NSString *endt;
-@property (nonatomic,copy) NSNumber *meprice;
-@property (nonatomic,copy) NSString *moprice;
-@property (nonatomic,copy) NSString *brprice;
-@property (nonatomic,copy) NSString *issign;
+@property(nonatomic, copy) NSString *pk;
+@property(nonatomic, copy) NSString *pic;
+@property(nonatomic, copy) NSString *caption;
+@property(nonatomic, copy) NSString *intro;
+@property(nonatomic, copy) NSString *term;
+@property(nonatomic, copy) NSString *sbeg;
+@property(nonatomic, copy) NSString *sendt;
+@property(nonatomic, copy) NSString *beg;
+@property(nonatomic, copy) NSString *endt;
+@property(nonatomic, copy) NSNumber *meprice;
+@property(nonatomic, copy) NSString *moprice;
+@property(nonatomic, copy) NSString *brprice;
+@property(nonatomic, copy) NSString *issign;
+@property(nonatomic, copy) NSString *signcount;
+@property(nonatomic, copy) NSString *issigndate;
+@property(nonatomic, copy) NSString *isTop;
+@property(nonatomic, copy) NSString *url;
 @end

+ 4 - 4
model/Classes/Controllers/Model/ActivityModel.m

@@ -9,11 +9,11 @@
 #import "ActivityModel.h"
 
 @implementation ActivityModel
-- (void)setValue:(id)value forUndefinedKey:(NSString *)key
-{
-    
+- (void)setValue:(id)value forUndefinedKey:(NSString *)key {
+
 }
-+(BOOL)propertyIsOptional:(NSString *)propertyName{
+
++ (BOOL)propertyIsOptional:(NSString *)propertyName {
     return YES;
 }
 @end