代码的优化

HappyWork/HappyWork.xcodeproj/project.pbxproj

@@ -10,6 +10,8 @@
 		07BE169926BF6F039617C808 /* Pods_HappyWorkUITests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 11E564662BC473A1BB75C633 /* Pods_HappyWorkUITests.framework */; };
 		4E3917FC45F71DA840F8E0B5 /* Pods_HappyWork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AFEAF32B812259519C406C37 /* Pods_HappyWork.framework */; };
 		5E909172A4E0C02B249067EF /* Pods_HappyWorkTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D9DE7D1B0771B348EE1EAC6A /* Pods_HappyWorkTests.framework */; };
+		7101527F23C56B0100E14876 /* DemanHallDetailViewModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 7101527E23C56B0100E14876 /* DemanHallDetailViewModel.m */; };
+		7101528623C598E300E14876 /* MyOrderDetailViewModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 7101528523C598E300E14876 /* MyOrderDetailViewModel.m */; };
 		712AF6D42333074400EBD542 /* LoginRegisterViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 712AF6D32333074400EBD542 /* LoginRegisterViewController.m */; };
 		712AF6DA2333117C00EBD542 /* LoginRegisterView.m in Sources */ = {isa = PBXBuildFile; fileRef = 712AF6D92333117C00EBD542 /* LoginRegisterView.m */; };
 		712AF6F32333124400EBD542 /* NSArray+HYBUnicodeReadable.m in Sources */ = {isa = PBXBuildFile; fileRef = 712AF6E02333124400EBD542 /* NSArray+HYBUnicodeReadable.m */; };
@@ -22,7 +24,6 @@
 		712AF6FA2333124400EBD542 /* UIColor+Palette.m in Sources */ = {isa = PBXBuildFile; fileRef = 712AF6EF2333124400EBD542 /* UIColor+Palette.m */; };
 		712AF6FB2333124400EBD542 /* UIButton+ImageTitleSpace.m in Sources */ = {isa = PBXBuildFile; fileRef = 712AF6F02333124400EBD542 /* UIButton+ImageTitleSpace.m */; };
 		712AF6FC2333124400EBD542 /* NSDictionary+ValueAccess.m in Sources */ = {isa = PBXBuildFile; fileRef = 712AF6F12333124400EBD542 /* NSDictionary+ValueAccess.m */; };
-		712AF705233312FA00EBD542 /* UIView+FBProgressHUD.m in Sources */ = {isa = PBXBuildFile; fileRef = 712AF6FF233312FA00EBD542 /* UIView+FBProgressHUD.m */; };
 		712AF706233312FA00EBD542 /* UIView+AZGradient.m in Sources */ = {isa = PBXBuildFile; fileRef = 712AF702233312FA00EBD542 /* UIView+AZGradient.m */; };
 		712AF70C2333455F00EBD542 /* PhoneAndCodeView.m in Sources */ = {isa = PBXBuildFile; fileRef = 712AF70B2333455F00EBD542 /* PhoneAndCodeView.m */; };
 		712AF712233350BB00EBD542 /* DemanHallViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 712AF711233350BB00EBD542 /* DemanHallViewController.m */; };
@@ -48,8 +49,8 @@
 		712AF7642334747200EBD542 /* DemanHallDetailPositionView.m in Sources */ = {isa = PBXBuildFile; fileRef = 712AF7632334747200EBD542 /* DemanHallDetailPositionView.m */; };
 		712AF769233493C500EBD542 /* PersonalCenterCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 712AF768233493C500EBD542 /* PersonalCenterCell.m */; };
 		712AF76C2334984900EBD542 /* PersonalCenterHeaderCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 712AF76B2334984900EBD542 /* PersonalCenterHeaderCell.m */; };
-		712AF7722334A35000EBD542 /* SetViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 712AF7712334A35000EBD542 /* SetViewController.m */; };
-		712AF7752334A40400EBD542 /* SetCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 712AF7742334A40400EBD542 /* SetCell.m */; };
+		712AF7722334A35000EBD542 /* BasicInformationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 712AF7712334A35000EBD542 /* BasicInformationViewController.m */; };
+		712AF7752334A40400EBD542 /* BasicInformationCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 712AF7742334A40400EBD542 /* BasicInformationCell.m */; };
 		712AF7872334ADC300EBD542 /* UIViewController+HJNavBar.m in Sources */ = {isa = PBXBuildFile; fileRef = 712AF7832334ADC300EBD542 /* UIViewController+HJNavBar.m */; };
 		712AF78B2334B87200EBD542 /* MySignUpViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 712AF78A2334B87200EBD542 /* MySignUpViewController.m */; };
 		712AF78E2334B8A800EBD542 /* MySignUpCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 712AF78D2334B8A800EBD542 /* MySignUpCell.m */; };
@@ -61,7 +62,7 @@
 		712AF7A02335B3FA00EBD542 /* PaymentRecordDetailView.m in Sources */ = {isa = PBXBuildFile; fileRef = 712AF79F2335B3FA00EBD542 /* PaymentRecordDetailView.m */; };
 		7133D5D923500B1A009BCCC1 /* MyOrderWebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7133D5D823500B1A009BCCC1 /* MyOrderWebViewController.m */; };
 		7133D5DC23504548009BCCC1 /* HWAppService.m in Sources */ = {isa = PBXBuildFile; fileRef = 7133D5DB23504548009BCCC1 /* HWAppService.m */; };
-		7133D5EC2351A8AF009BCCC1 /* SetViewModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 7133D5EB2351A8AF009BCCC1 /* SetViewModel.m */; };
+		7133D5EC2351A8AF009BCCC1 /* BasicInformationViewModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 7133D5EB2351A8AF009BCCC1 /* BasicInformationViewModel.m */; };
 		71373090233C634A00AF5F8E /* HWBaseAPIManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 7137308F233C634A00AF5F8E /* HWBaseAPIManager.m */; };
 		71373094233C63F100AF5F8E /* HWNetWorkingConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = 71373093233C63F100AF5F8E /* HWNetWorkingConfig.m */; };
 		7137309B233CA9C100AF5F8E /* PageBaseViewModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 7137309A233CA9C100AF5F8E /* PageBaseViewModel.m */; };
@@ -96,6 +97,7 @@
 		71382916233A1E30007256F4 /* HWProgressHUD.m in Sources */ = {isa = PBXBuildFile; fileRef = 71382915233A1E30007256F4 /* HWProgressHUD.m */; };
 		713DE88323715A3200E0E5EA /* DemanHallEmptyCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 713DE88223715A3200E0E5EA /* DemanHallEmptyCell.m */; };
 		713E8DB02372662400EE66DC /* HWUpdateView.m in Sources */ = {isa = PBXBuildFile; fileRef = 713E8DAF2372662400EE66DC /* HWUpdateView.m */; };
+		71459D2523B1E007002E2CF2 /* UserInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 71459D2423B1E007002E2CF2 /* UserInfoModel.m */; };
 		714662B423A7783A004FBF7D /* NSObject+AutoCancelRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 714662B323A7783A004FBF7D /* NSObject+AutoCancelRequest.m */; };
 		714959EA23A9E4FB0070601D /* pdfjs in Resources */ = {isa = PBXBuildFile; fileRef = 714959E923A9E4FB0070601D /* pdfjs */; };
 		714D38D7238B7B80001E151A /* BaseWKWebView.m in Sources */ = {isa = PBXBuildFile; fileRef = 714D38D6238B7B80001E151A /* BaseWKWebView.m */; };
@@ -107,6 +109,9 @@
 		71A3B0A1234DD372004D73A5 /* MySignUpModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 71A3B0A0234DD372004D73A5 /* MySignUpModel.m */; };
 		71A3B0A4234DD564004D73A5 /* MyOrderModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 71A3B0A3234DD564004D73A5 /* MyOrderModel.m */; };
 		71A3B0A7234DD9F0004D73A5 /* PaymentRecordModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 71A3B0A6234DD9F0004D73A5 /* PaymentRecordModel.m */; };
+		71EFFA4C23B9D91800DE0DFF /* GeneralSetViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71EFFA4B23B9D91800DE0DFF /* GeneralSetViewController.m */; };
+		71EFFA5023B9D98400DE0DFF /* GeneralSetViewModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 71EFFA4F23B9D98400DE0DFF /* GeneralSetViewModel.m */; };
+		71EFFA5323B9DE1400DE0DFF /* CancellationCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 71EFFA5223B9DE1400DE0DFF /* CancellationCell.m */; };
 		71F9190E2383C80600E964CC /* MyOrderWebECOViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71F9190D2383C80600E964CC /* MyOrderWebECOViewController.m */; };
 		71FA53D72330C6780007094A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 71FA53D62330C6780007094A /* AppDelegate.m */; };
 		71FA53DF2330C6780007094A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 71FA53DE2330C6780007094A /* Assets.xcassets */; };
@@ -137,6 +142,10 @@
 		11E564662BC473A1BB75C633 /* Pods_HappyWorkUITests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_HappyWorkUITests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		1B25BED2E0902421A5B8CCD2 /* Pods-HappyWorkTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-HappyWorkTests.release.xcconfig"; path = "Target Support Files/Pods-HappyWorkTests/Pods-HappyWorkTests.release.xcconfig"; sourceTree = "<group>"; };
 		23E10786080E0275760C03A4 /* Pods-HappyWorkUITests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-HappyWorkUITests.debug.xcconfig"; path = "Target Support Files/Pods-HappyWorkUITests/Pods-HappyWorkUITests.debug.xcconfig"; sourceTree = "<group>"; };
+		7101527D23C56B0100E14876 /* DemanHallDetailViewModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DemanHallDetailViewModel.h; sourceTree = "<group>"; };
+		7101527E23C56B0100E14876 /* DemanHallDetailViewModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DemanHallDetailViewModel.m; sourceTree = "<group>"; };
+		7101528423C598E300E14876 /* MyOrderDetailViewModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MyOrderDetailViewModel.h; sourceTree = "<group>"; };
+		7101528523C598E300E14876 /* MyOrderDetailViewModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MyOrderDetailViewModel.m; sourceTree = "<group>"; };
 		712AF6D22333074400EBD542 /* LoginRegisterViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LoginRegisterViewController.h; sourceTree = "<group>"; };
 		712AF6D32333074400EBD542 /* LoginRegisterViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LoginRegisterViewController.m; sourceTree = "<group>"; };
 		712AF6D523330FEC00EBD542 /* HappyWork.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HappyWork.pch; sourceTree = "<group>"; };
@@ -162,10 +171,8 @@
 		712AF6F02333124400EBD542 /* UIButton+ImageTitleSpace.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIButton+ImageTitleSpace.m"; sourceTree = "<group>"; };
 		712AF6F12333124400EBD542 /* NSDictionary+ValueAccess.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSDictionary+ValueAccess.m"; sourceTree = "<group>"; };
 		712AF6F22333124400EBD542 /* UIImage+FitSize.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIImage+FitSize.h"; sourceTree = "<group>"; };
-		712AF6FF233312FA00EBD542 /* UIView+FBProgressHUD.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIView+FBProgressHUD.m"; sourceTree = "<group>"; };
 		712AF700233312FA00EBD542 /* UIView+AZGradient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIView+AZGradient.h"; sourceTree = "<group>"; };
 		712AF702233312FA00EBD542 /* UIView+AZGradient.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIView+AZGradient.m"; sourceTree = "<group>"; };
-		712AF703233312FA00EBD542 /* UIView+FBProgressHUD.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIView+FBProgressHUD.h"; sourceTree = "<group>"; };
 		712AF70A2333455F00EBD542 /* PhoneAndCodeView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PhoneAndCodeView.h; sourceTree = "<group>"; };
 		712AF70B2333455F00EBD542 /* PhoneAndCodeView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PhoneAndCodeView.m; sourceTree = "<group>"; };
 		712AF710233350BB00EBD542 /* DemanHallViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DemanHallViewController.h; sourceTree = "<group>"; };
@@ -213,10 +220,10 @@
 		712AF768233493C500EBD542 /* PersonalCenterCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PersonalCenterCell.m; sourceTree = "<group>"; };
 		712AF76A2334984900EBD542 /* PersonalCenterHeaderCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PersonalCenterHeaderCell.h; sourceTree = "<group>"; };
 		712AF76B2334984900EBD542 /* PersonalCenterHeaderCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PersonalCenterHeaderCell.m; sourceTree = "<group>"; };
-		712AF7702334A35000EBD542 /* SetViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SetViewController.h; sourceTree = "<group>"; };
-		712AF7712334A35000EBD542 /* SetViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SetViewController.m; sourceTree = "<group>"; };
-		712AF7732334A40400EBD542 /* SetCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SetCell.h; sourceTree = "<group>"; };
-		712AF7742334A40400EBD542 /* SetCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SetCell.m; sourceTree = "<group>"; };
+		712AF7702334A35000EBD542 /* BasicInformationViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BasicInformationViewController.h; sourceTree = "<group>"; };
+		712AF7712334A35000EBD542 /* BasicInformationViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BasicInformationViewController.m; sourceTree = "<group>"; };
+		712AF7732334A40400EBD542 /* BasicInformationCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BasicInformationCell.h; sourceTree = "<group>"; };
+		712AF7742334A40400EBD542 /* BasicInformationCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BasicInformationCell.m; sourceTree = "<group>"; };
 		712AF7832334ADC300EBD542 /* UIViewController+HJNavBar.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIViewController+HJNavBar.m"; sourceTree = "<group>"; };
 		712AF7852334ADC300EBD542 /* UIViewController+HJNavBar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIViewController+HJNavBar.h"; sourceTree = "<group>"; };
 		712AF7892334B87200EBD542 /* MySignUpViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MySignUpViewController.h; sourceTree = "<group>"; };
@@ -239,8 +246,8 @@
 		7133D5D823500B1A009BCCC1 /* MyOrderWebViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MyOrderWebViewController.m; sourceTree = "<group>"; };
 		7133D5DA23504548009BCCC1 /* HWAppService.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HWAppService.h; sourceTree = "<group>"; };
 		7133D5DB23504548009BCCC1 /* HWAppService.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HWAppService.m; sourceTree = "<group>"; };
-		7133D5EA2351A8AF009BCCC1 /* SetViewModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SetViewModel.h; sourceTree = "<group>"; };
-		7133D5EB2351A8AF009BCCC1 /* SetViewModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SetViewModel.m; sourceTree = "<group>"; };
+		7133D5EA2351A8AF009BCCC1 /* BasicInformationViewModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BasicInformationViewModel.h; sourceTree = "<group>"; };
+		7133D5EB2351A8AF009BCCC1 /* BasicInformationViewModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BasicInformationViewModel.m; sourceTree = "<group>"; };
 		7137308E233C634A00AF5F8E /* HWBaseAPIManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HWBaseAPIManager.h; sourceTree = "<group>"; };
 		7137308F233C634A00AF5F8E /* HWBaseAPIManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HWBaseAPIManager.m; sourceTree = "<group>"; };
 		71373092233C63F100AF5F8E /* HWNetWorkingConfig.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HWNetWorkingConfig.h; sourceTree = "<group>"; };
@@ -311,6 +318,8 @@
 		713DE88223715A3200E0E5EA /* DemanHallEmptyCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DemanHallEmptyCell.m; sourceTree = "<group>"; };
 		713E8DAE2372662400EE66DC /* HWUpdateView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HWUpdateView.h; sourceTree = "<group>"; };
 		713E8DAF2372662400EE66DC /* HWUpdateView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HWUpdateView.m; sourceTree = "<group>"; };
+		71459D2323B1E007002E2CF2 /* UserInfoModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UserInfoModel.h; sourceTree = "<group>"; };
+		71459D2423B1E007002E2CF2 /* UserInfoModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UserInfoModel.m; sourceTree = "<group>"; };
 		714662B223A7783A004FBF7D /* NSObject+AutoCancelRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSObject+AutoCancelRequest.h"; sourceTree = "<group>"; };
 		714662B323A7783A004FBF7D /* NSObject+AutoCancelRequest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSObject+AutoCancelRequest.m"; sourceTree = "<group>"; };
 		714959E923A9E4FB0070601D /* pdfjs */ = {isa = PBXFileReference; lastKnownFileType = folder; path = pdfjs; sourceTree = "<group>"; };
@@ -332,6 +341,12 @@
 		71A3B0A3234DD564004D73A5 /* MyOrderModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MyOrderModel.m; sourceTree = "<group>"; };
 		71A3B0A5234DD9F0004D73A5 /* PaymentRecordModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PaymentRecordModel.h; sourceTree = "<group>"; };
 		71A3B0A6234DD9F0004D73A5 /* PaymentRecordModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PaymentRecordModel.m; sourceTree = "<group>"; };
+		71EFFA4A23B9D91800DE0DFF /* GeneralSetViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneralSetViewController.h; sourceTree = "<group>"; };
+		71EFFA4B23B9D91800DE0DFF /* GeneralSetViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GeneralSetViewController.m; sourceTree = "<group>"; };
+		71EFFA4E23B9D98400DE0DFF /* GeneralSetViewModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneralSetViewModel.h; sourceTree = "<group>"; };
+		71EFFA4F23B9D98400DE0DFF /* GeneralSetViewModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GeneralSetViewModel.m; sourceTree = "<group>"; };
+		71EFFA5123B9DE1400DE0DFF /* CancellationCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CancellationCell.h; sourceTree = "<group>"; };
+		71EFFA5223B9DE1400DE0DFF /* CancellationCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CancellationCell.m; sourceTree = "<group>"; };
 		71F9190C2383C80600E964CC /* MyOrderWebECOViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MyOrderWebECOViewController.h; sourceTree = "<group>"; };
 		71F9190D2383C80600E964CC /* MyOrderWebECOViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MyOrderWebECOViewController.m; sourceTree = "<group>"; };
 		71FA53D22330C6780007094A /* HappyWork.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = HappyWork.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -383,6 +398,15 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		7101527C23C56ACF00E14876 /* ViewModel */ = {
+			isa = PBXGroup;
+			children = (
+				7101527D23C56B0100E14876 /* DemanHallDetailViewModel.h */,
+				7101527E23C56B0100E14876 /* DemanHallDetailViewModel.m */,
+			);
+			path = ViewModel;
+			sourceTree = "<group>";
+		};
 		712AF6CC233305F900EBD542 /* Support */ = {
 			isa = PBXGroup;
 			children = (
@@ -445,6 +469,7 @@
 			children = (
 				712AF6D72333110D00EBD542 /* ViewController */,
 				712AF6D62333110D00EBD542 /* View */,
+				71459D2223B1DFD8002E2CF2 /* Model */,
 			);
 			path = LoginRegister;
 			sourceTree = "<group>";
@@ -533,8 +558,6 @@
 			children = (
 				712AF700233312FA00EBD542 /* UIView+AZGradient.h */,
 				712AF702233312FA00EBD542 /* UIView+AZGradient.m */,
-				712AF703233312FA00EBD542 /* UIView+FBProgressHUD.h */,
-				712AF6FF233312FA00EBD542 /* UIView+FBProgressHUD.m */,
 				713828C22338B704007256F4 /* UIView+HJLoadingViewAndErrorView.h */,
 				713828C32338B704007256F4 /* UIView+HJLoadingViewAndErrorView.m */,
 			);
@@ -679,7 +702,8 @@
 		712AF74823346FA500EBD542 /* PersonalCenter */ = {
 			isa = PBXGroup;
 			children = (
-				712AF76D2334A30C00EBD542 /* 设置_set */,
+				71EFFA4723B9D88E00DE0DFF /* 通用设置_generalSet */,
+				712AF76D2334A30C00EBD542 /* 基本信息_basicinformation */,
 				712AF7762334AC5200EBD542 /* 我的报名_signup */,
 				712AF7792334ACE500EBD542 /* 我的订单_order */,
 				712AF77C2334AD1100EBD542 /* 收款记录_record */,
@@ -721,21 +745,21 @@
 			path = ViewController;
 			sourceTree = "<group>";
 		};
-		712AF76D2334A30C00EBD542 /* 设置_set */ = {
+		712AF76D2334A30C00EBD542 /* 基本信息_basicinformation */ = {
 			isa = PBXGroup;
 			children = (
 				712AF76F2334A32500EBD542 /* ViewController */,
 				7133D5E92351A852009BCCC1 /* ViewModel */,
 				712AF76E2334A32500EBD542 /* View */,
 			);
-			path = "设置_set";
+			path = "基本信息_basicinformation";
 			sourceTree = "<group>";
 		};
 		712AF76E2334A32500EBD542 /* View */ = {
 			isa = PBXGroup;
 			children = (
-				712AF7732334A40400EBD542 /* SetCell.h */,
-				712AF7742334A40400EBD542 /* SetCell.m */,
+				712AF7732334A40400EBD542 /* BasicInformationCell.h */,
+				712AF7742334A40400EBD542 /* BasicInformationCell.m */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -743,8 +767,8 @@
 		712AF76F2334A32500EBD542 /* ViewController */ = {
 			isa = PBXGroup;
 			children = (
-				712AF7702334A35000EBD542 /* SetViewController.h */,
-				712AF7712334A35000EBD542 /* SetViewController.m */,
+				712AF7702334A35000EBD542 /* BasicInformationViewController.h */,
+				712AF7712334A35000EBD542 /* BasicInformationViewController.m */,
 			);
 			path = ViewController;
 			sourceTree = "<group>";
@@ -885,8 +909,8 @@
 		7133D5E92351A852009BCCC1 /* ViewModel */ = {
 			isa = PBXGroup;
 			children = (
-				7133D5EA2351A8AF009BCCC1 /* SetViewModel.h */,
-				7133D5EB2351A8AF009BCCC1 /* SetViewModel.m */,
+				7133D5EA2351A8AF009BCCC1 /* BasicInformationViewModel.h */,
+				7133D5EB2351A8AF009BCCC1 /* BasicInformationViewModel.m */,
 			);
 			path = ViewModel;
 			sourceTree = "<group>";
@@ -907,6 +931,7 @@
 			isa = PBXGroup;
 			children = (
 				71382834233605DF007256F4 /* ViewController */,
+				7101527C23C56ACF00E14876 /* ViewModel */,
 				71382833233605DF007256F4 /* View */,
 			);
 			path = "DemanHall_详情";
@@ -1027,6 +1052,8 @@
 			children = (
 				713828DE2339BC66007256F4 /* MyOrderViewModel.h */,
 				713828DF2339BC66007256F4 /* MyOrderViewModel.m */,
+				7101528423C598E300E14876 /* MyOrderDetailViewModel.h */,
+				7101528523C598E300E14876 /* MyOrderDetailViewModel.m */,
 			);
 			path = ViewModel;
 			sourceTree = "<group>";
@@ -1158,6 +1185,15 @@
 			path = ProgressHUD;
 			sourceTree = "<group>";
 		};
+		71459D2223B1DFD8002E2CF2 /* Model */ = {
+			isa = PBXGroup;
+			children = (
+				71459D2323B1E007002E2CF2 /* UserInfoModel.h */,
+				71459D2423B1E007002E2CF2 /* UserInfoModel.m */,
+			);
+			path = Model;
+			sourceTree = "<group>";
+		};
 		714662B123A7783A004FBF7D /* YRAutoCancelRequest */ = {
 			isa = PBXGroup;
 			children = (
@@ -1167,6 +1203,43 @@
 			path = YRAutoCancelRequest;
 			sourceTree = "<group>";
 		};
+		71EFFA4723B9D88E00DE0DFF /* 通用设置_generalSet */ = {
+			isa = PBXGroup;
+			children = (
+				71EFFA4923B9D8B000DE0DFF /* ViewController */,
+				71EFFA4D23B9D95F00DE0DFF /* ViewModel */,
+				71EFFA4823B9D8B000DE0DFF /* View */,
+			);
+			path = "通用设置_generalSet";
+			sourceTree = "<group>";
+		};
+		71EFFA4823B9D8B000DE0DFF /* View */ = {
+			isa = PBXGroup;
+			children = (
+				71EFFA5123B9DE1400DE0DFF /* CancellationCell.h */,
+				71EFFA5223B9DE1400DE0DFF /* CancellationCell.m */,
+			);
+			path = View;
+			sourceTree = "<group>";
+		};
+		71EFFA4923B9D8B000DE0DFF /* ViewController */ = {
+			isa = PBXGroup;
+			children = (
+				71EFFA4A23B9D91800DE0DFF /* GeneralSetViewController.h */,
+				71EFFA4B23B9D91800DE0DFF /* GeneralSetViewController.m */,
+			);
+			path = ViewController;
+			sourceTree = "<group>";
+		};
+		71EFFA4D23B9D95F00DE0DFF /* ViewModel */ = {
+			isa = PBXGroup;
+			children = (
+				71EFFA4E23B9D98400DE0DFF /* GeneralSetViewModel.h */,
+				71EFFA4F23B9D98400DE0DFF /* GeneralSetViewModel.m */,
+			);
+			path = ViewModel;
+			sourceTree = "<group>";
+		};
 		71FA53C92330C6780007094A = {
 			isa = PBXGroup;
 			children = (
@@ -1473,6 +1546,7 @@
 				714D38D7238B7B80001E151A /* BaseWKWebView.m in Sources */,
 				7138289823385151007256F4 /* TaxCertificateViewController.m in Sources */,
 				7138289B23385161007256F4 /* TaxCertificateView.m in Sources */,
+				71EFFA5323B9DE1400DE0DFF /* CancellationCell.m in Sources */,
 				713828D42339AC39007256F4 /* PageListViewController.m in Sources */,
 				713828BD2338AE07007256F4 /* HJBlankView.m in Sources */,
 				713828C12338AE07007256F4 /* HJLoadingView.m in Sources */,
@@ -1483,21 +1557,23 @@
 				712AF73E233454E100EBD542 /* DemanHallIndustryView.m in Sources */,
 				712AF6F72333124400EBD542 /* NSString+RdUtility.m in Sources */,
 				71A3B09D234DC6B7004D73A5 /* MyOrderDetailViewController.m in Sources */,
-				7133D5EC2351A8AF009BCCC1 /* SetViewModel.m in Sources */,
+				7133D5EC2351A8AF009BCCC1 /* BasicInformationViewModel.m in Sources */,
 				713828E32339BC86007256F4 /* PaymentRecordViewModel.m in Sources */,
 				713829032339E964007256F4 /* AddressPickViewView.m in Sources */,
 				712AF6FB2333124400EBD542 /* UIButton+ImageTitleSpace.m in Sources */,
 				71A3B0A4234DD564004D73A5 /* MyOrderModel.m in Sources */,
 				7137309B233CA9C100AF5F8E /* PageBaseViewModel.m in Sources */,
 				712AF6F92333124400EBD542 /* UIImage+FitSize.m in Sources */,
-				712AF705233312FA00EBD542 /* UIView+FBProgressHUD.m in Sources */,
 				713DE88323715A3200E0E5EA /* DemanHallEmptyCell.m in Sources */,
+				71459D2523B1E007002E2CF2 /* UserInfoModel.m in Sources */,
 				712AF6F52333124400EBD542 /* NSSet+HYBUnicodeReadable.m in Sources */,
 				7138287F23366600007256F4 /* RegisterUserViewController.m in Sources */,
 				713828EC2339C1C9007256F4 /* DemanHallMenuFilterView.m in Sources */,
 				71A3B094234D6CB4004D73A5 /* DemanHallDetailSignUpView.m in Sources */,
-				712AF7722334A35000EBD542 /* SetViewController.m in Sources */,
+				71EFFA4C23B9D91800DE0DFF /* GeneralSetViewController.m in Sources */,
+				712AF7722334A35000EBD542 /* BasicInformationViewController.m in Sources */,
 				712AF7332333739A00EBD542 /* DemanhallAddressAreaView.m in Sources */,
+				71EFFA5023B9D98400DE0DFF /* GeneralSetViewModel.m in Sources */,
 				712AF706233312FA00EBD542 /* UIView+AZGradient.m in Sources */,
 				713829012339E964007256F4 /* ZHDatePickerView.m in Sources */,
 				713829072339E9DD007256F4 /* HJToolbarView.m in Sources */,
@@ -1509,7 +1585,7 @@
 				712AF71D2333579300EBD542 /* DemanHallTagView.m in Sources */,
 				71373090233C634A00AF5F8E /* HWBaseAPIManager.m in Sources */,
 				713828C42338B704007256F4 /* UIView+HJLoadingViewAndErrorView.m in Sources */,
-				712AF7752334A40400EBD542 /* SetCell.m in Sources */,
+				712AF7752334A40400EBD542 /* BasicInformationCell.m in Sources */,
 				713828C72338BA63007256F4 /* DemanHallBannerView.m in Sources */,
 				713828BF2338AE07007256F4 /* HWRefreshHeaderView.m in Sources */,
 				713828D92339B9C1007256F4 /* MySignUpViewModel.m in Sources */,
@@ -1536,6 +1612,8 @@
 				712AF712233350BB00EBD542 /* DemanHallViewController.m in Sources */,
 				7138290C2339F324007256F4 /* HWAppUserProfile.m in Sources */,
 				712AF6D42333074400EBD542 /* LoginRegisterViewController.m in Sources */,
+				7101527F23C56B0100E14876 /* DemanHallDetailViewModel.m in Sources */,
+				7101528623C598E300E14876 /* MyOrderDetailViewModel.m in Sources */,
 				712AF7642334747200EBD542 /* DemanHallDetailPositionView.m in Sources */,
 				713E8DB02372662400EE66DC /* HWUpdateView.m in Sources */,
 				712AF7872334ADC300EBD542 /* UIViewController+HJNavBar.m in Sources */,
@@ -1731,7 +1809,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 6TLH64Q4Z4;
 				GCC_PREFIX_HEADER = "$(SRCROOT)/HappyWork/Support/HappyWork.pch";
 				INFOPLIST_FILE = HappyWork/Info.plist;
@@ -1740,7 +1818,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.0;
+				MARKETING_VERSION = 1.1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.huijiabo.happywork;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGETED_DEVICE_FAMILY = 1;
@@ -1753,7 +1831,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 6TLH64Q4Z4;
 				GCC_PREFIX_HEADER = "$(SRCROOT)/HappyWork/Support/HappyWork.pch";
 				INFOPLIST_FILE = HappyWork/Info.plist;
@@ -1762,7 +1840,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.0;
+				MARKETING_VERSION = 1.1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.huijiabo.happywork;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGETED_DEVICE_FAMILY = 1;

HappyWork/HappyWork/Assets.xcassets/PersonalCenter/general_Set.imageset/Contents.json

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

HappyWork/HappyWork/Assets.xcassets/PersonalCenter/protocol_privacy.imageset/Contents.json

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

HappyWork/HappyWork/Base/BaseWKWebView.m

@@ -19,7 +19,6 @@
 - (void)dealloc {
     
     [self.webView removeObserver:self forKeyPath:@"estimatedProgress"];
-    
 }
 
 - (instancetype)initWithFrame:(CGRect)frame {
@@ -41,6 +40,7 @@
 }
 
 #pragma mark - WKNavigationDelegate
+
 /* 计算wkWebView进度条 */
 - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
 {
@@ -58,7 +58,6 @@
             } completion:^(BOOL finished) {
                 
                 [self.myProgressView setProgress:0 animated:NO];
-                
             }];
         }
     }
@@ -78,7 +77,6 @@
         _myProgressView.tintColor = COLOR_GRAY_88;
         _myProgressView.trackTintColor = [UIColor whiteColor];
     }
-    
     return _myProgressView;
 }
 - (WKWebView *)webView {

HappyWork/HappyWork/Base/PageListViewController.m

@@ -76,13 +76,13 @@
 
 }
 
-/* 结束刷新操作 */
+/* 成功结束刷新操作 */
 - (void)successfulRefreshOperation {
     
     self.firstLoading = NO;
     [self.view dismissLoadingView];
     [self.view dismissErrorView];
-    [self.tableView.mj_header endRefreshing];//结束头部刷新
+    [self.tableView.mj_header endRefreshing];//结束头部刷新，结束尾部刷新在setLastPage方法里操作
     [self.tableView reloadData];
 }
 
@@ -99,6 +99,7 @@
 }
 
 #pragma mark - setter and getter
+
 /* 是否是最后一页 */
 - (void)setLastPage:(BOOL)lastPage {
     

HappyWork/HappyWork/Class/DemandHall/DemanHall_详情/ViewController/DemanHallDetailViewController.m

@@ -12,11 +12,11 @@
 #import "DemanHallDetailCompanyView.h"
 #import "DemanHallDetailPositionView.h"
 #import "DemanHallDetailSignUpView.h"
+#import "DemanHallDetailViewModel.h"
 
 @interface DemanHallDetailViewController ()
 <
-FBScrollLayoutViewDelegate,
-HWConfirmPanelViewDelegate
+FBScrollLayoutViewDelegate
 >
 
 @property (nonatomic, strong) FBScrollLayoutView    *scrollLayoutView;
@@ -24,8 +24,9 @@ HWConfirmPanelViewDelegate
 @property (nonatomic, strong) DemanHallDetailCompanyView  *companyView;
 @property (nonatomic, strong) DemanHallDetailPositionView *positionView;
 @property (nonatomic, strong) DemanHallDetailSignUpView   *signUpViewView;
-@property (nonatomic, strong) UIButton                    *signupBtn;
+@property (nonatomic, strong) UIButton                    *signupBtn;//报名button
 @property (nonatomic, strong) NSDictionary                *detailDict;
+@property (nonatomic, strong) DemanHallDetailViewModel    *viewModel;
 
 
 @end
@@ -61,7 +62,26 @@ HWConfirmPanelViewDelegate
     [self.scrollLayoutView makeConstraints];
     
 }
+#pragma mark - private method
 
+/* 网络请求 */
+- (void)requestDetailData {
+    
+    NSMutableDictionary *parameter = [NSMutableDictionary dictionary];
+    [parameter setValue:self.hwRequirementId forKey:@"hwRequirementId"];
+    [parameter setValue:[HWAppUserProfile sharedInstance].userId forKey:@"user_id"];
+    [parameter setValue:[HWAppUserProfile sharedInstance].oauthToken forKey:@"user_token"];
+    
+    [self.viewModel requestDetailData:parameter currentView:self.view backData:^(NSDictionary * _Nonnull dataDict) {
+       
+        self.detailDict = dataDict[@"data"][@"hwRequirementAPI"];
+        [self.headerView demanHallDetailHeaderViewDict:self.detailDict];
+        [self.companyView demanHallDetailCompanyViewDict:self.detailDict];
+        [self.positionView demanHallDetailPositionViewDict:self.detailDict];
+        
+    }];
+
+}
 #pragma mark - FBScrollLayoutViewDelegate
 
 - (void)scrollLayoutViewMakeConstraints:(FBScrollLayoutView *)scrollLayoutView {
@@ -104,26 +124,21 @@ HWConfirmPanelViewDelegate
     }];
 }
 
-#pragma mark - HWConfirmPanelViewDelegate
-
-- (void)HWConfirmPanelViewClickButtonAtIndex:(NSInteger)index withAlertView:(HWConfirmPanelView *)alertView {
-    
-    
-}
-
 #pragma mark - event response
-
+/* 错误按钮点击 */
 - (void)refreshButtonClicked:(UIButton *)btn {
     
     [self requestDetailData];
 }
+
+/* 我要报名 */
 - (void)signupButtonClick:(UIButton *)btn {
     
     _signUpViewView = [[DemanHallDetailSignUpView alloc]init];
     [_signUpViewView.doneBtn addTarget:self action:@selector(doneButtonClick:) forControlEvents:UIControlEventTouchUpInside];
     [_signUpViewView showDemanHallDetailSignUpView];
-    
 }
+
 - (void)doneButtonClick:(UIButton *)btn {
     
     NSMutableDictionary *parameter = [NSMutableDictionary dictionary];
@@ -133,63 +148,8 @@ HWConfirmPanelViewDelegate
     [parameter setValue:self.signUpViewView.textView.text forKey:@"bright_points"];
     [parameter setValue:@"2" forKey:@"enroll_from"];
     
-    [HWProgressHUD fb_showLoading];
-    [HWAFHttpTool postJSONRequestWithURLStr:enrollment_Require params:parameter success:^(NSDictionary *responseDic) {
-        
-        [HWProgressHUD fb_dismiss];
-        
-        if ([responseDic[@"errcode"] integerValue] == 0)
-        {
-            [HWProgressHUD fb_showSuccessWithStatus:@"报名成功"];
-        }
-        else
-        {
-            [HWConfirmPanelView showAlertWithTitle:@"报名失败" message:responseDic[@"errmsg"] sure:@"确定" delegate:self tag:0];
-        }
-        
-    } failure:^(NSString *error) {
-        
-        [HWProgressHUD fb_dismiss];
-        [HWProgressHUD fb_showFailureWithStatus:error];
-        
-    }];
-    
-}
-
-#pragma mark - private method
-
-/* 网络请求 */
-- (void)requestDetailData {
+    [self.viewModel signupParameter:parameter currentView:self.view];
     
-    NSMutableDictionary *parameter = [NSMutableDictionary dictionary];
-    [parameter setValue:self.hwRequirementId forKey:@"hwRequirementId"];
-    [parameter setValue:[HWAppUserProfile sharedInstance].userId forKey:@"user_id"];
-    [parameter setValue:[HWAppUserProfile sharedInstance].oauthToken forKey:@"user_token"];
-    [HWProgressHUD fb_showLoading];
-    [HWAFHttpTool getRequestWithURLStr:get_Requirement_Detail params:parameter success:^(NSDictionary *responseDic) {
-        
-        [self.view dismissErrorView];
-        [HWProgressHUD fb_dismiss];
-        if ([responseDic[@"errcode"] integerValue] == 0)
-        {
-            self.detailDict = responseDic[@"data"][@"hwRequirementAPI"];
-            [self.headerView demanHallDetailHeaderViewDict:self.detailDict];
-            [self.companyView demanHallDetailCompanyViewDict:self.detailDict];
-            [self.positionView demanHallDetailPositionViewDict:self.detailDict];
-        }
-        else
-        {
-            [HWProgressHUD fb_showFailureWithStatus:responseDic[@"errmsg"]];
-            [self.view showErrorView];
-        }
-        
-    } failure:^(NSString *error) {
-        
-        [HWProgressHUD fb_dismiss];
-        [self.view showErrorView];
-        [HWProgressHUD fb_showFailureWithStatus:error];
-        
-    }];
 }
 
 #pragma mark - setter and getter
@@ -253,6 +213,14 @@ HWConfirmPanelViewDelegate
     }
     return _signupBtn;
 }
+- (DemanHallDetailViewModel *)viewModel {
+    
+    if (_viewModel == nil)
+    {
+        _viewModel = [[DemanHallDetailViewModel alloc]init];
+    }
+    return _viewModel;
+}
 /*
 #pragma mark - Navigation
 

HappyWork/HappyWork/Class/DemandHall/DemanHall_详情/ViewModel/DemanHallDetailViewModel.h

@@ -0,0 +1,23 @@
+//
+//  DemanHallDetailViewModel.h
+//  HappyWork
+//
+//  Created by 张晓光 on 2020/1/8.
+//  Copyright © 2020 张晓光. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface DemanHallDetailViewModel : NSObject
+
+/* 详情 */
+- (void)requestDetailData:(NSDictionary *)paramDict currentView:(UIView *)view backData:(void(^)(NSDictionary *dataDict))detailBlock;
+
+/* 报名*/
+- (void)signupParameter:(NSDictionary *)paramDict currentView:(UIView *)view;
+
+@end
+
+NS_ASSUME_NONNULL_END

HappyWork/HappyWork/Class/DemandHall/DemanHall_详情/ViewModel/DemanHallDetailViewModel.m

@@ -0,0 +1,76 @@
+//
+//  DemanHallDetailViewModel.m
+//  HappyWork
+//
+//  Created by 张晓光 on 2020/1/8.
+//  Copyright © 2020 张晓光. All rights reserved.
+//
+
+#import "DemanHallDetailViewModel.h"
+
+@interface DemanHallDetailViewModel ()<HWConfirmPanelViewDelegate>
+
+@end
+
+@implementation DemanHallDetailViewModel
+
+/* 详情 */
+- (void)requestDetailData:(NSDictionary *)paramDict currentView:(UIView *)view backData:(void(^)(NSDictionary *dataDict))detailBlock {
+    
+    [HWProgressHUD fb_showLoading];
+    [HWAFHttpTool getRequestWithURLStr:get_Requirement_Detail params:paramDict success:^(NSDictionary *responseDic) {
+        
+        [view dismissErrorView];
+        [HWProgressHUD fb_dismiss];
+        if ([responseDic[@"errcode"] integerValue] == 0)
+        {
+            detailBlock(responseDic);
+        }
+        else
+        {
+            [HWProgressHUD fb_showFailureWithStatus:responseDic[@"errmsg"]];
+            [view showErrorView];
+        }
+        
+    } failure:^(NSString *error) {
+        
+        [HWProgressHUD fb_dismiss];
+        [view showErrorView];
+        [HWProgressHUD fb_showFailureWithStatus:error];
+        
+    }];
+    
+}
+
+/* 报名的 */
+- (void)signupParameter:(NSDictionary *)paramDict currentView:(UIView *)view {
+    
+    [HWProgressHUD fb_showLoading];
+    [HWAFHttpTool postJSONRequestWithURLStr:enrollment_Require params:paramDict success:^(NSDictionary *responseDic) {
+        
+        [HWProgressHUD fb_dismiss];
+        
+        if ([responseDic[@"errcode"] integerValue] == 0)
+        {
+            [HWProgressHUD fb_showSuccessWithStatus:@"报名成功"];
+        }
+        else
+        {
+            [HWConfirmPanelView showAlertWithTitle:@"报名失败" message:responseDic[@"errmsg"] sure:@"确定" delegate:self tag:0];
+        }
+        
+    } failure:^(NSString *error) {
+        
+        [HWProgressHUD fb_dismiss];
+        [HWProgressHUD fb_showFailureWithStatus:error];
+    }];
+}
+
+#pragma mark - HWConfirmPanelViewDelegate
+
+- (void)HWConfirmPanelViewClickButtonAtIndex:(NSInteger)index withAlertView:(HWConfirmPanelView *)alertView {
+    
+    
+}
+
+@end

HappyWork/HappyWork/Class/DemandHall/Model/DemanHallModel.h

@@ -49,6 +49,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, copy) NSString *acceptanceCriteria;
 @property (nonatomic, copy) NSString *companyName;
 
+
 @end
 
 NS_ASSUME_NONNULL_END

HappyWork/HappyWork/Class/DemandHall/ViewController/DemanHallViewController.m

@@ -12,7 +12,6 @@
 #import "PersonalCenterViewController.h"//个人中心
 #import "DemanHallDetailViewController.h"//详情
 #import "DemanHallViewModel.h"
-#import "HWUpdateView.h"
 
 @interface DemanHallViewController ()
 <
@@ -69,39 +68,25 @@ DemanHallMenuFilterViewDelegate
 - (void)dealWithRequestResult {
     
     [self.view showLoadingView];
-    [self.viewModel bannerRequirement];
-    [self.viewModel appUpdateRequirement];
+    
     __weak typeof(self) weakSelf = self;
     
-    //banner
-    self.viewModel.bannerDataBlock = ^{
-      
-        [weakSelf.tableView reloadData];
-    };
     //更新
-    self.viewModel.updateDataBlock = ^(NSDictionary * _Nonnull dataDict) {
+    [self.viewModel appUpdateRequirement];
+    
+    //banner
+    [self.viewModel bannerRequirement:^{
         
-        id isLatest = [dataDict valueForKeyPath:@"data.isLatest"];//[isLatest isKindOfClass:[NSNumber class]] &&
-       
-        if (![isLatest boolValue])
-        {
-            id isForceUpdate = [dataDict valueForKeyPath:@"data.hwVersion.isForceUpdate"];//1强制更新
-            id description = [dataDict valueForKeyPath:@"data.hwVersion.description"];
-            if ([isForceUpdate isKindOfClass:[NSNumber class]] && [description isKindOfClass:[NSString class]])
-            {
-                HWUpdateView *updateView =  [[HWUpdateView alloc]init];
-                updateView.update = [isForceUpdate boolValue];
-                NSAttributedString * attrStr = [[NSAttributedString alloc] initWithData:[description dataUsingEncoding:NSUnicodeStringEncoding] options:@{ NSDocumentTypeDocumentAttribute: NSHTMLTextDocumentType } documentAttributes:nil error:nil];
-                updateView.detailLabel.attributedText = attrStr;
-            }
-        }
-    };
+        [weakSelf.tableView reloadData];
+    }];
+    
     //列表
     [self.viewModel initWithResponseDataBlock:^(id  _Nonnull data) {
         
         [weakSelf successfulRefreshOperation];
         
          weakSelf.lastPage = [data[@"data"][@"isLast"] boolValue];
+        
         if (weakSelf.viewModel.listArray.count == 0)
         {//空页面是否显示（没有加载更多了）
             weakSelf.refreshFooter.noText = YES;
@@ -114,6 +99,7 @@ DemanHallMenuFilterViewDelegate
     } fail:^(id  _Nonnull data) {
         
         [weakSelf failRefreshOperation];
+        
         [HWProgressHUD fb_showFailureWithStatus:data];
     }];
     
@@ -124,6 +110,7 @@ DemanHallMenuFilterViewDelegate
 - (void)requestListData {
     
     [super requestListData];
+    
     [self.viewModel getRequirementList:self.parametersDict];
 }
 
@@ -131,7 +118,11 @@ DemanHallMenuFilterViewDelegate
 - (void)loadNewData {
 
     [super loadNewData];
-    [self.viewModel bannerRequirement];
+    
+    [self.viewModel bannerRequirement:^{
+        
+        [self.tableView reloadData];
+    }];
 }
 
 /* 下一页*/
@@ -207,8 +198,8 @@ DemanHallMenuFilterViewDelegate
     }
     self.currentPage = 1;
     [self requestListData];
-    
 }
+
 - (void)menuFilter:(DemanHallMenuFilterView *)menuFilter selectIndustry:(NSString *)industryName industryIndex:(NSString *)industryIndex {
     
     if ([industryIndex isEqualToString:@"-1"])
@@ -221,7 +212,6 @@ DemanHallMenuFilterViewDelegate
     }
     self.currentPage = 1;
     [self requestListData];
-    
 }
 - (void)menuFilter:(DemanHallMenuFilterView *)menuFilter selectPrice:(NSString *)priceName priceIndex:(NSString *)priceIndex {
     

HappyWork/HappyWork/Class/DemandHall/ViewModel/DemanHallViewModel.h

@@ -14,11 +14,16 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (nonatomic, strong) NSMutableArray *bannerList;
 @property (nonatomic, strong) NSMutableArray *listArray;
-@property (nonatomic, copy) void(^bannerDataBlock)(void);
-@property (nonatomic, copy) void(^updateDataBlock)(NSDictionary *dataDict);
 
-- (void)bannerRequirement;
+//@property (nonatomic, copy) void(^updateDataBlock)(NSDictionary *dataDict);
+
+/* banner */
+- (void)bannerRequirement:(void(^)(void))bannerDataBlock;
+
+/* 更新 */
 - (void)appUpdateRequirement;
+
+/* 列表的 */
 - (void)getRequirementList:(NSDictionary *)parameterDict;
 
 @end

HappyWork/HappyWork/Class/DemandHall/ViewModel/DemanHallViewModel.m

@@ -11,6 +11,7 @@
 #import "DemanHallCell.h"
 #import "DemanHallEmptyCell.h"
 #import "DemanHallModel.h"
+#import "HWUpdateView.h"
 
 @interface DemanHallViewModel ()
 
@@ -27,13 +28,30 @@
     }
     return self;
 }
-- (void)appUpdateRequirement {
+
+/* 更新 */
+- (void)appUpdateRequirement{
     
     [HWAFHttpTool getRequestWithURLStr:check_Version params:@{@"version":BUNDLE_SHORTVERSION,@"app_system":@"1"} success:^(NSDictionary *responseDic) {
         
         if ([responseDic[@"errcode"] integerValue] == 0)
         {
-            self.updateDataBlock(responseDic);
+            NSDictionary *dataDict = responseDic;
+            
+            id isLatest = [dataDict valueForKeyPath:@"data.isLatest"];//[isLatest isKindOfClass:[NSNumber class]] &&
+            
+             if (![isLatest boolValue])
+             {
+                 id isForceUpdate = [dataDict valueForKeyPath:@"data.hwVersion.isForceUpdate"];//1强制更新
+                 id description = [dataDict valueForKeyPath:@"data.hwVersion.description"];
+                 if ([isForceUpdate isKindOfClass:[NSNumber class]] && [description isKindOfClass:[NSString class]])
+                 {
+                     HWUpdateView *updateView =  [[HWUpdateView alloc]init];
+                     updateView.update = [isForceUpdate boolValue];
+                     NSAttributedString * attrStr = [[NSAttributedString alloc] initWithData:[description dataUsingEncoding:NSUnicodeStringEncoding] options:@{ NSDocumentTypeDocumentAttribute: NSHTMLTextDocumentType } documentAttributes:nil error:nil];
+                     updateView.detailLabel.attributedText = attrStr;
+                 }
+             }
         }
         else
         {
@@ -42,17 +60,20 @@
         
     } failure:^(NSString *error) {
         
+        [HWProgressHUD fb_showFailureWithStatus:error];
+        
     }];
-    
 }
-- (void)bannerRequirement {
+
+/* banner */
+- (void)bannerRequirement:(void(^)(void))bannerDataBlock {
     
     [HWAFHttpTool getRequestWithURLStr:banner params:nil success:^(NSDictionary *responseDic) {
         
         if ([responseDic[@"errcode"] integerValue] == 0)
         {
             self.bannerList = [NSMutableArray arrayWithArray:responseDic[@"data"][@"bannerList"]];
-            self.bannerDataBlock();
+            bannerDataBlock();
         }
         else
         {
@@ -63,7 +84,10 @@
         
         [HWProgressHUD fb_showFailureWithStatus:error];
     }];
+    
 }
+
+/* 列表的 */
 - (void)getRequirementList:(NSDictionary *)parameterDict {
     
     [HWAFHttpTool getRequestWithURLStr:get_Requirements params:parameterDict success:^(NSDictionary *responseDic) {

HappyWork/HappyWork/Class/LoginRegister/Model/UserInfoModel.h

@@ -0,0 +1,23 @@
+//
+//  UserInfoModel.h
+//  HappyWork
+//
+//  Created by 张晓光 on 2019/12/24.
+//  Copyright © 2019 张晓光. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface UserInfoModel : NSObject
+
+@property (nonatomic, copy)NSString *userToken;
+@property (nonatomic, copy)NSString *name;
+@property (nonatomic, copy)NSString *ID;
+@property (nonatomic, copy)NSString *platformId;
+
+
+@end
+
+NS_ASSUME_NONNULL_END

HappyWork/HappyWork/Class/LoginRegister/Model/UserInfoModel.m

@@ -0,0 +1,20 @@
+//
+//  UserInfoModel.m
+//  HappyWork
+//
+//  Created by 张晓光 on 2019/12/24.
+//  Copyright © 2019 张晓光. All rights reserved.
+//
+
+#import "UserInfoModel.h"
+
+@implementation UserInfoModel
+
++(NSDictionary *)mj_replacedKeyFromPropertyName {
+    
+    return @{
+        @"ID":@"id"
+             };
+    
+}
+@end

HappyWork/HappyWork/Class/LoginRegister/ViewController/LoginRegisterViewController.m

@@ -11,6 +11,7 @@
 #import "RegisterUserViewController.h"//注册用户
 #import "DemanHallViewController.h"//需求大厅
 #import "RegisterAgreementViewController.h"//注册协议
+#import "UserInfoModel.h"
 
 @interface LoginRegisterViewController ()
 
@@ -83,10 +84,13 @@
         {
             if ([responseDic[@"data"][@"userInfo"][@"registerFrom"] integerValue] == 2)
             {
-                [[HWAppUserProfile sharedInstance] setOauthToken:responseDic[@"data"][@"userInfo"][@"userToken"]];
-                [[HWAppUserProfile sharedInstance] setUserName:responseDic[@"data"][@"userInfo"][@"name"]];
-                [[HWAppUserProfile sharedInstance] setUserId:responseDic[@"data"][@"userInfo"][@"id"]];
-                [[HWAppUserProfile sharedInstance] setEnterpriseId:responseDic[@"data"][@"userInfo"][@"platformId"]];
+                UserInfoModel *model = [UserInfoModel mj_objectWithKeyValues:responseDic[@"data"][@"userInfo"]];
+                
+                [[HWAppUserProfile sharedInstance] setOauthToken:model.userToken];
+                [[HWAppUserProfile sharedInstance] setUserName:model.name];
+                [[HWAppUserProfile sharedInstance] setUserId:model.ID];
+                [[HWAppUserProfile sharedInstance] setEnterpriseId:model.platformId];
+                
                 [[HWAppUserProfile sharedInstance] save];
                 DemanHallViewController *demanHall = [[DemanHallViewController alloc]init];
                 [self.navigationController pushViewController:demanHall animated:YES];

HappyWork/HappyWork/Class/PersonalCenter/View/PersonalCenterHeaderCell.h

@@ -12,10 +12,10 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface PersonalCenterHeaderCell : UITableViewCell
 
-@property (nonatomic, strong) UIButton    *headerBtn;
-@property (nonatomic, strong) UILabel     *nameLabel;
-@property (nonatomic, strong) UILabel     *authLabel;
-@property (nonatomic, strong) UIButton    *setBtn;
+@property (nonatomic, strong) UIButton    *headerBtn;//头像
+@property (nonatomic, strong) UILabel     *nameLabel;//名字
+@property (nonatomic, strong) UILabel     *authLabel;//认证状态
+@property (nonatomic, strong) UIButton    *setBtn;//设置
 
 @end
 

HappyWork/HappyWork/Class/PersonalCenter/View/PersonalCenterHeaderCell.m

@@ -58,12 +58,10 @@
     
     [self.authLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         make.centerX.equalTo(self.contentView);
-        make.top.equalTo(self.nameLabel.mas_bottom).offset(5);
+        make.top.equalTo(self.headerBtn.mas_bottom).offset(43);
         make.size.mas_offset(CGSizeMake(60, 20));
         make.bottom.equalTo(self.contentView.mas_bottom).offset(-37);
     }];
-    self.nameLabel.text = @"名字";
-    self.authLabel.text = @"未认证";
     
 }
 

HappyWork/HappyWork/Class/PersonalCenter/ViewController/PersonalCenterViewController.m

@@ -8,13 +8,13 @@
 
 #import "PersonalCenterViewController.h"
 #import "PersonalCenterViewModel.h"
-#import "SetViewController.h"//设置
+#import "BasicInformationViewController.h"//设置
 #import "MySignUpViewController.h"//我的报名
 #import "MyOrderViewController.h"//我的订单
 #import "PaymentRecordViewController.h"//收款记录
 #import "TaxCertificateViewController.h"//完税证明
+#import "GeneralSetViewController.h"//通用设置
 #import "LoginRegisterViewController.h"
-#import "HWUpdateView.h"
 
 @interface PersonalCenterViewController ()
 <
@@ -30,9 +30,10 @@ HWConfirmPanelViewDelegate
 
 @implementation PersonalCenterViewController
 
+#pragma mark - life cycle
+
 - (void)dealloc {
     
-    DDLogDebug(@"--------------------------------");
     [[NSNotificationCenter defaultCenter] removeObserver:self name:changeHeadPortrait object:nil];
 }
 
@@ -84,33 +85,13 @@ HWConfirmPanelViewDelegate
     } fail:^(id  _Nonnull data) {
         
         [HWProgressHUD fb_showFailureWithStatus:data];
-    }];
-    //更新
-    self.viewModel.updateDataBlock = ^(NSDictionary * _Nonnull dataDict) {
         
-        id isLatest = [dataDict valueForKeyPath:@"data.isLatest"];//[isLatest isKindOfClass:[NSNumber class]] &&
-       
-        if (![isLatest boolValue])
-        {
-            id isForceUpdate = [dataDict valueForKeyPath:@"data.hwVersion.isForceUpdate"];//1强制更新
-            id description = [dataDict valueForKeyPath:@"data.hwVersion.description"];
-            if ([isForceUpdate isKindOfClass:[NSNumber class]] && [description isKindOfClass:[NSString class]])
-            {
-                HWUpdateView *updateView =  [[HWUpdateView alloc]init];
-                updateView.update = [isForceUpdate boolValue];
-                NSAttributedString * attrStr = [[NSAttributedString alloc] initWithData:[description dataUsingEncoding:NSUnicodeStringEncoding] options:@{ NSDocumentTypeDocumentAttribute: NSHTMLTextDocumentType } documentAttributes:nil error:nil];
-                updateView.detailLabel.attributedText = attrStr;
-            }
-        }
-        else
-        {
-            [HWProgressHUD fb_showInfoWithStatus:@"已是最新版本"];
-        }
-    };
+    }];
+
     // 设置
     self.viewModel.setBlock = ^{
         
-        SetViewController *setVC = [[SetViewController alloc]init];
+        BasicInformationViewController *setVC = [[BasicInformationViewController alloc]init];
         setVC.userDict = weakSlef.viewModel.userDict;
         [weakSlef.navigationController pushViewController:setVC animated:YES];
     };
@@ -175,7 +156,8 @@ HWConfirmPanelViewDelegate
     }
     if (indexPath.section == 3)
     {
-        [self.viewModel appUpdateRequirement];
+        GeneralSetViewController *generalSet = [[GeneralSetViewController alloc]init];
+        [self.navigationController pushViewController:generalSet animated:YES];
     }
 }
 

HappyWork/HappyWork/Class/PersonalCenter/ViewModel/PersonalCenterViewModel.h

@@ -14,11 +14,10 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (nonatomic, strong) NSDictionary *userDict;
 @property (nonatomic, copy)   void(^setBlock)(void);
-@property (nonatomic, copy) void(^updateDataBlock)(NSDictionary *dataDict);
 
 /* 请求用户数据 */
 - (void)requestPersonalCenterData;
-- (void)appUpdateRequirement;
+
 
 
 @end

HappyWork/HappyWork/Class/PersonalCenter/ViewModel/PersonalCenterViewModel.m

@@ -9,7 +9,6 @@
 #import "PersonalCenterViewModel.h"
 #import "PersonalCenterHeaderCell.h"
 #import "PersonalCenterCell.h"
-#import "SetViewController.h"
 #import "PersonalCenterModel.h"
 
 @interface PersonalCenterViewModel ()
@@ -28,25 +27,6 @@
     return self;
 }
 
-- (void)appUpdateRequirement {
-    
-    __weak typeof(self) weakSelf = self;
-    [HWAFHttpTool getRequestWithURLStr:check_Version params:@{@"version":BUNDLE_SHORTVERSION,@"app_system":@"1"} success:^(NSDictionary *responseDic) {
-        
-        if ([responseDic[@"errcode"] integerValue] == 0)
-        {
-            weakSelf.updateDataBlock(responseDic);
-        }
-        else
-        {
-            [HWProgressHUD fb_showFailureWithStatus:responseDic[@"errmsg"]];
-        }
-        
-    } failure:^(NSString *error) {
-        
-    }];
-    
-}
 - (void)requestPersonalCenterData{
     
     __weak typeof(self) weakSelf = self;
@@ -66,8 +46,8 @@
        
         weakSelf.failBlock(error);
     }];
-    
 }
+
 #pragma mark - event response
 
 /* 设置 */
@@ -108,7 +88,7 @@
         [cell.headerBtn addTarget:self action:@selector(setButtonClick:) forControlEvents:UIControlEventTouchUpInside];
         PersonalCenterModel *model = [PersonalCenterModel mj_objectWithKeyValues:self.userDict];
         
-        cell.nameLabel.text = model.name;
+        cell.nameLabel.text = model.name ;
         [cell.headerBtn sd_setImageWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@",model.avatar]] forState:UIControlStateNormal placeholderImage:[UIImage imageNamed:@"personalCenter_icon"]];
         if ([model.authenticationStatus integerValue] == 0)
         {
@@ -155,8 +135,8 @@
         }
         if (indexPath.section == 3 && indexPath.row == 0)
         {
-            cell.leftImageV.image = [UIImage imageNamed:@"app_update"];
-            cell.titleLabel.text = @"版本信息";
+            cell.leftImageV.image = [UIImage imageNamed:@"general_Set"];
+            cell.titleLabel.text = @"通用设置";
         }
         return cell;
     }

HappyWork/HappyWork/Class/PersonalCenter/设置_set/View/SetCell.h

@@ -10,7 +10,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface SetCell : UITableViewCell
+@interface BasicInformationCell : UITableViewCell
 
 @property (nonatomic, strong) UILabel *titleLabel;
 @property (nonatomic, strong) UIImageView *headerImageV;

HappyWork/HappyWork/Class/PersonalCenter/设置_set/View/SetCell.m

@@ -6,9 +6,9 @@
 //  Copyright © 2019 张晓光. All rights reserved.
 //
 
-#import "SetCell.h"
+#import "BasicInformationCell.h"
 
-@implementation SetCell
+@implementation BasicInformationCell
 - (void)dealloc {
     
 //    DDLogDebug(@"------dddd----");

HappyWork/HappyWork/Class/PersonalCenter/设置_set/ViewController/SetViewController.h

@@ -10,10 +10,11 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface SetViewController : UIViewController
+@interface BasicInformationViewController : UIViewController
 
 @property (nonatomic, strong) NSDictionary *userDict;
 
+
 @end
 
 NS_ASSUME_NONNULL_END

HappyWork/HappyWork/Class/PersonalCenter/设置_set/ViewController/SetViewController.m

@@ -6,31 +6,32 @@
 //  Copyright © 2019 张晓光. All rights reserved.
 //
 
-#import "SetViewController.h"
-#import "SetViewModel.h"
+#import "BasicInformationViewController.h"
+#import "BasicInformationViewModel.h"
 #import "TZImagePickerController.h"
 
-@interface SetViewController ()<UITableViewDelegate>
+@interface BasicInformationViewController ()<UITableViewDelegate>
 
 @property (nonatomic, strong) UITableView  *tableView;
-@property (nonatomic, strong) SetViewModel *viewModel;
+@property (nonatomic, strong) BasicInformationViewModel *viewModel;
 
 @end
 
-@implementation SetViewController
+@implementation BasicInformationViewController
+
+#pragma mark - life cycle
 
 - (void)dealloc {
     
-//    DDLogDebug(@"---------------------------");
 }
+
 - (void)viewDidLoad {
     [super viewDidLoad];
     
     self.view.backgroundColor = [UIColor whiteColor];
     self.navigationItem.title = @"基本信息";
     [self initSubViews];
-//    HWAFHttpTool *HW = [[HWAFHttpTool alloc]init];
-//    DDLogDebug(@"HW:::%@",HW);
+
 }
 
 #pragma mark - init
@@ -117,24 +118,12 @@
     __weak typeof(self) weakSelf = self;
     
     TZImagePickerController *imagePickerVc = [[TZImagePickerController alloc] initWithMaxImagesCount:1 delegate:nil];
+    
     imagePickerVc.didFinishPickingPhotosHandle = ^(NSArray<UIImage *> *photos, NSArray *assets, BOOL isSelectOriginalPhoto) {
         
         if (photos)
         {
-            [HWAFHttpTool uploadImage:photos[0] URL:change_Avatar parameters:@{@"user_id":[HWAppUserProfile sharedInstance].userId,@"user_token":[HWAppUserProfile sharedInstance].oauthToken} success:^(id responseDic) {
-                
-                if ([responseDic[@"errcode"] integerValue] == 0)
-                {
-                    weakSelf.viewModel.headerImageV.image = photos[0];
-                    //登录通知刷新
-                    [[NSNotificationCenter defaultCenter] postNotificationName:changeHeadPortrait object:nil];
-                }
-                else
-                {
-                    [HWProgressHUD fb_showFailureWithStatus:responseDic[@"errmsg"]];
-                }
-            
-            }];
+            [weakSelf.viewModel changeUserHeadPortraitImage:photos[0]];
         }
     };
     imagePickerVc.modalPresentationStyle = UIModalPresentationFullScreen;
@@ -157,11 +146,11 @@
     }
     return _tableView;
 }
-- (SetViewModel *)viewModel {
+- (BasicInformationViewModel *)viewModel {
     
     if (_viewModel == nil)
     {
-        _viewModel = [[SetViewModel alloc]init];
+        _viewModel = [[BasicInformationViewModel alloc]init];
     }
     return _viewModel;
 }

HappyWork/HappyWork/Class/PersonalCenter/设置_set/ViewModel/SetViewModel.h

@@ -10,10 +10,11 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface SetViewModel : NSObject<UITableViewDataSource>
+@interface BasicInformationViewModel : NSObject<UITableViewDataSource>
 
 @property (nonatomic, strong) NSDictionary *userDict;
-@property (nonatomic, strong) UIImageView  *headerImageV;
+
+- (void)changeUserHeadPortraitImage:(UIImage *)userImage;
 
 @end
 

HappyWork/HappyWork/Class/PersonalCenter/设置_set/ViewModel/SetViewModel.m

@@ -6,16 +6,43 @@
 //  Copyright © 2019 张晓光. All rights reserved.
 //
 
-#import "SetViewModel.h"
-#import "SetCell.h"
+#import "BasicInformationViewModel.h"
+#import "BasicInformationCell.h"
 #import "PersonalCenterModel.h"
 
-@implementation SetViewModel
+@interface BasicInformationViewModel ()
+
+@property (nonatomic, strong) UIImageView  *headerImageV;
+
+@end
+
+@implementation BasicInformationViewModel
 
 - (void)dealloc {
     
-//    DDLogDebug(@"------dealloc-----");
 }
+/* 更换头像 */
+- (void)changeUserHeadPortraitImage:(UIImage *)userImage {
+    
+    __weak typeof(self) weakSelf = self;
+    
+    [HWAFHttpTool uploadImage:userImage URL:change_Avatar parameters:@{@"user_id":[HWAppUserProfile sharedInstance].userId,@"user_token":[HWAppUserProfile sharedInstance].oauthToken} success:^(id responseDic) {
+        
+        if ([responseDic[@"errcode"] integerValue] == 0)
+        {
+            weakSelf.headerImageV.image = userImage;
+            //登录通知刷新
+            [[NSNotificationCenter defaultCenter] postNotificationName:changeHeadPortrait object:nil];
+        }
+        else
+        {
+            [HWProgressHUD fb_showFailureWithStatus:responseDic[@"errmsg"]];
+        }
+    
+    }];
+    
+}
+
 #pragma mark -  UITableViewDataSource
 
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
@@ -31,10 +58,10 @@
     PersonalCenterModel *model = [PersonalCenterModel mj_objectWithKeyValues:self.userDict];
     
     static  NSString *listCell = @"listCell";
-    SetCell *cell = [tableView dequeueReusableCellWithIdentifier:listCell];
+    BasicInformationCell *cell = [tableView dequeueReusableCellWithIdentifier:listCell];
     if (cell == nil)
     {
-        cell = [[SetCell alloc]initWithStyle:UITableViewCellStyleDefault reuseIdentifier:listCell];
+        cell = [[BasicInformationCell alloc]initWithStyle:UITableViewCellStyleDefault reuseIdentifier:listCell];
     }
     
     __weak typeof(cell) weakCell = cell;

HappyWork/HappyWork/Class/PersonalCenter/我的报名_signup/ViewController/MySignUpViewController.m

@@ -19,6 +19,8 @@
 
 @implementation MySignUpViewController
 
+#pragma mark - life cycle
+
 - (void)viewDidLoad {
     
     [super viewDidLoad];
@@ -27,7 +29,6 @@
     self.tableView.dataSource = self.viewModel;
     [self dealWithRequestResult];
     self.blankView.detailLabel.text = @"您目前没有报名需求";
-    
 }
 
 #pragma maek - super method
@@ -58,7 +59,6 @@
     DemanHallDetailViewController *detail = [[DemanHallDetailViewController alloc]init];
     detail.hwRequirementId = self.viewModel.listArray[indexPath.row][@"hwRequirement"][@"id"];
     [self.navigationController pushViewController:detail animated:YES];
-    
 }
 
 #pragma mark - private metnod

HappyWork/HappyWork/Class/PersonalCenter/我的订单_order/ViewController/MyOrderDetailViewController.m

@@ -13,6 +13,7 @@
 #import "DemanHallDetailPositionView.h"
 #import "MyOrderWebViewController.h"
 #import "MyOrderWebECOViewController.h"
+#import "MyOrderDetailViewModel.h"
 #import "MyOrderModel.h"
 
 @interface MyOrderDetailViewController ()
@@ -27,12 +28,13 @@ FBScrollLayoutViewDelegate
 @property (nonatomic, strong) NSDictionary                *detailDict;
 @property (nonatomic, strong) UIButton *contractBtn;//查看合同
 @property (nonatomic, strong) UIButton *makesureBtn;//确认订单
+@property (nonatomic, strong) MyOrderDetailViewModel *viewModel;
 
 @end
 
 @implementation MyOrderDetailViewController
 
-#pragma mark - life
+#pragma mark - life cycle
 
 - (void)viewDidLoad {
     [super viewDidLoad];
@@ -72,41 +74,27 @@ FBScrollLayoutViewDelegate
 - (void)requestDetailData {
     
     __weak typeof(self) weakSelf = self;
-    [HWAFHttpTool getRequestWithURLStr:get_OrderDetail params:@{@"orderId":self.orderID,@"user_id":[HWAppUserProfile sharedInstance].userId,@"user_token":[HWAppUserProfile sharedInstance].oauthToken} success:^(NSDictionary *responseDic) {
-        
-        if ([responseDic[@"errcode"] integerValue] == 0)
+    [self.viewModel orderDetailDataParameter:@{@"orderId":self.orderID,@"user_id":[HWAppUserProfile sharedInstance].userId,@"user_token":[HWAppUserProfile sharedInstance].oauthToken} currentView:self.view backData:^(NSDictionary * _Nonnull dataDict) {
+       
+        weakSelf.detailDict = dataDict[@"data"];
+        MyOrderModel *model = [MyOrderModel mj_objectWithKeyValues:self.detailDict[@"hwOrderAPI"]];
+        //判断是否要隐藏查看合同按钮
+        if (model.workContract)
         {
-            [weakSelf.view dismissErrorView];
-            weakSelf.detailDict = responseDic[@"data"];
-            MyOrderModel *model = [MyOrderModel mj_objectWithKeyValues:self.detailDict[@"hwOrderAPI"]];
-            //判断是否要隐藏查看合同按钮
-            if (model.workContract)
-            {
-                weakSelf.contractBtn.hidden = NO;
-            }
-            else
-            {
-                weakSelf.contractBtn.hidden = YES;
-                [weakSelf.makesureBtn mas_updateConstraints:^(MASConstraintMaker *make) {
-                    
-                    make.left.offset(15);
-                }];
-            }
-            [weakSelf.headerView demanHallDetailHeaderViewDict:self.detailDict[@"hwRequirementAPI"]];
-            [weakSelf.companyView demanHallDetailCompanyViewDict:self.detailDict[@"hwRequirementAPI"]];
-            [weakSelf.positionView demanHallDetailPositionViewDict:self.detailDict[@"hwRequirementAPI"]];
+            weakSelf.contractBtn.hidden = NO;
         }
         else
         {
-            [weakSelf.view showErrorView];
-            [HWProgressHUD fb_showFailureWithStatus:responseDic[@"errmsg"]];
+            weakSelf.contractBtn.hidden = YES;
+            [weakSelf.makesureBtn mas_updateConstraints:^(MASConstraintMaker *make) {
+                
+                make.left.offset(15);
+            }];
         }
-        
-    } failure:^(NSString *error) {
-        
-        [weakSelf.view showErrorView];
-        [HWProgressHUD fb_showFailureWithStatus:error];
-        
+        [weakSelf.headerView demanHallDetailHeaderViewDict:self.detailDict[@"hwRequirementAPI"]];
+        [weakSelf.companyView demanHallDetailCompanyViewDict:self.detailDict[@"hwRequirementAPI"]];
+        [weakSelf.positionView demanHallDetailPositionViewDict:self.detailDict[@"hwRequirementAPI"]];
+    
     }];
 }
 
@@ -190,54 +178,25 @@ FBScrollLayoutViewDelegate
 - (void)makeconfirmOrders:(UIButton *)btn {
     
     __weak typeof(self) weakSelf = self;
-    [HWProgressHUD fb_showLoading];
-
-    [HWAFHttpTool postJSONRequestWithURLStr:confirm_Order params:@{@"user_id":[HWAppUserProfile sharedInstance].userId,@"user_token":[HWAppUserProfile sharedInstance].oauthToken,@"orderId":self.orderID} success:^(NSDictionary *responseDic) {
-
-        [HWProgressHUD fb_dismiss];
-
-        if ([responseDic[@"errcode"] integerValue] == 0)
-        {
-            [HWProgressHUD fb_showSuccessWithStatus:@"确认订单成功"];
-            [weakSelf.makesureBtn az_setGradientBackgroundWithColors:@[[UIColor colorFromHexString:@"CDCFD3"], [UIColor colorFromHexString:@"CDCFD3"]] locations:@[@(0.0),@(1.0f)] startPoint:CGPointMake(0, 0) endPoint:CGPointMake(1, 0)];
-            weakSelf.makesureBtn.userInteractionEnabled = NO;
-            //登录通知刷新
-            [[NSNotificationCenter defaultCenter] postNotificationName:confirmationOrderNotification object:nil];
-        }
-        else
-        {
-            [HWProgressHUD fb_showFailureWithStatus:responseDic[@"errmsg"]];
-        }
-
-    } failure:^(NSString *error) {
-
-        [HWProgressHUD fb_dismiss];
-        [HWProgressHUD fb_showFailureWithStatus:error];
+    
+    [self.viewModel makeconfirmOrdersParameter:@{@"user_id":[HWAppUserProfile sharedInstance].userId,@"user_token":[HWAppUserProfile sharedInstance].oauthToken,@"orderId":self.orderID} backData:^(NSDictionary * _Nonnull dataDict) {
+        
+        [weakSelf.makesureBtn az_setGradientBackgroundWithColors:@[[UIColor colorFromHexString:@"CDCFD3"], [UIColor colorFromHexString:@"CDCFD3"]] locations:@[@(0.0),@(1.0f)] startPoint:CGPointMake(0, 0) endPoint:CGPointMake(1, 0)];
+        weakSelf.makesureBtn.userInteractionEnabled = NO;
+        //登录通知刷新
+        [[NSNotificationCenter defaultCenter] postNotificationName:confirmationOrderNotification object:nil];
+        
     }];
 }
 
 /* 电子合同 */
 - (void)makeconfirmECOrders:(UIButton *)btn {
     
-    [HWProgressHUD fb_showLoading];
-    [HWAFHttpTool postJSONRequestWithURLStr:confirmECOrders params:@{@"user_id":[HWAppUserProfile sharedInstance].userId,@"user_token":[HWAppUserProfile sharedInstance].oauthToken,@"orderId":self.orderID} success:^(NSDictionary *responseDic) {
-        
-        [HWProgressHUD fb_dismiss];
-        if ([responseDic[@"errcode"] integerValue] == 0)
-        {
-            MyOrderWebECOViewController *web = [[MyOrderWebECOViewController alloc]init];
-            web.webUrl = responseDic[@"data"][@"url"];
-            [self.navigationController pushViewController:web animated:YES];
-        }
-        else
-        {
-            [HWProgressHUD fb_showFailureWithStatus:responseDic[@"errmsg"]];
-        }
-        
-    } failure:^(NSString *error) {
+    [self.viewModel makeconfirmECOrders:@{@"user_id":[HWAppUserProfile sharedInstance].userId,@"user_token":[HWAppUserProfile sharedInstance].oauthToken,@"orderId":self.orderID} backData:^(NSDictionary * _Nonnull dataDict) {
         
-        [HWProgressHUD fb_dismiss];
-        [HWProgressHUD fb_showFailureWithStatus:error];
+        MyOrderWebECOViewController *web = [[MyOrderWebECOViewController alloc]init];
+        web.webUrl = dataDict[@"data"][@"url"];
+        [self.navigationController pushViewController:web animated:YES];
     }];
     
 }
@@ -317,7 +276,14 @@ FBScrollLayoutViewDelegate
         [_makesureBtn addTarget:self action:@selector(makesureButtonClick:) forControlEvents:UIControlEventTouchUpInside];
     }
     return _makesureBtn;
+}
+- (MyOrderDetailViewModel *)viewModel {
     
+    if (_viewModel == nil)
+    {
+        _viewModel = [[MyOrderDetailViewModel alloc]init];
+    }
+    return _viewModel;
 }
 /*
 #pragma mark - Navigation

HappyWork/HappyWork/Class/PersonalCenter/我的订单_order/ViewController/MyOrderViewController.m

@@ -20,6 +20,8 @@
 
 @implementation MyOrderViewController
 
+#pragma mark - life cycle
+
 - (void)dealloc {
     
     [[NSNotificationCenter defaultCenter] removeObserver:self name:confirmationOrderNotification object:nil];
@@ -69,7 +71,7 @@
 - (void)requestListData {
     
     [super requestListData];
-    [self.viewModel myOrderViewModelParameter:self.parametersDict];
+    [self.viewModel myOrderListParameter:self.parametersDict];
 }
 
 /* 第一页 */
@@ -102,15 +104,15 @@
     MyOrderWebViewController *web = [[MyOrderWebViewController alloc]init];
     web.webUrl = self.viewModel.listArray[index][@"workContract"];
     [self.navigationController pushViewController:web animated:YES];
-    
 }
+
 /* 确认订单 */
 - (void)makeSureOrderIndexPath:(NSIndexPath *)indexpath andMyOrderViewModel:(MyOrderViewModel *)viewModel {
     
     NSIndexPath *indexPath=[NSIndexPath indexPathForRow:indexpath.row inSection:0];
     [self.tableView reloadRowsAtIndexPaths:[NSArray arrayWithObjects:indexPath,nil] withRowAnimation:UITableViewRowAnimationNone];
-    
 }
+
 /* 电子合同 */
 - (void)makeconfirmECOrdersURL:(NSString *)url andMyOrderViewModel:(MyOrderViewModel *)viewModel {
     

HappyWork/HappyWork/Class/PersonalCenter/我的订单_order/ViewController/MyOrderWebECOViewController.m

@@ -9,7 +9,7 @@
 #import "MyOrderWebECOViewController.h"
 #import "BaseWKWebView.h"
 
-@interface MyOrderWebECOViewController ()
+@interface MyOrderWebECOViewController ()<UIWebViewDelegate>
 
 @property (nonatomic, strong) UIWebView *webView;
 
@@ -23,6 +23,7 @@
     self.navigationItem.title = @"电子合同";
     self.view.backgroundColor = [UIColor whiteColor];
     self.webView  = [[UIWebView alloc]init];
+    self.webView.delegate = self;
     [self.view addSubview:self.webView];
     [self.webView mas_makeConstraints:^(MASConstraintMaker *make) {
        
@@ -32,7 +33,18 @@
     [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@",self.webUrl]]]];
         
 }
-
+// 网页中的每一个请求都会被触发这个方法，返回NO代表不执行这个请求(常用于JS与iOS之间通讯)
+-(BOOL)webView:(UIWebView *)webView shouldStartLoadWithRequest:(NSURLRequest *)request navigationType:(UIWebViewNavigationType)navigationType
+{
+    
+    NSURL *requestURL = [request URL];
+            NSLog(@"=1%@",requestURL);
+            NSLog(@"=2%@",[requestURL scheme]);//得到协议的名称http
+            NSLog(@"=＝＝3%@",[[request URL] absoluteString]);//得到整个url
+//        NSString * absoluteString = [[request URL] absoluteString];
+        
+        return YES;
+}
 /*
 #pragma mark - Navigation
 

HappyWork/HappyWork/Class/PersonalCenter/我的订单_order/ViewController/MyOrderWebViewController.m

@@ -28,7 +28,6 @@
     [self initViews];
 
     [self downloadFile:self.webUrl];
-    
 //    NSLog(@"%@",self.webUrl);
     self.uiWebView.hidden = YES;
     self.webView.hidden = YES;

HappyWork/HappyWork/Class/PersonalCenter/我的订单_order/ViewModel/MyOrderDetailViewModel.h

@@ -0,0 +1,27 @@
+//
+//  MyOrderDetailViewModel.h
+//  HappyWork
+//
+//  Created by 张晓光 on 2020/1/8.
+//  Copyright © 2020 张晓光. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface MyOrderDetailViewModel : NSObject
+
+/*
+ *详情
+ */
+- (void)orderDetailDataParameter:(NSDictionary *)parameter currentView:(UIView *)view backData:(void(^)(NSDictionary *dataDict))orderDetailBlock;
+
+- (void)makeconfirmOrdersParameter:(NSDictionary *)parameter backData:(void(^)(NSDictionary *dataDict))orderBlock;
+
+
+- (void)makeconfirmECOrders:(NSDictionary *)parameter backData:(void(^)(NSDictionary *dataDict))orderBlock;
+
+@end
+
+NS_ASSUME_NONNULL_END

HappyWork/HappyWork/Class/PersonalCenter/我的订单_order/ViewModel/MyOrderDetailViewModel.m

@@ -0,0 +1,92 @@
+//
+//  MyOrderDetailViewModel.m
+//  HappyWork
+//
+//  Created by 张晓光 on 2020/1/8.
+//  Copyright © 2020 张晓光. All rights reserved.
+//
+
+#import "MyOrderDetailViewModel.h"
+
+@implementation MyOrderDetailViewModel
+
+/*
+ *详情
+ */
+- (void)orderDetailDataParameter:(NSDictionary *)parameter currentView:(UIView *)view backData:(void(^)(NSDictionary *dataDict))orderDetailBlock {
+    
+    [HWAFHttpTool getRequestWithURLStr:get_OrderDetail params:parameter success:^(NSDictionary *responseDic) {
+        
+        if ([responseDic[@"errcode"] integerValue] == 0)
+        {
+            [view dismissErrorView];
+            orderDetailBlock(responseDic);
+        }
+        else
+        {
+            [view showErrorView];
+            [HWProgressHUD fb_showFailureWithStatus:responseDic[@"errmsg"]];
+        }
+        
+    } failure:^(NSString *error) {
+        
+        [view showErrorView];
+        [HWProgressHUD fb_showFailureWithStatus:error];
+        
+    }];
+}
+
+/*
+ *确认订单非电子合同
+ */
+- (void)makeconfirmOrdersParameter:(NSDictionary *)parameter backData:(void(^)(NSDictionary *dataDict))orderBlock {
+    
+    [HWProgressHUD fb_showLoading];
+
+    [HWAFHttpTool postJSONRequestWithURLStr:confirm_Order params:parameter success:^(NSDictionary *responseDic) {
+
+        [HWProgressHUD fb_dismiss];
+
+        if ([responseDic[@"errcode"] integerValue] == 0)
+        {
+            [HWProgressHUD fb_showSuccessWithStatus:@"确认订单成功"];
+            orderBlock(responseDic);
+        }
+        else
+        {
+            [HWProgressHUD fb_showFailureWithStatus:responseDic[@"errmsg"]];
+        }
+
+    } failure:^(NSString *error) {
+
+        [HWProgressHUD fb_dismiss];
+        [HWProgressHUD fb_showFailureWithStatus:error];
+    }];
+    
+}
+
+/*
+ *确认订单电子合同
+ */
+- (void)makeconfirmECOrders:(NSDictionary *)parameter backData:(void(^)(NSDictionary *dataDict))orderBlock {
+    
+    [HWProgressHUD fb_showLoading];
+    [HWAFHttpTool postJSONRequestWithURLStr:confirmECOrders params:parameter success:^(NSDictionary *responseDic) {
+        
+        [HWProgressHUD fb_dismiss];
+        if ([responseDic[@"errcode"] integerValue] == 0)
+        {
+            orderBlock(responseDic);
+        }
+        else
+        {
+            [HWProgressHUD fb_showFailureWithStatus:responseDic[@"errmsg"]];
+        }
+        
+    } failure:^(NSString *error) {
+        
+        [HWProgressHUD fb_dismiss];
+        [HWProgressHUD fb_showFailureWithStatus:error];
+    }];
+}
+@end

HappyWork/HappyWork/Class/PersonalCenter/我的订单_order/ViewModel/MyOrderViewModel.h

@@ -26,7 +26,10 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, strong) NSMutableArray *listArray;
 @property (nonatomic, weak) id<MyOrderViewModelDelegate>delegate;
 
-- (void)myOrderViewModelParameter:(NSDictionary *)parameterDict;
+/*
+ *我的订单列表
+ */
+- (void)myOrderListParameter:(NSDictionary *)parameterDict;
 
 
 @end

HappyWork/HappyWork/Class/PersonalCenter/我的订单_order/ViewModel/MyOrderViewModel.m

@@ -27,7 +27,10 @@
     }
     return self;
 }
-- (void)myOrderViewModelParameter:(NSDictionary *)parameterDict {
+/*
+ *我的订单列表
+ */
+- (void)myOrderListParameter:(NSDictionary *)parameterDict {
     
     [HWAFHttpTool getRequestWithURLStr:get_Orders params:parameterDict success:^(NSDictionary *responseDic) {
         
@@ -106,7 +109,7 @@
             [self makeconfirmECOrdersIndexpath:indexPath];
         }
         else
-        {
+        {//非电子合同的
             [self makeSureOrderIndexpath:indexPath];
         }
     };
@@ -207,7 +210,6 @@
         [HWProgressHUD fb_dismiss];
         [HWProgressHUD fb_showFailureWithStatus:error];
     }];
-    
 }
 
 /* 电子合同 */

HappyWork/HappyWork/Class/PersonalCenter/收款记录_record/ViewController/PaymentRecordDetailViewController.m

@@ -27,6 +27,7 @@
 
 @implementation PaymentRecordDetailViewController
 
+#pragma mark - life cycle
 
 - (void)viewDidLoad {
     [super viewDidLoad];
@@ -102,6 +103,7 @@
         make.bottom.equalTo(self.collectedTimeView.mas_bottom).with.offset(0);
     }];
 }
+
 #pragma mark - private method
 
 - (void)requestDetailData {

HappyWork/HappyWork/Class/PersonalCenter/收款记录_record/ViewController/PaymentRecordViewController.m

@@ -18,6 +18,7 @@
 
 @implementation PaymentRecordViewController
 
+#pragma mark - life cycle
 
 - (void)viewDidLoad {
     
@@ -25,8 +26,6 @@
     
     self.navigationItem.title = @"收款记录";
     [self dealWithRequestResult];
-    
-    
 }
 
 #pragma mark – init

HappyWork/HappyWork/Class/PersonalCenter/收款记录_record/ViewModel/PaymentRecordViewModel.h

@@ -13,6 +13,7 @@ NS_ASSUME_NONNULL_BEGIN
 @interface PaymentRecordViewModel : PageBaseViewModel<UITableViewDataSource>
 
 @property (nonatomic, strong) NSMutableArray *listArray;
+
 - (void)paymentRecordViewModelParameter:(NSDictionary *)parameterDict;
 
 @end

HappyWork/HappyWork/Class/PersonalCenter/通用设置_generalSet/View/CancellationCell.h

@@ -0,0 +1,17 @@
+//
+//  CancellationCell.h
+//  HappyWork
+//
+//  Created by 张晓光 on 2019/12/30.
+//  Copyright © 2019 张晓光. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface CancellationCell : UITableViewCell
+
+@end
+
+NS_ASSUME_NONNULL_END

HappyWork/HappyWork/Class/PersonalCenter/通用设置_generalSet/View/CancellationCell.m

@@ -0,0 +1,42 @@
+//
+//  CancellationCell.m
+//  HappyWork
+//
+//  Created by 张晓光 on 2019/12/30.
+//  Copyright © 2019 张晓光. All rights reserved.
+//
+
+#import "CancellationCell.h"
+
+@implementation CancellationCell
+
+- (void)awakeFromNib {
+    [super awakeFromNib];
+    // Initialization code
+}
+- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier {
+    
+    if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier])
+    {
+        UILabel *label = [[UILabel alloc]init];
+        label.text = @"注销账户";
+        label.font = [UIFont systemFontOfSize:16];
+        label.textColor = COLOR_BACK_31;
+        [self.contentView addSubview:label];
+        [label mas_makeConstraints:^(MASConstraintMaker *make) {
+           
+            make.centerX.equalTo(self);
+            make.top.equalTo(self.contentView.mas_top).offset(14);
+            make.bottom.equalTo(self.contentView.mas_bottom).offset(-14);
+        }];
+        
+    }
+    return self;
+}
+- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
+    [super setSelected:selected animated:animated];
+
+    // Configure the view for the selected state
+}
+
+@end

HappyWork/HappyWork/Class/PersonalCenter/通用设置_generalSet/ViewController/GeneralSetViewController.h

@@ -0,0 +1,17 @@
+//
+//  GeneralSetViewController.h
+//  HappyWork
+//
+//  Created by 张晓光 on 2019/12/30.
+//  Copyright © 2019 张晓光. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface GeneralSetViewController : UIViewController
+
+@end
+
+NS_ASSUME_NONNULL_END

HappyWork/HappyWork/Class/PersonalCenter/通用设置_generalSet/ViewController/GeneralSetViewController.m

@@ -0,0 +1,145 @@
+//
+//  GeneralSetViewController.m
+//  HappyWork
+//
+//  Created by 张晓光 on 2019/12/30.
+//  Copyright © 2019 张晓光. All rights reserved.
+//
+
+#import "GeneralSetViewController.h"
+#import "GeneralSetViewModel.h"
+#import "RegisterAgreementViewController.h"
+#import "LoginRegisterViewController.h"
+#import "HWUpdateView.h"
+
+@interface GeneralSetViewController ()<UITableViewDelegate,HWConfirmPanelViewDelegate>
+
+@property (nonatomic, strong) UITableView         *tableView;
+@property (nonatomic, strong) GeneralSetViewModel *viewModel;
+
+@end
+
+@implementation GeneralSetViewController
+
+#pragma mark - life cycle
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    
+    self.view.backgroundColor = COLOR_GRAY_F5;
+    self.title = @"个人中心";
+    [self initSubViews];
+}
+
+#pragma matk - init
+
+- (void)initSubViews {
+    
+    __weak typeof(self) weakSlef = self;
+    [self.view addSubview:self.tableView];
+    
+    [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) {
+       
+        make.left.right.top.offset(0);
+        make.bottom.equalTo(weakSlef.view.mas_bottom).offset(0);
+    }];
+}
+
+#pragma  mark - private metnod
+
+/* 更新  */
+- (void)appUpdateRequirement {
+
+    [self.viewModel appUpdateRequirement];
+}
+
+#pragma mark - UITableViewDelegate
+
+- (UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section {
+    
+    UIView *view = [[UIView alloc]init];
+    view.backgroundColor = COLOR_GRAY_F5;
+    return view;
+}
+- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section {
+    
+    return CGFLOAT_MIN;
+}
+- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section {
+    
+    UIView *view = [[UIView alloc]init];
+    view.backgroundColor = COLOR_GRAY_F5;
+    return view;
+}
+- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section {
+    
+    return 10;
+}
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+    
+    if (indexPath.section == 0)
+    {
+        if (indexPath.row == 0)
+        {
+            RegisterAgreementViewController *registerAgreement = [[RegisterAgreementViewController alloc]init];
+            [self.navigationController pushViewController:registerAgreement animated:YES];
+        }
+        if (indexPath.row == 1)
+        {
+            [self appUpdateRequirement];
+        }
+    }
+    if (indexPath.section == 1)
+    {
+        [HWConfirmPanelView showAlertWithMessage:@"注销账号是一个不可逆操作， 注销后会失去所有记录，请谨慎操作。" cancle:@"取消" sure:@"确定" delegate:self tag:0];
+    }
+}
+#pragma mark - HWConfirmPanelViewDelegate
+
+- (void)HWConfirmPanelViewClickButtonAtIndex:(NSInteger)index withAlertView:(HWConfirmPanelView *)alertView {
+    
+    if (index == 1)
+    {
+        [[HWAppUserProfile sharedInstance] loginOut];
+        [[HWAppUserProfile sharedInstance] save];
+        LoginRegisterViewController *loginVC = [[LoginRegisterViewController alloc] init];
+        UINavigationController *loginNav = [[UINavigationController alloc] initWithRootViewController:loginVC];
+        self.view.window.rootViewController = loginNav;
+    }
+}
+#pragma mark - setter and getter
+
+- (UITableView *)tableView {
+    
+    if (_tableView == nil)
+    {
+        _tableView = [[UITableView alloc]initWithFrame:CGRectZero style:UITableViewStyleGrouped];
+        _tableView.delegate = self;
+        _tableView.dataSource = self.viewModel;
+        _tableView.separatorStyle = NO;
+        _tableView.rowHeight = UITableViewAutomaticDimension;
+        _tableView.estimatedRowHeight = 10.0;
+        _tableView.backgroundColor = COLOR_GRAY_F5;
+    }
+    return _tableView;
+}
+- (GeneralSetViewModel *)viewModel {
+    
+    if (_viewModel == nil)
+    {
+        _viewModel = [[GeneralSetViewModel alloc]init];
+    }
+    return _viewModel;
+}
+
+/*
+#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

HappyWork/HappyWork/Class/PersonalCenter/通用设置_generalSet/ViewModel/GeneralSetViewModel.h

@@ -0,0 +1,20 @@
+//
+//  GeneralSetViewModel.h
+//  HappyWork
+//
+//  Created by 张晓光 on 2019/12/30.
+//  Copyright © 2019 张晓光. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface GeneralSetViewModel : NSObject<UITableViewDataSource>
+
+/* 更新 */
+- (void)appUpdateRequirement;
+
+@end
+
+NS_ASSUME_NONNULL_END

HappyWork/HappyWork/Class/PersonalCenter/通用设置_generalSet/ViewModel/GeneralSetViewModel.m

@@ -0,0 +1,115 @@
+//
+//  GeneralSetViewModel.m
+//  HappyWork
+//
+//  Created by 张晓光 on 2019/12/30.
+//  Copyright © 2019 张晓光. All rights reserved.
+//
+
+#import "GeneralSetViewModel.h"
+#import "PersonalCenterCell.h"
+#import "CancellationCell.h"
+#import "HWUpdateView.h"
+
+@implementation GeneralSetViewModel
+
+- (instancetype)init {
+    
+    if ([super init])
+    {
+        
+    }
+    return self;
+}
+
+/* 更新 */
+- (void)appUpdateRequirement{
+    
+    [HWAFHttpTool getRequestWithURLStr:check_Version params:@{@"version":BUNDLE_SHORTVERSION,@"app_system":@"1"} success:^(NSDictionary *responseDic) {
+        
+        if ([responseDic[@"errcode"] integerValue] == 0)
+        {
+            id isLatest = [responseDic valueForKeyPath:@"data.isLatest"];//[isLatest isKindOfClass:[NSNumber class]] &&
+            
+             if (![isLatest boolValue])
+             {
+                 id isForceUpdate = [responseDic valueForKeyPath:@"data.hwVersion.isForceUpdate"];//1强制更新
+                 id description = [responseDic valueForKeyPath:@"data.hwVersion.description"];
+                 if ([isForceUpdate isKindOfClass:[NSNumber class]] && [description isKindOfClass:[NSString class]])
+                 {
+                     HWUpdateView *updateView =  [[HWUpdateView alloc]init];
+                     updateView.update = [isForceUpdate boolValue];
+                     NSAttributedString * attrStr = [[NSAttributedString alloc] initWithData:[description dataUsingEncoding:NSUnicodeStringEncoding] options:@{ NSDocumentTypeDocumentAttribute: NSHTMLTextDocumentType } documentAttributes:nil error:nil];
+                     updateView.detailLabel.attributedText = attrStr;
+                 }
+             }
+             else
+             {
+                 [HWProgressHUD fb_showInfoWithStatus:@"已是最新版本"];
+             }
+        }
+        else
+        {
+            [HWProgressHUD fb_showFailureWithStatus:responseDic[@"errmsg"]];
+        }
+        
+    } failure:^(NSString *error) {
+        
+        [HWProgressHUD fb_showFailureWithStatus:error];
+    }];
+}
+
+#pragma mark -  UITableViewDataSource
+
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
+    
+    return 2;
+}
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+    
+    if (section == 0)
+    {
+        return 2;
+    }
+    else
+    {
+        return 1;
+    }
+}
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+    
+    if (indexPath.section == 0)
+    {
+        static  NSString *listCell = @"listCell";
+        PersonalCenterCell *cell = [tableView dequeueReusableCellWithIdentifier:listCell];
+        if (cell == nil)
+        {
+            cell = [[PersonalCenterCell alloc]initWithStyle:UITableViewCellStyleDefault reuseIdentifier:listCell];
+        }
+        if (indexPath.row == 0)
+        {
+            cell.leftImageV.image = [UIImage imageNamed:@"personalCenter_tax"];
+            cell.titleLabel.text = @"用户协议与隐私政策";
+        }
+        if (indexPath.row == 1)
+        {
+            cell.leftImageV.image = [UIImage imageNamed:@"app_update"];
+            cell.titleLabel.text = @"版本信息";
+        }
+        return cell;
+    }
+    else
+    {
+        static  NSString *cancellationCell = @"cancellationCell";
+        CancellationCell *cell = [tableView dequeueReusableCellWithIdentifier:cancellationCell];
+        if (cell == nil)
+        {
+            cell = [[CancellationCell alloc]initWithStyle:UITableViewCellStyleDefault reuseIdentifier:cancellationCell];
+        }
+        return cell;
+        
+    }
+    
+}
+
+@end

HappyWork/HappyWork/Custom/Category/UIView/UIView+FBProgressHUD.h

@@ -1,26 +0,0 @@
-//
-//  UIView+FBProgressHUD.h
-//  HappyJob
-//
-//  Created by Bob on 2019/3/29.
-//  Copyright © 2019 Bob. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface UIView (FBProgressHUD)
-
-- (void)fb_showLoading;
-- (void)fb_showInfoWithStatus:(NSString *)status;
-- (void)fb_showInfoWithStatus:(NSString *)status completion:(void (^ __nullable)(void))completion;
-- (void)fb_showSuccessWithStatus:(NSString *)status;
-- (void)fb_showSuccessWithStatus:(NSString *)status completion:(void (^ __nullable)(void))completion;
-- (void)fb_showFailureWithStatus:(NSString *)status;
-- (void)fb_showFailureWithStatus:(NSString *)status completion:(void (^ __nullable)(void))completion;
-- (void)fb_dismiss;
-
-@end
-
-NS_ASSUME_NONNULL_END

HappyWork/HappyWork/Custom/Category/UIView/UIView+FBProgressHUD.m

@@ -1,76 +0,0 @@
-//
-//  UIView+FBProgressHUD.m
-//  HappyJob
-//
-//  Created by Bob on 2019/3/29.
-//  Copyright © 2019 Bob. All rights reserved.
-//
-
-#import "UIView+FBProgressHUD.h"
-#import <SVProgressHUD/SVProgressHUD.h>
-
-@implementation UIView (FBProgressHUD)
-
-- (void)fb_showLoading {
-    
-    [SVProgressHUD setCornerRadius:5];
-    [SVProgressHUD setBorderColor:COLOR_BACK_31];
-    [SVProgressHUD setDefaultStyle:SVProgressHUDStyleDark];
-    [SVProgressHUD setDefaultMaskType:SVProgressHUDMaskTypeNone];
-    [SVProgressHUD show];
-}
-
-- (void)fb_showInfoWithStatus:(NSString *)status {
-    
-    [self fb_showInfoWithStatus:status completion:nil];
-}
-
-- (void)fb_showInfoWithStatus:(NSString *)status completion:(void (^ _Nullable)(void))completion {
-   
-    
-    [SVProgressHUD setCornerRadius:5];
-    [SVProgressHUD setBorderColor:COLOR_BACK_31];
-    [SVProgressHUD setDefaultStyle:SVProgressHUDStyleDark];
-    [SVProgressHUD setDefaultMaskType:SVProgressHUDMaskTypeNone];
-    [SVProgressHUD setInfoImage:[UIImage imageNamed:@""]];
-    [SVProgressHUD showInfoWithStatus:status];
-    [SVProgressHUD dismissWithDelay:1.5 completion:completion];
-    
-}
-
-- (void)fb_showSuccessWithStatus:(NSString *)status {
-    
-    [self fb_showSuccessWithStatus:status completion:nil];
-}
-
-- (void)fb_showSuccessWithStatus:(NSString *)status completion:(void (^ _Nullable)(void))completion {
-    
-    [SVProgressHUD setCornerRadius:5];
-    [SVProgressHUD setBorderColor:COLOR_BACK_31];
-    [SVProgressHUD setDefaultStyle:SVProgressHUDStyleDark];
-    [SVProgressHUD setDefaultMaskType:SVProgressHUDMaskTypeNone];
-    [SVProgressHUD showSuccessWithStatus:status];
-    [SVProgressHUD dismissWithDelay:1.0 completion:completion];
-}
-
-- (void)fb_showFailureWithStatus:(NSString *)status {
-    
-    [self fb_showFailureWithStatus:status completion:nil];
-}
-
-- (void)fb_showFailureWithStatus:(NSString *)status completion:(void (^ _Nullable)(void))completion {
-    
-    [SVProgressHUD setCornerRadius:5];
-    [SVProgressHUD setBorderColor:COLOR_BACK_31];
-    [SVProgressHUD setDefaultStyle:SVProgressHUDStyleDark];
-    [SVProgressHUD setDefaultMaskType:SVProgressHUDMaskTypeNone];
-    [SVProgressHUD showErrorWithStatus:status];
-    [SVProgressHUD dismissWithDelay:1.5 completion:completion];
-}
-
-- (void)fb_dismiss {
-    
-    [SVProgressHUD dismiss];
-}
-
-@end

HappyWork/HappyWork/Custom/CustomView/MessageAlertView/HWConfirmPanelView.m

@@ -202,6 +202,7 @@
         _titleLabel.textColor = COLOR_BACK_31;
         _titleLabel.textAlignment = NSTextAlignmentCenter;
         _titleLabel.font = [UIFont boldSystemFontOfSize:19];
+        _titleLabel.numberOfLines = 0;
     }
     return _titleLabel;
 }

HappyWork/HappyWork/Info.plist

@@ -2,8 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>NSMicrophoneUsageDescription</key>
-	<string>若不允许，您将无法使用麦克风</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>zh_CN</string>
 	<key>CFBundleDisplayName</key>
@@ -31,6 +29,8 @@
 	</dict>
 	<key>NSCameraUsageDescription</key>
 	<string>我们需要您的相机授权，上传更改头像</string>
+	<key>NSMicrophoneUsageDescription</key>
+	<string>若不允许，您将无法使用麦克风</string>
 	<key>NSPhotoLibraryAddUsageDescription</key>
 	<string>我们需要您的相册授权，上传更改头像</string>
 	<key>NSPhotoLibraryUsageDescription</key>

HappyWork/HappyWork/Support/HWConfig.h

@@ -11,6 +11,7 @@
 #define HWConfig_h
 
 /*---------- 测试服接口地址 ---------*/
+
 static NSString * const kHWBaseURL = @"https://hw.hap-job.com/happy-boot";
 
 

HappyWork/podfile

@@ -1,6 +1,7 @@
 # Uncomment the next line to define a global platform for your project
-# platform :ios, '9.0'
+platform :ios, '8.0'
 
+inhibit_all_warnings!
 target 'HappyWork' do
   # Comment the next line if you don't want to use dynamic frameworks
   use_frameworks!