登录流程的修改

HappyJob/HappyJob.xcodeproj/project.pbxproj

@@ -30,12 +30,9 @@
 		7132695322CAF1BC00DEB10B /* BPositionDetailTopMoreCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 7132695222CAF1BC00DEB10B /* BPositionDetailTopMoreCell.m */; };
 		7132695622CAF20000DEB10B /* BPositionDetailDescribeAddressCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 7132695522CAF20000DEB10B /* BPositionDetailDescribeAddressCell.m */; };
 		7132695C22CB075A00DEB10B /* BMessageCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 7132695B22CB075A00DEB10B /* BMessageCell.m */; };
-		7132695F22CB1CB800DEB10B /* BMoreMessageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7132695E22CB1CB800DEB10B /* BMoreMessageViewController.m */; };
-		7132696222CB1E6B00DEB10B /* BMoreMessageCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 7132696122CB1E6B00DEB10B /* BMoreMessageCell.m */; };
 		7132696822CB411C00DEB10B /* BReleaseJobsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7132696722CB411C00DEB10B /* BReleaseJobsViewController.m */; };
 		7132696B22CB454E00DEB10B /* BHomeListCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 7132696A22CB454E00DEB10B /* BHomeListCell.m */; };
 		7132696E22CB4C0300DEB10B /* BHomeSearchView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7132696D22CB4C0300DEB10B /* BHomeSearchView.m */; };
-		7132697122CB550E00DEB10B /* BHomeCertificationResultView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7132697022CB550E00DEB10B /* BHomeCertificationResultView.m */; };
 		7132697822CB5A8400DEB10B /* HJIdentitySwitchViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7132697722CB5A8400DEB10B /* HJIdentitySwitchViewController.m */; };
 		7132697B22CB5B2900DEB10B /* HJIdentitySwitchView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7132697A22CB5B2900DEB10B /* HJIdentitySwitchView.m */; };
 		7132698422CC56E300DEB10B /* BHomeJobInfoFullTimeBasicView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7132698322CC56E300DEB10B /* BHomeJobInfoFullTimeBasicView.m */; };
@@ -55,7 +52,6 @@
 		713269C422CCE91B00DEB10B /* BHomeResumeDetailIntentionCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 713269C122CCE91A00DEB10B /* BHomeResumeDetailIntentionCell.m */; };
 		713269C722CCEADB00DEB10B /* BHomeResumeDetailExperienceListCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 713269C622CCEADB00DEB10B /* BHomeResumeDetailExperienceListCell.m */; };
 		713269CC22CCFC4A00DEB10B /* BHomeNoCertificationView.m in Sources */ = {isa = PBXBuildFile; fileRef = 713269CB22CCFC4A00DEB10B /* BHomeNoCertificationView.m */; };
-		713269D222CCFCE700DEB10B /* BHomeCertificationingView.m in Sources */ = {isa = PBXBuildFile; fileRef = 713269D122CCFCE700DEB10B /* BHomeCertificationingView.m */; };
 		713269DB22CD031300DEB10B /* BHomeCertificationTopCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 713269DA22CD031300DEB10B /* BHomeCertificationTopCell.m */; };
 		713269E422CD03BC00DEB10B /* BHomeCertificationEnterpriseVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 713269E322CD03BC00DEB10B /* BHomeCertificationEnterpriseVC.m */; };
 		713269E722CD03D400DEB10B /* BHomeCertificationEnterpriseCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 713269E622CD03D400DEB10B /* BHomeCertificationEnterpriseCell.m */; };
@@ -78,9 +74,12 @@
 		71331B9022DC6390000F9782 /* ZHDatePickerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 71331B8F22DC6390000F9782 /* ZHDatePickerView.m */; };
 		71331BA122E03373000F9782 /* BPositionDropDownView.m in Sources */ = {isa = PBXBuildFile; fileRef = 71331BA022E03373000F9782 /* BPositionDropDownView.m */; };
 		7135959B22FD2F3100B579DD /* HJSalaryEmptyView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7135959A22FD2F3100B579DD /* HJSalaryEmptyView.m */; };
-		713D342F23024CE1007DCBB6 /* HJMemberModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 713D342E23024CE1007DCBB6 /* HJMemberModel.m */; };
-		713D343223025D8B007DCBB6 /* HJLoginInfoMergeModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 713D343123025D8B007DCBB6 /* HJLoginInfoMergeModel.m */; };
+		713D342F23024CE1007DCBB6 /* HJMemberInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 713D342E23024CE1007DCBB6 /* HJMemberInfoModel.m */; };
 		713D343823027E76007DCBB6 /* HJLoginInfoMergeAPI.m in Sources */ = {isa = PBXBuildFile; fileRef = 713D343723027E76007DCBB6 /* HJLoginInfoMergeAPI.m */; };
+		713D343B2302F1BC007DCBB6 /* HJLoginInfoMergeUserModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 713D343A2302F1BC007DCBB6 /* HJLoginInfoMergeUserModel.m */; };
+		713D34412306387A007DCBB6 /* HJJoinDetailHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 713D34402306387A007DCBB6 /* HJJoinDetailHeaderView.m */; };
+		713D344423066D43007DCBB6 /* HJFullTimeDetailHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 713D344323066D43007DCBB6 /* HJFullTimeDetailHeaderView.m */; };
+		713D344723066DC6007DCBB6 /* HJPartTimeDetailHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 713D344623066DC6007DCBB6 /* HJPartTimeDetailHeaderView.m */; };
 		715E5CD222D16E3A00AAFA24 /* BHomeCertificationEnterpriseAPI.m in Sources */ = {isa = PBXBuildFile; fileRef = 715E5CD122D16E3A00AAFA24 /* BHomeCertificationEnterpriseAPI.m */; };
 		715E5CD622D1C60500AAFA24 /* BReleasePartTimeJobsAPI.m in Sources */ = {isa = PBXBuildFile; fileRef = 715E5CD522D1C60500AAFA24 /* BReleasePartTimeJobsAPI.m */; };
 		715E5CDC22D2D32800AAFA24 /* BHomeCertificationingEnterpriseVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 715E5CDB22D2D32800AAFA24 /* BHomeCertificationingEnterpriseVC.m */; };
@@ -135,7 +134,6 @@
 		71A2B03C22F2F1D100B4FACF /* HJLoginInfoLookResumeExperienceView.m in Sources */ = {isa = PBXBuildFile; fileRef = 71A2B03B22F2F1D100B4FACF /* HJLoginInfoLookResumeExperienceView.m */; };
 		71A2B03F22F2F21700B4FACF /* HJLoginInfoLookResumeExperienceListView.m in Sources */ = {isa = PBXBuildFile; fileRef = 71A2B03E22F2F21700B4FACF /* HJLoginInfoLookResumeExperienceListView.m */; };
 		71AC1A5722F91AE600569CB5 /* HJJoinApplyContentListView.m in Sources */ = {isa = PBXBuildFile; fileRef = 71AC1A5622F91AE600569CB5 /* HJJoinApplyContentListView.m */; };
-		71AC1A5A22F9800800569CB5 /* HJPositionDetailRemindView.m in Sources */ = {isa = PBXBuildFile; fileRef = 71AC1A5922F9800800569CB5 /* HJPositionDetailRemindView.m */; };
 		71AC1A5D22F982AC00569CB5 /* HJPositionDetailCompanyView.m in Sources */ = {isa = PBXBuildFile; fileRef = 71AC1A5C22F982AC00569CB5 /* HJPositionDetailCompanyView.m */; };
 		71AC1A6022F9CEA000569CB5 /* HJPositionDetailCompanyInfoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71AC1A5F22F9CEA000569CB5 /* HJPositionDetailCompanyInfoViewController.m */; };
 		71AC1A6622FAB6C800569CB5 /* HJCircularGradientProgress.m in Sources */ = {isa = PBXBuildFile; fileRef = 71AC1A6422FAB6C800569CB5 /* HJCircularGradientProgress.m */; };
@@ -216,7 +214,6 @@
 		C40FF250223F86F4008868BF /* HJMainViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C40FF23A223F86F4008868BF /* HJMainViewController.m */; };
 		C40FF252223F86F4008868BF /* HJLoginViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C40FF23F223F86F4008868BF /* HJLoginViewController.m */; };
 		C410166422A395A10088364B /* HJSaveExpectationAPIManager.m in Sources */ = {isa = PBXBuildFile; fileRef = C410166322A395A10088364B /* HJSaveExpectationAPIManager.m */; };
-		C410339322927FBB00736298 /* HJResumeSectionView.m in Sources */ = {isa = PBXBuildFile; fileRef = C410339222927FBB00736298 /* HJResumeSectionView.m */; };
 		C410339A2292B59B00736298 /* HJSaveWechatNumberAPIManager.m in Sources */ = {isa = PBXBuildFile; fileRef = C41033992292B59B00736298 /* HJSaveWechatNumberAPIManager.m */; };
 		C410512322A0FB3B00560009 /* HJSaveExperienceAPIManager.m in Sources */ = {isa = PBXBuildFile; fileRef = C410512222A0FB3B00560009 /* HJSaveExperienceAPIManager.m */; };
 		C410512622A1253900560009 /* HJResumeExperienceModel.m in Sources */ = {isa = PBXBuildFile; fileRef = C410512522A1253900560009 /* HJResumeExperienceModel.m */; };
@@ -415,18 +412,12 @@
 		7132695522CAF20000DEB10B /* BPositionDetailDescribeAddressCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BPositionDetailDescribeAddressCell.m; sourceTree = "<group>"; };
 		7132695A22CB075A00DEB10B /* BMessageCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BMessageCell.h; sourceTree = "<group>"; };
 		7132695B22CB075A00DEB10B /* BMessageCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BMessageCell.m; sourceTree = "<group>"; };
-		7132695D22CB1CB800DEB10B /* BMoreMessageViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BMoreMessageViewController.h; sourceTree = "<group>"; };
-		7132695E22CB1CB800DEB10B /* BMoreMessageViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BMoreMessageViewController.m; sourceTree = "<group>"; };
-		7132696022CB1E6B00DEB10B /* BMoreMessageCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BMoreMessageCell.h; sourceTree = "<group>"; };
-		7132696122CB1E6B00DEB10B /* BMoreMessageCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BMoreMessageCell.m; sourceTree = "<group>"; };
 		7132696622CB411C00DEB10B /* BReleaseJobsViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BReleaseJobsViewController.h; sourceTree = "<group>"; };
 		7132696722CB411C00DEB10B /* BReleaseJobsViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BReleaseJobsViewController.m; sourceTree = "<group>"; };
 		7132696922CB454E00DEB10B /* BHomeListCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BHomeListCell.h; sourceTree = "<group>"; };
 		7132696A22CB454E00DEB10B /* BHomeListCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BHomeListCell.m; sourceTree = "<group>"; };
 		7132696C22CB4C0300DEB10B /* BHomeSearchView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BHomeSearchView.h; sourceTree = "<group>"; };
 		7132696D22CB4C0300DEB10B /* BHomeSearchView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BHomeSearchView.m; sourceTree = "<group>"; };
-		7132696F22CB550E00DEB10B /* BHomeCertificationResultView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BHomeCertificationResultView.h; sourceTree = "<group>"; };
-		7132697022CB550E00DEB10B /* BHomeCertificationResultView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BHomeCertificationResultView.m; sourceTree = "<group>"; };
 		7132697622CB5A8400DEB10B /* HJIdentitySwitchViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HJIdentitySwitchViewController.h; sourceTree = "<group>"; };
 		7132697722CB5A8400DEB10B /* HJIdentitySwitchViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HJIdentitySwitchViewController.m; sourceTree = "<group>"; };
 		7132697922CB5B2900DEB10B /* HJIdentitySwitchView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HJIdentitySwitchView.h; sourceTree = "<group>"; };
@@ -465,8 +456,6 @@
 		713269C622CCEADB00DEB10B /* BHomeResumeDetailExperienceListCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BHomeResumeDetailExperienceListCell.m; sourceTree = "<group>"; };
 		713269CA22CCFC4A00DEB10B /* BHomeNoCertificationView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BHomeNoCertificationView.h; sourceTree = "<group>"; };
 		713269CB22CCFC4A00DEB10B /* BHomeNoCertificationView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BHomeNoCertificationView.m; sourceTree = "<group>"; };
-		713269D022CCFCE700DEB10B /* BHomeCertificationingView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BHomeCertificationingView.h; sourceTree = "<group>"; };
-		713269D122CCFCE700DEB10B /* BHomeCertificationingView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BHomeCertificationingView.m; sourceTree = "<group>"; };
 		713269D922CD031300DEB10B /* BHomeCertificationTopCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BHomeCertificationTopCell.h; sourceTree = "<group>"; };
 		713269DA22CD031300DEB10B /* BHomeCertificationTopCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BHomeCertificationTopCell.m; sourceTree = "<group>"; };
 		713269E222CD03BC00DEB10B /* BHomeCertificationEnterpriseVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BHomeCertificationEnterpriseVC.h; sourceTree = "<group>"; };
@@ -511,12 +500,18 @@
 		71331BA022E03373000F9782 /* BPositionDropDownView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BPositionDropDownView.m; sourceTree = "<group>"; };
 		7135959922FD2F3100B579DD /* HJSalaryEmptyView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HJSalaryEmptyView.h; sourceTree = "<group>"; };
 		7135959A22FD2F3100B579DD /* HJSalaryEmptyView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HJSalaryEmptyView.m; sourceTree = "<group>"; };
-		713D342D23024CE1007DCBB6 /* HJMemberModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HJMemberModel.h; sourceTree = "<group>"; };
-		713D342E23024CE1007DCBB6 /* HJMemberModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HJMemberModel.m; sourceTree = "<group>"; };
-		713D343023025D8B007DCBB6 /* HJLoginInfoMergeModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HJLoginInfoMergeModel.h; sourceTree = "<group>"; };
-		713D343123025D8B007DCBB6 /* HJLoginInfoMergeModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HJLoginInfoMergeModel.m; sourceTree = "<group>"; };
+		713D342D23024CE1007DCBB6 /* HJMemberInfoModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HJMemberInfoModel.h; sourceTree = "<group>"; };
+		713D342E23024CE1007DCBB6 /* HJMemberInfoModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HJMemberInfoModel.m; sourceTree = "<group>"; };
 		713D343623027E76007DCBB6 /* HJLoginInfoMergeAPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HJLoginInfoMergeAPI.h; sourceTree = "<group>"; };
 		713D343723027E76007DCBB6 /* HJLoginInfoMergeAPI.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HJLoginInfoMergeAPI.m; sourceTree = "<group>"; };
+		713D34392302F1BC007DCBB6 /* HJLoginInfoMergeUserModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HJLoginInfoMergeUserModel.h; sourceTree = "<group>"; };
+		713D343A2302F1BC007DCBB6 /* HJLoginInfoMergeUserModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HJLoginInfoMergeUserModel.m; sourceTree = "<group>"; };
+		713D343F2306387A007DCBB6 /* HJJoinDetailHeaderView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HJJoinDetailHeaderView.h; sourceTree = "<group>"; };
+		713D34402306387A007DCBB6 /* HJJoinDetailHeaderView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HJJoinDetailHeaderView.m; sourceTree = "<group>"; };
+		713D344223066D43007DCBB6 /* HJFullTimeDetailHeaderView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HJFullTimeDetailHeaderView.h; sourceTree = "<group>"; };
+		713D344323066D43007DCBB6 /* HJFullTimeDetailHeaderView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HJFullTimeDetailHeaderView.m; sourceTree = "<group>"; };
+		713D344523066DC6007DCBB6 /* HJPartTimeDetailHeaderView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HJPartTimeDetailHeaderView.h; sourceTree = "<group>"; };
+		713D344623066DC6007DCBB6 /* HJPartTimeDetailHeaderView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HJPartTimeDetailHeaderView.m; sourceTree = "<group>"; };
 		715E5CD022D16E3A00AAFA24 /* BHomeCertificationEnterpriseAPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BHomeCertificationEnterpriseAPI.h; sourceTree = "<group>"; };
 		715E5CD122D16E3A00AAFA24 /* BHomeCertificationEnterpriseAPI.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BHomeCertificationEnterpriseAPI.m; sourceTree = "<group>"; };
 		715E5CD422D1C60500AAFA24 /* BReleasePartTimeJobsAPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BReleasePartTimeJobsAPI.h; sourceTree = "<group>"; };
@@ -625,8 +620,6 @@
 		71A2B03E22F2F21700B4FACF /* HJLoginInfoLookResumeExperienceListView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HJLoginInfoLookResumeExperienceListView.m; sourceTree = "<group>"; };
 		71AC1A5522F91AE600569CB5 /* HJJoinApplyContentListView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HJJoinApplyContentListView.h; sourceTree = "<group>"; };
 		71AC1A5622F91AE600569CB5 /* HJJoinApplyContentListView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HJJoinApplyContentListView.m; sourceTree = "<group>"; };
-		71AC1A5822F9800800569CB5 /* HJPositionDetailRemindView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HJPositionDetailRemindView.h; sourceTree = "<group>"; };
-		71AC1A5922F9800800569CB5 /* HJPositionDetailRemindView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HJPositionDetailRemindView.m; sourceTree = "<group>"; };
 		71AC1A5B22F982AC00569CB5 /* HJPositionDetailCompanyView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HJPositionDetailCompanyView.h; sourceTree = "<group>"; };
 		71AC1A5C22F982AC00569CB5 /* HJPositionDetailCompanyView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HJPositionDetailCompanyView.m; sourceTree = "<group>"; };
 		71AC1A5E22F9CEA000569CB5 /* HJPositionDetailCompanyInfoViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HJPositionDetailCompanyInfoViewController.h; sourceTree = "<group>"; };
@@ -783,8 +776,6 @@
 		C410166222A395A10088364B /* HJSaveExpectationAPIManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HJSaveExpectationAPIManager.h; sourceTree = "<group>"; };
 		C410166322A395A10088364B /* HJSaveExpectationAPIManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HJSaveExpectationAPIManager.m; sourceTree = "<group>"; };
 		C41033902292388D00736298 /* HJResumeKeys.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HJResumeKeys.h; sourceTree = "<group>"; };
-		C410339122927FBB00736298 /* HJResumeSectionView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HJResumeSectionView.h; sourceTree = "<group>"; };
-		C410339222927FBB00736298 /* HJResumeSectionView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HJResumeSectionView.m; sourceTree = "<group>"; };
 		C41033982292B59B00736298 /* HJSaveWechatNumberAPIManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HJSaveWechatNumberAPIManager.h; sourceTree = "<group>"; };
 		C41033992292B59B00736298 /* HJSaveWechatNumberAPIManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HJSaveWechatNumberAPIManager.m; sourceTree = "<group>"; };
 		C410512122A0FB3B00560009 /* HJSaveExperienceAPIManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HJSaveExperienceAPIManager.h; sourceTree = "<group>"; };
@@ -1118,7 +1109,7 @@
 			path = plistFile;
 			sourceTree = "<group>";
 		};
-		713268DD22C9AA7E00DEB10B /* BMessage */ = {
+		713268DD22C9AA7E00DEB10B /* BMessage_消息 */ = {
 			isa = PBXGroup;
 			children = (
 				715E5D3222D48E2100AAFA24 /* API */,
@@ -1126,7 +1117,7 @@
 				713268DF22C9AA7E00DEB10B /* View */,
 				713268DE22C9AA7E00DEB10B /* Model */,
 			);
-			path = BMessage;
+			path = "BMessage_消息";
 			sourceTree = "<group>";
 		};
 		713268DE22C9AA7E00DEB10B /* Model */ = {
@@ -1143,8 +1134,6 @@
 			children = (
 				7132695A22CB075A00DEB10B /* BMessageCell.h */,
 				7132695B22CB075A00DEB10B /* BMessageCell.m */,
-				7132696022CB1E6B00DEB10B /* BMoreMessageCell.h */,
-				7132696122CB1E6B00DEB10B /* BMoreMessageCell.m */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -1154,13 +1143,11 @@
 			children = (
 				713268FA22C9AB6C00DEB10B /* BMessageViewController.h */,
 				713268FB22C9AB6C00DEB10B /* BMessageViewController.m */,
-				7132695D22CB1CB800DEB10B /* BMoreMessageViewController.h */,
-				7132695E22CB1CB800DEB10B /* BMoreMessageViewController.m */,
 			);
 			path = ViewController;
 			sourceTree = "<group>";
 		};
-		713268E122C9AA7F00DEB10B /* BPosition */ = {
+		713268E122C9AA7F00DEB10B /* BPosition_职位 */ = {
 			isa = PBXGroup;
 			children = (
 				715E5CEC22D322BA00AAFA24 /* API */,
@@ -1168,7 +1155,7 @@
 				713268E222C9AA7F00DEB10B /* Model */,
 				713268E322C9AA7F00DEB10B /* View */,
 			);
-			path = BPosition;
+			path = "BPosition_职位";
 			sourceTree = "<group>";
 		};
 		713268E222C9AA7F00DEB10B /* Model */ = {
@@ -1216,7 +1203,7 @@
 			path = ViewController;
 			sourceTree = "<group>";
 		};
-		713268E522C9AA7F00DEB10B /* BRelease */ = {
+		713268E522C9AA7F00DEB10B /* BRelease_发布 */ = {
 			isa = PBXGroup;
 			children = (
 				715E5CD322D19B3200AAFA24 /* API */,
@@ -1224,7 +1211,7 @@
 				713268E622C9AA7F00DEB10B /* Model */,
 				713268E722C9AA7F00DEB10B /* View */,
 			);
-			path = BRelease;
+			path = "BRelease_发布";
 			sourceTree = "<group>";
 		};
 		713268E622C9AA7F00DEB10B /* Model */ = {
@@ -1260,7 +1247,7 @@
 			path = ViewController;
 			sourceTree = "<group>";
 		};
-		713268E922C9AA8000DEB10B /* BMy */ = {
+		713268E922C9AA8000DEB10B /* BMy_我的 */ = {
 			isa = PBXGroup;
 			children = (
 				713269EE22CDA4B500DEB10B /* 设置 */,
@@ -1268,7 +1255,7 @@
 				713268EB22C9AA8000DEB10B /* View */,
 				713268EA22C9AA8000DEB10B /* Model */,
 			);
-			path = BMy;
+			path = "BMy_我的";
 			sourceTree = "<group>";
 		};
 		713268EA22C9AA8000DEB10B /* Model */ = {
@@ -1300,7 +1287,7 @@
 			path = ViewController;
 			sourceTree = "<group>";
 		};
-		713268ED22C9AA8000DEB10B /* BHome */ = {
+		713268ED22C9AA8000DEB10B /* BHome_首页 */ = {
 			isa = PBXGroup;
 			children = (
 				71331B9722DE104E000F9782 /* 面试邀请 */,
@@ -1310,7 +1297,7 @@
 				713268EE22C9AA8000DEB10B /* Model */,
 				713268EF22C9AA8000DEB10B /* Views */,
 			);
-			path = BHome;
+			path = "BHome_首页";
 			sourceTree = "<group>";
 		};
 		713268EE22C9AA8000DEB10B /* Model */ = {
@@ -1392,13 +1379,13 @@
 			path = "兼职";
 			sourceTree = "<group>";
 		};
-		7132697222CB5A2F00DEB10B /* 身份切换 */ = {
+		7132697222CB5A2F00DEB10B /* Switch_身份切换 */ = {
 			isa = PBXGroup;
 			children = (
 				7132697322CB5A5200DEB10B /* ViewController */,
 				7132697522CB5A5300DEB10B /* View */,
 			);
-			path = "身份切换";
+			path = "Switch_身份切换";
 			sourceTree = "<group>";
 		};
 		7132697322CB5A5200DEB10B /* ViewController */ = {
@@ -1454,10 +1441,6 @@
 		713269C922CCFBEB00DEB10B /* View */ = {
 			isa = PBXGroup;
 			children = (
-				7132696F22CB550E00DEB10B /* BHomeCertificationResultView.h */,
-				7132697022CB550E00DEB10B /* BHomeCertificationResultView.m */,
-				713269D022CCFCE700DEB10B /* BHomeCertificationingView.h */,
-				713269D122CCFCE700DEB10B /* BHomeCertificationingView.m */,
 				713269CA22CCFC4A00DEB10B /* BHomeNoCertificationView.h */,
 				713269CB22CCFC4A00DEB10B /* BHomeNoCertificationView.m */,
 				7132696C22CB4C0300DEB10B /* BHomeSearchView.h */,
@@ -1835,8 +1818,6 @@
 		715E5D5122D895B300AAFA24 /* View */ = {
 			isa = PBXGroup;
 			children = (
-				C410339122927FBB00736298 /* HJResumeSectionView.h */,
-				C410339222927FBB00736298 /* HJResumeSectionView.m */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -1883,11 +1864,11 @@
 		71714E0C22C99B65009984B6 /* BClass */ = {
 			isa = PBXGroup;
 			children = (
-				713268ED22C9AA8000DEB10B /* BHome */,
-				713268E122C9AA7F00DEB10B /* BPosition */,
-				713268E522C9AA7F00DEB10B /* BRelease */,
-				713268DD22C9AA7E00DEB10B /* BMessage */,
-				713268E922C9AA8000DEB10B /* BMy */,
+				713268ED22C9AA8000DEB10B /* BHome_首页 */,
+				713268E122C9AA7F00DEB10B /* BPosition_职位 */,
+				713268E522C9AA7F00DEB10B /* BRelease_发布 */,
+				713268DD22C9AA7E00DEB10B /* BMessage_消息 */,
+				713268E922C9AA8000DEB10B /* BMy_我的 */,
 			);
 			path = BClass;
 			sourceTree = "<group>";
@@ -2010,8 +1991,8 @@
 		71AC1A1022F3BC1000569CB5 /* Model */ = {
 			isa = PBXGroup;
 			children = (
-				713D343023025D8B007DCBB6 /* HJLoginInfoMergeModel.h */,
-				713D343123025D8B007DCBB6 /* HJLoginInfoMergeModel.m */,
+				713D34392302F1BC007DCBB6 /* HJLoginInfoMergeUserModel.h */,
+				713D343A2302F1BC007DCBB6 /* HJLoginInfoMergeUserModel.m */,
 			);
 			path = Model;
 			sourceTree = "<group>";
@@ -2074,10 +2055,12 @@
 				C42F899A2286A18D007E1228 /* FullTimePositionAPIManager */,
 				C40AEC512241CAA800A9EA23 /* HJFullTimeViewController.h */,
 				C40AEC522241CAA800A9EA23 /* HJFullTimeViewController.m */,
-				C40AEC772243955F00A9EA23 /* HJFullTimeDetailViewController.h */,
-				C40AEC782243955F00A9EA23 /* HJFullTimeDetailViewController.m */,
 				C410BD0E228D0CB500624A25 /* HJFullTimeTableViewCell.h */,
 				C410BD0D228D0CB500624A25 /* HJFullTimeTableViewCell.m */,
+				C40AEC772243955F00A9EA23 /* HJFullTimeDetailViewController.h */,
+				C40AEC782243955F00A9EA23 /* HJFullTimeDetailViewController.m */,
+				713D344223066D43007DCBB6 /* HJFullTimeDetailHeaderView.h */,
+				713D344323066D43007DCBB6 /* HJFullTimeDetailHeaderView.m */,
 			);
 			path = "FullTime_全职工作";
 			sourceTree = "<group>";
@@ -2086,12 +2069,14 @@
 			isa = PBXGroup;
 			children = (
 				C42F89992286A122007E1228 /* PartTimePositionAPIManager */,
-				C40FF229223F86F4008868BF /* HJPartTimeTableViewCell.h */,
-				C40FF227223F86F4008868BF /* HJPartTimeTableViewCell.m */,
 				C40AEC632242671F00A9EA23 /* HJPartTimeViewController.h */,
 				C40AEC642242671F00A9EA23 /* HJPartTimeViewController.m */,
+				C40FF229223F86F4008868BF /* HJPartTimeTableViewCell.h */,
+				C40FF227223F86F4008868BF /* HJPartTimeTableViewCell.m */,
 				C413FCC72254E51B00BEE4F0 /* HJPartTimeDetailViewController.h */,
 				C413FCC82254E51B00BEE4F0 /* HJPartTimeDetailViewController.m */,
+				713D344523066DC6007DCBB6 /* HJPartTimeDetailHeaderView.h */,
+				713D344623066DC6007DCBB6 /* HJPartTimeDetailHeaderView.m */,
 			);
 			path = "PartTime_兼职工作";
 			sourceTree = "<group>";
@@ -2306,7 +2291,7 @@
 		C40FF217223F86F3008868BF /* Me_我 */ = {
 			isa = PBXGroup;
 			children = (
-				7132697222CB5A2F00DEB10B /* 身份切换 */,
+				7132697222CB5A2F00DEB10B /* Switch_身份切换 */,
 				C425569D229E6A16007833D5 /* Salary_薪资查询 */,
 				C411A4BC22A7E94B00E7C10A /* Interview_面试邀请 */,
 				C42F898C22869051007E1228 /* Apply_我的申请 */,
@@ -2337,6 +2322,8 @@
 				C413FCC422548C8500BEE4F0 /* HJJoinTableViewCell.m */,
 				C4147EE12255C98A00F13FD6 /* HJJoinDetailViewController.h */,
 				C4147EE22255C98A00F13FD6 /* HJJoinDetailViewController.m */,
+				713D343F2306387A007DCBB6 /* HJJoinDetailHeaderView.h */,
+				713D34402306387A007DCBB6 /* HJJoinDetailHeaderView.m */,
 			);
 			path = "Join_拼工";
 			sourceTree = "<group>";
@@ -2704,8 +2691,8 @@
 		C41393EC225363DB009F61FE /* UserInfo */ = {
 			isa = PBXGroup;
 			children = (
-				713D342D23024CE1007DCBB6 /* HJMemberModel.h */,
-				713D342E23024CE1007DCBB6 /* HJMemberModel.m */,
+				713D342D23024CE1007DCBB6 /* HJMemberInfoModel.h */,
+				713D342E23024CE1007DCBB6 /* HJMemberInfoModel.m */,
 				C41393ED225364CE009F61FE /* HJUserInfoModel.h */,
 				C41393EE225364CE009F61FE /* HJUserInfoModel.m */,
 				717086E922E84176004ADC88 /* HJUserResumeModel.h */,
@@ -2931,8 +2918,6 @@
 				C42F89972286A008007E1228 /* PositionDetailAPIManager */,
 				C41907D2227EC5CB00E1F482 /* HJPositionDetailView.h */,
 				C41907D3227EC5CB00E1F482 /* HJPositionDetailView.m */,
-				71AC1A5822F9800800569CB5 /* HJPositionDetailRemindView.h */,
-				71AC1A5922F9800800569CB5 /* HJPositionDetailRemindView.m */,
 				71AC1A5B22F982AC00569CB5 /* HJPositionDetailCompanyView.h */,
 				71AC1A5C22F982AC00569CB5 /* HJPositionDetailCompanyView.m */,
 				71AC1A5E22F9CEA000569CB5 /* HJPositionDetailCompanyInfoViewController.h */,
@@ -3457,6 +3442,7 @@
 				71A2B03922F2EDD400B4FACF /* HJLoginInfoLookResumeObjectiveView.m in Sources */,
 				C49DB95822687CC9000D8AFE /* HJMeResumeView.m in Sources */,
 				713269FB22CDBF1700DEB10B /* CalendarCCell.m in Sources */,
+				713D343B2302F1BC007DCBB6 /* HJLoginInfoMergeUserModel.m in Sources */,
 				71714E2C22C99E6B009984B6 /* UIImage+FitSize.m in Sources */,
 				C40FA70C227590BC00EB2371 /* UIColor+FBGetRGBComponents.m in Sources */,
 				C4158F42225B269500A7B1E5 /* HJJoinAllJoinPanelViewController.m in Sources */,
@@ -3492,11 +3478,9 @@
 				713D343823027E76007DCBB6 /* HJLoginInfoMergeAPI.m in Sources */,
 				713269C222CCE91B00DEB10B /* BHomeResumeDetailTopCell.m in Sources */,
 				C40F58A122B08C0D0047D6E6 /* HJJoinCycleScrollView.m in Sources */,
-				71AC1A5A22F9800800569CB5 /* HJPositionDetailRemindView.m in Sources */,
 				C4B3D340227AD31800FEAA58 /* HJSearchAPIManager.m in Sources */,
 				71714E2922C99E6B009984B6 /* MyLog.m in Sources */,
 				C413DDEF2283D24100F9F17D /* HJClearMessageAPIManager.m in Sources */,
-				713D343223025D8B007DCBB6 /* HJLoginInfoMergeModel.m in Sources */,
 				7132696822CB411C00DEB10B /* BReleaseJobsViewController.m in Sources */,
 				713269BB22CCE35F00DEB10B /* BHomeInvitationCompanyBottomView.m in Sources */,
 				713269F422CDA4DA00DEB10B /* BSetViewController.m in Sources */,
@@ -3528,6 +3512,7 @@
 				7132693222CA046D00DEB10B /* BHomeJobInfoFullTimeRequireView.m in Sources */,
 				71A2B01E22F2A2ED00B4FACF /* HJLoginInfoMergeCell.m in Sources */,
 				C49DE84B228580FE00A1B67A /* HJSettingViewController.m in Sources */,
+				713D34412306387A007DCBB6 /* HJJoinDetailHeaderView.m in Sources */,
 				7132696E22CB4C0300DEB10B /* BHomeSearchView.m in Sources */,
 				C412D03222AFA7BA00174248 /* CountDown.m in Sources */,
 				C40FF248223F86F4008868BF /* HJPartTimeTableViewCell.m in Sources */,
@@ -3563,7 +3548,6 @@
 				C40FF213223F86C0008868BF /* UIView+AZGradient.m in Sources */,
 				C41F498E2298F86F006318F8 /* HJTrafficViewController.m in Sources */,
 				C40FF24F223F86F4008868BF /* HJSearchViewController.m in Sources */,
-				7132695F22CB1CB800DEB10B /* BMoreMessageViewController.m in Sources */,
 				C40F6EEB225E12D30034BEF8 /* HJBenefitViewController.m in Sources */,
 				713268FC22C9AB6C00DEB10B /* BMessageViewController.m in Sources */,
 				C40B5A152249E87B00BCF1D7 /* HJWorkplaceAnnotation.m in Sources */,
@@ -3597,6 +3581,7 @@
 				C4113AEC22A8A86D0015DCF3 /* HJUpdateViewController.m in Sources */,
 				7132691222C9CB9400DEB10B /* BReleaseJobsPartTimeView.m in Sources */,
 				717086EB22E84176004ADC88 /* HJUserResumeModel.m in Sources */,
+				713D344723066DC6007DCBB6 /* HJPartTimeDetailHeaderView.m in Sources */,
 				C4129F16224B5ADA00E762D5 /* HJCityPickerHotCell.m in Sources */,
 				C4113AF022A8BB040015DCF3 /* HJCheckVersionAPIManager.m in Sources */,
 				C410EB372282D20500DF55B7 /* HJMessageModel.m in Sources */,
@@ -3613,7 +3598,6 @@
 				C41393EF225364CE009F61FE /* HJUserInfoModel.m in Sources */,
 				713268FF22C9AB7A00DEB10B /* BMyViewController.m in Sources */,
 				C49DB952226874BC000D8AFE /* HJMeProfileView.m in Sources */,
-				713269D222CCFCE700DEB10B /* BHomeCertificationingView.m in Sources */,
 				C40E8F0C226DB5F700F3900A /* HJLoadingView.m in Sources */,
 				C49612BA226489D700898E55 /* HJExpectationViewController.m in Sources */,
 				C410966C229FB7B700231BB6 /* HJSalarySheetView.m in Sources */,
@@ -3688,14 +3672,13 @@
 				7132695022CAF1A500DEB10B /* BPositionDetailTopCell.m in Sources */,
 				715E5CF222D326EE00AAFA24 /* BPositonModel.m in Sources */,
 				C4072E542248C26400C39E4B /* HJWorkplaceLocationViewController.m in Sources */,
-				C410339322927FBB00736298 /* HJResumeSectionView.m in Sources */,
 				C410BD0F228D0CB500624A25 /* HJFullTimeTableViewCell.m in Sources */,
 				715E5CEB22D30BD300AAFA24 /* BReleaseFullTimeJobsAPI.m in Sources */,
 				C412B2242269ABDA002B0C44 /* HJAuthingViewController.m in Sources */,
 				715E5D1622D37E9500AAFA24 /* BIdentitySwitchViewController.m in Sources */,
 				7132699A22CC8E3900DEB10B /* OneListPickView.m in Sources */,
 				C410F0842272E9B1002A397C /* HJPositionDetailDataBox.m in Sources */,
-				713D342F23024CE1007DCBB6 /* HJMemberModel.m in Sources */,
+				713D342F23024CE1007DCBB6 /* HJMemberInfoModel.m in Sources */,
 				C414D89B22671CF400719CE0 /* HJMessageDateTableViewCell.m in Sources */,
 				C49DB94722680D78000D8AFE /* HJMeNavBarView.m in Sources */,
 				C40AEC412240C0DA00A9EA23 /* HJSearchHotView.m in Sources */,
@@ -3730,7 +3713,6 @@
 				C411AE1A228EA8EE008B77A5 /* HJSaveBasicInfoAPIManager.m in Sources */,
 				C49612B62264579100898E55 /* HJLoginFieldView.m in Sources */,
 				C40FF252223F86F4008868BF /* HJLoginViewController.m in Sources */,
-				7132696222CB1E6B00DEB10B /* BMoreMessageCell.m in Sources */,
 				715E5CD622D1C60500AAFA24 /* BReleasePartTimeJobsAPI.m in Sources */,
 				C413FCBF22547D8D00BEE4F0 /* HJFullTimeCellView.m in Sources */,
 				C413DDFC228419DC00F9F17D /* HJMessageDetailDataBox.m in Sources */,
@@ -3794,9 +3776,9 @@
 				C4158F4C225B42FF00A7B1E5 /* HJJoinApplyViewController.m in Sources */,
 				C41907D7227ED36300E1F482 /* UIViewController+HJNavBar.m in Sources */,
 				C40FF210223F86C0008868BF /* UIButton+Layout.m in Sources */,
-				7132697122CB550E00DEB10B /* BHomeCertificationResultView.m in Sources */,
 				C40AEC4B224116E600A9EA23 /* HJCityPickerSectionIndexListView.m in Sources */,
 				7132694722CAE0B200DEB10B /* BCheckPeopleCell.m in Sources */,
+				713D344423066D43007DCBB6 /* HJFullTimeDetailHeaderView.m in Sources */,
 				71A2B03622F2D50500B4FACF /* HJLoginInfoLookResumePersonalDataListView.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

HappyJob/HappyJob/API/FBNetworking/FBBaseAPIManager.m

@@ -59,7 +59,7 @@
 #pragma mark - YTKRequestDelegate
 
 - (void)requestFinished:(__kindof YTKBaseRequest *)request {
-    DDLogDebug(@"[%@: %@] = %@", [self requestUrl], [self requestArgument], request.responseObject);
+//    DDLogDebug(@"[%@: %@] = %@", [self requestUrl], [self requestArgument], request.responseObject);
     
     [self callingSuccessWithResponseObject:request.responseObject];
 }

HappyJob/HappyJob/AppDelegate.m

@@ -37,8 +37,6 @@
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
     
-    [[HJAppUserType sharedInstance] loadUserType];
-    
     //配置Bugly
     [Bugly startWithAppId:kBuglyAppID];
     
@@ -82,7 +80,7 @@
     return YES;
 }
 
-//iOS 9 之前用
+/* iOS 9 之前用 */
 - (BOOL)application:(UIApplication *)application handleOpenURL:(NSURL *)url {
     
     return [WXApi handleOpenURL:url delegate:[HJWeiXinAPIManager sharedManager]];
@@ -92,7 +90,7 @@
     
     return [WXApi handleOpenURL:url delegate:[HJWeiXinAPIManager sharedManager]];
 }
-//iOS 9之后用
+/* iOS 9之后用 */
 - (BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary<UIApplicationOpenURLOptionsKey,id> *)options {
     
     return [WXApi handleOpenURL:url delegate:[HJWeiXinAPIManager sharedManager]];
@@ -116,7 +114,7 @@
 
 - (UIViewController *)setupFirstViewController {
     
-    if ([HJMemberModel memberInfo].memberId == nil || [[HJMemberModel memberInfo].memberId isEqualToString: @""])
+    if ([HJMemberInfoModel memberInfo].memberId == nil || [[HJMemberInfoModel memberInfo].memberId isEqualToString: @""])
     {   //c端
         _CTabBarC = [[HJMainViewController alloc] init];
         _CTabBarC.delegate = self;
@@ -150,7 +148,6 @@
 - (void)switchTabBar {
     
     self.window.rootViewController = [self setupFirstViewController];
-    
 }
 #pragma mark - UITabBarControllerDelegate 代理
 
@@ -195,7 +192,7 @@
     }
     else
     {
-        if ([HJMemberModel memberInfo].memberId == nil || [[HJMemberModel memberInfo].memberId isEqualToString: @""])
+        if ([HJMemberInfoModel memberInfo].memberId == nil || [[HJMemberInfoModel memberInfo].memberId isEqualToString: @""])
         {
             if( tabBarController.selectedIndex == 2 || tabBarController.selectedIndex == 3)
             {

HappyJob/HappyJob/BClass/BHome/Views/View/BHomeCertificationResultView.h

@@ -1,22 +0,0 @@
-//
-//  BHomeCertificationView.h
-//  HappyJob
-//
-//  Created by 张晓光 on 2019/7/2.
-//  Copyright © 2019 Bob. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface BHomeCertificationResultView : UIView
-
-@property (nonatomic, strong) NSString *state;
-@property (nonatomic, copy) void(^nameCertificationBlock)(void);
-
-- (void)showCertificationResultView;
-
-@end
-
-NS_ASSUME_NONNULL_END

HappyJob/HappyJob/BClass/BHome/Views/View/BHomeCertificationResultView.m

@@ -1,85 +0,0 @@
-//
-//  BHomeCertificationView.m
-//  HappyJob
-//
-//  Created by 张晓光 on 2019/7/2.
-//  Copyright © 2019 Bob. All rights reserved.
-//
-
-#import "BHomeCertificationResultView.h"
-#import "BHomeCertificationingView.h"
-#import "BHomeNoCertificationView.h"
-
-
-@interface BHomeCertificationResultView ()
-
-@property (nonatomic, strong) BHomeCertificationingView *certificationView;//审核中
-@property (nonatomic, strong) BHomeNoCertificationView  *noview;//没有认证
-
-
-@end
-
-@implementation BHomeCertificationResultView
-
-- (instancetype)initWithFrame:(CGRect)frame {
-    
-    if (self = [super initWithFrame:frame])
-    {
-        self.backgroundColor = [UIColor whiteColor];
-    }
-    return self;
-    
-}
-- (void)showCertificationResultView {
-   
-    if ([self.state isEqualToString:@"0"])
-    {   //没有认证
-        [self createNoview];
-    }
-    else
-    {
-        [self createcertificationView];
-    }
-}
-- (void)createcertificationView {
-    
-    [self addSubview:self.certificationView];
-    [_certificationView mas_makeConstraints:^(MASConstraintMaker *make) {
-        
-        make.left.bottom.top.right.offset(0);
-    }];
-}
-- (void)createNoview {
-    
-    [self addSubview:self.noview];
-    [_noview mas_makeConstraints:^(MASConstraintMaker *make) {
-        
-        make.left.bottom.top.right.offset(0);
-    }];
-    
-}
-
-- (BHomeCertificationingView *)certificationView {
-    
-    if (_certificationView == nil)
-    {
-        _certificationView = [[BHomeCertificationingView alloc]init];
-    }
-    return _certificationView;
-    
-}
-- (BHomeNoCertificationView *)noview {
-    
-    if (_noview == nil)
-    {
-        _noview = [[BHomeNoCertificationView alloc]init];
-        __weak typeof(self) weakSelf = self;
-        _noview.certificationBlock = ^{
-            
-            weakSelf.nameCertificationBlock();
-        };
-    }
-    return _noview;
-}
-
-@end

HappyJob/HappyJob/BClass/BHome/Views/View/BHomeCertificationingView.h

@@ -1,17 +0,0 @@
-//
-//  BHomeCertificationView.h
-//  HappyJob
-//
-//  Created by 张晓光 on 2019/7/3.
-//  Copyright © 2019 Bob. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface BHomeCertificationingView : UIView
-
-@end
-
-NS_ASSUME_NONNULL_END

HappyJob/HappyJob/BClass/BHome/Views/View/BHomeCertificationingView.m

@@ -1,97 +0,0 @@
-//
-//  BHomeCertificationView.m
-//  HappyJob
-//
-//  Created by 张晓光 on 2019/7/3.
-//  Copyright © 2019 Bob. All rights reserved.
-//
-
-#import "BHomeCertificationingView.h"
-@interface BHomeCertificationingView ()
-
-@property (nonatomic, strong) UIImageView *middleImageV;
-@property (nonatomic, strong) UILabel     *label1;
-@property (nonatomic, strong) UILabel     *label2;
-
-@end
-
-@implementation BHomeCertificationingView
-
-- (instancetype)initWithFrame:(CGRect)frame {
-    
-    if (self = [super initWithFrame:frame])
-    {
-        self.backgroundColor = [UIColor whiteColor];
-        [self initViews];
-        [self autoLayOutViews];
-    }
-    return self;
-    
-}
-- (void)initViews {
-    
-    [self addSubview:self.middleImageV];
-    [self addSubview:self.label1];
-    [self addSubview:self.label2];
-}
-- (void)autoLayOutViews {
-    
-    __weak typeof(self) weakSelf = self;
-    [_middleImageV mas_makeConstraints:^(MASConstraintMaker *make) {
-        
-        make.centerX.equalTo(weakSelf);
-        make.size.mas_offset(CGSizeMake(157, 157));
-        make.top.equalTo(weakSelf).offset(HJHorizontalScale(120));
-        
-    }];
-    [_label1 mas_makeConstraints:^(MASConstraintMaker *make) {
-        
-        make.centerX.equalTo(weakSelf);
-        make.top.equalTo(weakSelf.middleImageV.mas_bottom).offset(60);
-    }];
-    [_label2 mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.centerX.equalTo(weakSelf);
-        make.top.equalTo(weakSelf.label1.mas_bottom).offset(20);
-    }];
-
-}
-- (UIImageView *)middleImageV {
-    
-    if (_middleImageV == nil)
-    {
-        _middleImageV = [[UIImageView alloc]init];
-        _middleImageV.image = [UIImage imageNamed:@"b_home_certification"];
-    }
-    return _middleImageV;
-}
-- (UILabel *)label1 {
-    
-    if (_label1 == nil)
-    {
-        _label1 = [[UILabel alloc]init];
-        _label1.text = @"招聘者认证审核中";
-        _label1.textColor = COLOR_BACK3;
-        _label1.font = [UIFont systemFontOfSize:18];
-    }
-    return _label1;
-}
-- (UILabel *)label2 {
-    
-    if (_label2 == nil)
-    {
-        _label2 = [[UILabel alloc]init];
-        _label2.text = @"审核通过即可发布岗位";
-        _label2.textColor = COLOR_GRAY9;
-        _label2.font = [UIFont systemFontOfSize:12];
-    }
-    return _label2;
-}
-/*
-// Only override drawRect: if you perform custom drawing.
-// An empty implementation adversely affects performance during animation.
-- (void)drawRect:(CGRect)rect {
-    // Drawing code
-}
-*/
-
-@end

HappyJob/HappyJob/BClass/BHome/API/BHomeChangeIdentityAPI.m

@@ -48,7 +48,7 @@
              @"user_id": [HJUserInfoModel userInfo].userID,
              @"user_token":[HJUserInfoModel userInfo].userToken,
              @"user_type":@"1",
-             @"member_id":[HJMemberModel memberInfo].memberId
+             @"member_id":[HJMemberInfoModel memberInfo].memberId
              };
     
 }

HappyJob/HappyJob/BClass/BHome/API/BHomeEnterpriseAuthAPI.m

@@ -50,7 +50,7 @@
     return @{
              @"user_id": [HJUserInfoModel userInfo].userID,
              @"user_token":[HJUserInfoModel userInfo].userToken,
-             @"member_id":[HJMemberModel memberInfo].memberId
+             @"member_id":[HJMemberInfoModel memberInfo].memberId
              };
     
 }

HappyJob/HappyJob/BClass/BHome/API/BHomeListAPI.m

@@ -22,7 +22,7 @@
              @"user_token":[HJUserInfoModel userInfo].userToken,
              @"pageNo": @(self.currentPageNumber),
              @"searchKey":self.searchStr,
-             @"member_id":[HJMemberModel memberInfo].memberId
+             @"member_id":[HJMemberInfoModel memberInfo].memberId
              };
     
 }

HappyJob/HappyJob/BClass/BHome/API/BHomeResumeDetailAPI.m

@@ -48,7 +48,7 @@
              @"user_id": [HJUserInfoModel userInfo].userID,
              @"user_token":[HJUserInfoModel userInfo].userToken,
              @"resumeId":self.resumeId,
-             @"member_id":[HJMemberModel memberInfo].memberId
+             @"member_id":[HJMemberInfoModel memberInfo].memberId
              };
     
 }

HappyJob/HappyJob/BClass/BHome/ViewController/BHomeViewController.m

@@ -10,7 +10,7 @@
 #import "BHomeListCell.h"
 #import "BHomeSearchView.h"
 #import "IQKeyboardManager.h"
-#import "BHomeCertificationResultView.h"//认证结果
+#import "BHomeNoCertificationView.h"//认证结果
 #import "BHomeResumeDetailViewController.h"//简历详情
 #import "BHomeCertificationEnterpriseVC.h"//企业认证
 #import "BHomeCertificationingEnterpriseVC.h"//认证中
@@ -29,7 +29,7 @@ FBAPIManagerDelegate,
 FBAPIManagerInterceptor
 >
 
-@property (nonatomic, strong) BHomeCertificationResultView *certificationView;
+@property (nonatomic, strong) BHomeNoCertificationView *certificationView;
 @property (nonatomic, strong) TableViewListView      *tableView;
 @property (nonatomic, strong) BHomeSearchView        *searchView;
 @property (nonatomic, strong) NSMutableArray         *listArray;//简历列表
@@ -130,7 +130,7 @@ FBAPIManagerInterceptor
         NSDictionary *dict = [manager fetchDataWithBox:nil];
         if ([[dict valueForKeyPath:@"data.isAuth"] boolValue] == NO)
         {//没有提交企业认证
-            [self createCertificationView:@"0"];
+            [self createCertificationView];
         }
         else if ([[dict valueForKeyPath:@"data.isAuth"] boolValue] == YES)
         {//有提交企业认证
@@ -251,17 +251,18 @@ FBAPIManagerInterceptor
     
 }
 /* 没有认证和认证中的页面 */
-- (void)createCertificationView:(NSString *)state {
+- (void)createCertificationView {
     
      __weak typeof(self) weakSelf = self;
     [self.view addSubview:self.certificationView];
-    self.certificationView.state = state;
+    
     [self.certificationView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.equalTo(weakSelf.view).offset(0);
-        make.left.bottom.right.offset(0);
+        
+        make.left.right.offset(0);
+        make.centerY.equalTo(weakSelf.view);
     }];
-    [self.certificationView showCertificationResultView];
-    _certificationView.nameCertificationBlock = ^{
+//    [self.certificationView showCertificationResultView];
+    _certificationView.certificationBlock = ^{
         
         BHomeCertificationEnterpriseVC *enterpriseVC = [[BHomeCertificationEnterpriseVC alloc]init];
         enterpriseVC.hidesBottomBarWhenPushed = YES;
@@ -270,11 +271,11 @@ FBAPIManagerInterceptor
 }
 #pragma mark - setter&getter
 
-- (BHomeCertificationResultView *)certificationView {
+- (BHomeNoCertificationView *)certificationView {
     
     if (_certificationView == nil)
     {
-        _certificationView = [[BHomeCertificationResultView alloc]init];
+        _certificationView = [[BHomeNoCertificationView alloc]init];
     }
     return _certificationView;
 }

HappyJob/HappyJob/BClass/BHome/Views/Cell/BHomeResumeDetailIntentionCell.m

@@ -84,7 +84,7 @@
         self.addressLabel.text = model.expectationAddress ? model.expectationAddress :@"无";
 
         NSArray *moneyArray = @[@"1000~2000元/月", @"2001~3000元/月", @"3001~4000元/月", @"4001~5000元/月", @"5001~6000元/月", @"6001~7000元/月", @"7001~8000元/月", @"8001~9000元/月", @"9001~10000元/月", @"10000以上元/月"];
-        if (model.expectationSalary.length > 0)
+        if (model.expectationSalary.length > 0 && [model.expectationSalary integerValue] >= 0)
         {
             self.salaryLabel.text = moneyArray[[model.expectationSalary integerValue]];
         }

HappyJob/HappyJob/BClass/BHome/Views/View/BHomeNoCertificationView.m

@@ -43,8 +43,7 @@
         
         make.centerX.equalTo(weakSelf);
         make.size.mas_offset(CGSizeMake(157, 157));
-        make.top.equalTo(weakSelf).offset(HJHorizontalScale(120));
-        
+        make.top.equalTo(weakSelf.mas_top).offset(0);
     }];
     [_label1 mas_makeConstraints:^(MASConstraintMaker *make) {
         
@@ -59,6 +58,7 @@
         make.centerX.equalTo(weakSelf);
         make.top.equalTo(weakSelf.label1.mas_bottom).offset(HJHorizontalScale(55));
         make.size.mas_offset(CGSizeMake(160, 40));
+        make.bottom.equalTo(weakSelf.mas_bottom).offset(0);
     }];
     _certificationBtn.layer.cornerRadius = 20;
     

HappyJob/HappyJob/BClass/BHome/企业认证/ViewController/BHomeCertificationEnterpriseVC.m

@@ -217,10 +217,8 @@ UIGestureRecognizerDelegate
         //提交审核
         cell.submitBlock = ^(UIButton * _Nonnull btn) {
             
-//            [weakSelf.enterpriseAPI start];
+            [weakSelf.enterpriseAPI start];
             
-            BHomeCertificationingEnterpriseVC *vc = [[BHomeCertificationingEnterpriseVC alloc]init];
-            [self.navigationController pushViewController:vc animated:YES];
         };
         return cell;
     }

HappyJob/HappyJob/BClass/BHome/企业认证/ViewController/BHomeCertificationFailVC.m

@@ -9,10 +9,10 @@
 #import "BHomeCertificationFailVC.h"
 #import "BHomeCertificationEnterpriseVC.h"
 
-@interface BHomeCertificationFailVC ()
+@interface BHomeCertificationFailVC ()<UINavigationControllerDelegate,UIGestureRecognizerDelegate>
 
 @property (nonatomic, strong) UIButton    *backBtn;
-@property (nonatomic, strong) UIImageView *bgImageV;
+@property (nonatomic, strong) UIView      *bgView;
 @property (nonatomic, strong) UILabel     *titleLabel;
 @property (nonatomic, strong) UILabel     *detailLabel;
 @property (nonatomic, strong) UIButton    *certificationBtn;
@@ -25,46 +25,60 @@
 - (void)viewWillAppear:(BOOL)animated {
     
     [super viewWillAppear:animated];
-    [self.navigationController setNavigationBarHidden:YES animated:animated];
+    self.navigationController.delegate = self;
+    self.navigationController.interactivePopGestureRecognizer.delegate = self;
+   
 }
 
 - (void)viewDidLoad {
     [super viewDidLoad];
     [self autoLayOutViews];
+    
+    [self.view az_setGradientBackgroundWithColors:@[[UIColor colorFromHexString:@"1C90EA"],[UIColor colorFromHexString:@"30BBF9"]] locations:@[@(0.0),@(1.0f)] startPoint:CGPointMake(0, 0) endPoint:CGPointMake(1, 1)];
+    
+}
+#pragma mark - 导航栏的代理
+- (void)navigationController:(UINavigationController *)navigationController willShowViewController:(UIViewController *)viewController animated:(BOOL)animated {
+    // 判断要显示的控制器是否是自己
+    BOOL isPushSelfClass = [viewController isKindOfClass:[self class]];
+    [self.navigationController setNavigationBarHidden:isPushSelfClass animated:animated];
 }
 - (void)autoLayOutViews {
     
     __weak typeof(self) weakSelf = self;
-    [self.view addSubview:self.bgImageV];
-    [self.bgImageV addSubview:self.backBtn];
-    [self.bgImageV addSubview:self.certificationBtn];
-    [self.bgImageV addSubview:self.titleLabel];
-    [self.bgImageV addSubview:self.detailLabel];
+    [self.view addSubview:self.backBtn];
+    [self.view addSubview:self.bgView];
+    [self.bgView addSubview:self.certificationBtn];
+    [self.bgView addSubview:self.titleLabel];
+    [self.bgView addSubview:self.detailLabel];
     
+    [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) {
+       
+        make.centerY.equalTo(weakSelf.view);
+        make.left.right.equalTo(weakSelf.view).offset(0);
+    }];
     [self.backBtn mas_makeConstraints:^(MASConstraintMaker *make) {
         
         make.left.offset(15);
         make.top.offset(STATUS_H + 15);
     }];
-    [_bgImageV mas_makeConstraints:^(MASConstraintMaker *make) {
-        
-        make.left.bottom.right.top.offset(0);
-    }];
+    
     [_titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.equalTo(weakSelf.view).offset(46);
-        make.top.equalTo(weakSelf.view).offset(HJHorizontalScale(190));
+        make.left.equalTo(weakSelf.bgView).offset(46);
+        make.top.equalTo(weakSelf.bgView.mas_top).offset(0);
     }];
     [_detailLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.equalTo(weakSelf.view).offset(46);
+        make.left.equalTo(weakSelf.bgView).offset(46);
         make.top.equalTo(weakSelf.titleLabel.mas_bottom).offset(HJHorizontalScale(90));
     }];
     [self.certificationBtn mas_makeConstraints:^(MASConstraintMaker *make) {
         
-        make.size.mas_offset(CGSizeMake(120, 30));
-        make.bottom.offset(-HJHorizontalScale(120));
-        make.centerX.equalTo(weakSelf.view);
+        make.size.mas_offset(CGSizeMake(210, 44));
+        make.centerX.equalTo(weakSelf.bgView);
+         make.top.equalTo(weakSelf.detailLabel.mas_bottom).offset(HJHorizontalScale(67));
+        make.bottom.equalTo(weakSelf.bgView.mas_bottom).offset(0);
     }];
-    self.certificationBtn.layer.cornerRadius = 15;
+    self.certificationBtn.layer.cornerRadius = 44/2;
 }
 - (void)backButonClick {
     
@@ -80,19 +94,15 @@
     }
     return _backBtn;
 }
-
-- (UIImageView *)bgImageV {
+- (UIView *)bgView {
     
-    if (_bgImageV == nil)
+    if (_bgView == nil)
     {
-        _bgImageV = [[UIImageView alloc]init];
-        _bgImageV.contentMode = UIViewContentModeScaleAspectFill;
-        _bgImageV.clipsToBounds = YES;
-        _bgImageV.image = [UIImage imageNamed:@"bg_bgview"];
-        _bgImageV.userInteractionEnabled = YES;
+        _bgView = [[UIView alloc]init];
     }
-    return _bgImageV;
+    return _bgView;
 }
+
 - (UILabel *)titleLabel {
     
     if (_titleLabel == nil)
@@ -110,7 +120,7 @@
     {
         _detailLabel = [[UILabel alloc]init];
         _detailLabel.text = @"您的企业认证未通过，可能存在以下原因：\n\n\n·营业执照信息与照片上的信息不符\n\n·证件照片模糊不清\n\n·证件照片并未完整将证件拍摄出来\n\n·营业执照注册号有误\n\n·其他原因";
-        _detailLabel.font = [UIFont systemFontOfSize:11];
+        _detailLabel.font = [UIFont systemFontOfSize:14];
         _detailLabel.textColor = [UIColor whiteColor];
         _detailLabel.numberOfLines = 0;
     }
@@ -123,10 +133,10 @@
     {
         _certificationBtn = [UIButton buttonWithType:UIButtonTypeCustom];
         [_certificationBtn addTarget:self action:@selector(certificationButonClick) forControlEvents:UIControlEventTouchUpInside];
-        _certificationBtn.layer.borderWidth = 1;
-        _certificationBtn.layer.borderColor = [UIColor whiteColor].CGColor;
+        _certificationBtn.backgroundColor = [UIColor whiteColor];
         [_certificationBtn setTitle:@"重新认证" forState:UIControlStateNormal];
-        _certificationBtn.titleLabel.font = [UIFont systemFontOfSize:12];
+        _certificationBtn.titleLabel.font = [UIFont systemFontOfSize:17];
+        [_certificationBtn setTitleColor:COLOR_DEFAULT forState:UIControlStateNormal];
     }
     return _certificationBtn;
 }

HappyJob/HappyJob/BClass/BHome/企业认证/ViewController/BHomeCertificationingEnterpriseVC.m

@@ -12,7 +12,7 @@
 @interface BHomeCertificationingEnterpriseVC ()<UINavigationControllerDelegate,UIGestureRecognizerDelegate>
 
 @property (nonatomic, strong) UIButton    *backBtn;
-@property (nonatomic, strong) UIImageView *bgImageV;
+@property (nonatomic, strong) UIView      *bgView;
 @property (nonatomic, strong) UILabel     *titleLabel;
 @property (nonatomic, strong) UILabel     *detailLabel;
 
@@ -32,6 +32,11 @@
     [self autoLayOutViews];
     self.navigationController.delegate = self;
     self.navigationController.interactivePopGestureRecognizer.delegate = self;
+    [self.view az_setGradientBackgroundWithColors:@[[UIColor colorFromHexString:@"1C90EA"],
+                                                    [UIColor colorFromHexString:@"30BBF9"]]
+                                        locations:@[@(0.0),@(1.0f)]
+                                       startPoint:CGPointMake(0, 0)
+                                         endPoint:CGPointMake(1, 1)];
 }
 
 - (void)backButonClick {
@@ -50,39 +55,37 @@
 - (void)autoLayOutViews {
     
     __weak typeof(self) weakSelf = self;
-    [self.view addSubview:self.bgImageV];
-    [self.bgImageV addSubview:self.backBtn];
-    [self.bgImageV addSubview:self.titleLabel];
-    [self.bgImageV addSubview:self.detailLabel];
+    [self.view addSubview:self.bgView];
+    [self.view addSubview:self.backBtn];
+    [self.bgView addSubview:self.titleLabel];
+    [self.bgView addSubview:self.detailLabel];
     [self.backBtn mas_makeConstraints:^(MASConstraintMaker *make) {
         
         make.left.offset(15);
         make.top.offset(STATUS_H + 15);
     }];
-    [_bgImageV mas_makeConstraints:^(MASConstraintMaker *make) {
+    [_bgView mas_makeConstraints:^(MASConstraintMaker *make) {
        
-        make.left.bottom.right.top.offset(0);
+        make.centerY.equalTo(weakSelf.view);
+        make.left.right.equalTo(weakSelf.view);
     }];
     [_titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.equalTo(weakSelf.view).offset(46);
-        make.top.equalTo(weakSelf.view).offset(HJHorizontalScale(190));
+        make.left.equalTo(weakSelf.bgView).offset(46);
+        make.top.equalTo(weakSelf.bgView.mas_top).offset(0);
     }];
     [_detailLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.equalTo(weakSelf.view).offset(46);
         make.top.equalTo(weakSelf.titleLabel.mas_bottom).offset(HJHorizontalScale(90));
+        make.bottom.equalTo(weakSelf.bgView.mas_bottom).offset(0);
     }];
 }
-- (UIImageView *)bgImageV {
+- (UIView *)bgView {
     
-    if (_bgImageV == nil)
+    if (_bgView == nil)
     {
-        _bgImageV = [[UIImageView alloc]init];
-        _bgImageV.contentMode = UIViewContentModeScaleAspectFill;
-        _bgImageV.clipsToBounds = YES;
-        _bgImageV.image = [UIImage imageNamed:@"bg_bgview"];
-        _bgImageV.userInteractionEnabled = YES;
+        _bgView = [[UIView alloc]init];
     }
-    return _bgImageV;
+    return _bgView;
 }
 - (UILabel *)titleLabel {
     
@@ -101,7 +104,7 @@
     {
         _detailLabel = [[UILabel alloc]init];
         _detailLabel.text = @"感谢您的耐心填写，认证信息已经成功提交，\n后台人员会在2至3个工作日内审核完毕。\n\n您的企业资料仅用于实名认证，不会用于其他渠道。";
-        _detailLabel.font = [UIFont systemFontOfSize:11];
+        _detailLabel.font = [UIFont systemFontOfSize:14];
         _detailLabel.textColor = [UIColor whiteColor];
         _detailLabel.numberOfLines = 0;
     }

HappyJob/HappyJob/BClass/BMessage/View/BMoreMessageCell.h

@@ -1,17 +0,0 @@
-//
-//  BMoreMessageCell.h
-//  HappyJob
-//
-//  Created by 张晓光 on 2019/7/2.
-//  Copyright © 2019 Bob. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface BMoreMessageCell : UITableViewCell
-
-@end
-
-NS_ASSUME_NONNULL_END

HappyJob/HappyJob/BClass/BMessage/View/BMoreMessageCell.m

@@ -1,153 +0,0 @@
-//
-//  BMoreMessageCell.m
-//  HappyJob
-//
-//  Created by 张晓光 on 2019/7/2.
-//  Copyright © 2019 Bob. All rights reserved.
-//
-
-#import "BMoreMessageCell.h"
-
-@interface BMoreMessageCell ()
-
-@property (nonatomic, strong) UIView      *bgView;
-@property (nonatomic, strong) UIImageView *stateImageV;
-@property (nonatomic, strong) UILabel     *stateLabel;
-@property (nonatomic, strong) UILabel     *detailLabel;
-@property (nonatomic, strong) UILabel     *timeLabel;
-@property (nonatomic, strong) UIView      *lineView;
-
-@end
-
-@implementation BMoreMessageCell
-
-- (void)awakeFromNib {
-    [super awakeFromNib];
-    // Initialization code
-}
-- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier {
-    
-    if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier])
-    {
-        self.selectionStyle = UITableViewCellSelectionStyleNone;
-        self.backgroundColor = COLOR_GRAYFA;
-        [self initViews];
-        [self autoLayOutViews];
-    }
-    return self;
-}
-- (void)initViews {
-    
-    [self.contentView addSubview:self.bgView];
-    [self.bgView addSubview:self.stateImageV];
-    [self.bgView addSubview:self.stateLabel];
-    [self.bgView addSubview:self.detailLabel];
-    [self.bgView addSubview:self.timeLabel];
-    [self.bgView addSubview:self.lineView];
-    
-}
-- (void)autoLayOutViews {
-    
-    __weak typeof(self) weakSelf = self;
-    [_bgView mas_makeConstraints:^(MASConstraintMaker *make) {
-        
-        make.leading.equalTo(weakSelf.contentView.mas_leading).offset(0);
-        make.trailing.equalTo(weakSelf.contentView.mas_trailing).offset(0);
-        make.top.equalTo(weakSelf.contentView.mas_top).offset(15);
-        make.bottom.equalTo(weakSelf.contentView.mas_bottom).offset(0);
-    }];
-    [_stateImageV mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.leading.equalTo(weakSelf.bgView.mas_leading).offset(35);
-        make.top.equalTo(weakSelf.bgView.mas_top).offset(15);
-        make.size.mas_offset(CGSizeMake(12, 12));
-    }];
-    [_stateLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.leading.equalTo(weakSelf.stateImageV.mas_trailing).offset(5);
-        make.centerY.equalTo(weakSelf.stateImageV);
-    }];
-    [_detailLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.leading.equalTo(weakSelf.bgView.mas_leading).offset(35);
-        make.trailing.equalTo(weakSelf.bgView.mas_trailing).offset(-56);
-        make.top.equalTo(weakSelf.stateImageV.mas_bottom).offset(14);
-        make.bottom.equalTo(weakSelf.contentView.mas_bottom).offset(-13);
-    }];
-    [_timeLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.trailing.equalTo(weakSelf.bgView.mas_trailing).offset(-25);
-        make.centerY.equalTo(weakSelf.stateImageV);
-    }];
-    [_lineView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.trailing.equalTo(weakSelf.bgView.mas_trailing).offset(0);
-        make.leading.equalTo(weakSelf.bgView.mas_leading).offset(0);
-        make.bottom.equalTo(weakSelf.bgView.mas_bottom).offset(0);
-        make.height.mas_equalTo(1);
-    }];
-    
-    _stateImageV.image = [UIImage imageNamed:@"b_message_nopass"];
-    _stateLabel.text = @"新简历处理";
-    _detailLabel.text = @"你好，。。。。。。。。。。。。";
-    _timeLabel.text = @"2019-09-08";
-    
-}
-- (UIView *)bgView {
-    
-    if (_bgView == nil)
-    {
-        _bgView = [[UIView alloc]init];
-        _bgView.backgroundColor = [UIColor whiteColor];
-    }
-    return _bgView;
-}
-- (UIImageView *)stateImageV {
-    
-    if (_stateImageV == nil)
-    {
-        _stateImageV = [[UIImageView alloc]init];
-    }
-    return _stateImageV;
-}
-- (UILabel *)stateLabel {
-    
-    if (_stateLabel == nil)
-    {
-        _stateLabel = [[UILabel alloc]init];
-        _stateLabel.font = [UIFont systemFontOfSize:13];
-        _stateLabel.textColor = COLOR_DEFAULT;
-    }
-    return _stateLabel;
-}
-- (UILabel *)detailLabel {
-    
-    if (_detailLabel == nil)
-    {
-        _detailLabel = [[UILabel alloc]init];
-        _detailLabel.font = [UIFont systemFontOfSize:12];
-        _detailLabel.textColor = COLOR_BACK6;
-        _detailLabel.numberOfLines = 0;
-    }
-    return _detailLabel;
-}
-- (UILabel *)timeLabel {
-    
-    if (_timeLabel == nil)
-    {
-        _timeLabel = [[UILabel alloc]init];
-        _timeLabel.font = [UIFont systemFontOfSize:11];
-        _timeLabel.textColor = [UIColor colorFromHexString:@"C8C6D2"];
-    }
-    return _timeLabel;
-}
-- (UIView *)lineView {
-    
-    if (_lineView == nil)
-    {
-        _lineView = [[UIView alloc]init];
-        _lineView.backgroundColor = COLOR_BACKE;
-    }
-    return _lineView;
-}
-- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
-    [super setSelected:selected animated:animated];
-    
-    // Configure the view for the selected state
-}
-@end

HappyJob/HappyJob/BClass/BMessage/ViewController/BMoreMessageViewController.h

@@ -1,17 +0,0 @@
-//
-//  BMoreMessageViewController.h
-//  HappyJob
-//
-//  Created by 张晓光 on 2019/7/2.
-//  Copyright © 2019 Bob. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface BMoreMessageViewController : UIViewController
-
-@end
-
-NS_ASSUME_NONNULL_END

HappyJob/HappyJob/BClass/BMessage/ViewController/BMoreMessageViewController.m

@@ -1,81 +0,0 @@
-//
-//  BMoreMessageViewController.m
-//  HappyJob
-//
-//  Created by 张晓光 on 2019/7/2.
-//  Copyright © 2019 Bob. All rights reserved.
-//
-
-#import "BMoreMessageViewController.h"
-#import "BMoreMessageCell.h"
-
-
-@interface BMoreMessageViewController ()<UITableViewDelegate,UITableViewDataSource>
-
-@property (nonatomic, strong) UITableView *tableView;
-
-@end
-
-@implementation BMoreMessageViewController
-
-- (void)viewDidLoad {
-    [super viewDidLoad];
-    
-    [self hj_setupNavBar];
-    self.navigationItem.title = @"更多消息";
-    [self autoLayOutViews];
-    
-}
-#pragma mark - UITableView
-
-- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
-    
-    return 1;
-}
-- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
-    
-    static NSString *listCell = @"cellID";
-    BMoreMessageCell *cell = [tableView dequeueReusableCellWithIdentifier:listCell];
-    if (cell == nil)
-    {
-        cell = [[BMoreMessageCell alloc]initWithStyle:UITableViewCellStyleDefault reuseIdentifier:listCell];
-    }
-    return cell;
-}
-
-#pragma mark - setter&getter
-- (void)autoLayOutViews {
-    
-    [self.view addSubview:self.tableView];
-    [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) {
-        
-        make.left.right.bottom.top.offset(0);
-    }];
-}
-- (UITableView *)tableView {
-    
-    if (_tableView == nil)
-    {
-        _tableView = [[UITableView alloc]initWithFrame:CGRectZero style:UITableViewStylePlain];
-        _tableView.delegate = self;
-        _tableView.dataSource = self;
-        _tableView.separatorStyle = NO;
-        _tableView.estimatedRowHeight = 10.0;
-        _tableView.rowHeight = UITableViewAutomaticDimension;
-        _tableView.backgroundColor = COLOR_GRAYFA;
-        
-    }
-    return _tableView;
-}
-
-/*
-#pragma mark - Navigation
-
-// In a storyboard-based application, you will often want to do a little preparation before navigation
-- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
-    // Get the new view controller using [segue destinationViewController].
-    // Pass the selected object to the new view controller.
-}
-*/
-
-@end

HappyJob/HappyJob/BClass/BMessage/API/BMessageListAPI.m

@@ -21,7 +21,7 @@
              @"user_token":[HJUserInfoModel userInfo].userToken,
             
              @"pageNo": @(self.currentPageNumber),
-             @"member_id":[HJMemberModel memberInfo].memberId
+             @"member_id":[HJMemberInfoModel memberInfo].memberId
              
              };
     

HappyJob/HappyJob/BClass/BMy/ViewController/BMyViewController.m

@@ -116,11 +116,11 @@
         
         //处理手机号码
         NSString *phoneStr = @"";
-        if ([HJUserInfoModel userInfo].phone)
+        if ([HJMemberInfoModel memberInfo].phone)
         {
-            phoneStr = [NSString stringWithFormat:@"%@***%@",[[HJUserInfoModel userInfo].phone substringToIndex:3],[[HJUserInfoModel userInfo].phone substringFromIndex:7]];
+            phoneStr = [NSString stringWithFormat:@"%@***%@",[[HJMemberInfoModel memberInfo].phone substringToIndex:3],[[HJMemberInfoModel memberInfo].phone substringFromIndex:7]];
         }
-        cell.nameLabel.text= [HJUserInfoModel userInfo].realName;
+        cell.nameLabel.text= [HJMemberInfoModel memberInfo].realName;
         cell.infoLabel.text = phoneStr;
         return cell;
     }
@@ -156,24 +156,6 @@
                 }
             }
         }
-//        if (indexPath.row == 1)
-//        {
-//            cell.titleLabel.text = @"意见反馈";
-//            cell.leftImageV.image = [UIImage imageNamed:@"b_my_feedback"];
-//            cell.rightLabel.text = @"";
-//        }
-//        if (indexPath.row == 2)
-//        {
-//            cell.titleLabel.text = @"我的收藏";
-//            cell.leftImageV.image = [UIImage imageNamed:@"b_my_collection"];
-//            cell.rightLabel.text = @"";
-//        }
-//        if (indexPath.row == 3)
-//        {
-//            cell.titleLabel.text = @"我的钱包";
-//            cell.leftImageV.image = [UIImage imageNamed:@"b_my_wallet"];
-//            cell.rightLabel.text = @"";
-//        }
         if (indexPath.row == 1)
         {
             cell.titleLabel.text = @"设置";

HappyJob/HappyJob/BClass/BMy/设置/ViewControlletr/BIdentitySwitchViewController.m

@@ -30,24 +30,19 @@
     [self.view addSubview:self.sView];
     [_sView mas_makeConstraints:^(MASConstraintMaker *make) {
         
-        make.left.bottom.right.top.offset(0);
+        make.left.right.offset(0);
+        make.centerY.equalTo(self.view);
     }];
     _sView.sekectIdentityBlock = ^(int tag) {
         
         if (tag == 1)
         { //我要招聘
-            [[HJAppUserType sharedInstance] setUserType:@"1"];
-            [[HJAppUserType sharedInstance] setUserPhone:[HJUserInfoModel userInfo].phone];
-            [[HJAppUserType sharedInstance] saveUserType];
             [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"userType"];//用户类型 yes 企业 0 非企业
             AppDelegate *appdelegate = (AppDelegate *)[UIApplication sharedApplication].delegate;
             [appdelegate switchTabBar];
         }
         else
         {   //我要找工作
-            [[HJAppUserType sharedInstance] setUserType:@"0"];
-            [[HJAppUserType sharedInstance] setUserPhone:[HJUserInfoModel userInfo].phone];
-            [[HJAppUserType sharedInstance] saveUserType];
             [[NSUserDefaults standardUserDefaults] setBool:NO forKey:@"userType"];//用户类型 yes 企业 0 非企业
             AppDelegate *appdelegate = (AppDelegate *)[UIApplication sharedApplication].delegate;
             [appdelegate switchTabBar];

HappyJob/HappyJob/BClass/BMy/设置/ViewControlletr/BSetViewController.m

@@ -142,7 +142,7 @@
     [self dismissViewControllerAnimated:NO completion:^{
         // 清空所有本地用户信息
         [HJUserInfoModel clear];
-        [HJMemberModel clear];
+        [HJMemberInfoModel clear];
         AppDelegate *appdelegate = (AppDelegate *)[UIApplication sharedApplication].delegate;
         [appdelegate switchTabBar];
 

HappyJob/HappyJob/BClass/BPosition/API/BCheckPeopleAPI.m

@@ -23,7 +23,7 @@
              @"positionId":self.positionId,
              @"positionCategory":self.positionCategory,
              @"type":self.type,
-             @"member_id":[HJMemberModel memberInfo].memberId
+             @"member_id":[HJMemberInfoModel memberInfo].memberId
              
              };
     

HappyJob/HappyJob/BClass/BPosition/API/BCheckPeopleApplysStatusAPI.m

@@ -51,7 +51,7 @@
              @"type":self.type,
              @"isRefuse":self.isRefuse,
              @"isEmploy":self.isEmploy,
-             @"member_id":[HJMemberModel memberInfo].memberId
+             @"member_id":[HJMemberInfoModel memberInfo].memberId
              };
     
 }

HappyJob/HappyJob/BClass/BPosition/API/BPositionChangeIsOnStatusAPI.m

@@ -49,7 +49,7 @@
              @"user_token":[HJUserInfoModel userInfo].userToken,
              @"id":self.ID,
              @"isOn":self.isOn,
-             @"member_id":[HJMemberModel memberInfo].memberId
+             @"member_id":[HJMemberInfoModel memberInfo].memberId
              };
     
 }

HappyJob/HappyJob/BClass/BPosition/API/BPositionChangeIsPauseAPI.m

@@ -49,7 +49,7 @@
              @"user_token":[HJUserInfoModel userInfo].userToken,
              @"id":self.ID,
              @"isPause":self.isPause,
-             @"member_id":[HJMemberModel memberInfo].memberId
+             @"member_id":[HJMemberInfoModel memberInfo].memberId
              };
     
 }

HappyJob/HappyJob/BClass/BPosition/API/BPositionChangeUpdateTimeAPI.m

@@ -48,7 +48,7 @@
              @"user_id": [HJUserInfoModel userInfo].userID,
              @"user_token":[HJUserInfoModel userInfo].userToken,
              @"id":self.ID,
-             @"member_id":[HJMemberModel memberInfo].memberId
+             @"member_id":[HJMemberInfoModel memberInfo].memberId
              };
     
 }

HappyJob/HappyJob/BClass/BPosition/API/BPositionDetailAPI.m

@@ -48,7 +48,7 @@
              @"user_id": [HJUserInfoModel userInfo].userID,
              @"user_token":[HJUserInfoModel userInfo].userToken,
              @"id":self.ID,
-             @"member_id":[HJMemberModel memberInfo].memberId
+             @"member_id":[HJMemberInfoModel memberInfo].memberId
             
              };
     

HappyJob/HappyJob/BClass/BPosition/API/BPositionListAPI.m

@@ -20,7 +20,7 @@
                                                                                 @"user_id": [HJUserInfoModel userInfo].userID,
                                                                                 @"user_token": [HJUserInfoModel userInfo].userToken,
                                                                                 @"pageNo": @(self.currentPageNumber),
-                                                                                @"member_id":[HJMemberModel memberInfo].memberId
+                                                                                @"member_id":[HJMemberInfoModel memberInfo].memberId
                                                                                 }];
     if (![self.isOn isEqualToString:@"-1"])
     {