Browse Source

好困啊

熊竹 7 years ago
parent
commit
3458824c5d
67 changed files with 1022 additions and 81 deletions
  1. BIN
      .DS_Store
  2. 34 0
      model.xcodeproj/project.pbxproj
  3. 23 0
      model/Assets.xcassets/个人中心/icon_paihang.imageset/Contents.json
  4. BIN
      model/Assets.xcassets/个人中心/icon_paihang.imageset/icon_paihang.png
  5. BIN
      model/Assets.xcassets/个人中心/icon_paihang.imageset/icon_paihang@2x.png
  6. BIN
      model/Assets.xcassets/个人中心/icon_paihang.imageset/icon_paihang@3x.png
  7. 23 0
      model/Assets.xcassets/个人中心/img_jiantou_01.imageset/Contents.json
  8. BIN
      model/Assets.xcassets/个人中心/img_jiantou_01.imageset/img_jiantou_01.png
  9. BIN
      model/Assets.xcassets/个人中心/img_jiantou_01.imageset/img_jiantou_01@2x.png
  10. BIN
      model/Assets.xcassets/个人中心/img_jiantou_01.imageset/img_jiantou_01@3x.png
  11. 23 0
      model/Assets.xcassets/个人中心/img_jiantou_02.imageset/Contents.json
  12. BIN
      model/Assets.xcassets/个人中心/img_jiantou_02.imageset/img_jiantou_02.png
  13. BIN
      model/Assets.xcassets/个人中心/img_jiantou_02.imageset/img_jiantou_02@2x.png
  14. BIN
      model/Assets.xcassets/个人中心/img_jiantou_02.imageset/img_jiantou_02@3x.png
  15. 23 0
      model/Assets.xcassets/个人中心/img_jineng.imageset/Contents.json
  16. BIN
      model/Assets.xcassets/个人中心/img_jineng.imageset/img_jineng.png
  17. BIN
      model/Assets.xcassets/个人中心/img_jineng.imageset/img_jineng@2x.png
  18. BIN
      model/Assets.xcassets/个人中心/img_jineng.imageset/img_jineng@3x.png
  19. 23 0
      model/Assets.xcassets/个人中心/img_moka.imageset/Contents.json
  20. BIN
      model/Assets.xcassets/个人中心/img_moka.imageset/img_moka.png
  21. BIN
      model/Assets.xcassets/个人中心/img_moka.imageset/img_moka@2x.png
  22. BIN
      model/Assets.xcassets/个人中心/img_moka.imageset/img_moka@3x.png
  23. 23 0
      model/Assets.xcassets/个人中心/into_icon_dingdan.imageset/Contents.json
  24. BIN
      model/Assets.xcassets/个人中心/into_icon_dingdan.imageset/into_icon_dingdan.png
  25. BIN
      model/Assets.xcassets/个人中心/into_icon_dingdan.imageset/into_icon_dingdan@2x.png
  26. BIN
      model/Assets.xcassets/个人中心/into_icon_dingdan.imageset/into_icon_dingdan@3x.png
  27. 23 0
      model/Assets.xcassets/个人中心/into_icon_huancun.imageset/Contents.json
  28. BIN
      model/Assets.xcassets/个人中心/into_icon_huancun.imageset/into_icon_huancun.png
  29. BIN
      model/Assets.xcassets/个人中心/into_icon_huancun.imageset/into_icon_huancun@2x.png
  30. BIN
      model/Assets.xcassets/个人中心/into_icon_huancun.imageset/into_icon_huancun@3x.png
  31. 23 0
      model/Assets.xcassets/个人中心/into_icon_shezhi_baise-1.imageset/Contents.json
  32. BIN
      model/Assets.xcassets/个人中心/into_icon_shezhi_baise-1.imageset/into_icon_shezhi_baise.png
  33. BIN
      model/Assets.xcassets/个人中心/into_icon_shezhi_baise-1.imageset/into_icon_shezhi_baise@2x.png
  34. BIN
      model/Assets.xcassets/个人中心/into_icon_shezhi_baise-1.imageset/into_icon_shezhi_baise@3x.png
  35. 23 0
      model/Assets.xcassets/个人中心/into_icon_tuijian.imageset/Contents.json
  36. BIN
      model/Assets.xcassets/个人中心/into_icon_tuijian.imageset/into_icon_tuijian.png
  37. BIN
      model/Assets.xcassets/个人中心/into_icon_tuijian.imageset/into_icon_tuijian@2x.png
  38. BIN
      model/Assets.xcassets/个人中心/into_icon_tuijian.imageset/into_icon_tuijian@3x.png
  39. 23 0
      model/Assets.xcassets/个人中心/text_001.imageset/Contents.json
  40. BIN
      model/Assets.xcassets/个人中心/text_001.imageset/text_001.png
  41. BIN
      model/Assets.xcassets/个人中心/text_001.imageset/text_001@2x.png
  42. BIN
      model/Assets.xcassets/个人中心/text_001.imageset/text_001@3x.png
  43. 23 0
      model/Assets.xcassets/个人中心/text_002.imageset/Contents.json
  44. BIN
      model/Assets.xcassets/个人中心/text_002.imageset/text_002.png
  45. BIN
      model/Assets.xcassets/个人中心/text_002.imageset/text_002@2x.png
  46. BIN
      model/Assets.xcassets/个人中心/text_002.imageset/text_002@3x.png
  47. 23 0
      model/Assets.xcassets/个人中心/text_003.imageset/Contents.json
  48. BIN
      model/Assets.xcassets/个人中心/text_003.imageset/text_003.png
  49. BIN
      model/Assets.xcassets/个人中心/text_003.imageset/text_003@2x.png
  50. BIN
      model/Assets.xcassets/个人中心/text_003.imageset/text_003@3x.png
  51. BIN
      model/Classes/Controllers/Controller/.DS_Store
  52. 79 19
      model/Classes/Controllers/Controller/MineVC/MineNewViewController.m
  53. 182 45
      model/Classes/Controllers/Controller/MineVC/MineNewViewController.xib
  54. 21 0
      model/Classes/Controllers/Controller/MineVC/View/IntroView.h
  55. 55 0
      model/Classes/Controllers/Controller/MineVC/View/IntroView.m
  56. 136 0
      model/Classes/Controllers/Controller/MineVC/View/IntroView.xib
  57. 4 0
      model/Classes/Controllers/Controller/MyProfileVC/InfoEditViewController.h
  58. 32 2
      model/Classes/Controllers/Controller/MyProfileVC/InfoEditViewController.m
  59. 3 3
      model/Classes/Controllers/Controller/MyProfileVC/ModelDataController.m
  60. BIN
      model/Classes/Controllers/Controller/MyTeamVC/.DS_Store
  61. 11 2
      model/Classes/Controllers/Controller/MyTeamVC/TabControl.h
  62. 50 4
      model/Classes/Controllers/Controller/MyTeamVC/TabControl.m
  63. 17 0
      model/Classes/Controllers/Controller/RankVC/RankController.h
  64. 33 0
      model/Classes/Controllers/Controller/RankVC/RankController.m
  65. 74 0
      model/Classes/Controllers/Controller/RankVC/RankController.xib
  66. 9 0
      model/Classes/Controllers/Model/ModelUser.h
  67. 6 6
      model/ModelHeader.h

BIN
.DS_Store


+ 34 - 0
model.xcodeproj/project.pbxproj

@@ -369,6 +369,11 @@
 		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 */; };
+		3AE8C7AA218B2E550069D147 /* ModelCardController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3AE8C7A9218B2E550069D147 /* ModelCardController.m */; };
+		3AE8C7AD218B49890069D147 /* IntroView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3AE8C7AC218B49890069D147 /* IntroView.m */; };
+		3AE8C7AF218B49EC0069D147 /* IntroView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3AE8C7AE218B49EC0069D147 /* IntroView.xib */; };
+		3AE8C7B4218B65860069D147 /* RankController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3AE8C7B2218B65860069D147 /* RankController.m */; };
+		3AE8C7B5218B65860069D147 /* RankController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3AE8C7B3218B65860069D147 /* RankController.xib */; };
 		3AF44FDA21856E1600ABEAEB /* MineNewViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3AF44FD821856E1600ABEAEB /* MineNewViewController.m */; };
 		3AF44FDB21856E1600ABEAEB /* MineNewViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3AF44FD921856E1600ABEAEB /* MineNewViewController.xib */; };
 		3AF44FE721856F0700ABEAEB /* MineItemView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3AF44FDE21856F0600ABEAEB /* MineItemView.m */; };
@@ -1139,6 +1144,14 @@
 		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>"; };
+		3AE8C7A8218B2E550069D147 /* ModelCardController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ModelCardController.h; sourceTree = "<group>"; };
+		3AE8C7A9218B2E550069D147 /* ModelCardController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ModelCardController.m; sourceTree = "<group>"; };
+		3AE8C7AB218B49890069D147 /* IntroView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IntroView.h; sourceTree = "<group>"; };
+		3AE8C7AC218B49890069D147 /* IntroView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = IntroView.m; sourceTree = "<group>"; };
+		3AE8C7AE218B49EC0069D147 /* IntroView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = IntroView.xib; sourceTree = "<group>"; };
+		3AE8C7B1218B65860069D147 /* RankController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RankController.h; sourceTree = "<group>"; };
+		3AE8C7B2218B65860069D147 /* RankController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RankController.m; sourceTree = "<group>"; };
+		3AE8C7B3218B65860069D147 /* RankController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = RankController.xib; sourceTree = "<group>"; };
 		3AF44FD721856E1600ABEAEB /* MineNewViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MineNewViewController.h; sourceTree = "<group>"; };
 		3AF44FD821856E1600ABEAEB /* MineNewViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MineNewViewController.m; sourceTree = "<group>"; };
 		3AF44FD921856E1600ABEAEB /* MineNewViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MineNewViewController.xib; sourceTree = "<group>"; };
@@ -2452,6 +2465,16 @@
 			path = PromoteVC;
 			sourceTree = "<group>";
 		};
+		3AE8C7B0218B65630069D147 /* RankVC */ = {
+			isa = PBXGroup;
+			children = (
+				3AE8C7B1218B65860069D147 /* RankController.h */,
+				3AE8C7B2218B65860069D147 /* RankController.m */,
+				3AE8C7B3218B65860069D147 /* RankController.xib */,
+			);
+			path = RankVC;
+			sourceTree = "<group>";
+		};
 		3AF44FDC21856E5C00ABEAEB /* MineVC */ = {
 			isa = PBXGroup;
 			children = (
@@ -2478,6 +2501,9 @@
 				3AF44FE521856F0700ABEAEB /* ShadowView.h */,
 				3AF44FE321856F0700ABEAEB /* ShadowView.m */,
 				3AF44FE421856F0700ABEAEB /* ShadowView.xib */,
+				3AE8C7AB218B49890069D147 /* IntroView.h */,
+				3AE8C7AC218B49890069D147 /* IntroView.m */,
+				3AE8C7AE218B49EC0069D147 /* IntroView.xib */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -2604,6 +2630,7 @@
 				EF7B0C0720FC69EE0078781D /* MySkillsVC */,
 				EF7B0C0D20FC69EF0078781D /* MyWalletVC */,
 				2FA1AF8B212AA984005F12CA /* AboutUsVC */,
+				3AE8C7B0218B65630069D147 /* RankVC */,
 			);
 			path = Controller;
 			sourceTree = "<group>";
@@ -2798,6 +2825,8 @@
 			children = (
 				EF7B0C1E20FC6DA50078781D /* ModelDataController.h */,
 				EF7B0C1F20FC6DA50078781D /* ModelDataController.m */,
+				3AE8C7A8218B2E550069D147 /* ModelCardController.h */,
+				3AE8C7A9218B2E550069D147 /* ModelCardController.m */,
 				8848C6532108040F00EDB121 /* InfoEditViewController.h */,
 				8848C6542108040F00EDB121 /* InfoEditViewController.m */,
 				8848C6562108050100EDB121 /* MeasurementsViewController.h */,
@@ -2953,6 +2982,7 @@
 				2F8D26C221183D7300CD7347 /* LICENSE in Resources */,
 				3AF44FE821856F0700ABEAEB /* SettingsItemView.xib in Resources */,
 				2F8D27CA21183DEF00CD7347 /* README.md in Resources */,
+				3AE8C7B5218B65860069D147 /* RankController.xib in Resources */,
 				9EC8712020FAE7190087746C /* Assets.xcassets in Resources */,
 				2FA1AF8621280AE9005F12CA /* video_chat_tip_onTimer.aac in Resources */,
 				2F4A8947211ADB00006D7DD3 /* PingLunCell.xib in Resources */,
@@ -2993,6 +3023,7 @@
 				2F7FC08B21242E6300492F0C /* README.md in Resources */,
 				2F4A894A211ADB00006D7DD3 /* DetailOneImageCell.xib in Resources */,
 				3AF44FF92185901300ABEAEB /* SharePopViewController.xib in Resources */,
+				3AE8C7AF218B49EC0069D147 /* IntroView.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3137,6 +3168,7 @@
 				9EA6D16B20FE356900953CE3 /* WalletDetailsController.m in Sources */,
 				2F7FC08E21242E6300492F0C /* NSData+NTES.m in Sources */,
 				EF4A658D20FDEB0700FFCD3C /* PostSkillsController.m in Sources */,
+				3AE8C7AA218B2E550069D147 /* ModelCardController.m in Sources */,
 				2F8D26F121183D7300CD7347 /* NIMCreateTeamAnnouncement.m in Sources */,
 				2F8D271821183D7400CD7347 /* NIMKitAudioCenter.m in Sources */,
 				2F4A894D211ADB00006D7DD3 /* OnlyTextCell.m in Sources */,
@@ -3245,6 +3277,7 @@
 				2F8D256621146D1A00CD7347 /* PGPickerTableView.m in Sources */,
 				2F8D25432114691C00CD7347 /* PGDatePicker+Common.m in Sources */,
 				2F8D278B21183D9000CD7347 /* yuv420sp.fsh.c in Sources */,
+				3AE8C7B4218B65860069D147 /* RankController.m in Sources */,
 				2F8D278721183D9000CD7347 /* shader.c in Sources */,
 				3A44C12C218A0E7A0021DA3F /* MyMemberController.m in Sources */,
 				2F8D25362114691C00CD7347 /* NSCalendar+PGCurrent.m in Sources */,
@@ -3366,6 +3399,7 @@
 				2F8D271421183D7400CD7347 /* NIMCellLayoutConfig.m in Sources */,
 				8848C68F2108370800EDB121 /* TagCollectionViewCell.m in Sources */,
 				2F8D270421183D7400CD7347 /* NIMMediaItem.m in Sources */,
+				3AE8C7AD218B49890069D147 /* IntroView.m in Sources */,
 				2F8D25442114691C00CD7347 /* PGDatePicker+MonthDay.m in Sources */,
 				2F8D24652111A14B00CD7347 /* YJImageCropper.m in Sources */,
 				2F8D272321183D7400CD7347 /* NIMSessionVideoContentView.m in Sources */,

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

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

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


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


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


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

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

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


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


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


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

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

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


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


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


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

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

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


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


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


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

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

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


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


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


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

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

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


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


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


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

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

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


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


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


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

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

BIN
model/Assets.xcassets/个人中心/into_icon_shezhi_baise-1.imageset/into_icon_shezhi_baise.png


BIN
model/Assets.xcassets/个人中心/into_icon_shezhi_baise-1.imageset/into_icon_shezhi_baise@2x.png


BIN
model/Assets.xcassets/个人中心/into_icon_shezhi_baise-1.imageset/into_icon_shezhi_baise@3x.png


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

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

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


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


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


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

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

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


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


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


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

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

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


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


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


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

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

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


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


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


BIN
model/Classes/Controllers/Controller/.DS_Store


+ 79 - 19
model/Classes/Controllers/Controller/MineVC/MineNewViewController.m

@@ -17,6 +17,9 @@
 #import "PromoteController.h"
 #import "SettingsViewController.h"
 #import "ShareViewController.h"
+#import "IntroView.h"
+#import "ModelCardController.h"
+#import "RankController.h"
 
 @interface MineNewViewController ()
 @property(weak, nonatomic) IBOutlet UIView *headView;
@@ -24,11 +27,13 @@
 @property(weak, nonatomic) IBOutlet UILabel *nameLabel;
 @property (weak, nonatomic) IBOutlet UIView *avatarBg;
 @property(weak, nonatomic) IBOutlet UIImageView *avatarView;
-@property(weak, nonatomic) IBOutlet UIView *shadowView;
-@property (weak, nonatomic) IBOutlet UIView *menus;
+@property (weak, nonatomic) IBOutlet UIView *container1;
+@property (weak, nonatomic) IBOutlet UIView *container2;
 @property (weak, nonatomic) IBOutlet UIView *incomeView;
 @property (weak, nonatomic) IBOutlet UILabel *incomeLabel;
 @property (weak, nonatomic) IBOutlet UISwitch *onlineSwitch;
+@property (weak, nonatomic) IBOutlet UIView *modelCardView;
+@property (weak, nonatomic) IBOutlet UIView *skillView;
 
 @end
 
@@ -73,11 +78,17 @@
     maskLayer.path = maskPath.CGPath;
     self.bgView.layer.mask = maskLayer;
     
-    self.menus.layer.cornerRadius = 12;
-    self.menus.layer.shadowColor = [UIColor colorWithRed:0/255.0 green:0/255.0 blue:0/255.0 alpha:0.08].CGColor;
-    self.menus.layer.shadowOffset = CGSizeMake(0,6);
-    self.menus.layer.shadowOpacity = 1;
-    self.menus.layer.shadowRadius = 12;
+    self.container1.layer.cornerRadius = 12;
+    self.container1.layer.shadowColor = [UIColor colorWithRed:0/255.0 green:0/255.0 blue:0/255.0 alpha:0.08].CGColor;
+    self.container1.layer.shadowOffset = CGSizeMake(0,6);
+    self.container1.layer.shadowOpacity = 1;
+    self.container1.layer.shadowRadius = 12;
+    
+    self.container2.layer.cornerRadius = 12;
+    self.container2.layer.shadowColor = [UIColor colorWithRed:0/255.0 green:0/255.0 blue:0/255.0 alpha:0.08].CGColor;
+    self.container2.layer.shadowOffset = CGSizeMake(0,6);
+    self.container2.layer.shadowOpacity = 1;
+    self.container2.layer.shadowRadius = 12;
     
     self.incomeView.layer.cornerRadius = 17;
     self.incomeView.layer.shadowColor = [UIColor colorWithRed:255/255.0 green:64/255.0 blue:149/255.0 alpha:0.36].CGColor;
@@ -86,6 +97,33 @@
     self.incomeView.layer.shadowRadius = 10;
 }
 
+- (void)viewDidAppear:(BOOL)animated {
+    [super viewDidAppear:animated];
+    NSNumber* intro = [[NSUserDefaults standardUserDefaults] objectForKey:@"intro"];
+    if (!intro) {
+        __weak MineNewViewController *this = self;
+        IntroView* introView = [[IntroView alloc] initWithFrame:CGRectMake(0, 0, [UIScreen mainScreen].bounds.size.width, [UIScreen mainScreen].bounds.size.height)
+                                                        confirm:^{
+                                                            ModelCardController *modelCardVC = [[ModelCardController alloc] init];
+                                                            modelCardVC.hidesBottomBarWhenPushed = YES;
+                                                            [this.navigationController pushViewController:modelCardVC animated:YES];
+                                                        }
+                                                         cancel:^{
+                                                             
+                                                         }];
+        UIWindow * window=[[[UIApplication sharedApplication] delegate] window];
+        CGRect rect1 = [self.modelCardView convertRect: self.modelCardView.bounds toView:window];
+        introView.icon1left.constant = rect1.origin.x + rect1.size.width / 2 - 43;
+        introView.icon1top.constant = rect1.origin.y + rect1.size.height / 2 - 43 - [[UIApplication sharedApplication] statusBarFrame].size.height;
+        CGRect rect2 = [self.skillView convertRect: self.skillView.bounds toView:window];
+        introView.icon2left.constant = rect2.origin.x + rect2.size.width / 2 - 43;
+        [window addSubview:introView];
+        [introView updateConstraints];
+        [introView layoutIfNeeded];
+        [[NSUserDefaults standardUserDefaults] setObject:@1 forKey:@"intro"];
+    }
+}
+
 - (void)viewWillDisappear:(BOOL)animated {
     [self.navigationController setNavigationBarHidden:NO animated:YES];
 }
@@ -143,10 +181,9 @@
 - (IBAction)handelTap:(id)sender {
     switch (((UITapGestureRecognizer *) sender).view.tag) {
         case 1: {
-            MyWalletController *myWalletVC = [[MyWalletController alloc] init];
-            myWalletVC.hidesBottomBarWhenPushed = YES;
-            myWalletVC.amount = [ModelUser modelUser].coin_a;
-            [self.navigationController pushViewController:myWalletVC animated:YES];
+            ModelCardController *modelCardVC = [[ModelCardController alloc] init];
+            modelCardVC.hidesBottomBarWhenPushed = YES;
+            [self.navigationController pushViewController:modelCardVC animated:YES];
             break;
         }
         case 2: {
@@ -156,29 +193,47 @@
             break;
         }
         case 3: {
-            ModelDataController *modelDataVC = [[ModelDataController alloc] init];
-            modelDataVC.hidesBottomBarWhenPushed = YES;
-            [self.navigationController pushViewController:modelDataVC animated:YES];
-            break;
+            
         }
         case 4: {
-            PlatformActivityController *activityVC = [[PlatformActivityController alloc] init];
-            activityVC.hidesBottomBarWhenPushed = YES;
-            [self.navigationController pushViewController:activityVC animated:YES];
+            PromoteController* vc = [[PromoteController alloc] init];
+            vc.hidesBottomBarWhenPushed = YES;
+            [self.navigationController pushViewController:vc animated:YES];
             break;
         }
         case 5: {
-            PromoteController* vc = [[PromoteController alloc] init];
+            MyOrderController *vc = [[MyOrderController alloc] init];
             vc.hidesBottomBarWhenPushed = YES;
             [self.navigationController pushViewController:vc animated:YES];
             break;
         }
         case 6: {
+            MyWalletController *myWalletVC = [[MyWalletController alloc] init];
+            myWalletVC.hidesBottomBarWhenPushed = YES;
+            myWalletVC.amount = [ModelUser modelUser].coin_a;
+            [self.navigationController pushViewController:myWalletVC animated:YES];
+            break;
+        }
+        case 7:{
+            PlatformActivityController *activityVC = [[PlatformActivityController alloc] init];
+            activityVC.hidesBottomBarWhenPushed = YES;
+            [self.navigationController pushViewController:activityVC animated:YES];
+            break;
+        }
+        case 8:{
             AboutUsViewController *aboutUsVC = [[AboutUsViewController alloc] init];
             aboutUsVC.hidesBottomBarWhenPushed = YES;
             [self.navigationController pushViewController:aboutUsVC animated:YES];
             break;
         }
+        case 9:{
+            [MBProgressHUD showHUDAddedTo:self.view animated:YES];
+            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                [MBProgressHUD hideHUDForView:self.view];
+                [MBProgressHUD showInfo:@"清理完成"];
+            });
+            break;
+        }
         default:
             break;
     }
@@ -199,6 +254,11 @@
         [MBProgressHUD showInfo:@"您已开启离线模式,别人将无法呼叫您"];
     }
 }
+- (IBAction)tapRank:(id)sender {
+    RankController* rankVC = [[RankController alloc] init];
+    rankVC.hidesBottomBarWhenPushed = YES;
+    [self.navigationController pushViewController:rankVC animated:YES];
+}
 
 - (UIStatusBarStyle)preferredStatusBarStyle {
     return UIStatusBarStyleLightContent;

+ 182 - 45
model/Classes/Controllers/Controller/MineVC/MineNewViewController.xib

@@ -1,6 +1,6 @@
 <?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">
+    <device id="retina5_9" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
@@ -15,19 +15,21 @@
                 <outlet property="avatarBg" destination="SCh-5U-jcN" id="X8c-wO-oWf"/>
                 <outlet property="avatarView" destination="l52-m1-42R" id="W7X-lp-Myx"/>
                 <outlet property="bgView" destination="r9j-ZU-SlD" id="m1X-LN-lPe"/>
+                <outlet property="container1" destination="IBe-5v-ajR" id="gcB-kr-PXO"/>
+                <outlet property="container2" destination="wTS-eH-R6J" id="1Eu-ag-eeI"/>
                 <outlet property="headView" destination="JMR-FE-a0P" id="Oyz-DF-L4X"/>
                 <outlet property="incomeLabel" destination="DWd-RQ-jKu" id="0Vs-Kg-msg"/>
                 <outlet property="incomeView" destination="kaC-Mh-u3w" id="kyJ-iN-iF8"/>
-                <outlet property="menus" destination="wTS-eH-R6J" id="bpA-ZL-fA0"/>
+                <outlet property="modelCardView" destination="etX-QK-1nU" id="EVQ-7h-fu5"/>
                 <outlet property="nameLabel" destination="tnV-pA-N5a" id="4Yj-BS-G5M"/>
                 <outlet property="onlineSwitch" destination="TDa-kz-FG6" id="2qw-gq-AB5"/>
-                <outlet property="shadowView" destination="IBe-5v-ajR" id="7DJ-B2-QGE"/>
+                <outlet property="skillView" destination="Ac7-NR-8Xp" id="Ven-w6-xmx"/>
                 <outlet property="view" destination="iN0-l3-epB" id="6qb-1w-qlZ"/>
             </connections>
         </placeholder>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view contentMode="scaleToFill" id="iN0-l3-epB">
-            <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+            <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="JMR-FE-a0P">
@@ -38,7 +40,7 @@
                     </constraints>
                 </view>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="r9j-ZU-SlD">
-                    <rect key="frame" x="0.0" y="104" width="375" height="563"/>
+                    <rect key="frame" x="0.0" y="104" width="375" height="674"/>
                     <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                 </view>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="TVo-sg-JF7">
@@ -61,7 +63,7 @@
                     <nil key="highlightedColor"/>
                 </label>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="SCh-5U-jcN">
-                    <rect key="frame" x="144.5" y="61" width="86" height="86"/>
+                    <rect key="frame" x="144.66666666666666" y="61" width="86" height="86"/>
                     <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="86" id="4ix-ss-Tab"/>
@@ -69,7 +71,7 @@
                     </constraints>
                 </view>
                 <imageView userInteractionEnabled="NO" tag="1" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="default_avatar" translatesAutoresizingMaskIntoConstraints="NO" id="l52-m1-42R">
-                    <rect key="frame" x="152.5" y="69" width="70" height="70"/>
+                    <rect key="frame" x="152.66666666666666" y="69" width="70" height="70"/>
                     <gestureRecognizers/>
                     <constraints>
                         <constraint firstAttribute="height" constant="70" id="PdB-sW-AtI"/>
@@ -80,10 +82,10 @@
                     </connections>
                 </imageView>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kaC-Mh-u3w">
-                    <rect key="frame" x="97.5" y="206" width="180" height="34"/>
+                    <rect key="frame" x="97.666666666666686" y="206" width="180" height="34"/>
                     <subviews>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="今日收入 0元" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DWd-RQ-jKu">
-                            <rect key="frame" x="51" y="9" width="78.5" height="16"/>
+                            <rect key="frame" x="50.666666666666664" y="9" width="78.666666666666686" height="16"/>
                             <fontDescription key="fontDescription" type="system" pointSize="13"/>
                             <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             <nil key="highlightedColor"/>
@@ -97,28 +99,131 @@
                         <constraint firstItem="DWd-RQ-jKu" firstAttribute="centerY" secondItem="kaC-Mh-u3w" secondAttribute="centerY" id="zIU-RJ-YeQ"/>
                     </constraints>
                 </view>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="IBe-5v-ajR" customClass="ShadowMenu">
-                    <rect key="frame" x="20" y="260" width="335" height="80"/>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="IBe-5v-ajR">
+                    <rect key="frame" x="20" y="260" width="335" height="86"/>
+                    <subviews>
+                        <view tag="1" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="etX-QK-1nU">
+                            <rect key="frame" x="0.0" y="0.0" width="111.66666666666667" height="86"/>
+                            <subviews>
+                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="into_icon_ziliao" translatesAutoresizingMaskIntoConstraints="NO" id="Jsv-UD-DQS">
+                                    <rect key="frame" x="41" y="19" width="30" height="30"/>
+                                    <constraints>
+                                        <constraint firstAttribute="width" constant="30" id="L1O-sr-0GA"/>
+                                        <constraint firstAttribute="height" constant="30" id="VJv-e7-lbG"/>
+                                    </constraints>
+                                </imageView>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="模卡资料" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Lft-JP-JTR">
+                                    <rect key="frame" x="29.333333333333332" y="59" width="53.333333333333343" height="16"/>
+                                    <fontDescription key="fontDescription" type="system" pointSize="13"/>
+                                    <nil key="textColor"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
+                            </subviews>
+                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                            <gestureRecognizers/>
+                            <constraints>
+                                <constraint firstItem="Jsv-UD-DQS" firstAttribute="centerX" secondItem="etX-QK-1nU" secondAttribute="centerX" id="Md7-d8-EpM"/>
+                                <constraint firstItem="Lft-JP-JTR" firstAttribute="top" secondItem="Jsv-UD-DQS" secondAttribute="bottom" constant="10" id="VOc-LL-dli"/>
+                                <constraint firstItem="Jsv-UD-DQS" firstAttribute="top" secondItem="etX-QK-1nU" secondAttribute="top" constant="19" id="cw8-R6-c10"/>
+                                <constraint firstItem="Lft-JP-JTR" firstAttribute="centerX" secondItem="Jsv-UD-DQS" secondAttribute="centerX" id="t5i-5V-kvo"/>
+                            </constraints>
+                            <connections>
+                                <outletCollection property="gestureRecognizers" destination="KGq-7F-oNE" appends="YES" id="BgV-zn-ngR"/>
+                            </connections>
+                        </view>
+                        <view tag="2" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ac7-NR-8Xp">
+                            <rect key="frame" x="111.66666666666666" y="0.0" width="111.66666666666666" height="86"/>
+                            <subviews>
+                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="into_icon_jineng" translatesAutoresizingMaskIntoConstraints="NO" id="nnT-az-pJQ">
+                                    <rect key="frame" x="41" y="19" width="30" height="30"/>
+                                    <constraints>
+                                        <constraint firstAttribute="height" constant="30" id="94v-JL-4CQ"/>
+                                        <constraint firstAttribute="width" constant="30" id="zCt-Eh-5nA"/>
+                                    </constraints>
+                                </imageView>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="我的技能" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="V2f-es-Dni">
+                                    <rect key="frame" x="29.333333333333346" y="59" width="53.333333333333343" height="16"/>
+                                    <fontDescription key="fontDescription" type="system" pointSize="13"/>
+                                    <nil key="textColor"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
+                            </subviews>
+                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                            <gestureRecognizers/>
+                            <constraints>
+                                <constraint firstItem="nnT-az-pJQ" firstAttribute="top" secondItem="Ac7-NR-8Xp" secondAttribute="top" constant="19" id="OIu-Yl-MN6"/>
+                                <constraint firstItem="V2f-es-Dni" firstAttribute="top" secondItem="nnT-az-pJQ" secondAttribute="bottom" constant="10" id="SC0-RW-hRj"/>
+                                <constraint firstItem="nnT-az-pJQ" firstAttribute="centerX" secondItem="Ac7-NR-8Xp" secondAttribute="centerX" id="YMn-KM-Vd5"/>
+                                <constraint firstItem="V2f-es-Dni" firstAttribute="centerX" secondItem="nnT-az-pJQ" secondAttribute="centerX" id="iZZ-eb-xwz"/>
+                            </constraints>
+                            <connections>
+                                <outletCollection property="gestureRecognizers" destination="rU9-Dv-cAH" appends="YES" id="tU0-IJ-m1W"/>
+                            </connections>
+                        </view>
+                        <view tag="3" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="veP-td-DVE">
+                            <rect key="frame" x="223.33333333333334" y="0.0" width="111.66666666666666" height="86"/>
+                            <subviews>
+                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="into_icon_tuijian" translatesAutoresizingMaskIntoConstraints="NO" id="6Oh-er-2FD">
+                                    <rect key="frame" x="40.999999999999972" y="19" width="30" height="30"/>
+                                    <constraints>
+                                        <constraint firstAttribute="width" constant="30" id="bvR-OW-Nv7"/>
+                                        <constraint firstAttribute="height" constant="30" id="pNu-92-8eo"/>
+                                    </constraints>
+                                </imageView>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="申请推荐" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uy6-ei-xVE">
+                                    <rect key="frame" x="29.333333333333346" y="59" width="53.333333333333343" height="16"/>
+                                    <fontDescription key="fontDescription" type="system" pointSize="13"/>
+                                    <nil key="textColor"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
+                            </subviews>
+                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                            <gestureRecognizers/>
+                            <constraints>
+                                <constraint firstItem="uy6-ei-xVE" firstAttribute="top" secondItem="6Oh-er-2FD" secondAttribute="bottom" constant="10" id="XWV-85-itg"/>
+                                <constraint firstItem="6Oh-er-2FD" firstAttribute="top" secondItem="veP-td-DVE" secondAttribute="top" constant="19" id="em3-te-hKY"/>
+                                <constraint firstItem="uy6-ei-xVE" firstAttribute="centerX" secondItem="6Oh-er-2FD" secondAttribute="centerX" id="g2B-ns-0hp"/>
+                                <constraint firstItem="6Oh-er-2FD" firstAttribute="centerX" secondItem="veP-td-DVE" secondAttribute="centerX" id="nJo-db-h5x"/>
+                            </constraints>
+                            <connections>
+                                <outletCollection property="gestureRecognizers" destination="PkZ-LE-JNn" appends="YES" id="UJo-QI-Era"/>
+                            </connections>
+                        </view>
+                    </subviews>
                     <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <constraints>
-                        <constraint firstAttribute="height" constant="80" id="TFj-AB-vM1"/>
+                        <constraint firstItem="veP-td-DVE" firstAttribute="leading" secondItem="Ac7-NR-8Xp" secondAttribute="trailing" id="Fvz-H1-UTH"/>
+                        <constraint firstItem="veP-td-DVE" firstAttribute="top" secondItem="IBe-5v-ajR" secondAttribute="top" id="Jeg-iN-hFk"/>
+                        <constraint firstItem="Ac7-NR-8Xp" firstAttribute="leading" secondItem="etX-QK-1nU" secondAttribute="trailing" id="KSO-Ap-u5e"/>
+                        <constraint firstItem="Ac7-NR-8Xp" firstAttribute="top" secondItem="IBe-5v-ajR" secondAttribute="top" id="QCJ-yO-MKa"/>
+                        <constraint firstAttribute="trailing" secondItem="veP-td-DVE" secondAttribute="trailing" id="RGC-al-aAa"/>
+                        <constraint firstItem="veP-td-DVE" firstAttribute="width" secondItem="etX-QK-1nU" secondAttribute="width" id="Rd7-Vo-hSO"/>
+                        <constraint firstItem="etX-QK-1nU" firstAttribute="top" secondItem="IBe-5v-ajR" secondAttribute="top" id="Rsp-jw-ht7"/>
+                        <constraint firstAttribute="height" constant="86" id="TFj-AB-vM1"/>
+                        <constraint firstItem="veP-td-DVE" firstAttribute="height" secondItem="etX-QK-1nU" secondAttribute="height" id="YeZ-1I-rob"/>
+                        <constraint firstAttribute="bottom" secondItem="etX-QK-1nU" secondAttribute="bottom" id="dpm-7K-B1J"/>
+                        <constraint firstItem="Ac7-NR-8Xp" firstAttribute="width" secondItem="etX-QK-1nU" secondAttribute="width" id="p4y-cr-TcI"/>
+                        <constraint firstItem="Ac7-NR-8Xp" firstAttribute="height" secondItem="etX-QK-1nU" secondAttribute="height" id="s7I-Ef-5l6"/>
+                        <constraint firstItem="etX-QK-1nU" firstAttribute="leading" secondItem="IBe-5v-ajR" secondAttribute="leading" id="ud6-cf-fEG"/>
+                        <constraint firstAttribute="bottom" secondItem="veP-td-DVE" secondAttribute="bottom" id="v4z-Hq-nPo"/>
+                        <constraint firstAttribute="bottom" secondItem="Ac7-NR-8Xp" secondAttribute="bottom" id="veF-d0-Qt0"/>
                     </constraints>
                 </view>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="wTS-eH-R6J">
-                    <rect key="frame" x="20" y="360" width="335" height="214"/>
+                    <rect key="frame" x="20" y="366" width="335" height="214"/>
                     <subviews>
-                        <view tag="1" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="NBl-XH-Hzs">
-                            <rect key="frame" x="0.0" y="0.0" width="111.5" height="107"/>
+                        <view tag="6" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="NBl-XH-Hzs">
+                            <rect key="frame" x="0.0" y="0.0" width="111.66666666666667" height="107"/>
                             <subviews>
-                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="into_icon_qianbao" translatesAutoresizingMaskIntoConstraints="NO" id="sya-g9-yRn">
+                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="into_icon_yaoqing" translatesAutoresizingMaskIntoConstraints="NO" id="sya-g9-yRn">
                                     <rect key="frame" x="41" y="19" width="30" height="30"/>
                                     <constraints>
                                         <constraint firstAttribute="width" constant="30" id="EHX-9q-K2O"/>
                                         <constraint firstAttribute="height" constant="30" id="ivg-Ly-qWZ"/>
                                     </constraints>
                                 </imageView>
-                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="我的钱包" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cEj-b1-PRe">
-                                    <rect key="frame" x="29" y="59" width="53.5" height="16"/>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="推广奖励" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cEj-b1-PRe">
+                                    <rect key="frame" x="29.333333333333332" y="59" width="53.333333333333343" height="16"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                     <nil key="textColor"/>
                                     <nil key="highlightedColor"/>
@@ -136,18 +241,18 @@
                                 <outletCollection property="gestureRecognizers" destination="lDW-Ha-YqP" appends="YES" id="amX-eb-w2M"/>
                             </connections>
                         </view>
-                        <view tag="2" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="T8r-6O-oez">
-                            <rect key="frame" x="111.5" y="0.0" width="112" height="107"/>
+                        <view tag="5" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="T8r-6O-oez">
+                            <rect key="frame" x="111.66666666666666" y="0.0" width="111.66666666666666" height="107"/>
                             <subviews>
-                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="into_icon_jineng" translatesAutoresizingMaskIntoConstraints="NO" id="paS-9R-vth">
+                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="into_icon_dingdan" translatesAutoresizingMaskIntoConstraints="NO" id="paS-9R-vth">
                                     <rect key="frame" x="41" y="19" width="30" height="30"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="30" id="19b-4p-L6V"/>
                                         <constraint firstAttribute="width" constant="30" id="qxI-63-rP0"/>
                                     </constraints>
                                 </imageView>
-                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="我的技能" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aVt-UN-UaG">
-                                    <rect key="frame" x="29.5" y="59" width="53.5" height="16"/>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="我的订单" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aVt-UN-UaG">
+                                    <rect key="frame" x="29.333333333333346" y="59" width="53.333333333333343" height="16"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                     <nil key="textColor"/>
                                     <nil key="highlightedColor"/>
@@ -165,18 +270,18 @@
                                 <outletCollection property="gestureRecognizers" destination="Y02-cS-gQI" appends="YES" id="fPb-fb-NB6"/>
                             </connections>
                         </view>
-                        <view tag="3" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="o1s-e5-SeB">
-                            <rect key="frame" x="223.5" y="0.0" width="111.5" height="107"/>
+                        <view tag="6" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="o1s-e5-SeB">
+                            <rect key="frame" x="223.33333333333334" y="0.0" width="111.66666666666666" height="107"/>
                             <subviews>
-                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="into_icon_ziliao" translatesAutoresizingMaskIntoConstraints="NO" id="h3h-m3-egt">
-                                    <rect key="frame" x="40.5" y="19" width="30" height="30"/>
+                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="into_icon_qianbao" translatesAutoresizingMaskIntoConstraints="NO" id="h3h-m3-egt">
+                                    <rect key="frame" x="40.999999999999972" y="19" width="30" height="30"/>
                                     <constraints>
                                         <constraint firstAttribute="width" constant="30" id="i1F-U6-TUE"/>
                                         <constraint firstAttribute="height" constant="30" id="lJv-ah-Oj6"/>
                                     </constraints>
                                 </imageView>
-                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="模卡资料" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="n5b-2g-nLc">
-                                    <rect key="frame" x="29" y="59" width="53.5" height="16"/>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="我的钱包" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="n5b-2g-nLc">
+                                    <rect key="frame" x="29.333333333333346" y="59" width="53.333333333333343" height="16"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                     <nil key="textColor"/>
                                     <nil key="highlightedColor"/>
@@ -194,8 +299,8 @@
                                 <outletCollection property="gestureRecognizers" destination="cV6-zd-8iH" appends="YES" id="kYc-uJ-Vca"/>
                             </connections>
                         </view>
-                        <view tag="4" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="HoW-Mj-Duu">
-                            <rect key="frame" x="0.0" y="107" width="111.5" height="107"/>
+                        <view tag="7" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="HoW-Mj-Duu">
+                            <rect key="frame" x="0.0" y="107" width="111.66666666666667" height="107"/>
                             <subviews>
                                 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="into_icon_huodong" translatesAutoresizingMaskIntoConstraints="NO" id="h7n-nK-6bg">
                                     <rect key="frame" x="41" y="19" width="30" height="30"/>
@@ -205,7 +310,7 @@
                                     </constraints>
                                 </imageView>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="平台活动" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="M4w-PY-G8J">
-                                    <rect key="frame" x="29" y="59" width="53.5" height="16"/>
+                                    <rect key="frame" x="29.333333333333332" y="59" width="53.333333333333343" height="16"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                     <nil key="textColor"/>
                                     <nil key="highlightedColor"/>
@@ -223,18 +328,18 @@
                                 <outletCollection property="gestureRecognizers" destination="VLm-8N-4Wh" appends="YES" id="QVd-qz-BVj"/>
                             </connections>
                         </view>
-                        <view tag="5" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gns-Zl-Ouc">
-                            <rect key="frame" x="111.5" y="107" width="112" height="107"/>
+                        <view tag="8" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gns-Zl-Ouc">
+                            <rect key="frame" x="111.66666666666666" y="107" width="111.66666666666666" height="107"/>
                             <subviews>
-                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="into_icon_yaoqing" translatesAutoresizingMaskIntoConstraints="NO" id="j8h-Hm-SlQ">
+                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="into_icon_lianxikefu" translatesAutoresizingMaskIntoConstraints="NO" id="j8h-Hm-SlQ">
                                     <rect key="frame" x="41" y="19" width="30" height="30"/>
                                     <constraints>
                                         <constraint firstAttribute="width" constant="30" id="9KG-RB-MqP"/>
                                         <constraint firstAttribute="height" constant="30" id="OTB-9A-vXN"/>
                                     </constraints>
                                 </imageView>
-                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="推广奖励" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Z87-2N-5uW">
-                                    <rect key="frame" x="29.5" y="59" width="53.5" height="16"/>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="联系我们" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Z87-2N-5uW">
+                                    <rect key="frame" x="29.333333333333346" y="59" width="53.333333333333343" height="16"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                     <nil key="textColor"/>
                                     <nil key="highlightedColor"/>
@@ -252,18 +357,18 @@
                                 <outletCollection property="gestureRecognizers" destination="JfW-VZ-2ny" appends="YES" id="nTP-fc-14A"/>
                             </connections>
                         </view>
-                        <view tag="6" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="VsH-0Y-1Cz">
-                            <rect key="frame" x="223.5" y="107" width="111.5" height="107"/>
+                        <view tag="9" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="VsH-0Y-1Cz">
+                            <rect key="frame" x="223.33333333333334" y="107" width="111.66666666666666" height="107"/>
                             <subviews>
-                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="into_icon_lianxikefu" translatesAutoresizingMaskIntoConstraints="NO" id="pYw-Ed-bRZ">
-                                    <rect key="frame" x="40.5" y="19" width="30" height="30"/>
+                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="into_icon_huancun" translatesAutoresizingMaskIntoConstraints="NO" id="pYw-Ed-bRZ">
+                                    <rect key="frame" x="40.999999999999972" y="19" width="30" height="30"/>
                                     <constraints>
                                         <constraint firstAttribute="width" constant="30" id="Ori-ku-Tl4"/>
                                         <constraint firstAttribute="height" constant="30" id="Ruq-L5-Hh1"/>
                                     </constraints>
                                 </imageView>
-                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="联系我们" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aVg-EV-GH1">
-                                    <rect key="frame" x="29" y="59" width="53.5" height="16"/>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="清除缓存" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aVg-EV-GH1">
+                                    <rect key="frame" x="29.333333333333346" y="59" width="53.333333333333343" height="16"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                     <nil key="textColor"/>
                                     <nil key="highlightedColor"/>
@@ -329,13 +434,24 @@
                     </userDefinedRuntimeAttributes>
                 </view>
                 <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="TDa-kz-FG6">
-                    <rect key="frame" x="20" y="44.5" width="51" height="31"/>
+                    <rect key="frame" x="20" y="44.666666666666664" width="51" height="30.999999999999993"/>
                     <color key="onTintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <color key="thumbTintColor" red="1" green="0.25098039220000001" blue="0.58431372550000005" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <connections>
                         <action selector="onlineChange:" destination="-1" eventType="valueChanged" id="11z-46-e9R"/>
                     </connections>
                 </switch>
+                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3ng-uh-Rqk">
+                    <rect key="frame" x="305" y="711" width="56" height="56"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="56" id="lTb-5b-0qM"/>
+                        <constraint firstAttribute="width" constant="56" id="p2v-qr-jj0"/>
+                    </constraints>
+                    <state key="normal" image="icon_paihang"/>
+                    <connections>
+                        <action selector="tapRank:" destination="-1" eventType="touchUpInside" id="iAj-Iy-Qqe"/>
+                    </connections>
+                </button>
             </subviews>
             <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
@@ -356,6 +472,8 @@
                         </userDefinedRuntimeAttribute>
                     </userDefinedRuntimeAttributes>
                 </constraint>
+                <constraint firstItem="60z-Gq-b3E" firstAttribute="bottom" secondItem="3ng-uh-Rqk" secondAttribute="bottom" constant="11" id="V0n-hY-CKz"/>
+                <constraint firstItem="60z-Gq-b3E" firstAttribute="trailing" secondItem="3ng-uh-Rqk" secondAttribute="trailing" constant="14" id="X57-ym-6ea"/>
                 <constraint firstAttribute="top" secondItem="JMR-FE-a0P" secondAttribute="top" id="YjH-SZ-13n"/>
                 <constraint firstItem="TDa-kz-FG6" firstAttribute="leading" secondItem="60z-Gq-b3E" secondAttribute="leading" constant="20" id="auZ-6d-A0b"/>
                 <constraint firstItem="IBe-5v-ajR" firstAttribute="top" secondItem="kaC-Mh-u3w" secondAttribute="bottom" constant="20" id="b6C-88-L6p"/>
@@ -373,7 +491,7 @@
             </constraints>
             <nil key="simulatedTopBarMetrics"/>
             <viewLayoutGuide key="safeArea" id="60z-Gq-b3E"/>
-            <point key="canvasLocation" x="4" y="-5.8470764617691158"/>
+            <point key="canvasLocation" x="4" y="-5.9113300492610836"/>
         </view>
         <tapGestureRecognizer id="JN3-oE-VBy">
             <connections>
@@ -410,14 +528,33 @@
                 <action selector="handelTap:" destination="-1" id="tbg-1v-3da"/>
             </connections>
         </tapGestureRecognizer>
+        <tapGestureRecognizer id="KGq-7F-oNE">
+            <connections>
+                <action selector="handelTap:" destination="-1" id="S5o-XF-0XG"/>
+            </connections>
+        </tapGestureRecognizer>
+        <tapGestureRecognizer id="rU9-Dv-cAH">
+            <connections>
+                <action selector="handelTap:" destination="-1" id="pHd-1f-BHc"/>
+            </connections>
+        </tapGestureRecognizer>
+        <tapGestureRecognizer id="PkZ-LE-JNn">
+            <connections>
+                <action selector="handelTap:" destination="-1" id="ofp-TT-ghk"/>
+            </connections>
+        </tapGestureRecognizer>
     </objects>
     <resources>
         <image name="default_avatar" width="36" height="36"/>
+        <image name="icon_paihang" width="56" height="56"/>
+        <image name="into_icon_dingdan" width="30" height="30"/>
+        <image name="into_icon_huancun" width="30" height="30"/>
         <image name="into_icon_huodong" width="30" height="30"/>
         <image name="into_icon_jineng" width="30" height="30"/>
         <image name="into_icon_lianxikefu" width="30" height="30"/>
         <image name="into_icon_qianbao" width="30" height="30"/>
         <image name="into_icon_shezhi_baise" width="30" height="30"/>
+        <image name="into_icon_tuijian" width="30" height="30"/>
         <image name="into_icon_yaoqing" width="30" height="30"/>
         <image name="into_icon_ziliao" width="30" height="30"/>
     </resources>

+ 21 - 0
model/Classes/Controllers/Controller/MineVC/View/IntroView.h

@@ -0,0 +1,21 @@
+//
+//  IntroView.h
+//  model
+//
+//  Created by Drew on 2018/11/1.
+//  Copyright © 2018年 Mine. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+typedef void (^Callback)();
+@interface IntroView : UIView
+- (instancetype)initWithFrame:(CGRect)frame confirm:(Callback)confirm cancel:(Callback)cancel;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *icon1top;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *icon1left;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *icon2left;
+@end
+
+NS_ASSUME_NONNULL_END

+ 55 - 0
model/Classes/Controllers/Controller/MineVC/View/IntroView.m

@@ -0,0 +1,55 @@
+//
+//  IntroView.m
+//  model
+//
+//  Created by Drew on 2018/11/1.
+//  Copyright © 2018年 Mine. All rights reserved.
+//
+
+#import "IntroView.h"
+@interface IntroView()
+@property(nonatomic, strong) Callback confirm;
+@property(nonatomic, strong) Callback cancel;
+@end
+@implementation IntroView
+
+- (instancetype)initWithFrame:(CGRect)frame confirm:(void(^)())confirm cancel:(void(^)())cancel {
+    if (self = [super initWithFrame:frame]) {
+        [self initView];
+        self.confirm = confirm;
+        self.cancel = cancel;
+    }
+    return self;
+}
+
+- (instancetype)initWithCoder:(NSCoder *)aDecoder {
+    if (self = [super initWithCoder:aDecoder]) {
+        [self initView];
+    }
+    return self;
+}
+
+- (void)initView {
+    NSBundle *bundle = [NSBundle bundleForClass:[self class]];
+    NSString *className = NSStringFromClass([self class]);
+    UIView *view = [[bundle loadNibNamed:className owner:self options:nil] firstObject];
+    view.frame = self.bounds;
+    [self addSubview:view];
+    self.backgroundColor = [UIColor clearColor];
+}
+
+- (IBAction)confirm:(id)sender {
+    [self removeFromSuperview];
+    if (self.confirm) {
+        self.confirm();
+    }
+}
+
+- (IBAction)cancel:(id)sender {
+    [self removeFromSuperview];
+    if (self.cancel) {
+        self.cancel();
+    }
+}
+
+@end

+ 136 - 0
model/Classes/Controllers/Controller/MineVC/View/IntroView.xib

@@ -0,0 +1,136 @@
+<?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="IntroView">
+            <connections>
+                <outlet property="icon1left" destination="BPs-wo-i9x" id="trW-T8-1gx"/>
+                <outlet property="icon1top" destination="78c-T6-fOB" id="rtN-MH-ODv"/>
+                <outlet property="icon2left" destination="Ap1-ou-ltX" id="n1Y-8u-8IJ"/>
+            </connections>
+        </placeholder>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view contentMode="scaleToFill" id="iN0-l3-epB">
+            <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_moka" translatesAutoresizingMaskIntoConstraints="NO" id="Sm7-qh-iUJ">
+                    <rect key="frame" x="33" y="267" width="86" height="86"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="86" id="09q-gF-LUy"/>
+                        <constraint firstAttribute="width" constant="86" id="2eG-y8-xuz"/>
+                    </constraints>
+                </imageView>
+                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_jineng" translatesAutoresizingMaskIntoConstraints="NO" id="FYK-ed-CBD">
+                    <rect key="frame" x="146" y="267" width="86" height="86"/>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="86" id="8IP-6f-zaf"/>
+                        <constraint firstAttribute="height" constant="86" id="HBk-ds-YrR"/>
+                    </constraints>
+                </imageView>
+                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_jiantou_01" translatesAutoresizingMaskIntoConstraints="NO" id="Y4V-kq-4ub">
+                    <rect key="frame" x="68" y="179" width="24" height="81"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="81" id="NBG-Wi-246"/>
+                        <constraint firstAttribute="width" constant="24" id="Q9b-Tn-krB"/>
+                    </constraints>
+                </imageView>
+                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="text_002" translatesAutoresizingMaskIntoConstraints="NO" id="6V2-6p-kaF">
+                    <rect key="frame" x="33" y="148" width="168" height="18"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="18" id="SeV-QZ-3mk"/>
+                        <constraint firstAttribute="width" constant="168" id="so1-eE-H5A"/>
+                    </constraints>
+                </imageView>
+                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="text_001" translatesAutoresizingMaskIntoConstraints="NO" id="L1s-vb-F77">
+                    <rect key="frame" x="33" y="109" width="263" height="20"/>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="263" id="M4Z-4B-gOP"/>
+                        <constraint firstAttribute="height" constant="20" id="ee0-DT-v1w"/>
+                    </constraints>
+                </imageView>
+                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_jiantou_02" translatesAutoresizingMaskIntoConstraints="NO" id="xkS-bU-3gu">
+                    <rect key="frame" x="165.5" y="358" width="37" height="72"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="72" id="4xX-4a-RM3"/>
+                        <constraint firstAttribute="width" constant="37" id="7ic-Bf-Gbb"/>
+                    </constraints>
+                </imageView>
+                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="text_003" translatesAutoresizingMaskIntoConstraints="NO" id="z5K-fp-TPN">
+                    <rect key="frame" x="146" y="441" width="168" height="18"/>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="168" id="Sya-mS-VX6"/>
+                        <constraint firstAttribute="height" constant="18" id="vnu-4n-N8P"/>
+                    </constraints>
+                </imageView>
+                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Pzw-IU-w81">
+                    <rect key="frame" x="104.5" y="558" width="166" height="44"/>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="166" id="HSr-M7-WDH"/>
+                        <constraint firstAttribute="height" constant="44" id="RjC-vR-WKK"/>
+                    </constraints>
+                    <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>
+                    <connections>
+                        <action selector="confirm:" destination="-1" eventType="touchUpInside" id="gO6-ah-b8H"/>
+                    </connections>
+                </button>
+                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dtE-0y-kDE">
+                    <rect key="frame" x="154" y="618" width="67" height="18"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="18" id="Z1A-EE-8gR"/>
+                    </constraints>
+                    <fontDescription key="fontDescription" type="system" pointSize="13"/>
+                    <state key="normal" title="稍后再完善">
+                        <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                    </state>
+                    <connections>
+                        <action selector="cancel:" destination="-1" eventType="touchUpInside" id="HrM-OA-7v5"/>
+                    </connections>
+                </button>
+            </subviews>
+            <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.80000000000000004" colorSpace="custom" customColorSpace="sRGB"/>
+            <constraints>
+                <constraint firstItem="dtE-0y-kDE" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="0Rr-O9-1Yf"/>
+                <constraint firstItem="Sm7-qh-iUJ" firstAttribute="top" secondItem="vUN-kp-3ea" secondAttribute="top" constant="247" id="78c-T6-fOB"/>
+                <constraint firstItem="xkS-bU-3gu" firstAttribute="top" secondItem="Sm7-qh-iUJ" secondAttribute="bottom" constant="5" id="7wI-96-dhh"/>
+                <constraint firstItem="vUN-kp-3ea" firstAttribute="bottom" secondItem="dtE-0y-kDE" secondAttribute="bottom" constant="31" id="8Of-9W-SgZ"/>
+                <constraint firstItem="Sm7-qh-iUJ" firstAttribute="top" secondItem="Y4V-kq-4ub" secondAttribute="bottom" constant="7" id="9Vf-Mo-6IR"/>
+                <constraint firstItem="FYK-ed-CBD" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" constant="146" id="Ap1-ou-ltX"/>
+                <constraint firstItem="Sm7-qh-iUJ" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" constant="33" id="BPs-wo-i9x"/>
+                <constraint firstItem="Y4V-kq-4ub" firstAttribute="centerX" secondItem="Sm7-qh-iUJ" secondAttribute="centerX" constant="4" id="DwH-Tw-61z"/>
+                <constraint firstItem="xkS-bU-3gu" firstAttribute="centerX" secondItem="FYK-ed-CBD" secondAttribute="centerX" constant="-5" id="FE4-O2-YNQ"/>
+                <constraint firstItem="Y4V-kq-4ub" firstAttribute="top" secondItem="6V2-6p-kaF" secondAttribute="bottom" constant="13" id="P7j-yJ-Wq1"/>
+                <constraint firstItem="6V2-6p-kaF" firstAttribute="top" secondItem="L1s-vb-F77" secondAttribute="bottom" constant="19" id="PZH-fZ-neo"/>
+                <constraint firstItem="Pzw-IU-w81" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="UUv-1c-LCR"/>
+                <constraint firstItem="z5K-fp-TPN" firstAttribute="top" secondItem="xkS-bU-3gu" secondAttribute="bottom" constant="11" id="g26-zJ-yX1"/>
+                <constraint firstItem="L1s-vb-F77" firstAttribute="leading" secondItem="Sm7-qh-iUJ" secondAttribute="leading" id="hFm-lr-ojM"/>
+                <constraint firstItem="z5K-fp-TPN" firstAttribute="leading" secondItem="FYK-ed-CBD" secondAttribute="leading" id="hxo-YX-Eg5"/>
+                <constraint firstItem="6V2-6p-kaF" firstAttribute="leading" secondItem="Sm7-qh-iUJ" secondAttribute="leading" id="srz-8f-wgi"/>
+                <constraint firstItem="FYK-ed-CBD" firstAttribute="top" secondItem="Sm7-qh-iUJ" secondAttribute="top" id="wf5-IK-bMt"/>
+                <constraint firstItem="vUN-kp-3ea" firstAttribute="bottom" secondItem="Pzw-IU-w81" secondAttribute="bottom" constant="65" id="x5e-Vf-e44"/>
+            </constraints>
+            <viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
+            <point key="canvasLocation" x="39.200000000000003" y="46.326836581709152"/>
+        </view>
+    </objects>
+    <resources>
+        <image name="img_jiantou_01" width="27" height="85"/>
+        <image name="img_jiantou_02" width="37" height="74"/>
+        <image name="img_jineng" width="86" height="86"/>
+        <image name="img_moka" width="86" height="86"/>
+        <image name="text_001" width="246" height="18"/>
+        <image name="text_002" width="166" height="17"/>
+        <image name="text_003" width="166" height="17"/>
+    </resources>
+</document>

+ 4 - 0
model/Classes/Controllers/Controller/MyProfileVC/InfoEditViewController.h

@@ -15,6 +15,10 @@ typedef NS_ENUM(NSInteger, InfoEditType) {
     InfoEditTypeWeight,
     InfoEditTypeSigature,
     InfoEditTypeVprice,
+    InfoEditTypeOccupation,
+    InfoEditTypeCollege,
+    InfoEditTypeHobby,
+    InfoEditTypeConstellation
 };
 
 typedef void(^EditComplete)(NSString *content);

+ 32 - 2
model/Classes/Controllers/Controller/MyProfileVC/InfoEditViewController.m

@@ -74,7 +74,26 @@
             self.infoTextField.placeholder = @"请输入视频单价(6--49)元";
             self.infoTextField.keyboardType = UIKeyboardTypeNumberPad;
             break;
-            
+        case InfoEditTypeHobby:
+            self.title = @"兴趣爱好";
+            self.infoTextField.text = [ModelUser modelUser].hobby;
+            self.infoTextField.placeholder = @"请填写兴趣爱好";
+            break;
+        case InfoEditTypeCollege:
+            self.title = @"毕业院校";
+            self.infoTextField.text = [ModelUser modelUser].college;
+            self.infoTextField.placeholder = @"请填写毕业院校";
+            break;
+        case InfoEditTypeOccupation:
+            self.title = @"职业";
+            self.infoTextField.text = [ModelUser modelUser].constellation;
+            self.infoTextField.placeholder = @"请填写职业";
+            break;
+        case InfoEditTypeConstellation:
+            self.title = @"星座";
+            self.infoTextField.text = [ModelUser modelUser].occupation;
+            self.infoTextField.placeholder = @"请填写星座";
+            break;
         default:
             break;
     }
@@ -120,7 +139,18 @@
         case InfoEditTypeVprice:
             paramterKey = @"vprice";
             break;
-            
+        case InfoEditTypeHobby:
+            paramterKey = @"hobby";
+            break;
+        case InfoEditTypeCollege:
+            paramterKey = @"college";
+            break;
+        case InfoEditTypeOccupation:
+            paramterKey = @"occupation";
+            break;
+        case InfoEditTypeConstellation:
+            paramterKey = @"constellation";
+            break;
         default:
             break;
     }

+ 3 - 3
model/Classes/Controllers/Controller/MyProfileVC/ModelDataController.m

@@ -146,9 +146,9 @@
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
     
     static NSString *reuseIdentifier=@"cellID";
-    UITableViewCell *modelCell=[tableView dequeueReusableCellWithIdentifier:reuseIdentifier];
-    if (modelCell==nil) {
-        modelCell=[[UITableViewCell alloc]initWithStyle:UITableViewCellStyleValue1 reuseIdentifier:reuseIdentifier];
+    UITableViewCell *modelCell = [tableView dequeueReusableCellWithIdentifier:reuseIdentifier];
+    if (modelCell == nil) {
+        modelCell = [[UITableViewCell alloc]initWithStyle:UITableViewCellStyleValue1 reuseIdentifier:reuseIdentifier];
     }
     modelCell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
     modelCell.selectionStyle = UITableViewCellSelectionStyleNone;

BIN
model/Classes/Controllers/Controller/MyTeamVC/.DS_Store


+ 11 - 2
model/Classes/Controllers/Controller/MyTeamVC/TabControl.h

@@ -11,13 +11,22 @@
 NS_ASSUME_NONNULL_BEGIN
 IB_DESIGNABLE
 @protocol TabControlDelegate <NSObject>
-
 - (void) tabChange:(NSInteger) index;
-
 @end
+
+typedef NS_ENUM(NSInteger, TabControlState) {
+    TabControlStateNormal,
+    TabControlStateActive
+};
+
 @interface TabControl : UIView
 @property (nonatomic, assign) NSInteger index;
 @property (nonatomic, retain) id<TabControlDelegate> delegate;
+@property (nonatomic, strong) IBInspectable UIColor* backgroungColor;
+@property (nonatomic, strong) IBInspectable UIColor* indicatorColor;
+@property (nonatomic, strong) IBInspectable UIColor* normalColor;
+@property (nonatomic, strong) IBInspectable UIColor* activeColor;
+- (void)setColor:(UIColor*) color forState:(TabControlState) state;
 @end
 
 NS_ASSUME_NONNULL_END

+ 50 - 4
model/Classes/Controllers/Controller/MyTeamVC/TabControl.m

@@ -12,6 +12,7 @@
 @property (weak, nonatomic) IBOutlet UIView *indicator;
 @property (weak, nonatomic) IBOutlet UILabel *label0;
 @property (weak, nonatomic) IBOutlet UILabel *label1;
+@property (nonatomic, strong) UIView* view;
 @end
 @implementation TabControl
 
@@ -37,7 +38,10 @@
     view.backgroundColor = [UIColor clearColor];
     [self addSubview:view];
     self.clipsToBounds = YES;
+    _view = view;
     _index = 0;
+    _normalColor = [UIColor blackColor];
+    _activeColor = [UIColor whiteColor];
 }
 
 -(void)layoutSubviews {
@@ -53,11 +57,11 @@
                          animations:^{
                              self.indicator.transform = CGAffineTransformMakeTranslation(self.indicator.frame.size.width * index, 0);
                              if(index == 0) {
-                                 self.label0.textColor = [UIColor whiteColor];
-                                 self.label1.textColor = [UIColor blackColor];
+                                 self.label0.textColor = self.activeColor;
+                                 self.label1.textColor = self.normalColor;
                              } else {
-                                 self.label0.textColor = [UIColor blackColor];
-                                 self.label1.textColor = [UIColor whiteColor];
+                                 self.label0.textColor = self.normalColor;
+                                 self.label1.textColor = self.activeColor;
                              }
                          }
                          completion:nil];
@@ -75,4 +79,46 @@
     }
 }
 
+- (void)setBackgroungColor:(UIColor *)backgroungColor {
+    self.view.backgroundColor = backgroungColor;
+}
+
+- (void)setIndicatorColor:(UIColor *)indicatorColor {
+    self.indicator.backgroundColor = indicatorColor;
+}
+
+-(void)setColor:(UIColor *)color forState:(TabControlState)state {
+    switch (state) {
+        case TabControlStateNormal:
+            self.normalColor = color;
+            break;
+        case TabControlStateActive:
+            self.activeColor = color;
+            break;
+        default:
+            break;
+    }
+}
+
+- (void)setActiveColor:(UIColor *)activeColor {
+    _activeColor = activeColor;
+    if(self.index == 0) {
+        self.label0.textColor = self.activeColor;
+        self.label1.textColor = self.normalColor;
+    } else {
+        self.label0.textColor = self.normalColor;
+        self.label1.textColor = self.activeColor;
+    }
+}
+
+- (void)setNormalColor:(UIColor *)normalColor {
+    _normalColor = normalColor;
+    if(self.index == 0) {
+        self.label0.textColor = self.activeColor;
+        self.label1.textColor = self.normalColor;
+    } else {
+        self.label0.textColor = self.normalColor;
+        self.label1.textColor = self.activeColor;
+    }
+}
 @end

+ 17 - 0
model/Classes/Controllers/Controller/RankVC/RankController.h

@@ -0,0 +1,17 @@
+//
+//  RankController.h
+//  model
+//
+//  Created by Drew on 2018/11/2.
+//  Copyright © 2018年 Mine. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface RankController : UIViewController
+
+@end
+
+NS_ASSUME_NONNULL_END

+ 33 - 0
model/Classes/Controllers/Controller/RankVC/RankController.m

@@ -0,0 +1,33 @@
+//
+//  RankController.m
+//  model
+//
+//  Created by Drew on 2018/11/2.
+//  Copyright © 2018年 Mine. All rights reserved.
+//
+
+#import "RankController.h"
+
+@interface RankController ()
+
+@end
+
+@implementation RankController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    // Do any additional setup after loading the view from its nib.
+}
+
+- (void)viewDidLayoutSubviews {
+    [super viewDidLayoutSubviews];
+    CAGradientLayer *gl = [CAGradientLayer layer];
+    gl.frame = self.view.bounds;
+    gl.startPoint = CGPointMake(0.5, 0);
+    gl.endPoint = CGPointMake(0.5, 0.98);
+    gl.colors = @[(__bridge id)[UIColor colorWithRed:251/255.0 green:92/255.0 blue:163/255.0 alpha:1].CGColor, (__bridge id)[UIColor colorWithRed:253/255.0 green:127/255.0 blue:141/255.0 alpha:1].CGColor];
+    gl.locations = @[@(0), @(1.0f)];
+    [self.view.layer insertSublayer:gl atIndex:0];
+}
+
+@end

+ 74 - 0
model/Classes/Controllers/Controller/RankVC/RankController.xib

@@ -0,0 +1,74 @@
+<?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="RankController">
+            <connections>
+                <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>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hxE-cK-4e8">
+                    <rect key="frame" x="0.0" y="0.0" width="375" height="64"/>
+                    <subviews>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kNP-sh-is1">
+                            <rect key="frame" x="0.0" y="20" width="375" height="44"/>
+                            <subviews>
+                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ko1-yQ-XVA" customClass="TabControl">
+                                    <rect key="frame" x="97.5" y="5" width="180" height="34"/>
+                                    <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                    <constraints>
+                                        <constraint firstAttribute="height" constant="34" id="IWo-st-isA"/>
+                                        <constraint firstAttribute="width" constant="180" id="sfK-gE-naS"/>
+                                    </constraints>
+                                </view>
+                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="g9p-6J-Zsw">
+                                    <rect key="frame" x="0.0" y="1" width="39" height="42"/>
+                                    <inset key="contentEdgeInsets" minX="20" minY="10" maxX="10" maxY="10"/>
+                                    <state key="normal" image="fanhui1"/>
+                                </button>
+                            </subviews>
+                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                            <constraints>
+                                <constraint firstItem="g9p-6J-Zsw" firstAttribute="leading" secondItem="kNP-sh-is1" secondAttribute="leading" id="DF6-Yg-nCo"/>
+                                <constraint firstItem="ko1-yQ-XVA" firstAttribute="centerY" secondItem="kNP-sh-is1" secondAttribute="centerY" id="SYo-xU-idN"/>
+                                <constraint firstItem="ko1-yQ-XVA" firstAttribute="centerX" secondItem="kNP-sh-is1" secondAttribute="centerX" id="TwT-fp-UB8"/>
+                                <constraint firstAttribute="height" constant="44" id="srj-3c-UMz"/>
+                                <constraint firstItem="g9p-6J-Zsw" firstAttribute="centerY" secondItem="kNP-sh-is1" secondAttribute="centerY" id="u7k-qi-Orw"/>
+                            </constraints>
+                        </view>
+                    </subviews>
+                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                    <constraints>
+                        <constraint firstAttribute="trailing" secondItem="kNP-sh-is1" secondAttribute="trailing" id="Cj4-hx-Smu"/>
+                        <constraint firstItem="kNP-sh-is1" firstAttribute="leading" secondItem="hxE-cK-4e8" secondAttribute="leading" id="QwR-1R-etH"/>
+                        <constraint firstAttribute="bottom" secondItem="kNP-sh-is1" secondAttribute="bottom" id="pOS-7e-jYR"/>
+                    </constraints>
+                </view>
+            </subviews>
+            <color key="backgroundColor" red="1" green="0.25098039220000001" blue="0.58431372550000005" alpha="1" colorSpace="calibratedRGB"/>
+            <constraints>
+                <constraint firstItem="Q5M-cg-NOt" firstAttribute="top" secondItem="hxE-cK-4e8" secondAttribute="bottom" constant="-44" id="0JZ-db-58O"/>
+                <constraint firstItem="Q5M-cg-NOt" firstAttribute="trailing" secondItem="hxE-cK-4e8" secondAttribute="trailing" id="E36-7X-daW"/>
+                <constraint firstItem="hxE-cK-4e8" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" id="NNZ-H4-qNs"/>
+                <constraint firstItem="hxE-cK-4e8" firstAttribute="leading" secondItem="Q5M-cg-NOt" secondAttribute="leading" id="Nc3-Hy-SGg"/>
+            </constraints>
+            <viewLayoutGuide key="safeArea" id="Q5M-cg-NOt"/>
+        </view>
+    </objects>
+    <resources>
+        <image name="fanhui1" width="9" height="16"/>
+    </resources>
+</document>

+ 9 - 0
model/Classes/Controllers/Model/ModelUser.h

@@ -47,6 +47,15 @@
 @property (nonatomic, copy) NSString *honorcount;
 ///邀请码
 @property (nonatomic ,copy) NSString *qrcode;
+// 职业
+@property (nonatomic ,copy) NSString *occupation;
+//兴趣爱好
+@property (nonatomic ,copy) NSString *hobby;
+//星座
+@property (nonatomic ,copy) NSString *constellation;
+//学校
+@property (nonatomic ,copy) NSString *college;
+
 
 @property (nonatomic ,copy) NSString *token;
 /**

+ 6 - 6
model/ModelHeader.h

@@ -19,14 +19,14 @@
 //#define imageURl @"http://118.190.49.85:8080/thmodeltest/"
 //#define apnsCernameStr @"chmoModelTest"
 
-#define PublicUrl @"http://192.168.50.132:8081"
-#define imageURl @"http://192.168.50.132:8081/"
-#define apnsCernameStr @"chmoMemberTest"
-
-//#define PublicUrl @"http://192.168.123.90:8080"
-//#define imageURl @"http://192.168.123.90:8080/"
+//#define PublicUrl @"http://192.168.50.132:8081"
+//#define imageURl @"http://192.168.50.132:8081/"
 //#define apnsCernameStr @"chmoMemberTest"
 
+#define PublicUrl @"http://192.168.123.90:8080"
+#define imageURl @"http://192.168.123.90:8080/"
+#define apnsCernameStr @"chmoMemberTest"
+
 #define shareUrl(type,code) [NSString stringWithFormat:@"%@/share.jsp?type=%@&code=%@", PublicUrl, type, code]
 
 //应用下载地址 https://itunes.apple.com/cn/app/id1434011196?mt=8