电子合同

HappyWork/HappyWork.xcodeproj/project.pbxproj

@@ -7,9 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		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 */; };
@@ -139,9 +137,6 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
-		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>"; };
@@ -364,9 +359,6 @@
 		71FA53FB2330C6790007094A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		A6847A9691739A2A3B464CDD /* Pods-HappyWork.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-HappyWork.debug.xcconfig"; path = "Target Support Files/Pods-HappyWork/Pods-HappyWork.debug.xcconfig"; sourceTree = "<group>"; };
 		AFEAF32B812259519C406C37 /* Pods_HappyWork.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_HappyWork.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		C896C522C156EC7D7D2ED6CD /* Pods-HappyWorkUITests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-HappyWorkUITests.release.xcconfig"; path = "Target Support Files/Pods-HappyWorkUITests/Pods-HappyWorkUITests.release.xcconfig"; sourceTree = "<group>"; };
-		D2CF6B4E09B05F7096092AE8 /* Pods-HappyWorkTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-HappyWorkTests.debug.xcconfig"; path = "Target Support Files/Pods-HappyWorkTests/Pods-HappyWorkTests.debug.xcconfig"; sourceTree = "<group>"; };
-		D9DE7D1B0771B348EE1EAC6A /* Pods_HappyWorkTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_HappyWorkTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		E0EE191E29130571F55940FB /* Pods-HappyWork.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-HappyWork.release.xcconfig"; path = "Target Support Files/Pods-HappyWork/Pods-HappyWork.release.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -383,7 +375,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				5E909172A4E0C02B249067EF /* Pods_HappyWorkTests.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -391,7 +382,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				07BE169926BF6F039617C808 /* Pods_HappyWorkUITests.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -702,12 +692,12 @@
 		712AF74823346FA500EBD542 /* PersonalCenter */ = {
 			isa = PBXGroup;
 			children = (
-				71EFFA4723B9D88E00DE0DFF /* 通用设置_generalSet */,
 				712AF76D2334A30C00EBD542 /* 基本信息_basicinformation */,
 				712AF7762334AC5200EBD542 /* 我的报名_signup */,
 				712AF7792334ACE500EBD542 /* 我的订单_order */,
 				712AF77C2334AD1100EBD542 /* 收款记录_record */,
 				712AF77F2334AD3400EBD542 /* 完税证明_tax */,
+				71EFFA4723B9D88E00DE0DFF /* 通用设置_generalSet */,
 				712AF766233493A400EBD542 /* ViewController */,
 				713828F12339E415007256F4 /* ViewModel */,
 				713828F02339E415007256F4 /* Model */,
@@ -1303,10 +1293,6 @@
 			children = (
 				A6847A9691739A2A3B464CDD /* Pods-HappyWork.debug.xcconfig */,
 				E0EE191E29130571F55940FB /* Pods-HappyWork.release.xcconfig */,
-				D2CF6B4E09B05F7096092AE8 /* Pods-HappyWorkTests.debug.xcconfig */,
-				1B25BED2E0902421A5B8CCD2 /* Pods-HappyWorkTests.release.xcconfig */,
-				23E10786080E0275760C03A4 /* Pods-HappyWorkUITests.debug.xcconfig */,
-				C896C522C156EC7D7D2ED6CD /* Pods-HappyWorkUITests.release.xcconfig */,
 			);
 			path = Pods;
 			sourceTree = "<group>";
@@ -1315,8 +1301,6 @@
 			isa = PBXGroup;
 			children = (
 				AFEAF32B812259519C406C37 /* Pods_HappyWork.framework */,
-				D9DE7D1B0771B348EE1EAC6A /* Pods_HappyWorkTests.framework */,
-				11E564662BC473A1BB75C633 /* Pods_HappyWorkUITests.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -1347,7 +1331,6 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 71FA54012330C6790007094A /* Build configuration list for PBXNativeTarget "HappyWorkTests" */;
 			buildPhases = (
-				27C9AA96F940FE2675DF43FC /* [CP] Check Pods Manifest.lock */,
 				71FA53E62330C6790007094A /* Sources */,
 				71FA53E72330C6790007094A /* Frameworks */,
 				71FA53E82330C6790007094A /* Resources */,
@@ -1366,7 +1349,6 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 71FA54042330C6790007094A /* Build configuration list for PBXNativeTarget "HappyWorkUITests" */;
 			buildPhases = (
-				64D08EBE79FAF7159E2EDA52 /* [CP] Check Pods Manifest.lock */,
 				71FA53F12330C6790007094A /* Sources */,
 				71FA53F22330C6790007094A /* Frameworks */,
 				71FA53F32330C6790007094A /* Resources */,
@@ -1470,50 +1452,6 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-HappyWork/Pods-HappyWork-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		27C9AA96F940FE2675DF43FC /* [CP] Check Pods Manifest.lock */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-HappyWorkTests-checkManifestLockResult.txt",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
-			showEnvVarsInLog = 0;
-		};
-		64D08EBE79FAF7159E2EDA52 /* [CP] Check Pods Manifest.lock */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-HappyWorkUITests-checkManifestLockResult.txt",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
-			showEnvVarsInLog = 0;
-		};
 		C73CA9A581736B04F889003C /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -1809,7 +1747,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_TEAM = 6TLH64Q4Z4;
 				GCC_PREFIX_HEADER = "$(SRCROOT)/HappyWork/Support/HappyWork.pch";
 				INFOPLIST_FILE = HappyWork/Info.plist;
@@ -1818,7 +1756,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.1.0;
+				MARKETING_VERSION = 1.1.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.huijiabo.happywork;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGETED_DEVICE_FAMILY = 1;
@@ -1831,7 +1769,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_TEAM = 6TLH64Q4Z4;
 				GCC_PREFIX_HEADER = "$(SRCROOT)/HappyWork/Support/HappyWork.pch";
 				INFOPLIST_FILE = HappyWork/Info.plist;
@@ -1840,7 +1778,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.1.0;
+				MARKETING_VERSION = 1.1.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.huijiabo.happywork;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGETED_DEVICE_FAMILY = 1;
@@ -1849,7 +1787,6 @@
 		};
 		71FA54022330C6790007094A /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = D2CF6B4E09B05F7096092AE8 /* Pods-HappyWorkTests.debug.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
@@ -1869,7 +1806,6 @@
 		};
 		71FA54032330C6790007094A /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 1B25BED2E0902421A5B8CCD2 /* Pods-HappyWorkTests.release.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
@@ -1889,7 +1825,6 @@
 		};
 		71FA54052330C6790007094A /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 23E10786080E0275760C03A4 /* Pods-HappyWorkUITests.debug.xcconfig */;
 			buildSettings = {
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = 6TLH64Q4Z4;
@@ -1908,7 +1843,6 @@
 		};
 		71FA54062330C6790007094A /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = C896C522C156EC7D7D2ED6CD /* Pods-HappyWorkUITests.release.xcconfig */;
 			buildSettings = {
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = 6TLH64Q4Z4;

HappyWork/HappyWork/Assets.xcassets/DemanHall/brightSpot_delete.imageset/Contents.json

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

HappyWork/HappyWork/Base/PageListViewController.m

@@ -37,7 +37,6 @@
     [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) {
         
         make.edges.equalTo(self.view);
-        
     }];
 }
 
@@ -73,7 +72,6 @@
     [self.parametersDict setValue:[HWAppUserProfile sharedInstance].enterpriseId forKey:@"platform_id"];
     [self.parametersDict setValue:@(self.currentPage) forKey:@"pageNo"];
     [self.parametersDict setValue:@(10) forKey:@"pageSize"];
-
 }
 
 /* 成功结束刷新操作 */

HappyWork/HappyWork/Class/DemandHall/DemanHall_详情/View/DemanHallDetailSignUpView.m

@@ -114,7 +114,7 @@
     
     if (textView.text.length == 0)
     {
-        _plLabel.text = @"填写亮点更容易获得发布者的青睐，该项为选";
+        _plLabel.text = @"填写亮点更容易获得发布者的青睐，该项为选填项。";
     }
     else
     {
@@ -161,9 +161,8 @@
     
     if (_deleteBtn == nil)
     {
-        _deleteBtn = [UIButton buttonWithType:UIButtonTypeSystem];
-        [_deleteBtn setTitle:@"x" forState:UIControlStateNormal];
-        _deleteBtn.titleLabel.font = [UIFont boldSystemFontOfSize:17];
+        _deleteBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+        [_deleteBtn setImage:[UIImage imageNamed:@"brightSpot_delete"] forState:UIControlStateNormal];
         [_deleteBtn setTitleColor:[UIColor colorFromHexString:@"DDDDDD"] forState:UIControlStateNormal];
         [_deleteBtn addTarget:self action:@selector(deleteButtonClick) forControlEvents:UIControlEventTouchUpInside];
     }
@@ -231,7 +230,7 @@
     if (_plLabel == nil)
     {
         _plLabel = [[UILabel alloc]init];
-        _plLabel.text = @"填写亮点更容易获得发布者的青睐，该项为选";
+        _plLabel.text = @"填写亮点更容易获得发布者的青睐，该项为选填项。";
         _plLabel.font = [UIFont systemFontOfSize:16];
         _plLabel.textColor = COLOR_GRAY_88;
         _plLabel.numberOfLines = 0;

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

@@ -28,12 +28,10 @@ FBScrollLayoutViewDelegate
 @property (nonatomic, strong) NSDictionary                *detailDict;
 @property (nonatomic, strong) DemanHallDetailViewModel    *viewModel;
 
-
 @end
 
 @implementation DemanHallDetailViewController
 
-
 - (void)viewWillAppear:(BOOL)animated {
     
     [super viewWillAppear:animated];
@@ -80,8 +78,8 @@ FBScrollLayoutViewDelegate
         [self.positionView demanHallDetailPositionViewDict:self.detailDict];
         
     }];
-
 }
+
 #pragma mark - FBScrollLayoutViewDelegate
 
 - (void)scrollLayoutViewMakeConstraints:(FBScrollLayoutView *)scrollLayoutView {
@@ -115,12 +113,13 @@ FBScrollLayoutViewDelegate
 }
 - (void)subviewsMakeConstraintsInScrollLayoutView:(FBScrollLayoutView *)scrollLayoutView footerView:(UIView *)footerView {
     
-    [footerView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.height.mas_equalTo(64);
-    }];
     [self.signupBtn mas_makeConstraints:^(MASConstraintMaker *make) {
         
-        make.edges.equalTo(footerView).with.insets(UIEdgeInsetsMake(10, 15, 10, 15));
+        make.left.equalTo(footerView.mas_left).offset(15);
+        make.top.equalTo(footerView.mas_top).offset(10);
+        make.right.equalTo(footerView.mas_right).offset(-15);
+        make.bottom.equalTo(footerView.mas_bottomMargin).offset(-10);
+        make.height.mas_equalTo(44);
     }];
 }
 
@@ -149,7 +148,6 @@ FBScrollLayoutViewDelegate
     [parameter setValue:@"2" forKey:@"enroll_from"];
     
     [self.viewModel signupParameter:parameter currentView:self.view];
-    
 }
 
 #pragma mark - setter and getter

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

@@ -37,7 +37,6 @@ DemanHallMenuFilterViewDelegate
     
     [super viewDidLoad];
     [self dealWithRequestResult];
-    
 }
 
 #pragma mark – init
@@ -104,6 +103,7 @@ DemanHallMenuFilterViewDelegate
     }];
     
 }
+
 #pragma maek - super method
 
 /* 请求数据 */
@@ -125,7 +125,7 @@ DemanHallMenuFilterViewDelegate
     }];
 }
 
-/* 下一页*/
+/* 下一页 */
 - (void)loadMoreData {
 
     [super loadMoreData];

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

@@ -15,8 +15,6 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, strong) NSMutableArray *bannerList;
 @property (nonatomic, strong) NSMutableArray *listArray;
 
-//@property (nonatomic, copy) void(^updateDataBlock)(NSDictionary *dataDict);
-
 /* banner */
 - (void)bannerRequirement:(void(^)(void))bannerDataBlock;
 

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

@@ -15,7 +15,6 @@
 
 @interface DemanHallViewModel ()
 
-
 @end
 
 @implementation DemanHallViewModel
@@ -61,7 +60,6 @@
     } failure:^(NSString *error) {
         
         [HWProgressHUD fb_showFailureWithStatus:error];
-        
     }];
 }
 

HappyWork/HappyWork/Class/LoginRegister/View/LoginRegisterView.m

@@ -71,7 +71,7 @@
     return YES;
 }
 
-#pragma event response
+#pragma mark -  event response
 
 - (void)phoneTFClick {
     
@@ -94,7 +94,7 @@
         [_loginBtn az_setGradientBackgroundWithColors:@[[UIColor colorFromHexString:@"ECF0F3"], [UIColor colorFromHexString:@"E4E2E7"]] locations:@[@(0.0),@(1.0f)] startPoint:CGPointMake(0, 0) endPoint:CGPointMake(1, 0)];
     }
 }
-#pragma maek - setter and getter
+#pragma mark - setter and getter
 
 - (UILabel *)titleLabel {
     

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

@@ -16,13 +16,14 @@
 @interface LoginRegisterViewController ()
 
 @property (nonatomic, strong) LoginRegisterView *loginView;
-@property (nonatomic, assign) NSInteger   second;
-@property (nonatomic, strong) NSTimer     *timer;
+@property (nonatomic, assign) NSInteger         second;
+@property (nonatomic, strong) NSTimer           *timer;
 
 @end
 
 @implementation LoginRegisterViewController
 
+
 - (void)viewWillAppear:(BOOL)animated {
     
     [super viewWillAppear:animated];
@@ -55,7 +56,7 @@
     };
 }
 
-#pragma event response
+#pragma  mark - event response
 
 /* 登录 */
 - (void)loginBUttonClick:(UIButton *)btn {
@@ -87,7 +88,7 @@
                 UserInfoModel *model = [UserInfoModel mj_objectWithKeyValues:responseDic[@"data"][@"userInfo"]];
                 
                 [[HWAppUserProfile sharedInstance] setOauthToken:model.userToken];
-                [[HWAppUserProfile sharedInstance] setUserName:model.name];
+                [[HWAppUserProfile sharedInstance] setUserName:model.name?model.name:@""];
                 [[HWAppUserProfile sharedInstance] setUserId:model.ID];
                 [[HWAppUserProfile sharedInstance] setEnterpriseId:model.platformId];
                 
@@ -113,7 +114,6 @@
         [HWProgressHUD fb_showFailureWithStatus:error];
         
     }];
-    
 }
 
 /* 获取验证码 */
@@ -135,11 +135,7 @@
     
     [HWAFHttpTool getRequestWithURLStr:get_Code params:@{@"phone":self.loginView.phoneView.phoneTF.text} success:^(NSDictionary *responseDic) {
     
-        if ([responseDic[@"errcode"] integerValue] == 0)
-        {
-            
-        }
-        else
+        if ([responseDic[@"errcode"] integerValue] != 0)
         {
             [HWProgressHUD fb_showFailureWithStatus:responseDic[@"errmsg"]];
             codeBtn.userInteractionEnabled = YES;
@@ -150,8 +146,8 @@
         codeBtn.userInteractionEnabled = YES;
         [HWProgressHUD fb_showFailureWithStatus:error];
     }];
-
 }
+
 - (void)runTimer {
     
     self.second -- ;

HappyWork/HappyWork/Class/LoginRegister/ViewController/RegisterAgreementViewController.m

@@ -7,23 +7,22 @@
 //
 
 #import "RegisterAgreementViewController.h"
-//#import <WebKit/WebKit.h>
 #import "BaseWKWebView.h"
 
 @interface RegisterAgreementViewController ()
 
 @property (nonatomic, strong) BaseWKWebView *webView;
 
-
 @end
 
 @implementation RegisterAgreementViewController
 
+#pragma mark - life cycle
+
 - (void)viewWillAppear:(BOOL)animated {
     
     [super viewWillAppear:animated];
     [self.navigationController setNavigationBarHidden:NO animated:animated];
-
 }
 
 - (void)viewDidLoad {
@@ -33,7 +32,6 @@
     [self hj_setupNavBar];
     self.view.backgroundColor = [UIColor whiteColor];
     
-    
     NSString *path = [[NSBundle mainBundle] pathForResource:@"用户注册协议" ofType:@"html" inDirectory:nil];
     
     [self.view addSubview:self.webView];
@@ -56,6 +54,7 @@
         }
         // 拷贝css  @"thecss.min.css" 这个文件在MyDirect下的css里
         [self onlyCopyFile:@"bootstrap.min" type:@"css" directory:@"MyDirect/css" child:@"css"];
+        
         // 拷贝图片,图片存在这个文件在MyDirect下的img里
         NSArray * arrayImage=@[@"img1",@"img2",@"img3"];
         
@@ -71,8 +70,8 @@
         NSURLRequest *request = [NSURLRequest requestWithURL:fileURL];
         [self.webView.webView loadRequest:request];
     }
-    
 }
+
 //仅仅复制文件  child 是子文件夹名字，为了传值写的，directory是文件路径
 -(void)onlyCopyFile:(NSString *)name type:(NSString *)type directory:(NSString *)directory child:(NSString *)child{
     
@@ -103,9 +102,11 @@
     [fileManager createDirectoryAtURL:temDirURL withIntermediateDirectories:YES attributes:nil error:&error];
     
     NSURL *dstURL = [temDirURL URLByAppendingPathComponent:fileURL.lastPathComponent];
+    
     // 将文件拷贝到新路径
     [fileManager removeItemAtURL:dstURL error:&error];
     [fileManager copyItemAtURL:fileURL toURL:dstURL error:&error];
+    
     // 返回新路径
     return dstURL;
 }

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

@@ -54,7 +54,6 @@ HWConfirmPanelViewDelegate
     [self.viewModel requestPersonalCenterData];
     //添加登录刷新通知
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(chageHeadPortraitRefresh:) name:changeHeadPortrait object:nil];
-
 }
 
 #pragma mark – init
@@ -85,7 +84,6 @@ HWConfirmPanelViewDelegate
     } fail:^(id  _Nonnull data) {
         
         [HWProgressHUD fb_showFailureWithStatus:data];
-        
     }];
 
     // 设置

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

@@ -15,7 +15,9 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, strong) NSDictionary *userDict;
 @property (nonatomic, copy)   void(^setBlock)(void);
 
-/* 请求用户数据 */
+/*
+ *请求用户数据
+ */
 - (void)requestPersonalCenterData;
 
 

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

@@ -27,6 +27,9 @@
     return self;
 }
 
+/*
+ *请求用户数据
+ */
 - (void)requestPersonalCenterData{
     
     __weak typeof(self) weakSelf = self;

HappyWork/HappyWork/Class/PersonalCenter/基本信息_basicinformation/ViewController/BasicInformationViewController.m

@@ -23,6 +23,7 @@
 
 - (void)dealloc {
     
+    
 }
 
 - (void)viewDidLoad {

HappyWork/HappyWork/Class/PersonalCenter/完税证明_tax/ViewController/TaxCertificateViewController.m

@@ -44,10 +44,10 @@
 
 - (void)phoneButtonClick:(UIButton *)btn {
     
-    NSMutableString *str = [[NSMutableString alloc] initWithFormat:@"tel:400-692-0099"];
-
-    NSURL *url = [NSURL URLWithString:str];
-    [[UIApplication sharedApplication] openURL:url];
+    NSURL *url = [NSURL URLWithString:@"tel:400-692-0099"];
+    UIWebView *webView = [[UIWebView alloc] init];
+    [webView loadRequest:[NSURLRequest requestWithURL:url]];
+    [self.view addSubview:webView];
 }
 
 #pragma mark - setter and getter

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

@@ -131,16 +131,21 @@ FBScrollLayoutViewDelegate
 }
 - (void)subviewsMakeConstraintsInScrollLayoutView:(FBScrollLayoutView *)scrollLayoutView footerView:(UIView *)footerView {
     
-    [footerView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.height.mas_equalTo(64);
-    }];
     [self.contractBtn mas_makeConstraints:^(MASConstraintMaker *make) {
        
-        make.edges.equalTo(footerView).with.insets(UIEdgeInsetsMake(10, 15, 10, HJHorizontalScale(250)));
+        make.left.equalTo(footerView.mas_left).offset(15);
+        make.top.equalTo(footerView.mas_top).offset(10);
+        make.right.equalTo(footerView.mas_right).offset(-HJHorizontalScale(250));
+        make.bottom.equalTo(footerView.mas_bottomMargin).offset(-10);
+        make.height.mas_equalTo(44);
     }];
     [self.makesureBtn mas_makeConstraints:^(MASConstraintMaker *make) {
         
-        make.edges.equalTo(footerView).with.insets(UIEdgeInsetsMake(10, HJHorizontalScale(135), 10, 15));
+        make.left.equalTo(footerView.mas_left).offset(HJHorizontalScale(135));
+        make.top.equalTo(footerView.mas_top).offset(10);
+        make.right.equalTo(footerView.mas_right).offset(-15);
+        make.bottom.equalTo(footerView.mas_bottomMargin).offset(-10);
+        make.height.mas_equalTo(44);
     }];
 }
 

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

@@ -11,7 +11,7 @@
 
 @interface MyOrderWebECOViewController ()<UIWebViewDelegate>
 
-@property (nonatomic, strong) UIWebView *webView;
+@property (nonatomic, strong) BaseWKWebView *webView;
 
 @end
 
@@ -22,29 +22,38 @@
     
     self.navigationItem.title = @"电子合同";
     self.view.backgroundColor = [UIColor whiteColor];
-    self.webView  = [[UIWebView alloc]init];
-    self.webView.delegate = self;
+    self.webView  = [[BaseWKWebView alloc]init];
+//    self.webView.delegate = self;
     [self.view addSubview:self.webView];
     [self.webView mas_makeConstraints:^(MASConstraintMaker *make) {
        
         make.left.right.top.bottom.equalTo(self.view).offset(0);
     }];
 
-    [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@",self.webUrl]]]];
-        
+//    self.webUrl = [self.webUrl stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
+
+//    self.webUrl = [self.webUrl stringByReplacingOccurrencesOfString:@" " withString:@"%"];
+
+    NSArray *urlArray = [self.webUrl componentsSeparatedByString:@"?"];
+
+    NSString *twebUrl =  [urlArray[1] stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];// 使用该方法
+
+    self.webUrl = [NSString stringWithFormat:@"%@?%@",urlArray[0],twebUrl];
+
+//    [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@",self.webUrl]]]];
+    
+    [self.webView.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@",self.webUrl]]]];
+
 }
-// 网页中的每一个请求都会被触发这个方法，返回NO代表不执行这个请求(常用于JS与iOS之间通讯)
--(BOOL)webView:(UIWebView *)webView shouldStartLoadWithRequest:(NSURLRequest *)request navigationType:(UIWebViewNavigationType)navigationType
-{
+
+
+#pragma mark - UIWebViewDelegate
+- (void)webView:(UIWebView *)webView didFailLoadWithError:(NSError *)error {
     
-    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;
+    NSLog(@"error::::%@",error);
 }
+
+
 /*
 #pragma mark - Navigation
 

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

@@ -11,7 +11,7 @@
 
 @interface MyOrderWebViewController ()
 
-@property (nonatomic, strong) UIWebView    *uiWebView;
+@property (nonatomic, strong) UIWebView     *uiWebView;
 @property (nonatomic, strong) BaseWKWebView *webView;
 
 @end
@@ -27,10 +27,16 @@
     self.view.backgroundColor = [UIColor whiteColor];
     [self initViews];
 
-    [self downloadFile:self.webUrl];
-//    NSLog(@"%@",self.webUrl);
     self.uiWebView.hidden = YES;
     self.webView.hidden = YES;
+//    NSLog(@"webUrl:::::%@",self.webUrl);
+    
+//    NSArray *urlArray = [self.webUrl componentsSeparatedByString:@"?"];
+//    NSString *twebUrl =  [urlArray[1] stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];// 使用该方法
+//    self.webUrl = [NSString stringWithFormat:@"%@?%@",urlArray[0],twebUrl];
+    [self downloadFile:self.webUrl];
+//    NSLog(@"webUrl:::::%@",self.webUrl);
+    
 }
 
 #pragma mark  - init
@@ -88,7 +94,6 @@
     }];
     
     [downTask resume];
-
 }
 
 #pragma mark - getter and setter

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

@@ -26,6 +26,7 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
     
+    NAVI_BACK_TITLE;
     self.view.backgroundColor = COLOR_GRAY_F5;
     self.title = @"个人中心";
     [self initSubViews];

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

@@ -42,7 +42,10 @@ static void *kContextLoadingView = &kContextLoadingView;
     
     [self addSubview:self.errorView];
     [self.errorView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.edges.equalTo(self);
+        
+//        make.edges.equalTo(self);
+        make.top.equalTo(self.mas_top).offset(44 + STATUS_BAR_H);
+        make.left.right.bottom.equalTo(self).offset(0);
     }];
 }
 

HappyWork/HappyWork/Custom/CustomView/Blank_空白页/HJBlankView.m

@@ -20,7 +20,7 @@
     
     if (self = [super init])
     {
-        self.backgroundColor = [UIColor redColor];
+//        self.backgroundColor = [UIColor redColor];
         
         [self addSubview:self.canvasView];
         [self.canvasView addSubview:self.imageView];

HappyWork/HappyWork/Custom/FBLayout/FBScrollLayoutView.m

@@ -7,7 +7,6 @@
 //
 
 #import "FBScrollLayoutView.h"
-//#import <Masonry/Masonry.h>
 
 @interface FBScrollLayoutView ()
 
@@ -79,7 +78,7 @@
     {
         [self.footerView mas_makeConstraints:^(MASConstraintMaker *make) {
             make.left.right.equalTo(self);
-            make.bottom.equalTo(self.mas_bottomMargin).offset(0);
+            make.bottom.equalTo(self).offset(0);//mas_bottomMargin
         }];
         [self.delegate subviewsMakeConstraintsInScrollLayoutView:self footerView:self.footerView];
     }

HappyWork/HappyWork/Custom/PickViewOne/ValuePickerView.h

@@ -10,27 +10,27 @@
 
 @interface ValuePickerView : UIView
 
-/**Picker的标题*/
+/*Picker的标题*/
 @property (nonatomic, copy) NSString * pickerTitle;
 
-/**滚轮上显示的数据(必填,会根据数据多少自动设置弹层的高度)*/
+/*滚轮上显示的数据(必填,会根据数据多少自动设置弹层的高度)*/
 @property (nonatomic, strong) NSArray * dataSource;
 
-/**设置默认选项,格式:选项文字/id (先设置dataArr,不设置默认选择第0个)*/
+/*设置默认选项,格式:选项文字/id (先设置dataArr,不设置默认选择第0个)*/
 @property (nonatomic, strong) NSString * defaultStr;
-/**弹层的高度*/
+/*弹层的高度*/
 @property (nonatomic, assign) NSInteger pickerHeight;
 
-/**回调选择的状态字符串(stateStr格式:state/row)*/
+/*回调选择的状态字符串(stateStr格式:state/row)*/
 @property (nonatomic, copy) void (^valueDidSelect)(NSString * value);
 
-/**回调选择的状态字符串(stateStr格式:state/row)*/
+/*回调选择的状态字符串(stateStr格式:state/row)*/
 @property (nonatomic, copy) void (^valueDidSelectWithIndexBlock)(NSString * value,NSInteger index);
 
-/**显示时间弹层*/
+/*显示时间弹层*/
 - (void)show;
 
-/**
+/*
  * 刷新picker
  */
 - (void)reloadPickers;

HappyWork/HappyWork/Custom/PickViewOne/ZHDatePickerView.h

@@ -13,9 +13,9 @@
 @protocol ZHDatePickerViewDelegate <NSObject>
 
 @optional
-/**
- 返回选择的时间字符串
 
+/*
+ 返回选择的时间字符串
  @param pickerView pickerView
  @param dateString 时间字符串
  */
@@ -27,9 +27,8 @@
 
 @property (nonatomic, weak) id<ZHDatePickerViewDelegate> delegate;
 
-/**
+/*
  初始化ZHDatePickerView
- 
  @param date 默认时间
  @param mode 时间显示格式
  @return ZHDatePickerView
@@ -37,12 +36,12 @@
 - (instancetype)initDatePickerWithDefaultDate:(NSDate *)date
                             andDatePickerMode:(UIDatePickerMode )mode;
 
-/**
+/*
  移除PickerView
  */
 - (void)remove;
 
-/**
+/*
  显示PickerView
  */
 - (void)show;

HappyWork/HappyWork/Custom/PickViewOne/ZHDatePickerView.m

@@ -36,9 +36,8 @@ static float ToolbarH  = 44;
     return self;
 }
 
-/**
+/*
  初始化ZHDatePickerView
- 
  @param date 默认时间
  @param mode 时间显示格式
  @return ZHDatePickerView
@@ -61,7 +60,7 @@ static float ToolbarH  = 44;
     return self;
 }
 
-/**
+/*
  设置Frame
  */
 - (void)setUpFrame
@@ -74,7 +73,7 @@ static float ToolbarH  = 44;
     self.frame = CGRectMake(0, SCREEN_H, SCREEN_W, ViewH);
 }
 
-/**
+/*
  确定
  */
 - (void)doneClick
@@ -103,7 +102,7 @@ static float ToolbarH  = 44;
     [self remove];
 }
 
-/**
+/*
  显示PickerView
  */
 - (void)show
@@ -134,7 +133,7 @@ static float ToolbarH  = 44;
     }];
 }
 
-/**
+/*
  移除PickerView
  */
 - (void)remove
@@ -158,7 +157,7 @@ static float ToolbarH  = 44;
 
 #pragma mark -- 懒加载
 
-/**
+/*
  DatePicker
  */
 - (UIDatePicker *)datePicker
@@ -175,8 +174,8 @@ static float ToolbarH  = 44;
     return _datePicker;
 }
 
-/**
- 工具栏
+/*
+ *工具栏
  */
 - (UIToolbar *)toolBar
 {

HappyWork/HappyWork/Support/HWAppService.h

@@ -10,7 +10,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-/**
+/*
  * 时间戳类型
  */
 typedef enum _TimeStampType {
@@ -43,9 +43,8 @@ typedef enum _TimeStampType {
 /* 时间转化为时间戳 */
 + (NSInteger)timeSwitchTimestamp:(NSString *)formatTime;
 
-/**
+/*
  * 千位分隔符
- *
  * @param numberStr 需要转换的数据
  * @return 带千位分隔符的字符串
  */

HappyWork/HappyWork/Support/HWAppService.m

@@ -25,6 +25,7 @@
     return [NSString stringWithFormat:@"%ld%@",(long)days,@""];
     
 }
+
 /* 时间戳转化为时间 */
 + (NSString *)time_timestampToString:(NSString *)timestamp withType:(TimeStampType)type{
     
@@ -57,6 +58,7 @@
     NSString* string=[dateFormat stringFromDate:confromTimesp];
     return string;
 }
+
 /* 时间月日 */
 + (NSString *)compareCurrentTimeDayAndMonth:(NSString *)str {
     
@@ -128,9 +130,8 @@
     
 }
 
-/**
+/*
  * 千位分隔符
- *
  * @param numberStr 需要转换的数据
  * @return 带千位分隔符的字符串
  */

HappyWork/HappyWork/Support/HWAppUserProfile.h

@@ -17,16 +17,21 @@
 @property(nonatomic, copy) NSString             *refreshToken;//刷新令牌
 @property(nonatomic, copy) NSString             *passWord;//密码
 @property(nonatomic, copy) NSDate               *tokenExpiredTime;//令牌过期时间
+
 @property(nonatomic, strong) NSMutableDictionary  *customAttributes;//用户字典
 
 +(HWAppUserProfile *)sharedInstance;
-//保存
+
+/* 保存 */
 -(BOOL)save;
-//下载
+
+/* 下载 */
 -(BOOL)load;
-//更新过期时间
+
+/* 更新过期时间 */
 -(void)updateTokenExpiredTime:(NSTimeInterval)life;
-//退出登录
+
+/* 退出登录 */
 -(void)loginOut;
 
 

HappyWork/HappyWork/Support/HWAppUserProfile.m

@@ -74,7 +74,8 @@ HWAppUserProfile *g_userProfile = nil;
     //把字典中的值写到这个路径下[RdAppUserProfile localFilePathName]
     return [_customAttributes writeToFile:[HWAppUserProfile localFilePathName] atomically:YES];
 }
-//下载
+
+/* 下载 */
 - (BOOL)load
 {
     //方法的功能是创建一个字典，将字典中的内容设置为指定文件中的所有内容，
@@ -96,7 +97,8 @@ HWAppUserProfile *g_userProfile = nil;
     
     return YES;
 }
-//退出登录
+
+/* 退出登录 */
 - (void)loginOut
 {
     self.oauthToken = @"";
@@ -104,7 +106,7 @@ HWAppUserProfile *g_userProfile = nil;
     [self save];
 }
 
-//更新令牌的过期时间
+/* 更新令牌的过期时间 */
 - (void)updateTokenExpiredTime:(NSTimeInterval)life
 {   //距离现在多少秒以后的那个时间
     _tokenExpiredTime = [NSDate dateWithTimeIntervalSinceNow:life];

HappyWork/HappyWork/Support/HWConfig.h

@@ -12,11 +12,11 @@
 
 /*---------- 测试服接口地址 ---------*/
 
-static NSString * const kHWBaseURL = @"https://hw.hap-job.com/happy-boot";
+//static NSString * const kHWBaseURL = @"https://hw.hap-job.com/happy-boot";
 
 
 /*--------- 正试服接口地址 ---------*/
 
-//static NSString * const kHWBaseURL = @"https://www.dal-pay.com/happy-boot";
+static NSString * const kHWBaseURL = @"https://www.dal-pay.com/happy-boot";
 
 #endif /* HWConfig_h */

HappyWork/HappyWork/Support/HappyWork.pch

@@ -36,7 +36,7 @@
 #import "HWAppService.h"
 
 
-/** 打印日志 */
+/* 打印日志 */
 #define LOG_LEVEL_DEF ddLogLevel
 #import <CocoaLumberjack/CocoaLumberjack.h>
 
@@ -70,7 +70,7 @@ self.navigationItem.backBarButtonItem = barItem;
 /* 系统版本判断 */
 #define IOSSYS [[[UIDevice currentDevice] systemVersion] floatValue] 
 
-
+/* 颜色 */
 #define COLOR_BACK_31    [UIColor colorFromHexString:@"31364C"]
 
 #define COLOR_BACK_53    [UIColor colorFromHexString:@"535768"]

HappyWork/Podfile.lock

@@ -53,7 +53,10 @@ DEPENDENCIES:
 SPEC REPOS:
   https://github.com/CocoaPods/Specs.git:
     - AFNetworking
+    - CocoaLumberjack
     - DZNEmptyDataSet
+    - FLAnimatedImage
+    - IQKeyboardManager
     - Masonry
     - MJExtension
     - MJRefresh
@@ -61,12 +64,8 @@ SPEC REPOS:
     - SDWebImage
     - SVProgressHUD
     - TZImagePickerController
-    - YTKNetwork
-  trunk:
-    - CocoaLumberjack
-    - FLAnimatedImage
-    - IQKeyboardManager
     - XHLaunchAd
+    - YTKNetwork
 
 SPEC CHECKSUMS:
   AFNetworking: b6f891fdfaed196b46c7a83cf209e09697b94057
@@ -84,6 +83,6 @@ SPEC CHECKSUMS:
   XHLaunchAd: 45048592af01aa501c9d2d0c45e95ca74c4d0596
   YTKNetwork: df8a7a5597bda1664a4efaa7ef871a818a887fe0
 
-PODFILE CHECKSUM: 644163c65d7217f09fc2cc41b692396a8182b104
+PODFILE CHECKSUM: 6271f6f0721c5dfc3747a0b0638b2dc5a75e8b01
 
 COCOAPODS: 1.8.4

HappyWork/Pods/Manifest.lock

@@ -53,7 +53,10 @@ DEPENDENCIES:
 SPEC REPOS:
   https://github.com/CocoaPods/Specs.git:
     - AFNetworking
+    - CocoaLumberjack
     - DZNEmptyDataSet
+    - FLAnimatedImage
+    - IQKeyboardManager
     - Masonry
     - MJExtension
     - MJRefresh
@@ -61,12 +64,8 @@ SPEC REPOS:
     - SDWebImage
     - SVProgressHUD
     - TZImagePickerController
-    - YTKNetwork
-  trunk:
-    - CocoaLumberjack
-    - FLAnimatedImage
-    - IQKeyboardManager
     - XHLaunchAd
+    - YTKNetwork
 
 SPEC CHECKSUMS:
   AFNetworking: b6f891fdfaed196b46c7a83cf209e09697b94057
@@ -84,6 +83,6 @@ SPEC CHECKSUMS:
   XHLaunchAd: 45048592af01aa501c9d2d0c45e95ca74c4d0596
   YTKNetwork: df8a7a5597bda1664a4efaa7ef871a818a887fe0
 
-PODFILE CHECKSUM: 644163c65d7217f09fc2cc41b692396a8182b104
+PODFILE CHECKSUM: 6271f6f0721c5dfc3747a0b0638b2dc5a75e8b01
 
 COCOAPODS: 1.8.4

HappyWork/Pods/Pods.xcodeproj/xcuserdata/zhangxiaoguang.xcuserdatad/xcschemes/Pods-HappyWorkTests.xcscheme

@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "1100"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "4B1FC8FF42E5E6C2FAA4E62DA1219B8B"
-               BuildableName = "Pods_HappyWorkTests.framework"
-               BlueprintName = "Pods-HappyWorkTests"
-               ReferencedContainer = "container:Pods.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

HappyWork/Pods/Pods.xcodeproj/xcuserdata/zhangxiaoguang.xcuserdatad/xcschemes/Pods-HappyWorkUITests.xcscheme

@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "1100"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "F6830445329EE46D1AB049890F9BFA4E"
-               BuildableName = "Pods_HappyWorkUITests.framework"
-               BlueprintName = "Pods-HappyWorkUITests"
-               ReferencedContainer = "container:Pods.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

HappyWork/Pods/Pods.xcodeproj/xcuserdata/zhangxiaoguang.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -8,120 +8,76 @@
 		<dict>
 			<key>isShown</key>
 			<false/>
-			<key>orderHint</key>
-			<integer>0</integer>
 		</dict>
 		<key>CocoaLumberjack.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
-			<key>orderHint</key>
-			<integer>1</integer>
 		</dict>
 		<key>DZNEmptyDataSet.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
-			<key>orderHint</key>
-			<integer>2</integer>
 		</dict>
 		<key>FLAnimatedImage.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
-			<key>orderHint</key>
-			<integer>3</integer>
 		</dict>
 		<key>IQKeyboardManager.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
-			<key>orderHint</key>
-			<integer>4</integer>
 		</dict>
 		<key>MJExtension.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
-			<key>orderHint</key>
-			<integer>6</integer>
 		</dict>
 		<key>MJRefresh.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
-			<key>orderHint</key>
-			<integer>7</integer>
 		</dict>
 		<key>Masonry.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
-			<key>orderHint</key>
-			<integer>5</integer>
 		</dict>
 		<key>Pods-HappyWork.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
-			<key>orderHint</key>
-			<integer>8</integer>
-		</dict>
-		<key>Pods-HappyWorkTests.xcscheme</key>
-		<dict>
-			<key>isShown</key>
-			<false/>
-			<key>orderHint</key>
-			<integer>9</integer>
-		</dict>
-		<key>Pods-HappyWorkUITests.xcscheme</key>
-		<dict>
-			<key>isShown</key>
-			<false/>
-			<key>orderHint</key>
-			<integer>10</integer>
 		</dict>
 		<key>SDCycleScrollView.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
-			<key>orderHint</key>
-			<integer>11</integer>
 		</dict>
 		<key>SDWebImage.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
-			<key>orderHint</key>
-			<integer>12</integer>
 		</dict>
 		<key>SVProgressHUD.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
-			<key>orderHint</key>
-			<integer>13</integer>
 		</dict>
 		<key>TZImagePickerController.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
-			<key>orderHint</key>
-			<integer>14</integer>
 		</dict>
 		<key>XHLaunchAd.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
-			<key>orderHint</key>
-			<integer>15</integer>
 		</dict>
 		<key>YTKNetwork.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
-			<key>orderHint</key>
-			<integer>16</integer>
 		</dict>
 	</dict>
 	<key>SuppressBuildableAutocreation</key>

HappyWork/Pods/Target Support Files/Pods-HappyWorkTests/Pods-HappyWorkTests-Info.plist

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-  <key>CFBundleDevelopmentRegion</key>
-  <string>en</string>
-  <key>CFBundleExecutable</key>
-  <string>${EXECUTABLE_NAME}</string>
-  <key>CFBundleIdentifier</key>
-  <string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
-  <key>CFBundleInfoDictionaryVersion</key>
-  <string>6.0</string>
-  <key>CFBundleName</key>
-  <string>${PRODUCT_NAME}</string>
-  <key>CFBundlePackageType</key>
-  <string>FMWK</string>
-  <key>CFBundleShortVersionString</key>
-  <string>1.0.0</string>
-  <key>CFBundleSignature</key>
-  <string>????</string>
-  <key>CFBundleVersion</key>
-  <string>${CURRENT_PROJECT_VERSION}</string>
-  <key>NSPrincipalClass</key>
-  <string></string>
-</dict>
-</plist>

HappyWork/Pods/Target Support Files/Pods-HappyWorkTests/Pods-HappyWorkTests-acknowledgements.markdown

@@ -1,3 +0,0 @@
-# Acknowledgements
-This application makes use of the following third party libraries:
-Generated by CocoaPods - https://cocoapods.org

HappyWork/Pods/Target Support Files/Pods-HappyWorkTests/Pods-HappyWorkTests-acknowledgements.plist

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>PreferenceSpecifiers</key>
-	<array>
-		<dict>
-			<key>FooterText</key>
-			<string>This application makes use of the following third party libraries:</string>
-			<key>Title</key>
-			<string>Acknowledgements</string>
-			<key>Type</key>
-			<string>PSGroupSpecifier</string>
-		</dict>
-		<dict>
-			<key>FooterText</key>
-			<string>Generated by CocoaPods - https://cocoapods.org</string>
-			<key>Title</key>
-			<string></string>
-			<key>Type</key>
-			<string>PSGroupSpecifier</string>
-		</dict>
-	</array>
-	<key>StringsTable</key>
-	<string>Acknowledgements</string>
-	<key>Title</key>
-	<string>Acknowledgements</string>
-</dict>
-</plist>

HappyWork/Pods/Target Support Files/Pods-HappyWorkTests/Pods-HappyWorkTests-dummy.m

@@ -1,5 +0,0 @@
-#import <Foundation/Foundation.h>
-@interface PodsDummy_Pods_HappyWorkTests : NSObject
-@end
-@implementation PodsDummy_Pods_HappyWorkTests
-@end

HappyWork/Pods/Target Support Files/Pods-HappyWorkTests/Pods-HappyWorkTests-umbrella.h

@@ -1,16 +0,0 @@
-#ifdef __OBJC__
-#import <UIKit/UIKit.h>
-#else
-#ifndef FOUNDATION_EXPORT
-#if defined(__cplusplus)
-#define FOUNDATION_EXPORT extern "C"
-#else
-#define FOUNDATION_EXPORT extern
-#endif
-#endif
-#endif
-
-
-FOUNDATION_EXPORT double Pods_HappyWorkTestsVersionNumber;
-FOUNDATION_EXPORT const unsigned char Pods_HappyWorkTestsVersionString[];
-

HappyWork/Pods/Target Support Files/Pods-HappyWorkTests/Pods-HappyWorkTests.modulemap

@@ -1,6 +0,0 @@
-framework module Pods_HappyWorkTests {
-  umbrella header "Pods-HappyWorkTests-umbrella.h"
-
-  export *
-  module * { export * }
-}

HappyWork/Pods/Target Support Files/Pods-HappyWorkUITests/Pods-HappyWorkUITests-Info.plist

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-  <key>CFBundleDevelopmentRegion</key>
-  <string>en</string>
-  <key>CFBundleExecutable</key>
-  <string>${EXECUTABLE_NAME}</string>
-  <key>CFBundleIdentifier</key>
-  <string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
-  <key>CFBundleInfoDictionaryVersion</key>
-  <string>6.0</string>
-  <key>CFBundleName</key>
-  <string>${PRODUCT_NAME}</string>
-  <key>CFBundlePackageType</key>
-  <string>FMWK</string>
-  <key>CFBundleShortVersionString</key>
-  <string>1.0.0</string>
-  <key>CFBundleSignature</key>
-  <string>????</string>
-  <key>CFBundleVersion</key>
-  <string>${CURRENT_PROJECT_VERSION}</string>
-  <key>NSPrincipalClass</key>
-  <string></string>
-</dict>
-</plist>

HappyWork/Pods/Target Support Files/Pods-HappyWorkUITests/Pods-HappyWorkUITests-acknowledgements.markdown

@@ -1,3 +0,0 @@
-# Acknowledgements
-This application makes use of the following third party libraries:
-Generated by CocoaPods - https://cocoapods.org

HappyWork/Pods/Target Support Files/Pods-HappyWorkUITests/Pods-HappyWorkUITests-acknowledgements.plist

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>PreferenceSpecifiers</key>
-	<array>
-		<dict>
-			<key>FooterText</key>
-			<string>This application makes use of the following third party libraries:</string>
-			<key>Title</key>
-			<string>Acknowledgements</string>
-			<key>Type</key>
-			<string>PSGroupSpecifier</string>
-		</dict>
-		<dict>
-			<key>FooterText</key>
-			<string>Generated by CocoaPods - https://cocoapods.org</string>
-			<key>Title</key>
-			<string></string>
-			<key>Type</key>
-			<string>PSGroupSpecifier</string>
-		</dict>
-	</array>
-	<key>StringsTable</key>
-	<string>Acknowledgements</string>
-	<key>Title</key>
-	<string>Acknowledgements</string>
-</dict>
-</plist>

HappyWork/Pods/Target Support Files/Pods-HappyWorkUITests/Pods-HappyWorkUITests-dummy.m

@@ -1,5 +0,0 @@
-#import <Foundation/Foundation.h>
-@interface PodsDummy_Pods_HappyWorkUITests : NSObject
-@end
-@implementation PodsDummy_Pods_HappyWorkUITests
-@end

HappyWork/Pods/Target Support Files/Pods-HappyWorkUITests/Pods-HappyWorkUITests-umbrella.h

@@ -1,16 +0,0 @@
-#ifdef __OBJC__
-#import <UIKit/UIKit.h>
-#else
-#ifndef FOUNDATION_EXPORT
-#if defined(__cplusplus)
-#define FOUNDATION_EXPORT extern "C"
-#else
-#define FOUNDATION_EXPORT extern
-#endif
-#endif
-#endif
-
-
-FOUNDATION_EXPORT double Pods_HappyWorkUITestsVersionNumber;
-FOUNDATION_EXPORT const unsigned char Pods_HappyWorkUITestsVersionString[];
-

HappyWork/Pods/Target Support Files/Pods-HappyWorkUITests/Pods-HappyWorkUITests.modulemap

@@ -1,6 +0,0 @@
-framework module Pods_HappyWorkUITests {
-  umbrella header "Pods-HappyWorkUITests-umbrella.h"
-
-  export *
-  module * { export * }
-}

HappyWork/podfile

@@ -1,12 +1,10 @@
-# Uncomment the next line to define a global platform for your project
+
+source 'https://github.com/CocoaPods/Specs.git'
 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!
-
-  # Pods for HappyWork
+use_frameworks!
 
 pod 'Masonry', '~> 1.1.0'
 pod 'SVProgressHUD', '~> 2.2.5'
@@ -23,15 +21,4 @@ pod 'XHLaunchAd', '~> 3.9.8'
 pod 'CocoaLumberjack', '~> 3.6.0'
 
 
-
-  target 'HappyWorkTests' do
-    inherit! :search_paths
-    # Pods for testing
-  end
-
-  target 'HappyWorkUITests' do
-    inherit! :search_paths
-    # Pods for testing
-  end
-
 end