Skip to content

G
galaxy-iOS
Commit ec5ee6d3 authored by pete谢兆麟's avatar pete谢兆麟
Browse files
Options

Merge commit 'c7c21a7e' into xiezhaolin

parents bd60747e c7c21a7e
Hide whitespace changes
Inline Side-by-side
Showing with 1982 additions and 581 deletions
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ ec5ee6d3
...@@ -36,6 +36,9 @@ ...@@ -36,6 +36,9 @@
043955212B70955200955D49 /* YHFormPickerViewType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 043955202B70955200955D49 /* YHFormPickerViewType.swift */; }; 043955212B70955200955D49 /* YHFormPickerViewType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 043955202B70955200955D49 /* YHFormPickerViewType.swift */; };
043955232B70BC2500955D49 /* YHChildInfoContainerVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 043955222B70BC2500955D49 /* YHChildInfoContainerVC.swift */; }; 043955232B70BC2500955D49 /* YHChildInfoContainerVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 043955222B70BC2500955D49 /* YHChildInfoContainerVC.swift */; };
043955252B70D20300955D49 /* YHFormItemQuestionsCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 043955242B70D20300955D49 /* YHFormItemQuestionsCell.swift */; }; 043955252B70D20300955D49 /* YHFormItemQuestionsCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 043955242B70D20300955D49 /* YHFormItemQuestionsCell.swift */; };
044CC6252B873F330083FF76 /* YHCollegeSearchViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044CC6242B873F330083FF76 /* YHCollegeSearchViewController.swift */; };
044CC6272B8740340083FF76 /* YHCollegeNameCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044CC6262B8740340083FF76 /* YHCollegeNameCell.swift */; };
044CC6292B8741AC0083FF76 /* YHSearchBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044CC6282B8741AC0083FF76 /* YHSearchBar.swift */; };
0468D4202B49320900CFB916 /* YHVerificationCodeLoginController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0468D41F2B49320900CFB916 /* YHVerificationCodeLoginController.swift */; }; 0468D4202B49320900CFB916 /* YHVerificationCodeLoginController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0468D41F2B49320900CFB916 /* YHVerificationCodeLoginController.swift */; };
0468D4222B493A5E00CFB916 /* YHPhoneMessageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0468D4212B493A5E00CFB916 /* YHPhoneMessageView.swift */; }; 0468D4222B493A5E00CFB916 /* YHPhoneMessageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0468D4212B493A5E00CFB916 /* YHPhoneMessageView.swift */; };
0468D4242B494BEA00CFB916 /* YHCodeResultViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0468D4232B494BEA00CFB916 /* YHCodeResultViewController.swift */; }; 0468D4242B494BEA00CFB916 /* YHCodeResultViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0468D4232B494BEA00CFB916 /* YHCodeResultViewController.swift */; };
...@@ -75,10 +78,10 @@ ...@@ -75,10 +78,10 @@
04AF58C42B4FC51C0066011A /* YHLocalizable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04AF58C32B4FC51C0066011A /* YHLocalizable.swift */; }; 04AF58C42B4FC51C0066011A /* YHLocalizable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04AF58C32B4FC51C0066011A /* YHLocalizable.swift */; };
04C693622B723AB8004C1758 /* YHMySettingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04C693612B723AB8004C1758 /* YHMySettingViewController.swift */; }; 04C693622B723AB8004C1758 /* YHMySettingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04C693612B723AB8004C1758 /* YHMySettingViewController.swift */; };
04C693642B723B56004C1758 /* YHMySettingCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04C693632B723B56004C1758 /* YHMySettingCell.swift */; }; 04C693642B723B56004C1758 /* YHMySettingCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04C693632B723B56004C1758 /* YHMySettingCell.swift */; };
04C693692B73191A004C1758 /* YHEducationalQualificationVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04C693682B73191A004C1758 /* YHEducationalQualificationVC.swift */; }; 04C693692B73191A004C1758 /* YHEducationInfoListVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04C693682B73191A004C1758 /* YHEducationInfoListVC.swift */; };
04C6936B2B7329E7004C1758 /* YHEducationInfoCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04C6936A2B7329E7004C1758 /* YHEducationInfoCell.swift */; }; 04C6936B2B7329E7004C1758 /* YHEducationInfoCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04C6936A2B7329E7004C1758 /* YHEducationInfoCell.swift */; };
04C6936F2B7350E7004C1758 /* YHEducationDetailVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04C6936E2B7350E7004C1758 /* YHEducationDetailVC.swift */; }; 04C6936F2B7350E7004C1758 /* YHEducationDetailVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04C6936E2B7350E7004C1758 /* YHEducationDetailVC.swift */; };
04C693712B735C6F004C1758 /* YHProfessionalQualificationVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04C693702B735C6F004C1758 /* YHProfessionalQualificationVC.swift */; }; 04C693712B735C6F004C1758 /* YHQualificationDetailVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04C693702B735C6F004C1758 /* YHQualificationDetailVC.swift */; };
04C8F4832B7216D800ADF59B /* YHUserInfoHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04C8F4822B7216D800ADF59B /* YHUserInfoHeaderView.swift */; }; 04C8F4832B7216D800ADF59B /* YHUserInfoHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04C8F4822B7216D800ADF59B /* YHUserInfoHeaderView.swift */; };
04E86E092B707ACE00A35F4B /* YHPhoneLoginViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04E86E082B707ACE00A35F4B /* YHPhoneLoginViewController.swift */; }; 04E86E092B707ACE00A35F4B /* YHPhoneLoginViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04E86E082B707ACE00A35F4B /* YHPhoneLoginViewController.swift */; };
04E86E0B2B70C13300A35F4B /* YHCodeSueecssViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04E86E0A2B70C13300A35F4B /* YHCodeSueecssViewController.swift */; }; 04E86E0B2B70C13300A35F4B /* YHCodeSueecssViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04E86E0A2B70C13300A35F4B /* YHCodeSueecssViewController.swift */; };
...@@ -224,6 +227,7 @@ ...@@ -224,6 +227,7 @@
A5C5B32D2B57D66000A7C5D1 /* YHBbxCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5C5B32C2B57D66000A7C5D1 /* YHBbxCollectionViewCell.swift */; }; A5C5B32D2B57D66000A7C5D1 /* YHBbxCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5C5B32C2B57D66000A7C5D1 /* YHBbxCollectionViewCell.swift */; };
A5D6AB1B2B46A1CC001C10A5 /* YHHomeModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5D6AB1A2B46A1CC001C10A5 /* YHHomeModel.swift */; }; A5D6AB1B2B46A1CC001C10A5 /* YHHomeModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5D6AB1A2B46A1CC001C10A5 /* YHHomeModel.swift */; };
A5D6AB1D2B46AAFB001C10A5 /* YHHomePageViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5D6AB1C2B46AAFB001C10A5 /* YHHomePageViewModel.swift */; }; A5D6AB1D2B46AAFB001C10A5 /* YHHomePageViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5D6AB1C2B46AAFB001C10A5 /* YHHomePageViewModel.swift */; };
A5F685F22B86D2E3006F4BF9 /* YHOtherPickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5F685F12B86D2E3006F4BF9 /* YHOtherPickerView.swift */; };
A5F78C822B68F39600EEA170 /* YHPersonInfoCommonCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5F78C812B68F39600EEA170 /* YHPersonInfoCommonCell.swift */; }; A5F78C822B68F39600EEA170 /* YHPersonInfoCommonCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5F78C812B68F39600EEA170 /* YHPersonInfoCommonCell.swift */; };
A5FD63BD2B623C2C00D1D9DA /* YHInformationPerfectListVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FD63BC2B623C2C00D1D9DA /* YHInformationPerfectListVC.swift */; }; A5FD63BD2B623C2C00D1D9DA /* YHInformationPerfectListVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FD63BC2B623C2C00D1D9DA /* YHInformationPerfectListVC.swift */; };
A5FD63BF2B6250BC00D1D9DA /* YHInformationPerfectCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FD63BE2B6250BC00D1D9DA /* YHInformationPerfectCell.swift */; }; A5FD63BF2B6250BC00D1D9DA /* YHInformationPerfectCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FD63BE2B6250BC00D1D9DA /* YHInformationPerfectCell.swift */; };
...@@ -316,6 +320,9 @@ ...@@ -316,6 +320,9 @@
043955202B70955200955D49 /* YHFormPickerViewType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFormPickerViewType.swift; sourceTree = "<group>"; }; 043955202B70955200955D49 /* YHFormPickerViewType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFormPickerViewType.swift; sourceTree = "<group>"; };
043955222B70BC2500955D49 /* YHChildInfoContainerVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHChildInfoContainerVC.swift; sourceTree = "<group>"; }; 043955222B70BC2500955D49 /* YHChildInfoContainerVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHChildInfoContainerVC.swift; sourceTree = "<group>"; };
043955242B70D20300955D49 /* YHFormItemQuestionsCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFormItemQuestionsCell.swift; sourceTree = "<group>"; }; 043955242B70D20300955D49 /* YHFormItemQuestionsCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFormItemQuestionsCell.swift; sourceTree = "<group>"; };
044CC6242B873F330083FF76 /* YHCollegeSearchViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCollegeSearchViewController.swift; sourceTree = "<group>"; };
044CC6262B8740340083FF76 /* YHCollegeNameCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCollegeNameCell.swift; sourceTree = "<group>"; };
044CC6282B8741AC0083FF76 /* YHSearchBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHSearchBar.swift; sourceTree = "<group>"; };
0468D41F2B49320900CFB916 /* YHVerificationCodeLoginController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHVerificationCodeLoginController.swift; sourceTree = "<group>"; }; 0468D41F2B49320900CFB916 /* YHVerificationCodeLoginController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHVerificationCodeLoginController.swift; sourceTree = "<group>"; };
0468D4212B493A5E00CFB916 /* YHPhoneMessageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPhoneMessageView.swift; sourceTree = "<group>"; }; 0468D4212B493A5E00CFB916 /* YHPhoneMessageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPhoneMessageView.swift; sourceTree = "<group>"; };
0468D4232B494BEA00CFB916 /* YHCodeResultViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCodeResultViewController.swift; sourceTree = "<group>"; }; 0468D4232B494BEA00CFB916 /* YHCodeResultViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCodeResultViewController.swift; sourceTree = "<group>"; };
...@@ -355,10 +362,10 @@ ...@@ -355,10 +362,10 @@
04AF58C32B4FC51C0066011A /* YHLocalizable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHLocalizable.swift; sourceTree = "<group>"; }; 04AF58C32B4FC51C0066011A /* YHLocalizable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHLocalizable.swift; sourceTree = "<group>"; };
04C693612B723AB8004C1758 /* YHMySettingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMySettingViewController.swift; sourceTree = "<group>"; }; 04C693612B723AB8004C1758 /* YHMySettingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMySettingViewController.swift; sourceTree = "<group>"; };
04C693632B723B56004C1758 /* YHMySettingCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMySettingCell.swift; sourceTree = "<group>"; }; 04C693632B723B56004C1758 /* YHMySettingCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMySettingCell.swift; sourceTree = "<group>"; };
04C693682B73191A004C1758 /* YHEducationalQualificationVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHEducationalQualificationVC.swift; sourceTree = "<group>"; }; 04C693682B73191A004C1758 /* YHEducationInfoListVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHEducationInfoListVC.swift; sourceTree = "<group>"; };
04C6936A2B7329E7004C1758 /* YHEducationInfoCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHEducationInfoCell.swift; sourceTree = "<group>"; }; 04C6936A2B7329E7004C1758 /* YHEducationInfoCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHEducationInfoCell.swift; sourceTree = "<group>"; };
04C6936E2B7350E7004C1758 /* YHEducationDetailVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHEducationDetailVC.swift; sourceTree = "<group>"; }; 04C6936E2B7350E7004C1758 /* YHEducationDetailVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHEducationDetailVC.swift; sourceTree = "<group>"; };
04C693702B735C6F004C1758 /* YHProfessionalQualificationVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHProfessionalQualificationVC.swift; sourceTree = "<group>"; }; 04C693702B735C6F004C1758 /* YHQualificationDetailVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHQualificationDetailVC.swift; sourceTree = "<group>"; };
04C8F4822B7216D800ADF59B /* YHUserInfoHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHUserInfoHeaderView.swift; sourceTree = "<group>"; }; 04C8F4822B7216D800ADF59B /* YHUserInfoHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHUserInfoHeaderView.swift; sourceTree = "<group>"; };
04E86E082B707ACE00A35F4B /* YHPhoneLoginViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPhoneLoginViewController.swift; sourceTree = "<group>"; }; 04E86E082B707ACE00A35F4B /* YHPhoneLoginViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPhoneLoginViewController.swift; sourceTree = "<group>"; };
04E86E0A2B70C13300A35F4B /* YHCodeSueecssViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCodeSueecssViewController.swift; sourceTree = "<group>"; }; 04E86E0A2B70C13300A35F4B /* YHCodeSueecssViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCodeSueecssViewController.swift; sourceTree = "<group>"; };
...@@ -509,6 +516,7 @@ ...@@ -509,6 +516,7 @@
A5C5B32C2B57D66000A7C5D1 /* YHBbxCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHBbxCollectionViewCell.swift; sourceTree = "<group>"; }; A5C5B32C2B57D66000A7C5D1 /* YHBbxCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHBbxCollectionViewCell.swift; sourceTree = "<group>"; };
A5D6AB1A2B46A1CC001C10A5 /* YHHomeModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHomeModel.swift; sourceTree = "<group>"; }; A5D6AB1A2B46A1CC001C10A5 /* YHHomeModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHomeModel.swift; sourceTree = "<group>"; };
A5D6AB1C2B46AAFB001C10A5 /* YHHomePageViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHomePageViewModel.swift; sourceTree = "<group>"; }; A5D6AB1C2B46AAFB001C10A5 /* YHHomePageViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHomePageViewModel.swift; sourceTree = "<group>"; };
A5F685F12B86D2E3006F4BF9 /* YHOtherPickerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHOtherPickerView.swift; sourceTree = "<group>"; };
A5F78C812B68F39600EEA170 /* YHPersonInfoCommonCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPersonInfoCommonCell.swift; sourceTree = "<group>"; }; A5F78C812B68F39600EEA170 /* YHPersonInfoCommonCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPersonInfoCommonCell.swift; sourceTree = "<group>"; };
A5FD63BC2B623C2C00D1D9DA /* YHInformationPerfectListVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHInformationPerfectListVC.swift; sourceTree = "<group>"; }; A5FD63BC2B623C2C00D1D9DA /* YHInformationPerfectListVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHInformationPerfectListVC.swift; sourceTree = "<group>"; };
A5FD63BE2B6250BC00D1D9DA /* YHInformationPerfectCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHInformationPerfectCell.swift; sourceTree = "<group>"; }; A5FD63BE2B6250BC00D1D9DA /* YHInformationPerfectCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHInformationPerfectCell.swift; sourceTree = "<group>"; };
...@@ -690,7 +698,7 @@ ...@@ -690,7 +698,7 @@
path = VM; path = VM;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
0468D43D2B61F68100CFB916 /* MainApplicantInformation */ = { 0468D43D2B61F68100CFB916 /* MainApplicantInformation(主申请人信息) */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
04E86E3F2B8357EC00A35F4B /* M */, 04E86E3F2B8357EC00A35F4B /* M */,
...@@ -698,7 +706,7 @@ ...@@ -698,7 +706,7 @@
0468D4402B61F6C400CFB916 /* V */, 0468D4402B61F6C400CFB916 /* V */,
0468D43E2B61F6B100CFB916 /* C */, 0468D43E2B61F6B100CFB916 /* C */,
); );
path = MainApplicantInformation; path = "MainApplicantInformation(主申请人信息)";
sourceTree = "<group>"; sourceTree = "<group>";
}; };
0468D43E2B61F6B100CFB916 /* C */ = { 0468D43E2B61F6B100CFB916 /* C */ = {
...@@ -772,22 +780,23 @@ ...@@ -772,22 +780,23 @@
path = Localized; path = Localized;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
04C693652B73183E004C1758 /* 学历专业资格填写 */ = { 04C693652B73183E004C1758 /* Education&Qualification(学历专业资格填写) */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
042F88892B847720008B60BD /* M */, 042F88892B847720008B60BD /* M */,
04C693672B7318D3004C1758 /* V */, 04C693672B7318D3004C1758 /* V */,
04C693662B7318CD004C1758 /* C */, 04C693662B7318CD004C1758 /* C */,
); );
path = "学历专业资格填写"; path = "Education&Qualification(学历专业资格填写)";
sourceTree = "<group>"; sourceTree = "<group>";
}; };
04C693662B7318CD004C1758 /* C */ = { 04C693662B7318CD004C1758 /* C */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
04C693682B73191A004C1758 /* YHEducationalQualificationVC.swift */, 04C693682B73191A004C1758 /* YHEducationInfoListVC.swift */,
04C693702B735C6F004C1758 /* YHProfessionalQualificationVC.swift */, 04C693702B735C6F004C1758 /* YHQualificationDetailVC.swift */,
04C6936E2B7350E7004C1758 /* YHEducationDetailVC.swift */, 04C6936E2B7350E7004C1758 /* YHEducationDetailVC.swift */,
044CC6242B873F330083FF76 /* YHCollegeSearchViewController.swift */,
); );
path = C; path = C;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -796,6 +805,8 @@ ...@@ -796,6 +805,8 @@
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
04C6936A2B7329E7004C1758 /* YHEducationInfoCell.swift */, 04C6936A2B7329E7004C1758 /* YHEducationInfoCell.swift */,
044CC6262B8740340083FF76 /* YHCollegeNameCell.swift */,
044CC6282B8741AC0083FF76 /* YHSearchBar.swift */,
); );
path = V; path = V;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -1164,6 +1175,7 @@ ...@@ -1164,6 +1175,7 @@
A596C39C2B84D9100067BBB8 /* YHOtherYesOrNoItemView.swift */, A596C39C2B84D9100067BBB8 /* YHOtherYesOrNoItemView.swift */,
A596C39D2B84D9100067BBB8 /* YHOtherSelecteItemView.swift */, A596C39D2B84D9100067BBB8 /* YHOtherSelecteItemView.swift */,
A596C39E2B84D9100067BBB8 /* YHOtherInfoSessionView.swift */, A596C39E2B84D9100067BBB8 /* YHOtherInfoSessionView.swift */,
A5F685F12B86D2E3006F4BF9 /* YHOtherPickerView.swift */,
); );
path = V; path = V;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -1498,12 +1510,12 @@ ...@@ -1498,12 +1510,12 @@
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
04E86E222B81EA1000A35F4B /* WorkExperience */, 04E86E222B81EA1000A35F4B /* WorkExperience */,
04C693652B73183E004C1758 /* 学历专业资格填写 */, 04C693652B73183E004C1758 /* Education&Qualification(学历专业资格填写) */,
A5234E382B72346A00A33433 /* OtherInformation(其他信息) */, A5234E382B72346A00A33433 /* OtherInformation(其他信息) */,
A58556BB2B6BD81C003746B2 /* BaseInformation(基本资料) */, A58556BB2B6BD81C003746B2 /* BaseInformation(基本资料) */,
A5167B2D2B6A23D10084C08F /* PersonInfoList(个人信息表) */, A5167B2D2B6A23D10084C08F /* PersonInfoList(个人信息表) */,
A5167B292B6A174B0084C08F /* MyScore(我的评分) */, A5167B292B6A174B0084C08F /* MyScore(我的评分) */,
0468D43D2B61F68100CFB916 /* MainApplicantInformation */, 0468D43D2B61F68100CFB916 /* MainApplicantInformation(主申请人信息) */,
041B52882B5E13EB007EBCEB /* FamilyMember(家庭成员信息表) */, 041B52882B5E13EB007EBCEB /* FamilyMember(家庭成员信息表) */,
); );
path = "ServiceProcess(流程)"; path = "ServiceProcess(流程)";
...@@ -1727,6 +1739,7 @@ ...@@ -1727,6 +1739,7 @@
A5C5B3002B55623800A7C5D1 /* YHMainContentBaseViewController.swift in Sources */, A5C5B3002B55623800A7C5D1 /* YHMainContentBaseViewController.swift in Sources */,
A5234E2C2B6E3BA400A33433 /* YHBasicInfoFillCell.swift in Sources */, A5234E2C2B6E3BA400A33433 /* YHBasicInfoFillCell.swift in Sources */,
A5573ED22B317BFF00D98EC0 /* AppDelegate.swift in Sources */, A5573ED22B317BFF00D98EC0 /* AppDelegate.swift in Sources */,
A5F685F22B86D2E3006F4BF9 /* YHOtherPickerView.swift in Sources */,
A5ACE9542B4564F7002C94D2 /* YHNavigationController.swift in Sources */, A5ACE9542B4564F7002C94D2 /* YHNavigationController.swift in Sources */,
A5FD63DF2B6639AD00D1D9DA /* YHScoreDataModel.swift in Sources */, A5FD63DF2B6639AD00D1D9DA /* YHScoreDataModel.swift in Sources */,
A5ACE95E2B4571BF002C94D2 /* YHHomeViewController.swift in Sources */, A5ACE95E2B4571BF002C94D2 /* YHHomeViewController.swift in Sources */,
...@@ -1801,7 +1814,7 @@ ...@@ -1801,7 +1814,7 @@
A5ACE94F2B4564F7002C94D2 /* YhOverlayView.swift in Sources */, A5ACE94F2B4564F7002C94D2 /* YhOverlayView.swift in Sources */,
A53026902B4E6F2700F35102 /* YHHomeCustomCell.swift in Sources */, A53026902B4E6F2700F35102 /* YHHomeCustomCell.swift in Sources */,
0468D44F2B634E8B00CFB916 /* YHMainApplicantInformationViewModel.swift in Sources */, 0468D44F2B634E8B00CFB916 /* YHMainApplicantInformationViewModel.swift in Sources */,
04C693692B73191A004C1758 /* YHEducationalQualificationVC.swift in Sources */, 04C693692B73191A004C1758 /* YHEducationInfoListVC.swift in Sources */,
0468D44D2B62643700CFB916 /* YHMainInformationTableViewCell.swift in Sources */, 0468D44D2B62643700CFB916 /* YHMainInformationTableViewCell.swift in Sources */,
A5ACE92E2B4564F7002C94D2 /* YHValidateCodeInputView.swift in Sources */, A5ACE92E2B4564F7002C94D2 /* YHValidateCodeInputView.swift in Sources */,
04C6936F2B7350E7004C1758 /* YHEducationDetailVC.swift in Sources */, 04C6936F2B7350E7004C1758 /* YHEducationDetailVC.swift in Sources */,
...@@ -1842,6 +1855,7 @@ ...@@ -1842,6 +1855,7 @@
04C6936B2B7329E7004C1758 /* YHEducationInfoCell.swift in Sources */, 04C6936B2B7329E7004C1758 /* YHEducationInfoCell.swift in Sources */,
04E86E092B707ACE00A35F4B /* YHPhoneLoginViewController.swift in Sources */, 04E86E092B707ACE00A35F4B /* YHPhoneLoginViewController.swift in Sources */,
04E86E342B83268F00A35F4B /* YHWorkExperienceViewController.swift in Sources */, 04E86E342B83268F00A35F4B /* YHWorkExperienceViewController.swift in Sources */,
044CC6292B8741AC0083FF76 /* YHSearchBar.swift in Sources */,
A5ACE9422B4564F7002C94D2 /* AppDelegate+Extension.swift in Sources */, A5ACE9422B4564F7002C94D2 /* AppDelegate+Extension.swift in Sources */,
A5FD63BF2B6250BC00D1D9DA /* YHInformationPerfectCell.swift in Sources */, A5FD63BF2B6250BC00D1D9DA /* YHInformationPerfectCell.swift in Sources */,
A510441A2B495DD0006B60BB /* UIView+Extension.swift in Sources */, A510441A2B495DD0006B60BB /* UIView+Extension.swift in Sources */,
...@@ -1889,6 +1903,7 @@ ...@@ -1889,6 +1903,7 @@
043955212B70955200955D49 /* YHFormPickerViewType.swift in Sources */, 043955212B70955200955D49 /* YHFormPickerViewType.swift in Sources */,
043955232B70BC2500955D49 /* YHChildInfoContainerVC.swift in Sources */, 043955232B70BC2500955D49 /* YHChildInfoContainerVC.swift in Sources */,
04E86E442B8357EC00A35F4B /* YHCountryMessage.swift in Sources */, 04E86E442B8357EC00A35F4B /* YHCountryMessage.swift in Sources */,
044CC6252B873F330083FF76 /* YHCollegeSearchViewController.swift in Sources */,
0468D42B2B55019900CFB916 /* YHAnalytics.swift in Sources */, 0468D42B2B55019900CFB916 /* YHAnalytics.swift in Sources */,
A5ACE93C2B4564F7002C94D2 /* UIColor+Extension.swift in Sources */, A5ACE93C2B4564F7002C94D2 /* UIColor+Extension.swift in Sources */,
04E86E4F2B8479B700A35F4B /* YHWorkIntroductionItemView.swift in Sources */, 04E86E4F2B8479B700A35F4B /* YHWorkIntroductionItemView.swift in Sources */,
...@@ -1912,6 +1927,7 @@ ...@@ -1912,6 +1927,7 @@
A5ACE9582B4564F7002C94D2 /* YHNoDataTipView.swift in Sources */, A5ACE9582B4564F7002C94D2 /* YHNoDataTipView.swift in Sources */,
04E86E592B84AD6200A35F4B /* YHWorkExampleViewController.swift in Sources */, 04E86E592B84AD6200A35F4B /* YHWorkExampleViewController.swift in Sources */,
042FBBBB2B62806D00F9DE23 /* YHCertificateInfoController.swift in Sources */, 042FBBBB2B62806D00F9DE23 /* YHCertificateInfoController.swift in Sources */,
044CC6272B8740340083FF76 /* YHCollegeNameCell.swift in Sources */,
042FBBC72B64CFBF00F9DE23 /* YHChildPrimaryInfoVC.swift in Sources */, 042FBBC72B64CFBF00F9DE23 /* YHChildPrimaryInfoVC.swift in Sources */,
A5234E2A2B6E349600A33433 /* YHBasicInfoFillBottomView.swift in Sources */, A5234E2A2B6E349600A33433 /* YHBasicInfoFillBottomView.swift in Sources */,
04A7BC912B6B7B89000E8D47 /* YHTwoOptionAlertView.swift in Sources */, 04A7BC912B6B7B89000E8D47 /* YHTwoOptionAlertView.swift in Sources */,
...@@ -1936,7 +1952,7 @@ ...@@ -1936,7 +1952,7 @@
A5ACE9352B4564F7002C94D2 /* YHNetRequest.swift in Sources */, A5ACE9352B4564F7002C94D2 /* YHNetRequest.swift in Sources */,
04E86E6E2B87388100A35F4B /* YHCompanyViewModel.swift in Sources */, 04E86E6E2B87388100A35F4B /* YHCompanyViewModel.swift in Sources */,
A5FD63CB2B63D6C300D1D9DA /* YHInformationFillTipsCell.swift in Sources */, A5FD63CB2B63D6C300D1D9DA /* YHInformationFillTipsCell.swift in Sources */,
04C693712B735C6F004C1758 /* YHProfessionalQualificationVC.swift in Sources */, 04C693712B735C6F004C1758 /* YHQualificationDetailVC.swift in Sources */,
04E86E492B8445F400A35F4B /* YHWorkActionView.swift in Sources */, 04E86E492B8445F400A35F4B /* YHWorkActionView.swift in Sources */,
A5ACE9272B4564F7002C94D2 /* YHLoginViewController.swift in Sources */, A5ACE9272B4564F7002C94D2 /* YHLoginViewController.swift in Sources */,
); );
......
galaxy/galaxy/Classes/Base/V/YHTwoOptionAlertView.swift
View file @ ec5ee6d3
...@@ -46,7 +46,7 @@ class YHTwoOptionAlertView: UIView { ...@@ -46,7 +46,7 @@ class YHTwoOptionAlertView: UIView {
centerView = { centerView = {
let view = UIView() let view = UIView()
view.backgroundColor = .white view.backgroundColor = .white
view.layer.cornerRadius = 12 view.layer.cornerRadius = kCornerRadius6
return view return view
}() }()
addSubview(centerView) addSubview(centerView)
...@@ -54,8 +54,8 @@ class YHTwoOptionAlertView: UIView { ...@@ -54,8 +54,8 @@ class YHTwoOptionAlertView: UIView {
messageLabel = { messageLabel = {
let label = UILabel() let label = UILabel()
label.text = "" label.text = ""
label.font = kFont(size: 16) label.font = UIFont.PFSC_R(ofSize: 16)
label.textColor = UIColor(hex:0x222222) label.textColor = UIColor.mainTextColor
label.textAlignment = .center label.textAlignment = .center
label.numberOfLines = 0 label.numberOfLines = 0
return label return label
...@@ -65,11 +65,11 @@ class YHTwoOptionAlertView: UIView { ...@@ -65,11 +65,11 @@ class YHTwoOptionAlertView: UIView {
leftButton = { leftButton = {
let button = UIButton(type: .custom) let button = UIButton(type: .custom)
button.backgroundColor = UIColor(hex:0xffffff) button.backgroundColor = UIColor(hex:0xffffff)
button.titleLabel?.font = kBoldFont(size: 14) button.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
button.contentHorizontalAlignment = .center button.contentHorizontalAlignment = .center
button.setTitle("取消".local, for: .normal) button.setTitle("取消".local, for: .normal)
button.setTitleColor( UIColor(hex:0x3c86f8), for: .normal) button.setTitleColor( UIColor(hex:0x3c86f8), for: .normal)
button.layer.cornerRadius = 8 button.layer.cornerRadius = kCornerRadius6
button.layer.borderWidth = 1 button.layer.borderWidth = 1
button.layer.borderColor = UIColor(hex: 0x3c86f8).cgColor button.layer.borderColor = UIColor(hex: 0x3c86f8).cgColor
button.addTarget(self, action: #selector(disagree), for: .touchUpInside) button.addTarget(self, action: #selector(disagree), for: .touchUpInside)
...@@ -80,11 +80,11 @@ class YHTwoOptionAlertView: UIView { ...@@ -80,11 +80,11 @@ class YHTwoOptionAlertView: UIView {
rightButton = { rightButton = {
let button = UIButton(type: .custom) let button = UIButton(type: .custom)
button.backgroundColor = UIColor(hex:0x3c86f8) button.backgroundColor = UIColor(hex:0x3c86f8)
button.titleLabel?.font = kBoldFont(size: 14) button.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
button.contentHorizontalAlignment = .center button.contentHorizontalAlignment = .center
button.setTitle("确认".local, for: .normal) button.setTitle("确认".local, for: .normal)
button.setTitleColor( UIColor(hex:0xffffff), for: .normal) button.setTitleColor( UIColor(hex:0xffffff), for: .normal)
button.layer.cornerRadius = 8 button.layer.cornerRadius = kCornerRadius6
button.addTarget(self, action: #selector(agree), for: .touchUpInside) button.addTarget(self, action: #selector(agree), for: .touchUpInside)
return button return button
}() }()
......
galaxy/galaxy/Classes/Modules/Home(首页)/V/YHBbxCollectionViewCell.swift
View file @ ec5ee6d3
...@@ -23,7 +23,7 @@ class YHBbxCollectionViewCell: UICollectionViewCell { ...@@ -23,7 +23,7 @@ class YHBbxCollectionViewCell: UICollectionViewCell {
lazy var descripeLable:UILabel = { lazy var descripeLable:UILabel = {
let label = UILabel() let label = UILabel()
label.textColor = UIColor(red: 0.315, green: 0.315, blue: 0.315, alpha: 1) label.textColor = UIColor(red: 0.315, green: 0.315, blue: 0.315, alpha: 1)
label.font = kFont(size: 12) label.font = UIFont.PFSC_R(ofSize: 12)
label.textAlignment = .center label.textAlignment = .center
label.text = "证件办理" label.text = "证件办理"
// label.backgroundColor = .blue // label.backgroundColor = .blue
......
galaxy/galaxy/Classes/Modules/Home(首页)/V/YHDavidCell1.swift
View file @ ec5ee6d3
...@@ -43,7 +43,7 @@ class YHDavidCell1: UITableViewCell { ...@@ -43,7 +43,7 @@ class YHDavidCell1: UITableViewCell {
lazy var subContentView : UIView = { lazy var subContentView : UIView = {
let view = UIView() let view = UIView()
view.backgroundColor = UIColor(hex: 0x999999, alpha: 1.0) view.backgroundColor = UIColor(hex: 0x999999, alpha: 1.0)
view.layer.cornerRadius = 12 view.layer.cornerRadius = kCornerRadius6
return view return view
}() }()
......
galaxy/galaxy/Classes/Modules/Home(首页)/V/YHDavidCell2.swift
View file @ ec5ee6d3
...@@ -43,7 +43,7 @@ class YHDavidCell2: UITableViewCell { ...@@ -43,7 +43,7 @@ class YHDavidCell2: UITableViewCell {
lazy var subContentView : UIView = { lazy var subContentView : UIView = {
let view = UIView() let view = UIView()
view.backgroundColor = UIColor(hex: 0x999999, alpha: 1.0) view.backgroundColor = UIColor(hex: 0x999999, alpha: 1.0)
view.layer.cornerRadius = 12 view.layer.cornerRadius = kCornerRadius6
view.layer.backgroundColor = UIColor(red: 1, green: 1, blue: 1, alpha: 1).cgColor view.layer.backgroundColor = UIColor(red: 1, green: 1, blue: 1, alpha: 1).cgColor
view.layer.cornerRadius = 10 view.layer.cornerRadius = 10
......
galaxy/galaxy/Classes/Modules/Home(首页)/V/YHDavidCell3.swift
View file @ ec5ee6d3
...@@ -63,7 +63,7 @@ class YHDavidCell3: UITableViewCell { ...@@ -63,7 +63,7 @@ class YHDavidCell3: UITableViewCell {
let bbxLable = UILabel() let bbxLable = UILabel()
bbxLable.text = "银河推荐官" bbxLable.text = "银河推荐官"
bbxLable.textColor = UIColor(red: 0.2, green: 0.2, blue: 0.2, alpha: 1) bbxLable.textColor = UIColor(red: 0.2, green: 0.2, blue: 0.2, alpha: 1)
bbxLable.font = kFont(size: 18) bbxLable.font = UIFont.PFSC_R(ofSize: 18)
subContentView.addSubview(bbxLable) subContentView.addSubview(bbxLable)
bbxLable.snp.makeConstraints { make in bbxLable.snp.makeConstraints { make in
...@@ -75,7 +75,7 @@ class YHDavidCell3: UITableViewCell { ...@@ -75,7 +75,7 @@ class YHDavidCell3: UITableViewCell {
desLable.text = "邀请拉新，合作共赢" desLable.text = "邀请拉新，合作共赢"
desLable.frame = CGRect(x: 0, y: 0, width: 141.5, height: 11.5) desLable.frame = CGRect(x: 0, y: 0, width: 141.5, height: 11.5)
desLable.textColor = UIColor(red: 0.592, green: 0.592, blue: 0.592, alpha: 1) desLable.textColor = UIColor(red: 0.592, green: 0.592, blue: 0.592, alpha: 1)
desLable.font = kFont(size: 10) desLable.font = UIFont.PFSC_R(ofSize: 10)
subContentView.addSubview(desLable) subContentView.addSubview(desLable)
desLable.snp.makeConstraints { make in desLable.snp.makeConstraints { make in
make.left.equalTo(bbxLable.snp.right).offset(11) make.left.equalTo(bbxLable.snp.right).offset(11)
......
galaxy/galaxy/Classes/Modules/Home(首页)/V/YHDavidCell5.swift
View file @ ec5ee6d3
...@@ -67,7 +67,7 @@ class YHDavidCell5: UITableViewCell { ...@@ -67,7 +67,7 @@ class YHDavidCell5: UITableViewCell {
let bbxLable = UILabel() let bbxLable = UILabel()
bbxLable.text = "百宝箱" bbxLable.text = "百宝箱"
bbxLable.textColor = UIColor(red: 0.2, green: 0.2, blue: 0.2, alpha: 1) bbxLable.textColor = UIColor(red: 0.2, green: 0.2, blue: 0.2, alpha: 1)
bbxLable.font = kFont(size: 18) bbxLable.font = UIFont.PFSC_R(ofSize: 18)
subContentView.addSubview(bbxLable) subContentView.addSubview(bbxLable)
bbxLable.snp.makeConstraints { make in bbxLable.snp.makeConstraints { make in
...@@ -79,7 +79,7 @@ class YHDavidCell5: UITableViewCell { ...@@ -79,7 +79,7 @@ class YHDavidCell5: UITableViewCell {
desLable.text = "香港本地宝，智慧小助手" desLable.text = "香港本地宝，智慧小助手"
desLable.frame = CGRect(x: 0, y: 0, width: 141.5, height: 11.5) desLable.frame = CGRect(x: 0, y: 0, width: 141.5, height: 11.5)
desLable.textColor = UIColor(red: 0.592, green: 0.592, blue: 0.592, alpha: 1) desLable.textColor = UIColor(red: 0.592, green: 0.592, blue: 0.592, alpha: 1)
desLable.font = kFont(size: 10) desLable.font = UIFont.PFSC_R(ofSize: 10)
subContentView.addSubview(desLable) subContentView.addSubview(desLable)
desLable.snp.makeConstraints { make in desLable.snp.makeConstraints { make in
make.left.equalTo(bbxLable.snp.right).offset(11) make.left.equalTo(bbxLable.snp.right).offset(11)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHInformationPerfectListVC.swift
View file @ ec5ee6d3
...@@ -139,7 +139,9 @@ extension YHInformationPerfectListVC { ...@@ -139,7 +139,9 @@ extension YHInformationPerfectListVC {
} }
@objc func clickSubmitBtn() { @objc func clickSubmitBtn() {
YHSubmitAllInfoCheckView.showCheckView { agree in
YHSubmitAllInfoCheckView.showCheckView(tipMsg: "确定是否提交信息？提交后将不能修改") { agree in
if agree == true { if agree == true {
printLog("点击了 确认 按钮") printLog("点击了 确认 按钮")
...@@ -155,6 +157,8 @@ extension YHInformationPerfectListVC { ...@@ -155,6 +157,8 @@ extension YHInformationPerfectListVC {
printLog("点击了 取消 按钮") printLog("点击了 取消 按钮")
} }
} }
} }
func setupUI() { func setupUI() {
...@@ -334,7 +338,7 @@ extension YHInformationPerfectListVC : UITableViewDelegate,UITableViewDataSource ...@@ -334,7 +338,7 @@ extension YHInformationPerfectListVC : UITableViewDelegate,UITableViewDataSource
navigationController?.pushViewController(vc) navigationController?.pushViewController(vc)
} else if indexPath.row == 3 { } else if indexPath.row == 3 {
//学历/专业资格 //学历/专业资格
let vc = YHEducationalQualificationVC() let vc = YHEducationInfoListVC()
// vc.orderId = orderId // vc.orderId = orderId
vc.orderId = 133971 vc.orderId = 133971
navigationController?.pushViewController(vc) navigationController?.pushViewController(vc)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/Education&Qualification(学历专业资格填写)/C/YHCollegeSearchViewController.swift 0 → 100644
View file @ ec5ee6d3
//
// YHCollegeSearchViewController.swift
// galaxy
//
// Created by edy on 2024/2/22.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
class YHCollegeSearchViewController: YHBaseViewController {
var searchCollegeName:String?
var selectBlock:(()->Void)?
var colleges:[Any] = [1,2,3]
lazy var searchBar: YHSearchBar = {
let bar = YHSearchBar.createBar()
return bar
}()
lazy var tableView: UITableView = {
let tableView = UITableView(frame:.zero, style:.plain)
if #available(iOS 11.0, *) {
tableView.contentInsetAdjustmentBehavior = .never
}
tableView.showsVerticalScrollIndicator = false
tableView.backgroundColor = .clear
tableView.separatorStyle = .none
tableView.delegate = self
tableView.dataSource = self
tableView.register(UITableViewCell.self, forCellReuseIdentifier: "UITableViewCell")
tableView.register(YHCollegeNameCell.self, forCellReuseIdentifier: YHCollegeNameCell.cellReuseIdentifier)
return tableView
}()
override func viewDidLoad() {
super.viewDidLoad()
createUI()
}
func createUI() {
self.view.backgroundColor = .white
self.gk_navTitle = "学校名称".local
view.addSubview(tableView)
view.addSubview(searchBar)
if let searchCollegeName = searchCollegeName {
searchBar.textField.text = searchCollegeName
}
searchBar.textChange = {
[weak self] text in
guard let self = self else { return }
}
searchBar.confirmBlock = {
}
searchBar.snp.makeConstraints { make in
make.left.equalToSuperview().offset(16)
make.right.equalToSuperview().offset(-16)
make.height.equalTo(YHSearchBar.height)
make.top.equalToSuperview().offset(k_Height_NavigationtBarAndStatuBar+16)
}
tableView.snp.makeConstraints { make in
make.top.equalTo(searchBar.snp.bottom).offset(8)
make.left.right.bottom.equalToSuperview()
}
}
}
extension YHCollegeSearchViewController: UITableViewDelegate, UITableViewDataSource {
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
return colleges.count
}
func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
return 36.0
}
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let cell = tableView.dequeueReusableCell(withIdentifier: YHCollegeNameCell.cellReuseIdentifier, for: indexPath) as! YHCollegeNameCell
cell.titleLabel.text = "XXXXXXXXX"
return cell
}
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/学历专业资格填写/C/YHEducationDetailVC.swift → galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/Education&Qualification(学历专业资格填写)/C/YHEducationDetailVC.swift
View file @ ec5ee6d3
...@@ -8,12 +8,16 @@ ...@@ -8,12 +8,16 @@
import UIKit import UIKit
import SwifterSwift import SwifterSwift
import Toast_Swift
class YHEducationDetailVC: YHBaseViewController { class YHEducationDetailVC: YHBaseViewController {
//【WARNING!】新添加 传orderId 已有信息传detailId
// 订单ID // 订单ID
var orderId: Int = 0 var orderId: Int = 0
// 学历ID // 学历ID
var detailId: Int = 0 var detailId: Int = 0
// 是否显示未填写错误提示
var isNeedShowError = false
let educationRequest:YHEducationRequestViewModel = YHEducationRequestViewModel() let educationRequest:YHEducationRequestViewModel = YHEducationRequestViewModel()
var detailInfo: YHEducationDetailInfo = YHEducationDetailInfo() var detailInfo: YHEducationDetailInfo = YHEducationDetailInfo()
var isChildsEditMode: YHFormTitleItemEditType = .none var isChildsEditMode: YHFormTitleItemEditType = .none
...@@ -65,7 +69,13 @@ class YHEducationDetailVC: YHBaseViewController { ...@@ -65,7 +69,13 @@ class YHEducationDetailVC: YHBaseViewController {
bottomView.saveBlock = { bottomView.saveBlock = {
[weak self] in [weak self] in
guard let self = self else { return } guard let self = self else { return }
saveDetailInfo() saveDetailInfo(isNeedPop: true)
}
bottomView.submitBlock = {
[weak self] in
guard let self = self else { return }
submitInfo()
} }
bottomView.snp.makeConstraints { make in bottomView.snp.makeConstraints { make in
...@@ -82,9 +92,9 @@ class YHEducationDetailVC: YHBaseViewController { ...@@ -82,9 +92,9 @@ class YHEducationDetailVC: YHBaseViewController {
} }
loadInfo() loadInfo()
if self.detailId != 0 { // 有学历ID则有历史学历 if self.detailId != 0 { // 有学历ID则该学历已存在
getDetailInfo() getDetailInfo()
} else { } else { // 该学历是新添加的
detailInfo.orderId = orderId detailInfo.orderId = orderId
} }
} }
...@@ -95,50 +105,59 @@ class YHEducationDetailVC: YHBaseViewController { ...@@ -95,50 +105,59 @@ class YHEducationDetailVC: YHBaseViewController {
let title0 = YHFormTitleItem(type: .mainApplicantEducation) let title0 = YHFormTitleItem(type: .mainApplicantEducation)
let item00 = YHFormDetailItem(type: .universityFullName) let item00 = YHFormDetailItem(type: .universityFullName)
item00.placeHolder = "请输入学校全称，例：清华，需填全称“清华大学".local item00.placeHolder = "请选择学校".local
item00.tips = "请选择学校".local
item00.value = detailInfo.college item00.value = detailInfo.college
let item01 = YHFormDetailItem(type: .educationStyle) let item01 = YHFormDetailItem(type: .educationStyle)
item01.placeHolder = "请选择授课形式".local item01.placeHolder = "请选择授课形式".local
item01.tips = "请选择授课形式".local
item01.value = detailInfo.type item01.value = detailInfo.type
let item02 = YHFormDetailItem(type: .educationTime) let item02 = YHFormDetailItem(type: .educationTime)
item02.placeHolder = "请选择年月".local item02.placeHolder = "请选择年月".local
item02.tips = "请选择年月".local
item02.value = detailInfo.admissionTime item02.value = detailInfo.admissionTime
let item03 = YHFormDetailItem(type: .graduateTime) let item03 = YHFormDetailItem(type: .graduateTime)
item03.placeHolder = "请选择年月".local item03.placeHolder = "请选择年月".local
item03.tips = "请选择年月".local
item03.value = detailInfo.graduateTime item03.value = detailInfo.graduateTime
let item04 = YHFormDetailItem(type: .educationMajor) let item04 = YHFormDetailItem(type: .educationMajor)
item04.placeHolder = "请输入专业".local item04.placeHolder = "请输入专业".local
item04.tips = "请输入专业".local
item04.value = detailInfo.professional item04.value = detailInfo.professional
let item05 = YHFormDetailItem(type: .educationDegree) let item05 = YHFormDetailItem(type: .educationDegree)
item05.placeHolder = "请选择学位".local item05.placeHolder = "请选择学位".local
item05.tips = "请选择学位".local
item05.value = detailInfo.background item05.value = detailInfo.background
let item06 = YHFormDetailItem(type: .degreeType) let item06 = YHFormDetailItem(type: .degreeType)
item06.placeHolder = "请输入学位类型，如管理学".local item06.placeHolder = "请选择学位类型".local
item06.tips = "请选择学位类型".local
item06.value = detailInfo.degreeType item06.value = detailInfo.degreeType
let item07 = YHFormDetailItem(type: .educationCountry) let item07 = YHFormDetailItem(type: .educationCountry)
item07.placeHolder = "请输入国家及地区".local item07.placeHolder = "请输入国家及地区".local
item07.value = detailInfo.schoolAddress?.country item07.tips = "请输入国家及地区".local
item07.value = detailInfo.schoolAddress.country
let item08 = YHFormDetailItem(type: .educationCity) let item08 = YHFormDetailItem(type: .educationCity)
item08.placeHolder = "请选择城市".local
if detailInfo.isSchoolInAboard() { if detailInfo.isSchoolInAboard() {
item08.value = detailInfo.schoolAddress?.foreign item08.value = detailInfo.schoolAddress.foreign
item08.tips = "请输入城市".local
item08.placeHolder = "请输入城市".local item08.placeHolder = "请输入城市".local
item08.tips = "请输入城市".local item08.tips = "请输入城市".local
} else { } else {
item08.value = detailInfo.schoolAddress?.area?.joined(separator: ",") item08.value = detailInfo.schoolAddress.area.joined(separator: ",")
item08.placeHolder = "请选择出生城市".local item08.tips = "请选择城市".local
item08.tips = "请选择出生城市".local item08.placeHolder = "请选择城市".local
item08.tips = "请选择城市".local
} }
let arr0:[YHFormItemProtocol] = [title0, item00, item01, item02, item03, item04, item05, item06, item07, item08] let arr0:[YHFormItemProtocol] = [title0, item00, item01, item02, item03, item04, item05, item06, item07, item08]
...@@ -171,7 +190,6 @@ extension YHEducationDetailVC : UITableViewDelegate, UITableViewDataSource { ...@@ -171,7 +190,6 @@ extension YHEducationDetailVC : UITableViewDelegate, UITableViewDataSource {
let formItem = item as! YHFormTitleItem let formItem = item as! YHFormTitleItem
let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemTitleCell.cellReuseIdentifier, for: indexPath) as! YHFormItemTitleCell let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemTitleCell.cellReuseIdentifier, for: indexPath) as! YHFormItemTitleCell
cell.titleLabel.text = formItem.getTitle() cell.titleLabel.text = formItem.getTitle()
cell.subTitleLabel.text = formItem.getSubTitle()
return cell return cell
} }
...@@ -181,6 +199,12 @@ extension YHEducationDetailVC : UITableViewDelegate, UITableViewDataSource { ...@@ -181,6 +199,12 @@ extension YHEducationDetailVC : UITableViewDelegate, UITableViewDataSource {
let cellType = getCellType(detailItem) let cellType = getCellType(detailItem)
if cellType == .inputText { if cellType == .inputText {
let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemInputTextCell.cellReuseIdentifier, for: indexPath) as! YHFormItemInputTextCell let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemInputTextCell.cellReuseIdentifier, for: indexPath) as! YHFormItemInputTextCell
cell.isShowBottomLine = (indexPath.row != arr.count-1)
var isValueValid = false
if let value = detailItem.value, !value.isEmpty {
isValueValid = true
}
cell.setTips(detailItem.tips, isShow: (isNeedShowError && !isValueValid))
cell.placeHolder = detailItem.placeHolder cell.placeHolder = detailItem.placeHolder
cell.isMust = detailItem.isNeed cell.isMust = detailItem.isNeed
cell.title = detailItem.getTitle() cell.title = detailItem.getTitle()
...@@ -190,24 +214,40 @@ extension YHEducationDetailVC : UITableViewDelegate, UITableViewDataSource { ...@@ -190,24 +214,40 @@ extension YHEducationDetailVC : UITableViewDelegate, UITableViewDataSource {
guard let self = self else { return } guard let self = self else { return }
// 只有国外城市才需输入，国内城市使用的是选择器 // 只有国外城市才需输入，国内城市使用的是选择器
if detailItem.type == .educationCity { if detailItem.type == .educationCity {
detailInfo.schoolAddress?.foreign = text if let text = text, !text.isEmpty {
detailInfo.schoolAddress.foreign = text
} else {
detailInfo.schoolAddress.foreign = ""
}
} else if detailItem.type == .educationMajor { } else if detailItem.type == .educationMajor {
detailInfo.professional = text if let text = text, !text.isEmpty {
detailInfo.professional = text
} else {
detailInfo.professional = ""
}
} }
if isEditEnd { if isEditEnd {
loadInfo() loadInfo()
saveDetailInfo() if detailId != 0 {
saveDetailInfo(isNeedPop: false)
}
} }
} }
return cell return cell
} else if cellType == .selectSheet { } else if cellType == .selectSheet {
let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemSelectSheetCell.cellReuseIdentifier, for: indexPath) as! YHFormItemSelectSheetCell let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemSelectSheetCell.cellReuseIdentifier, for: indexPath) as! YHFormItemSelectSheetCell
cell.isShowBottomLine = (indexPath.row != arr.count-1)
cell.placeHolder = detailItem.placeHolder cell.placeHolder = detailItem.placeHolder
cell.isMust = detailItem.isNeed cell.isMust = detailItem.isNeed
cell.title = detailItem.getTitle() cell.title = detailItem.getTitle()
cell.detail = detailItem.value cell.detail = detailItem.value
var isValueValid = false
if let value = detailItem.value, !value.isEmpty {
isValueValid = true
}
cell.setTips(detailItem.tips, isShow: (isNeedShowError && !isValueValid))
return cell return cell
} }
} }
...@@ -259,13 +299,19 @@ extension YHEducationDetailVC : UITableViewDelegate, UITableViewDataSource { ...@@ -259,13 +299,19 @@ extension YHEducationDetailVC : UITableViewDelegate, UITableViewDataSource {
if detailItem.type == .universityFullName { // 选择大学名称 if detailItem.type == .universityFullName { // 选择大学名称
let vc = YHCollegeSearchViewController()
vc.searchCollegeName = detailInfo.college
self.navigationController?.pushViewController(vc)
} else if detailItem.type == .educationStyle { // 授课形式 } else if detailItem.type == .educationStyle { // 授课形式
YHFormPickerView.show(type: .edution, selectType: .education(.fullTime)) { YHFormPickerView.show(type: .edution, selectType: .education(.fullTime)) {
[weak self] selectType in [weak self] selectType in
guard let self = self else { return } guard let self = self else { return }
detailInfo.type = selectType.title detailInfo.type = selectType.title
loadInfo() loadInfo()
saveDetailInfo() if detailId != 0 {
saveDetailInfo(isNeedPop: false)
}
} }
} else if detailItem.type == .educationTime || detailItem.type == .graduateTime { // 入学及毕业年月 } else if detailItem.type == .educationTime || detailItem.type == .graduateTime { // 入学及毕业年月
...@@ -280,7 +326,9 @@ extension YHEducationDetailVC : UITableViewDelegate, UITableViewDataSource { ...@@ -280,7 +326,9 @@ extension YHEducationDetailVC : UITableViewDelegate, UITableViewDataSource {
detailInfo.graduateTime = date detailInfo.graduateTime = date
} }
loadInfo() loadInfo()
saveDetailInfo() if detailId != 0 {
saveDetailInfo(isNeedPop: false)
}
} }
} else if detailItem.type == .educationDegree { // 学位 } else if detailItem.type == .educationDegree { // 学位
...@@ -290,21 +338,34 @@ extension YHEducationDetailVC : UITableViewDelegate, UITableViewDataSource { ...@@ -290,21 +338,34 @@ extension YHEducationDetailVC : UITableViewDelegate, UITableViewDataSource {
guard let self = self else { return } guard let self = self else { return }
detailInfo.background = selectType.title detailInfo.background = selectType.title
loadInfo() loadInfo()
saveDetailInfo() if detailId != 0 {
saveDetailInfo(isNeedPop: false)
}
} }
} else if detailItem.type == .degreeType { // 学位类型 } else if detailItem.type == .degreeType { // 学位类型
YHFormPickerView.show(type: .degreeCategory, selectType: .degreeCategory(.accountantOrFinance)) {
[weak self] selectType in
guard let self = self else { return }
detailInfo.degreeType = selectType.title
loadInfo()
if detailId != 0 {
saveDetailInfo(isNeedPop: false)
}
}
} else if detailItem.type == .educationCountry { // 上课国家/地区 } else if detailItem.type == .educationCountry { // 上课国家/地区
let vc = YHSelectCountryViewController() let vc = YHSelectCountryViewController()
vc.backLocationStringController = { vc.backLocationStringController = {
[weak self] country in [weak self] country in
guard let self = self else { return } guard let self = self else { return }
detailInfo.schoolAddress?.country = country detailInfo.schoolAddress.country = country
loadInfo() loadInfo()
saveDetailInfo() if detailId != 0 {
} saveDetailInfo(isNeedPop: false)
}
}
self.navigationController?.pushViewController(vc) self.navigationController?.pushViewController(vc)
} else if detailItem.type == .educationCity { // 上课城市 } else if detailItem.type == .educationCity { // 上课城市
...@@ -315,14 +376,15 @@ extension YHEducationDetailVC : UITableViewDelegate, UITableViewDataSource { ...@@ -315,14 +376,15 @@ extension YHEducationDetailVC : UITableViewDelegate, UITableViewDataSource {
vc.backLocationStringController = { vc.backLocationStringController = {
[weak self] (string1, string2, string3, string4) in [weak self] (string1, string2, string3, string4) in
guard let self = self else { return } guard let self = self else { return }
detailInfo.schoolAddress?.area = [string1, string2, string3, string4] detailInfo.schoolAddress.area = [string1, string2, string3, string4]
loadInfo() loadInfo()
saveDetailInfo() if detailId != 0 {
} saveDetailInfo(isNeedPop: false)
}
}
self.present(vc, animated: true) self.present(vc, animated: true)
} }
} }
} }
func createDefaultCell(_ indexPath: IndexPath) -> UITableViewCell { func createDefaultCell(_ indexPath: IndexPath) -> UITableViewCell {
...@@ -386,38 +448,83 @@ extension YHEducationDetailVC { ...@@ -386,38 +448,83 @@ extension YHEducationDetailVC {
[weak self] success, error in [weak self] success, error in
guard let self = self else { return } guard let self = self else { return }
if success { if success {
detailInfo = self.educationRequest.educationDetailInfo! if let educationDetailInfo = self.educationRequest.educationDetailInfo {
detailInfo = educationDetailInfo
}
loadInfo() loadInfo()
} }
} }
} }
func saveDetailInfo() { func submitInfo() {
let isChecked = checkIntegrity()
isNeedShowError = !isChecked
self.tableView .reloadData()
if !isChecked {
YHHUD.flash(message: "资料还未填完")
return
}
saveDetailInfo(isNeedPop: true)
}
// 检查填写信息完整性
func checkIntegrity() -> Bool {
if detailInfo.college.isEmpty
|| detailInfo.type.isEmpty
|| detailInfo.admissionTime.isEmpty
|| detailInfo.graduateTime.isEmpty
|| detailInfo.professional.isEmpty
|| detailInfo.background.isEmpty
|| detailInfo.degreeType.isEmpty
|| detailInfo.schoolAddress.country.isEmpty
{
return false
}
// detailInfo.toDictionary() 对于值为空的字段不会添加 而后台需要 所以如下处理 if detailInfo.isSchoolInAboard(), detailInfo.schoolAddress.foreign.isEmpty {
return false
}
if !detailInfo.isSchoolInAboard(), detailInfo.schoolAddress.area.count <= 0 {
return false
}
return true
}
// 保存信息 isNeedPop：保存成功后是否退出该页面
func saveDetailInfo(isNeedPop:Bool) {
// detailInfo.toDictionary() 对于值为空的字段不会添加 而后台需要 所以如下处理
let dict:[String : Any] = ["verify": 0, let dict:[String : Any] = ["verify": 0,
"id": detailInfo.id, "id": detailInfo.id,
"order_id": detailInfo.orderId, "order_id": detailInfo.orderId,
"admission_time": detailInfo.admissionTime ?? "", "admission_time": detailInfo.admissionTime,
"background": detailInfo.background ?? "", "background": detailInfo.background,
"college": detailInfo.college ?? "", "college": detailInfo.college,
"degree_type": detailInfo.degreeType ?? "", "degree_type": detailInfo.degreeType,
"graduate_time": detailInfo.graduateTime ?? "", "graduate_time": detailInfo.graduateTime,
"professional": detailInfo.professional ?? "", "professional": detailInfo.professional,
"school_address_aboard": "", "school_address_aboard": "",
"type": "", "type": detailInfo.type,
"school_address": ["country": detailInfo.schoolAddress?.country ?? "", "school_address": ["country": detailInfo.schoolAddress.country,
"area": detailInfo.schoolAddress?.area ?? "", "area": detailInfo.schoolAddress.area,
"foreign": detailInfo.schoolAddress?.foreign ?? ""], "foreign": detailInfo.schoolAddress.foreign],
] ]
self.educationRequest.saveEducationInfo(params: dict) { self.educationRequest.saveEducationInfo(params: dict) {
[weak self] success, error in [weak self] success, error in
guard let self = self else { return } guard let self = self else { return }
if success { if success {
// YHHUD.show(.success(message: "保存成功")) YHHUD.flash(message: "保存成功")
if isNeedPop {
self.navigationController?.popViewController(animated: true)
}
} else { } else {
// YHHUD.show(.error(message: "保存失败")) YHHUD.flash(message: "保存失败")
} }
} }
} }
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/学历专业资格填写/C/YHEducationalQualificationVC.swift → galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/Education&Qualification(学历专业资格填写)/C/YHEducationInfoListVC.swift
View file @ ec5ee6d3
...@@ -7,17 +7,21 @@ ...@@ -7,17 +7,21 @@
// //
import UIKit import UIKit
import Toast_Swift
class YHEducationInfoListVC: YHBaseViewController {
class YHEducationalQualificationVC: YHBaseViewController {
var orderId:Int = 0 var orderId:Int = 0
let educationRequest:YHEducationRequestViewModel = YHEducationRequestViewModel() let educationRequest:YHEducationRequestViewModel = YHEducationRequestViewModel()
var familyMemberInfo: YHFamilyMemberGroupInfo? var familyMemberInfo: YHFamilyMemberGroupInfo?
var isChildsEditMode: YHFormTitleItemEditType = .none // 学历编辑模式
var isBrothersEditMode: YHFormTitleItemEditType = .none var isDegreeEditMode: YHFormTitleItemEditType = .none
// 专业编辑模式
var isQualificationEditMode: YHFormTitleItemEditType = .none
var educationInfo: YHEducationListInfo? var educationInfo: YHEducationListInfo?
var items:[[YHFormItemProtocol]] = [] var items:[[YHFormItemProtocol]] = []
// 是否显示未填写错误提示
var isNeedShowError = false
lazy var tableView: UITableView = { lazy var tableView: UITableView = {
...@@ -63,6 +67,19 @@ class YHEducationalQualificationVC: YHBaseViewController { ...@@ -63,6 +67,19 @@ class YHEducationalQualificationVC: YHBaseViewController {
view.addSubview(tableView); view.addSubview(tableView);
view.addSubview(bottomView) view.addSubview(bottomView)
bottomView.saveBlock = {
[weak self] in
guard let self = self else { return }
saveInfo()
self.navigationController?.popViewController(animated: true)
}
bottomView.submitBlock = {
[weak self] in
guard let self = self else { return }
submitInfo()
}
bottomView.snp.makeConstraints { make in bottomView.snp.makeConstraints { make in
make.left.right.equalToSuperview() make.left.right.equalToSuperview()
make.bottom.equalToSuperview().offset(-k_Height_safeAreaInsetsBottom()) make.bottom.equalToSuperview().offset(-k_Height_safeAreaInsetsBottom())
...@@ -93,6 +110,16 @@ class YHEducationalQualificationVC: YHBaseViewController { ...@@ -93,6 +110,16 @@ class YHEducationalQualificationVC: YHBaseViewController {
let item = YHFormDetailItem(type: .educationInfo) let item = YHFormDetailItem(type: .educationInfo)
arr0.append(item) arr0.append(item)
} }
// 多学历可编辑删除状态
if eduList.count <= 0 {
isDegreeEditMode = .none
} else {
if isDegreeEditMode == .none {
isDegreeEditMode = .canEdit
}
}
} else {
isDegreeEditMode = .none
} }
// 新增学历信息 // 新增学历信息
arr0.append(YHFormAddItem(type: .addEducation)) arr0.append(YHFormAddItem(type: .addEducation))
...@@ -106,7 +133,18 @@ class YHEducationalQualificationVC: YHBaseViewController { ...@@ -106,7 +133,18 @@ class YHEducationalQualificationVC: YHBaseViewController {
let item = YHFormDetailItem(type: .certificateInfo) let item = YHFormDetailItem(type: .certificateInfo)
arr1.append(item) arr1.append(item)
} }
// 多专业可编辑删除状态
if quaList.count <= 0 {
isQualificationEditMode = .none
} else {
if isQualificationEditMode == .none {
isQualificationEditMode = .canEdit
}
}
} else {
isQualificationEditMode = .none
} }
// 新增学历信息 // 新增学历信息
arr1.append(YHFormAddItem(type: .addCertificateInfo)) arr1.append(YHFormAddItem(type: .addCertificateInfo))
items.append(arr1) items.append(arr1)
...@@ -126,11 +164,13 @@ class YHEducationalQualificationVC: YHBaseViewController { ...@@ -126,11 +164,13 @@ class YHEducationalQualificationVC: YHBaseViewController {
arr2.append(questionInfo) arr2.append(questionInfo)
} }
items.append(arr2) items.append(arr2)
self.tableView.reloadData() self.tableView.reloadData()
} }
} }
extension YHEducationalQualificationVC : UITableViewDelegate, UITableViewDataSource { extension YHEducationInfoListVC : UITableViewDelegate, UITableViewDataSource {
func numberOfSections(in tableView: UITableView) -> Int { func numberOfSections(in tableView: UITableView) -> Int {
return items.count return items.count
...@@ -155,21 +195,37 @@ extension YHEducationalQualificationVC : UITableViewDelegate, UITableViewDataSou ...@@ -155,21 +195,37 @@ extension YHEducationalQualificationVC : UITableViewDelegate, UITableViewDataSou
let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemTitleCell.cellReuseIdentifier, for: indexPath) as! YHFormItemTitleCell let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemTitleCell.cellReuseIdentifier, for: indexPath) as! YHFormItemTitleCell
cell.titleLabel.text = formItem.getTitle() cell.titleLabel.text = formItem.getTitle()
cell.subTitleLabel.text = formItem.getSubTitle()
// 决定右边按钮显示样式 // 决定右边按钮显示样式
cell.showEditType(type: .none) cell.showEditType(type: .none)
// if formItem.type == .child { if formItem.type == .mainApplicantEducation { // 学历
// cell.showEditType(type: isChildsEditMode) cell.showEditType(type: isDegreeEditMode)
//
// } else if formItem.type == .brother { } else if formItem.type == .mainApplicantProfessionalQualification { // 专业
// cell.showEditType(type: isBrothersEditMode) cell.showEditType(type: isQualificationEditMode)
// } }
// 右边按钮点击事件处理 // 右边按钮点击事件处理
cell.rightClickBlock = { [weak self] type in cell.rightClickBlock = {
[weak self] type in
guard let self = self else { return } guard let self = self else { return }
if formItem.type == .mainApplicantEducation { // 学历
if self.isDegreeEditMode == .canCancel {
self.isDegreeEditMode = .canEdit
} else if self.isDegreeEditMode == .canEdit {
self.isDegreeEditMode = .canCancel
}
}
if formItem.type == .mainApplicantProfessionalQualification { // 专业
if self.isQualificationEditMode == .canCancel {
self.isQualificationEditMode = .canEdit
} else if self.isQualificationEditMode == .canEdit {
self.isQualificationEditMode = .canCancel
}
}
loadInfo()
} }
return cell return cell
} }
...@@ -198,7 +254,8 @@ extension YHEducationalQualificationVC : UITableViewDelegate, UITableViewDataSou ...@@ -198,7 +254,8 @@ extension YHEducationalQualificationVC : UITableViewDelegate, UITableViewDataSou
self.navigationController?.pushViewController(vc) self.navigationController?.pushViewController(vc)
} else if detailItem.type == .addCertificateInfo { // 证书 } else if detailItem.type == .addCertificateInfo { // 证书
let vc = YHProfessionalQualificationVC() let vc = YHQualificationDetailVC()
vc.orderId = String(self.orderId)
self.navigationController?.pushViewController(vc) self.navigationController?.pushViewController(vc)
} }
return return
...@@ -245,21 +302,30 @@ extension YHEducationalQualificationVC : UITableViewDelegate, UITableViewDataSou ...@@ -245,21 +302,30 @@ extension YHEducationalQualificationVC : UITableViewDelegate, UITableViewDataSou
if item is YHFormDetailItem { if item is YHFormDetailItem {
let detailItem = item as! YHFormDetailItem let detailItem = item as! YHFormDetailItem
if detailItem.type == .educationInfo { if detailItem.type == .educationInfo {
if let eduList = educationInfo?.eduList { if let eduList = educationInfo?.eduList, eduList.count > 0 {
// 第一行是标题 // 第一行是标题
let eduInfo:YHEducationInfo = eduList[indexPath.row-1] let eduInfo:YHEducationInfo = eduList[indexPath.row-1]
if eduInfo.vacantNum > 0 { if eduInfo.vacantNum > 0 { // 有未填项
let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemEnterDetailCell.cellReuseIdentifier, for: indexPath) as! YHFormItemEnterDetailCell let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemEnterDetailCell.cellReuseIdentifier, for: indexPath) as! YHFormItemEnterDetailCell
cell.isShowBottomLine = (indexPath.row != eduList.count)
if let college = eduInfo.college, !college.isEmpty { if let college = eduInfo.college, !college.isEmpty {
cell.title = eduInfo.college cell.title = eduInfo.college
} else { } else {
cell.title = "学历标题".local cell.title = "学历标题".local
} }
cell.detailLabel.text = String(format: "有%d项未填", eduInfo.vacantNum) cell.detailLabel.text = String(format: "有%d项未填", eduInfo.vacantNum)
cell.isShowDeleteBtn = (isDegreeEditMode == .canCancel)
cell.detailLabel.textColor = (isNeedShowError && eduInfo.vacantNum > 0 ? .failColor : .labelTextColor2)
cell.deleteBlock = {
[weak self] in
guard let self = self else { return }
isDegreeEditMode = .none
deleteEducationInfo(id:eduInfo.id)
}
return cell return cell
} else { } else { // 数据已填满
let cell = tableView.dequeueReusableCell(withIdentifier: YHEducationInfoCell.cellReuseIdentifier, for: indexPath) as! YHEducationInfoCell let cell = tableView.dequeueReusableCell(withIdentifier: YHEducationInfoCell.cellReuseIdentifier, for: indexPath) as! YHEducationInfoCell
cell.titleLabel.text = eduInfo.college cell.titleLabel.text = eduInfo.college
...@@ -271,15 +337,23 @@ extension YHEducationalQualificationVC : UITableViewDelegate, UITableViewDataSou ...@@ -271,15 +337,23 @@ extension YHEducationalQualificationVC : UITableViewDelegate, UITableViewDataSou
if let admissionTime = eduInfo.admissionTime, let graduateTime = eduInfo.graduateTime { if let admissionTime = eduInfo.admissionTime, let graduateTime = eduInfo.graduateTime {
cell.timeLabel.text = String("\(admissionTime)-\(graduateTime)") cell.timeLabel.text = String("\(admissionTime)-\(graduateTime)")
} }
cell.isShowDeleteBtn = (isDegreeEditMode == .canCancel)
cell.deleteBlock = {
[weak self] in
guard let self = self else { return }
isDegreeEditMode = .none
deleteEducationInfo(id:eduInfo.id)
}
return cell return cell
} }
} }
} }
if detailItem.type == .certificateInfo { if detailItem.type == .certificateInfo {
if let quaList = educationInfo?.quaList { if let quaList = educationInfo?.quaList, quaList.count > 0 {
// 第一行是标题 // 第一行是标题
let quaInfo:YHQualificationInfo = quaList[indexPath.row-1] let quaInfo:YHQualificationInfo = quaList[indexPath.row-1]
let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemEnterDetailCell.cellReuseIdentifier, for: indexPath) as! YHFormItemEnterDetailCell let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemEnterDetailCell.cellReuseIdentifier, for: indexPath) as! YHFormItemEnterDetailCell
cell.isShowBottomLine = (indexPath.row != quaList.count)
cell.title = "证书标题" cell.title = "证书标题"
if let qualification = quaInfo.qualification, !qualification.isEmpty { if let qualification = quaInfo.qualification, !qualification.isEmpty {
cell.title = qualification cell.title = qualification
...@@ -289,6 +363,14 @@ extension YHEducationalQualificationVC : UITableViewDelegate, UITableViewDataSou ...@@ -289,6 +363,14 @@ extension YHEducationalQualificationVC : UITableViewDelegate, UITableViewDataSou
} else { } else {
cell.detailLabel.text = "已填完".local cell.detailLabel.text = "已填完".local
} }
cell.detailLabel.textColor = (isNeedShowError && quaInfo.vacantNum > 0 ? .failColor : .labelTextColor2)
cell.isShowDeleteBtn = (isQualificationEditMode == .canCancel)
cell.deleteBlock = {
[weak self] in
guard let self = self else { return }
isQualificationEditMode = .none
deleteQualificationInfo(id:quaInfo.id)
}
return cell return cell
} }
} }
...@@ -355,7 +437,11 @@ extension YHEducationalQualificationVC : UITableViewDelegate, UITableViewDataSou ...@@ -355,7 +437,11 @@ extension YHEducationalQualificationVC : UITableViewDelegate, UITableViewDataSou
return return
} }
if detailItem.type == .certificateInfo { // 证书 if detailItem.type == .certificateInfo { // 证书
let vc = YHProfessionalQualificationVC() let vc = YHQualificationDetailVC()
if let quaList = educationInfo?.quaList, indexPath.row-1 < quaList.count {
let quaInfo = quaList[indexPath.row-1]
vc.detailId = String(quaInfo.id)
}
self.navigationController?.pushViewController(vc) self.navigationController?.pushViewController(vc)
return return
} }
...@@ -383,7 +469,7 @@ extension YHEducationalQualificationVC : UITableViewDelegate, UITableViewDataSou ...@@ -383,7 +469,7 @@ extension YHEducationalQualificationVC : UITableViewDelegate, UITableViewDataSou
} }
} }
extension YHEducationalQualificationVC { extension YHEducationInfoListVC {
// 请求家庭成员信息 // 请求家庭成员信息
func requestEducationInfo() { func requestEducationInfo() {
...@@ -397,6 +483,89 @@ extension YHEducationalQualificationVC { ...@@ -397,6 +483,89 @@ extension YHEducationalQualificationVC {
} }
} }
} }
// 删除学历信息
func deleteEducationInfo(id:Int) {
self.educationRequest.deleteEducationInfo(id: id) {
[weak self] success, error in
guard let self = self else { return }
if success {
requestEducationInfo()
}
}
}
// 删除证书信息
func deleteQualificationInfo(id:Int) {
self.educationRequest.deleteQualificationInfo(id: id) {
[weak self] success, error in
guard let self = self else { return }
if success {
requestEducationInfo()
}
}
}
// 保存
func saveInfo() {
let params = ["go_next": 0,
"graduate": educationInfo?.graduate ?? 0,
"order_id": self.orderId,
"qualification": educationInfo?.qualification ?? 0]
self.educationRequest.saveAllEducationInfo(params: params) {
[weak self] success, error in
guard let self = self else { return }
if success {
requestEducationInfo()
}
}
}
func submitInfo() {
let isChecked = checkIntegrity()
isNeedShowError = !isChecked
self.tableView .reloadData()
if !isChecked {
YHHUD.flash(message: "资料还未填完")
return
}
saveInfo()
}
// 检查填写信息完整性
func checkIntegrity() -> Bool {
guard let educationInfo = educationInfo else { return false }
// 检查所有学历信息是否有未填项
if let eduList = educationInfo.eduList, eduList.count > 0 {
for eduInfo in eduList {
if eduInfo.vacantNum > 0 {
return false
}
}
}
// 检查所有证书信息是否有未填项
if let quaList = educationInfo.quaList, quaList.count > 0 {
for quaInfo in quaList {
if quaInfo.vacantNum > 0 {
return false
}
}
}
// 检查所有问题是否有未答项
if educationInfo.qualification == 0 || educationInfo.graduate == 0 {
return false
}
return true
}
} }
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/学历专业资格填写/C/YHProfessionalQualificationVC.swift → galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/Education&Qualification(学历专业资格填写)/C/YHQualificationDetailVC.swift
View file @ ec5ee6d3
...@@ -7,14 +7,22 @@ ...@@ -7,14 +7,22 @@
// //
import UIKit import UIKit
import Toast_Swift
class YHProfessionalQualificationVC: YHBaseViewController { class YHQualificationDetailVC: YHBaseViewController {
let familyRequest:YHFamilyRequestViewModel = YHFamilyRequestViewModel() //【WARNING!】新添加 传orderId 已有信息传detailId
var familyMemberInfo: YHFamilyMemberGroupInfo? // 订单ID
var orderId: String = ""
// 专业ID
var detailId: String = ""
let educationRequest:YHEducationRequestViewModel = YHEducationRequestViewModel()
// 专业详情信息
var detailInfo = YHQualificationDetailInfo()
var isChildsEditMode: YHFormTitleItemEditType = .none var isChildsEditMode: YHFormTitleItemEditType = .none
var isBrothersEditMode: YHFormTitleItemEditType = .none var isBrothersEditMode: YHFormTitleItemEditType = .none
// 是否显示未填写错误提示
var isNeedShowError = false
var items:[[YHFormItemProtocol]] = [] var items:[[YHFormItemProtocol]] = []
lazy var tableView: UITableView = { lazy var tableView: UITableView = {
...@@ -44,7 +52,7 @@ class YHProfessionalQualificationVC: YHBaseViewController { ...@@ -44,7 +52,7 @@ class YHProfessionalQualificationVC: YHBaseViewController {
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
self.gk_navTitle = "学历X".local self.gk_navTitle = "专业资格及会员资格".local
view.backgroundColor = UIColor(hexString:"#F8F8F8") view.backgroundColor = UIColor(hexString:"#F8F8F8")
createUI() createUI()
} }
...@@ -57,6 +65,16 @@ class YHProfessionalQualificationVC: YHBaseViewController { ...@@ -57,6 +65,16 @@ class YHProfessionalQualificationVC: YHBaseViewController {
view.addSubview(tableView); view.addSubview(tableView);
view.addSubview(bottomView) view.addSubview(bottomView)
bottomView.saveBlock = {
[weak self] in
guard let self = self else { return }
saveDetailInfo(isNeedPop: true)
}
bottomView.submitBlock = {
[weak self] in
guard let self = self else { return }
submitInfo()
}
bottomView.snp.makeConstraints { make in bottomView.snp.makeConstraints { make in
make.left.right.equalToSuperview() make.left.right.equalToSuperview()
...@@ -72,23 +90,48 @@ class YHProfessionalQualificationVC: YHBaseViewController { ...@@ -72,23 +90,48 @@ class YHProfessionalQualificationVC: YHBaseViewController {
} }
loadInfo() loadInfo()
if !self.detailId.isEmpty { // 有专业ID则该专业已存在
reqeustDetailInfo()
} else { // 该专业是新添加的
detailInfo.orderId = orderId
}
} }
func loadInfo() { func loadInfo() {
items.removeAll() items.removeAll()
let title0 = YHFormTitleItem(type: .mainApplicantEducation) let title0 = YHFormTitleItem(type: .mainApplicantProfessionalQualification)
let item00 = YHFormDetailItem(type: .qualificationCertificateName) let item00 = YHFormDetailItem(type: .qualificationCertificateName)
item00.placeHolder = "请选择资格证书名称".local item00.placeHolder = "请选择资格证书名称".local
item00.tips = "请选择资格证书名称".local
item00.value = detailInfo.qualification
let item01 = YHFormDetailItem(type: .conferAgencyFullName) let item01 = YHFormDetailItem(type: .conferAgencyFullName)
item01.placeHolder = "请输入颁授机构全称".local item01.placeHolder = "请输入颁授机构".local
item01.tips = "请输入颁授机构".local
item01.value = detailInfo.college
let item02 = YHFormDetailItem(type: .conferTime) let item02 = YHFormDetailItem(type: .conferTime)
item02.placeHolder = "请选择颁授年份".local item02.placeHolder = "请选择颁授年份".local
item02.tips = "请选择颁授年份".local
item02.value = detailInfo.promulgation
let item03 = YHFormDetailItem(type: .conferCountry) let item03 = YHFormDetailItem(type: .conferCountry)
item03.placeHolder = "请选择颁授国家/地区".local item03.placeHolder = "请选择颁授国家/地区".local
item02.tips = "请选择颁授国家/地区".local
item03.value = detailInfo.collegeAddress.country
let item04 = YHFormDetailItem(type: .conferCity) let item04 = YHFormDetailItem(type: .conferCity)
item04.placeHolder = "请选择颁授城市".local if detailInfo.isCollegeInAboard() {
item04.placeHolder = "请输入颁授城市".local
item04.tips = "请输入颁授城市".local
item04.value = detailInfo.collegeAddress.foreign
} else {
item04.placeHolder = "请选择颁授城市".local
item04.tips = "请选择颁授城市".local
item04.value = detailInfo.collegeAddress.area.joined(separator: ",")
}
let arr0:[YHFormItemProtocol] = [title0, item00, item01, item02, item03, item04] let arr0:[YHFormItemProtocol] = [title0, item00, item01, item02, item03, item04]
items.append(arr0) items.append(arr0)
...@@ -97,7 +140,7 @@ class YHProfessionalQualificationVC: YHBaseViewController { ...@@ -97,7 +140,7 @@ class YHProfessionalQualificationVC: YHBaseViewController {
} }
extension YHProfessionalQualificationVC : UITableViewDelegate, UITableViewDataSource { extension YHQualificationDetailVC : UITableViewDelegate, UITableViewDataSource {
func numberOfSections(in tableView: UITableView) -> Int { func numberOfSections(in tableView: UITableView) -> Int {
return items.count return items.count
...@@ -133,17 +176,54 @@ extension YHProfessionalQualificationVC : UITableViewDelegate, UITableViewDataSo ...@@ -133,17 +176,54 @@ extension YHProfessionalQualificationVC : UITableViewDelegate, UITableViewDataSo
let cellType = getCellType(detailItem) let cellType = getCellType(detailItem)
if cellType == .inputText { if cellType == .inputText {
let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemInputTextCell.cellReuseIdentifier, for: indexPath) as! YHFormItemInputTextCell let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemInputTextCell.cellReuseIdentifier, for: indexPath) as! YHFormItemInputTextCell
var isValueValid = false
if let value = detailItem.value, !value.isEmpty {
isValueValid = true
}
cell.setTips(detailItem.tips, isShow: (isNeedShowError && !isValueValid))
cell.placeHolder = detailItem.placeHolder cell.placeHolder = detailItem.placeHolder
cell.isMust = detailItem.isNeed cell.isMust = detailItem.isNeed
cell.title = detailItem.getTitle() cell.title = detailItem.getTitle()
cell.text = detailItem.value
cell.textChange = {
[weak self] (text, isEditEnd) in
guard let self = self else { return }
// 只有国外城市才需输入，国内城市使用的是选择器
if detailItem.type == .conferCity {
if let text = text, !text.isEmpty {
detailInfo.collegeAddress.foreign = text
} else {
detailInfo.collegeAddress.foreign = ""
}
} else if detailItem.type == .conferAgencyFullName {
if let text = text, !text.isEmpty {
detailInfo.college = text
} else {
detailInfo.college = ""
}
}
if isEditEnd {
loadInfo()
if !detailId.isEmpty {
saveDetailInfo(isNeedPop: false)
}
}
}
return cell return cell
} else if cellType == .selectSheet { } else if cellType == .selectSheet {
let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemSelectSheetCell.cellReuseIdentifier, for: indexPath) as! YHFormItemSelectSheetCell let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemSelectSheetCell.cellReuseIdentifier, for: indexPath) as! YHFormItemSelectSheetCell
cell.placeHolder = detailItem.placeHolder cell.placeHolder = detailItem.placeHolder
var isValueValid = false
if let value = detailItem.value, !value.isEmpty {
isValueValid = true
}
cell.setTips(detailItem.tips, isShow: (isNeedShowError && !isValueValid))
cell.isMust = detailItem.isNeed cell.isMust = detailItem.isNeed
cell.title = detailItem.getTitle() cell.title = detailItem.getTitle()
cell.detail = "" cell.detail = detailItem.value
return cell return cell
} }
} }
...@@ -186,8 +266,6 @@ extension YHProfessionalQualificationVC : UITableViewDelegate, UITableViewDataSo ...@@ -186,8 +266,6 @@ extension YHProfessionalQualificationVC : UITableViewDelegate, UITableViewDataSo
let arr = items[indexPath.section] let arr = items[indexPath.section]
let item:YHFormItemProtocol = arr[indexPath.row] let item:YHFormItemProtocol = arr[indexPath.row]
// 标题 // 标题
if item is YHFormTitleItem { if item is YHFormTitleItem {
return return
...@@ -200,7 +278,11 @@ extension YHProfessionalQualificationVC : UITableViewDelegate, UITableViewDataSo ...@@ -200,7 +278,11 @@ extension YHProfessionalQualificationVC : UITableViewDelegate, UITableViewDataSo
[weak self] selectType in [weak self] selectType in
guard let self = self else { return } guard let self = self else { return }
detailInfo.qualification = selectType.title
loadInfo()
if !detailId.isEmpty {
saveDetailInfo(isNeedPop: false)
}
} }
} else if detailItem.type == .conferTime { // 授权年份 } else if detailItem.type == .conferTime { // 授权年份
...@@ -208,7 +290,11 @@ extension YHProfessionalQualificationVC : UITableViewDelegate, UITableViewDataSo ...@@ -208,7 +290,11 @@ extension YHProfessionalQualificationVC : UITableViewDelegate, UITableViewDataSo
YHDatePickView.show(type: .yyyy) { YHDatePickView.show(type: .yyyy) {
[weak self] date in [weak self] date in
guard let self = self else { return } guard let self = self else { return }
detailInfo.promulgation = date
loadInfo()
if !detailId.isEmpty {
saveDetailInfo(isNeedPop: false)
}
} }
} else if detailItem.type == .conferCountry { // 授权国家/地区 } else if detailItem.type == .conferCountry { // 授权国家/地区
...@@ -217,15 +303,27 @@ extension YHProfessionalQualificationVC : UITableViewDelegate, UITableViewDataSo ...@@ -217,15 +303,27 @@ extension YHProfessionalQualificationVC : UITableViewDelegate, UITableViewDataSo
vc.backLocationStringController = { vc.backLocationStringController = {
[weak self] country in [weak self] country in
guard let self = self else { return } guard let self = self else { return }
detailInfo.collegeAddress.country = country
loadInfo()
if !detailId.isEmpty {
saveDetailInfo(isNeedPop: false)
}
} }
self.navigationController?.pushViewController(vc) self.navigationController?.pushViewController(vc)
} else if detailItem.type == .conferCity { // 授权城市 } else if detailItem.type == .conferCity { // 授权城市
if detailInfo.isCollegeInAboard() { return }
let vc = YHAddressViewController() let vc = YHAddressViewController()
vc.backLocationStringController = { vc.backLocationStringController = {
[weak self] (string1, string2, string3, string4) in [weak self] (string1, string2, string3, string4) in
guard let self = self else { return } guard let self = self else { return }
detailInfo.collegeAddress.area = [string1, string2, string3, string4]
loadInfo()
if !detailId.isEmpty {
saveDetailInfo(isNeedPop: false)
}
} }
self.present(vc, animated: true) self.present(vc, animated: true)
} }
...@@ -259,9 +357,18 @@ extension YHProfessionalQualificationVC : UITableViewDelegate, UITableViewDataSo ...@@ -259,9 +357,18 @@ extension YHProfessionalQualificationVC : UITableViewDelegate, UITableViewDataSo
if item is YHFormDetailItem { if item is YHFormDetailItem {
let detailItem = item as! YHFormDetailItem let detailItem = item as! YHFormDetailItem
if detailItem.type == .conferCity {
if detailInfo.isCollegeInAboard() {
return .inputText
}
return .selectSheet
}
if detailItem.type == .conferAgencyFullName { if detailItem.type == .conferAgencyFullName {
return .inputText return .inputText
} }
if detailItem.type == .conferTime if detailItem.type == .conferTime
|| detailItem.type == .conferCountry || detailItem.type == .conferCountry
|| detailItem.type == .conferCity || detailItem.type == .conferCity
...@@ -272,7 +379,94 @@ extension YHProfessionalQualificationVC : UITableViewDelegate, UITableViewDataSo ...@@ -272,7 +379,94 @@ extension YHProfessionalQualificationVC : UITableViewDelegate, UITableViewDataSo
} }
return .defaultType return .defaultType
} }
}
extension YHQualificationDetailVC {
func reqeustDetailInfo() {
self.educationRequest.getQualificationDetailInfo(id:self.detailId) {
[weak self] success, error in
guard let self = self else { return }
if success {
if let qualificationDetailInfo = self.educationRequest.qualificationDetailInfo {
detailInfo = qualificationDetailInfo
}
loadInfo()
}
}
}
// 保存数据 isNeedPop：保存成功后是否需要退出该页面
func saveDetailInfo(isNeedPop:Bool) {
var dict:[String : Any] = [:]
if detailId.isEmpty { // 新增数据
dict = ["verify" : 0,
"college":detailInfo.college,
"college_address_aboard":"",
"id":"",
"order_id" : detailInfo.orderId,
"promulgation" : detailInfo.promulgation,
"qualification" : detailInfo.qualification,
"college_address":["area":[],
"country":"",
"details":"",
"foreign":""]]
} else { // 已有数据
dict = detailInfo.toDictionary() ?? [:]
dict["verify"] = 0
}
print(dict)
self.educationRequest.saveQualificationInfo(params: dict) {
[weak self] success, error in
guard let self = self else { return }
if success {
YHHUD.flash(message: "保存成功")
if isNeedPop {
self.navigationController?.popViewController(animated: true)
}
} else {
YHHUD.flash(message: "保存失败")
}
}
}
func submitInfo() {
let isChecked = checkIntegrity()
isNeedShowError = !isChecked
self.tableView .reloadData()
if !isChecked {
YHHUD.flash(message: "资料还未填完")
return
}
saveDetailInfo(isNeedPop: true)
}
// 检查填写信息完整性
func checkIntegrity() -> Bool {
if detailInfo.qualification.isEmpty
|| detailInfo.college.isEmpty
|| detailInfo.promulgation.isEmpty
|| detailInfo.collegeAddress.country.isEmpty
{
return false
}
if detailInfo.isCollegeInAboard(), detailInfo.collegeAddress.foreign.isEmpty {
return false
}
if !detailInfo.isCollegeInAboard(), detailInfo.collegeAddress.area.count <= 0 {
return false
}
return true
}
} }
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/学历专业资格填写/M/YHEducationInfo.swift → galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/Education&Qualification(学历专业资格填写)/M/YHEducationInfo.swift
View file @ ec5ee6d3
...@@ -34,8 +34,8 @@ class YHEducationListInfo: SmartCodable { ...@@ -34,8 +34,8 @@ class YHEducationListInfo: SmartCodable {
} }
class YHEducationInfo: SmartCodable { class YHEducationInfo: SmartCodable {
var id: Int = -1 var id: Int = 0
var orderId: Int = -1 var orderId: Int = 0
var college: String? var college: String?
var background: String? var background: String?
var professional: String? var professional: String?
...@@ -60,8 +60,8 @@ class YHEducationInfo: SmartCodable { ...@@ -60,8 +60,8 @@ class YHEducationInfo: SmartCodable {
} }
class YHQualificationInfo: SmartCodable { class YHQualificationInfo: SmartCodable {
var id: Int = -1 var id: Int = 0
var orderId: Int = -1 var orderId: Int = 0
var qualification: String? var qualification: String?
var vacantNum: Int = 0 var vacantNum: Int = 0
...@@ -82,25 +82,25 @@ class YHEducationDetailInfo: SmartCodable { ...@@ -82,25 +82,25 @@ class YHEducationDetailInfo: SmartCodable {
var id: Int = 0 var id: Int = 0
var orderId: Int = 0 var orderId: Int = 0
var college: String? var college: String = ""
var isTop: Int = 0 var isTop: Int = 0
var type: String? var type: String = ""
var admissionTime: String? var admissionTime: String = ""
var graduateTime: String? var graduateTime: String = ""
var background: String? var background: String = ""
var professional: String? var professional: String = ""
var degreeType: String? var degreeType: String = ""
var remark: String? var remark: String = ""
var average: String? var average: String = ""
var schoolAddress: YHSchoolAddress? var schoolAddress: YHCollegeAddress = YHCollegeAddress()
var schoolAddressAboard: Int = 0 var schoolAddressAboard: Int = 0
var oldId: Int = 0 var oldId: Int = 0
var createdAt: String? var createdAt: String = ""
var updatedAt: String? var updatedAt: String = ""
var deletedAt: SmartAny? var deletedAt: String = ""
var isShow: Int = 0 var isShow: Int = 0
var operatorName: SmartAny? var operatorName: String = ""
var operatorEnglishName: SmartAny? var operatorEnglishName: String = ""
var operatorId: Int = 0 var operatorId: Int = 0
var matchListing: Int = 0 var matchListing: Int = 0
var createFromAppid: Int = 0 var createFromAppid: Int = 0
...@@ -141,30 +141,89 @@ class YHEducationDetailInfo: SmartCodable { ...@@ -141,30 +141,89 @@ class YHEducationDetailInfo: SmartCodable {
} }
// 学校是否在国外 默认是在国内 // 学校是否在国外 默认是在国内
func isSchoolInAboard() -> Bool { func isSchoolInAboard() -> Bool {
guard let schoolAddress = schoolAddress else { return false } if schoolAddress.country.isEmpty { return false }
guard let country = schoolAddress.country else { return false } if schoolAddress.country.contains("中国") {
if country.contains("中国") {
return false return false
} }
return true return true
} }
} }
class YHSchoolAddress: Codable { class YHCollegeAddress: Codable {
var area: [String]?
var country: String? var area: [String] = []
var foreign: String? var country: String = ""
var details: String = ""
var foreign: String = ""
enum CodingKeys: String, CodingKey { enum CodingKeys: String, CodingKey {
case area = "area" case area = "area"
case country = "country" case country = "country"
case details = "details"
case foreign = "foreign" case foreign = "foreign"
} }
required init(area: [String]?, country: String?, foreign: String?) { required init() {
self.area = area
self.country = country }
self.foreign = foreign }
class YHQualificationDetailInfo: SmartCodable {
var id: String = ""
var orderId: String = ""
var college: String = ""
var collegeAddress: YHCollegeAddress = YHCollegeAddress()
var collegeAddressAboard: Int = 0
var promulgation: String = ""
var qualification: String = ""
var remark: String = ""
var oldId: Int = 0
var createdAt: String = ""
var updatedAt: String = ""
var deletedAt: String = ""
var operatorName: String = ""
var operatorEnglishName: String = ""
var operatorId: Int = 0
var matchListing: Int = 0
var createFromAppid: Int = 0
var updateFromAppid: Int = 0
var customerCenterId: Int = 0
enum CodingKeys: String, CodingKey {
case id = "id"
case orderId = "order_id"
case college = "college"
case collegeAddress = "college_address"
case collegeAddressAboard = "college_address_aboard"
case promulgation = "promulgation"
case qualification = "qualification"
case remark = "remark"
case oldId = "old_id"
case createdAt = "created_at"
case updatedAt = "updated_at"
case deletedAt = "deleted_at"
case operatorName = "operator_name"
case operatorEnglishName = "operator_english_name"
case operatorId = "operator_id"
case matchListing = "match_listing"
case createFromAppid = "create_from_appid"
case updateFromAppid = "update_from_appid"
case customerCenterId = "customer_center_id"
}
// 学校是否在国外 默认是在国内
func isCollegeInAboard() -> Bool {
if collegeAddress.country.isEmpty { return false }
if collegeAddress.country.contains("中国") {
return false
}
return true
}
required init() {
} }
} }
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/学历专业资格填写/M/YHEducationRequestViewModel.swift → galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/Education&Qualification(学历专业资格填写)/M/YHEducationRequestViewModel.swift
View file @ ec5ee6d3
...@@ -12,7 +12,9 @@ class YHEducationRequestViewModel { ...@@ -12,7 +12,9 @@ class YHEducationRequestViewModel {
// 学历和专业信息 // 学历和专业信息
var educationInfo: YHEducationListInfo? var educationInfo: YHEducationListInfo?
// 学历详情信息 // 学历详情信息
var educationDetailInfo:YHEducationDetailInfo? var educationDetailInfo: YHEducationDetailInfo?
// 专业详情信息
var qualificationDetailInfo: YHQualificationDetailInfo?
// 请求学历和专业证书信息 // 请求学历和专业证书信息
func requestEducationInfo(params:[String:Any], callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) { func requestEducationInfo(params:[String:Any], callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) {
...@@ -104,4 +106,148 @@ class YHEducationRequestViewModel { ...@@ -104,4 +106,148 @@ class YHEducationRequestViewModel {
} }
} }
// 删除学历
func deleteEducationInfo(id:Int, callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) {
YHHUD.show(.progress(message: "数据加载中..."))
let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Education.deleteEducationInfoApi
let _ = YHNetRequest.postRequest(url: strUrl, params:["id" : id]) {[weak self] json, code in
YHHUD.hide()
guard let self = self else { return }
guard let model = NetBaseModel.deserialize(dict: json) else {
let error : YHErrorModel = YHErrorModel(errorCode:YHErrorCode.dictParseError.rawValue,errorMsg: YHErrorCode.dictParseError.description())
callBackBlock(false,error)
return
}
printLog("model 是 ==> \(model)")
if model.code == NetWorkCode.success.rawValue {
callBackBlock(true,nil)
} else {
callBackBlock(false, nil)
}
} failBlock: { err in
callBackBlock(false,err)
}
}
// 删除专业
func deleteQualificationInfo(id:Int, callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) {
YHHUD.show(.progress(message: "数据加载中..."))
let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Qualification.deleteQualificationInfoApi
let _ = YHNetRequest.postRequest(url: strUrl, params:["id" : id]) {[weak self] json, code in
YHHUD.hide()
guard let self = self else { return }
guard let model = NetBaseModel.deserialize(dict: json) else {
let error : YHErrorModel = YHErrorModel(errorCode:YHErrorCode.dictParseError.rawValue,errorMsg: YHErrorCode.dictParseError.description())
callBackBlock(false,error)
return
}
printLog("model 是 ==> \(model)")
if model.code == NetWorkCode.success.rawValue {
callBackBlock(true,nil)
} else {
callBackBlock(false, nil)
}
} failBlock: { err in
callBackBlock(false,err)
}
}
// 保存所有
func saveAllEducationInfo(params:[String:Any], callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) {
YHHUD.show(.progress(message: "数据加载中..."))
let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Education.saveAllEduAndQuaInfoApi
let _ = YHNetRequest.postRequest(url: strUrl, params:params) {[weak self] json, code in
YHHUD.hide()
guard let self = self else { return }
guard let model = NetBaseModel.deserialize(dict: json) else {
let error : YHErrorModel = YHErrorModel(errorCode:YHErrorCode.dictParseError.rawValue,errorMsg: YHErrorCode.dictParseError.description())
callBackBlock(false,error)
return
}
printLog("model 是 ==> \(model)")
if model.code == NetWorkCode.success.rawValue {
callBackBlock(true,nil)
} else {
callBackBlock(false, nil)
}
} failBlock: { err in
callBackBlock(false,err)
}
}
// 获取专业详情
func getQualificationDetailInfo(id:String, callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) {
YHHUD.show(.progress(message: "数据加载中..."))
let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Qualification.getQualificationDetailInfoApi
let _ = YHNetRequest.getRequest(url: strUrl, params:["id" : id]) {[weak self] json, code in
YHHUD.hide()
guard let self = self else { return }
guard let model = NetBaseModel.deserialize(dict: json) else {
let error : YHErrorModel = YHErrorModel(errorCode:YHErrorCode.dictParseError.rawValue,errorMsg: YHErrorCode.dictParseError.description())
callBackBlock(false,error)
return
}
printLog("model 是 ==> \(model)")
let dic = model.data?.peel as? [AnyHashable : Any]
guard let resultModel = YHQualificationDetailInfo.deserialize(dict: dic as? [AnyHashable : Any]) else {
callBackBlock(false,nil)
return
}
qualificationDetailInfo = resultModel
callBackBlock(true,nil)
} failBlock: { err in
callBackBlock(false,err)
}
}
// 保存专业信息
func saveQualificationInfo(params:[String:Any], callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) {
YHHUD.show(.progress(message: "数据加载中..."))
let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Qualification.saveQualificationInfoApi
let _ = YHNetRequest.postRequest(url: strUrl, params:params) {[weak self] json, code in
YHHUD.hide()
guard let self = self else { return }
guard let model = NetBaseModel.deserialize(dict: json) else {
let error : YHErrorModel = YHErrorModel(errorCode:YHErrorCode.dictParseError.rawValue,errorMsg: YHErrorCode.dictParseError.description())
callBackBlock(false,error)
return
}
printLog("model 是 ==> \(model)")
if model.code == NetWorkCode.success.rawValue {
callBackBlock(true,nil)
} else {
callBackBlock(false, nil)
}
} failBlock: { err in
callBackBlock(false,err)
}
}
} }
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/Education&Qualification(学历专业资格填写)/V/YHCollegeNameCell.swift 0 → 100644
View file @ ec5ee6d3
//
// YHCollegeNameCell.swift
// galaxy
//
// Created by edy on 2024/2/22.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
class YHCollegeNameCell: UITableViewCell {
static let cellReuseIdentifier = "YHCollegeNameCell"
lazy var titleLabel: UILabel = {
let label = UILabel()
label.textColor = .mainTextColor
label.textAlignment = .left
label.font = UIFont.PFSC_B(ofSize: 14)
return label
}()
required init?(coder: NSCoder) {
super.init(coder: coder)
}
override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
super.init(style: style, reuseIdentifier: reuseIdentifier)
setupUI()
}
func setupUI() {
self.selectionStyle = .none
contentView.addSubview(titleLabel)
titleLabel.snp.makeConstraints { make in
make.left.equalToSuperview().offset(21)
make.right.equalToSuperview().offset(-21)
make.top.bottom.equalToSuperview()
}
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/学历专业资格填写/V/YHEducationInfoCell.swift → galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/Education&Qualification(学历专业资格填写)/V/YHEducationInfoCell.swift
View file @ ec5ee6d3
...@@ -12,6 +12,14 @@ class YHEducationInfoCell: UITableViewCell { ...@@ -12,6 +12,14 @@ class YHEducationInfoCell: UITableViewCell {
static let cellReuseIdentifier = "YHEducationInfoCell" static let cellReuseIdentifier = "YHEducationInfoCell"
let horizonalGap = 18.0 let horizonalGap = 18.0
var deleteBlock:(()->Void)?
var isShowDeleteBtn:Bool = false {
didSet {
deleteButton.isHidden = !isShowDeleteBtn
timeLabel.isHidden = isShowDeleteBtn
arrowImgView.isHidden = isShowDeleteBtn
}
}
lazy var titleLabel: UILabel = { lazy var titleLabel: UILabel = {
let label = UILabel() let label = UILabel()
...@@ -38,6 +46,17 @@ class YHEducationInfoCell: UITableViewCell { ...@@ -38,6 +46,17 @@ class YHEducationInfoCell: UITableViewCell {
return label return label
}() }()
private lazy var deleteButton: UIButton = {
let btn = UIButton()
btn.setTitle("删除".local, for: .normal)
btn.titleLabel?.font = UIFont.PFSC_R(ofSize: 14)
btn.setTitleColor(.failColor, for: .normal)
btn.addTarget(self, action: #selector(didClickDeleteBtn(btn:)), for: .touchUpInside)
btn.isHidden = true
return btn
}()
private lazy var arrowImgView: UIImageView = { private lazy var arrowImgView: UIImageView = {
let imgView = UIImageView(image: UIImage(named: "form_right_arrow")) let imgView = UIImageView(image: UIImage(named: "form_right_arrow"))
return imgView return imgView
...@@ -66,6 +85,13 @@ class YHEducationInfoCell: UITableViewCell { ...@@ -66,6 +85,13 @@ class YHEducationInfoCell: UITableViewCell {
setupUI() setupUI()
} }
@objc func didClickDeleteBtn(btn:UIButton) {
if let deleteBlock = deleteBlock {
deleteBlock()
}
}
func setupUI() { func setupUI() {
self.selectionStyle = .none self.selectionStyle = .none
...@@ -74,6 +100,7 @@ class YHEducationInfoCell: UITableViewCell { ...@@ -74,6 +100,7 @@ class YHEducationInfoCell: UITableViewCell {
contentView.addSubview(timeLabel) contentView.addSubview(timeLabel)
contentView.addSubview(arrowImgView) contentView.addSubview(arrowImgView)
contentView.addSubview(bottomLine) contentView.addSubview(bottomLine)
contentView.addSubview(deleteButton)
titleLabel.setContentCompressionResistancePriority(.required, for: .horizontal) titleLabel.setContentCompressionResistancePriority(.required, for: .horizontal)
...@@ -88,6 +115,12 @@ class YHEducationInfoCell: UITableViewCell { ...@@ -88,6 +115,12 @@ class YHEducationInfoCell: UITableViewCell {
make.centerY.equalTo(titleLabel) make.centerY.equalTo(titleLabel)
} }
deleteButton.snp.makeConstraints { make in
make.size.equalTo(CGSizeMake(64, 40))
make.centerY.equalTo(titleLabel)
make.right.equalToSuperview()
}
arrowImgView.snp.makeConstraints { make in arrowImgView.snp.makeConstraints { make in
make.width.height.equalTo(20.0) make.width.height.equalTo(20.0)
make.centerY.equalTo(titleLabel) make.centerY.equalTo(titleLabel)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/Education&Qualification(学历专业资格填写)/V/YHSearchBar.swift 0 → 100644
View file @ ec5ee6d3
//
// YHSearchBar.swift
// galaxy
//
// Created by edy on 2024/2/22.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
class YHSearchBar: UIView {
static let height = 40.0
static let confirmBtnHeight = height-8.0
var textChange:((String?)->Void)?
var confirmBlock:(()->Void)?
var placeHolder:String? {
didSet {
if let placeholder = placeHolder {
textField.attributedPlaceholder = NSAttributedString(string: placeholder, attributes: [NSAttributedString.Key.foregroundColor : UIColor.placeHolderColor])
}
}
}
private lazy var contentView = {
let view = UIView()
view.backgroundColor = .contentBkgColor
view.layer.cornerRadius = Self.height/2.0
view.clipsToBounds = true
return view
}()
lazy var textField:UITextField = {
let textField = UITextField()
textField.backgroundColor = .clear
textField.attributedPlaceholder = NSAttributedString(string: "请输入学校全称", attributes: [NSAttributedString.Key.foregroundColor : UIColor.placeHolderColor])
textField.font = UIFont.PFSC_M(ofSize: 12)
textField.tintColor = UIColor(hexString: "#3D88F8")
textField.textColor = UIColor.mainTextColor
textField.addTarget(self, action: #selector(textFieldChanged(textField:)), for: .editingChanged)
return textField
}()
lazy var confirmBtn: UIButton = {
let btn = UIButton()
btn.setTitle("确认".local, for: .normal)
btn.titleLabel?.font = UIFont.PFSC_M(ofSize: 12)
btn.setTitleColor(.white, for: .normal)
btn.backgroundColor = UIColor(hexString: "#3D88F8")
btn.layer.cornerRadius = Self.confirmBtnHeight/2.0
btn.addTarget(self, action: #selector(confirmBtnClicked), for: .touchUpInside)
return btn
}()
override init(frame: CGRect) {
super.init(frame: frame)
self.createUI()
}
required init?(coder: NSCoder) {
super.init(coder: coder)
}
static func createBar() -> YHSearchBar {
let view = YHSearchBar(frame: CGRect(x: 0, y: 0, width: KScreenWidth-32, height: height))
return view
}
@objc func confirmBtnClicked() {
if let confirmBlock = confirmBlock {
confirmBlock()
}
}
func createUI() {
self.backgroundColor = .white
contentView.addSubview(textField)
contentView.addSubview(confirmBtn)
self.addSubview(contentView)
contentView.snp.makeConstraints { make in
make.edges.equalToSuperview()
}
textField.snp.makeConstraints { make in
make.left.equalToSuperview().offset(Self.height/2.0)
make.right.equalTo(confirmBtn.snp.left).offset(-4)
make.centerY.equalToSuperview()
}
confirmBtn.snp.makeConstraints { make in
make.size.equalTo(CGSize(width: 66, height: Self.height-8.0))
make.centerY.equalToSuperview()
make.right.equalToSuperview().offset(-4)
}
}
@objc func textFieldChanged(textField:UITextField) {
if let textChange = textChange {
textChange(textField.text)
}
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/V/PickerView/YHFormPickerView.swift
View file @ ec5ee6d3
...@@ -104,7 +104,7 @@ class YHFormPickerView: UIView { ...@@ -104,7 +104,7 @@ class YHFormPickerView: UIView {
lazy var titleLabel: UILabel = { lazy var titleLabel: UILabel = {
let label = UILabel() let label = UILabel()
label.textColor = UIColor(hexString:"#222222") label.textColor = UIColor.mainTextColor
label.textAlignment = .center label.textAlignment = .center
label.font = UIFont.PFSC_R(ofSize: 16) label.font = UIFont.PFSC_R(ofSize: 16)
label.text = "请选择" label.text = "请选择"
...@@ -115,7 +115,7 @@ class YHFormPickerView: UIView { ...@@ -115,7 +115,7 @@ class YHFormPickerView: UIView {
let btn = UIButton() let btn = UIButton()
btn.setTitle("取消".local, for: .normal) btn.setTitle("取消".local, for: .normal)
btn.titleLabel?.font = UIFont.PFSC_R(ofSize: 14) btn.titleLabel?.font = UIFont.PFSC_R(ofSize: 14)
btn.setTitleColor(UIColor(hex: 0x222222), for: .normal) btn.setTitleColor(UIColor.mainTextColor, for: .normal)
btn.addTarget(self, action: #selector(didClickCancelButton), for: .touchUpInside) btn.addTarget(self, action: #selector(didClickCancelButton), for: .touchUpInside)
return btn return btn
}() }()
...@@ -228,6 +228,21 @@ class YHFormPickerView: UIView { ...@@ -228,6 +228,21 @@ class YHFormPickerView: UIView {
YHFormPickerViewItem(type: .professionCertificate(.CQF)), YHFormPickerViewItem(type: .professionCertificate(.CQF)),
YHFormPickerViewItem(type: .professionCertificate(.CIMA)), YHFormPickerViewItem(type: .professionCertificate(.CIMA)),
YHFormPickerViewItem(type: .professionCertificate(.ACA))], YHFormPickerViewItem(type: .professionCertificate(.ACA))],
// 学位类型
.degreeCategory:
[YHFormPickerViewItem(type: .degreeCategory(.accountantOrFinance)),
YHFormPickerViewItem(type: .degreeCategory(.artOrLiterature)),
YHFormPickerViewItem(type: .degreeCategory(.businessManagement)),
YHFormPickerViewItem(type: .degreeCategory(.economics)),
YHFormPickerViewItem(type: .degreeCategory(.engineering)),
YHFormPickerViewItem(type: .degreeCategory(.electronicOrSoftwareEngineering)),
YHFormPickerViewItem(type: .degreeCategory(.laws)),
YHFormPickerViewItem(type: .degreeCategory(.lifeSciencesOrMedicine)),
YHFormPickerViewItem(type: .degreeCategory(.management)),
YHFormPickerViewItem(type: .degreeCategory(.NeoConfucianism)),
YHFormPickerViewItem(type: .degreeCategory(.socialScience)),
YHFormPickerViewItem(type: .degreeCategory(.others))],
] ]
}() }()
...@@ -382,6 +397,8 @@ class YHFormPickerView: UIView { ...@@ -382,6 +397,8 @@ class YHFormPickerView: UIView {
return "职业" return "职业"
case .professionCertificate: case .professionCertificate:
return "选择证书名称" return "选择证书名称"
case .degreeCategory:
return "选择学位类型"
} }
} }
} }
...@@ -425,7 +442,7 @@ extension YHFormPickerView: UIPickerViewDelegate, UIPickerViewDataSource { ...@@ -425,7 +442,7 @@ extension YHFormPickerView: UIPickerViewDelegate, UIPickerViewDataSource {
func pickerView(_ pickerView: UIPickerView, viewForRow row: Int, forComponent component: Int, reusing view: UIView?) -> UIView { func pickerView(_ pickerView: UIPickerView, viewForRow row: Int, forComponent component: Int, reusing view: UIView?) -> UIView {
let label = UILabel() let label = UILabel()
label.textColor = UIColor(hexString:"#222222") label.textColor = UIColor.mainTextColor
label.textAlignment = .center label.textAlignment = .center
label.font = UIFont.PFSC_R(ofSize: 14) label.font = UIFont.PFSC_R(ofSize: 14)
label.text = "" label.text = ""
...@@ -619,7 +636,42 @@ extension YHFormPickerView { ...@@ -619,7 +636,42 @@ extension YHFormPickerView {
} else if title.contains("英国皇家特许会计师") { } else if title.contains("英国皇家特许会计师") {
return .professionCertificate(.ACA) return .professionCertificate(.ACA)
} }
case .degreeCategory:
if title == "会计/金融" {
return .degreeCategory(.accountantOrFinance)
} else if title == "艺术及人文/文学" {
return .degreeCategory(.artOrLiterature)
} else if title == "工商管理" {
return .degreeCategory(.businessManagement)
} else if title == "经济学" {
return .degreeCategory(.economics)
} else if title == "工程学" {
return .degreeCategory(.engineering)
} else if title == "咨询科技/电子及软件工程/数据科学" {
return .degreeCategory(.electronicOrSoftwareEngineering)
} else if title == "法律" {
return .degreeCategory(.laws)
} else if title == "生命科学及医学" {
return .degreeCategory(.lifeSciencesOrMedicine)
} else if title == "管理学" {
return .degreeCategory(.management)
} else if title == "理学" {
return .degreeCategory(.NeoConfucianism)
} else if title == "社会科学" {
return .degreeCategory(.socialScience)
} else if title == "其他" {
return .degreeCategory(.others)
}
} }
return .none return .none
} }
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/V/PickerView/YHFormPickerViewType.swift
View file @ ec5ee6d3
...@@ -33,7 +33,8 @@ enum YHFormPickerViewType: Int { ...@@ -33,7 +33,8 @@ enum YHFormPickerViewType: Int {
case degreeLocation case degreeLocation
// 专业证书 // 专业证书
case professionCertificate case professionCertificate
// 学位类型
case degreeCategory
} }
enum YHPickerViewMarriageType: Int { enum YHPickerViewMarriageType: Int {
...@@ -188,6 +189,34 @@ enum YHPickerViewProfessionalCertificateType:Int { ...@@ -188,6 +189,34 @@ enum YHPickerViewProfessionalCertificateType:Int {
case ACA case ACA
} }
enum YHPickerViewDegreedegreeCategoryType:Int {
// 会计/金融
case accountantOrFinance
// 艺术及人文/文学
case artOrLiterature
// 工商管理
case businessManagement
// 经济学
case economics
// 工程学
case engineering
// 咨询科技/电子及软件工程/数据科学
case electronicOrSoftwareEngineering
// 法律
case laws
// 生命科学及医学
case lifeSciencesOrMedicine
// 管理学
case management
// 理学
case NeoConfucianism
// 社会科学
case socialScience
// 其他
case others
}
enum YHFormPickerViewSubType { enum YHFormPickerViewSubType {
case none case none
...@@ -202,6 +231,7 @@ enum YHFormPickerViewSubType { ...@@ -202,6 +231,7 @@ enum YHFormPickerViewSubType {
case degreeLocation(YHPickerViewDegreeLocationType) case degreeLocation(YHPickerViewDegreeLocationType)
case profession(YHPicerViewProfessionType) case profession(YHPicerViewProfessionType)
case professionCertificate(YHPickerViewProfessionalCertificateType) case professionCertificate(YHPickerViewProfessionalCertificateType)
case degreeCategory(YHPickerViewDegreedegreeCategoryType)
var title:String { var title:String {
switch self { switch self {
...@@ -312,33 +342,57 @@ enum YHFormPickerViewSubType { ...@@ -312,33 +342,57 @@ enum YHFormPickerViewSubType {
return "其他".local return "其他".local
case .professionCertificate(.CFA): case .professionCertificate(.CFA):
return "CFA(注册金融分析师)" return "CFA(注册金融分析师)".local
case .professionCertificate(.CFP): case .professionCertificate(.CFP):
return "CFP(CFP证书是目前世界上权威的权威理财顾问认证项目之一)" return "CFP(CFP证书是目前世界上权威的权威理财顾问认证项目之一)".local
case .professionCertificate(.FRM): case .professionCertificate(.FRM):
return "FRM(金融风险管理师)" return "FRM(金融风险管理师)".local
case .professionCertificate(.FIA): case .professionCertificate(.FIA):
return "FIA(保险精算师)" return "FIA(保险精算师)".local
case .professionCertificate(.CPA): case .professionCertificate(.CPA):
return "CPA(注册会计师)" return "CPA(注册会计师)".local
case .professionCertificate(.CIIA): case .professionCertificate(.CIIA):
return "CIIA(注册国际投资分析师)" return "CIIA(注册国际投资分析师)".local
case .professionCertificate(.RFC): case .professionCertificate(.RFC):
return "RFC(财务顾问师)" return "RFC(财务顾问师)".local
case .professionCertificate(.ACCA): case .professionCertificate(.ACCA):
return "ACCA(特许公认会计师)" return "ACCA(特许公认会计师)".local
case .professionCertificate(.CIA): case .professionCertificate(.CIA):
return "CIA(国际注册内部审计师)" return "CIA(国际注册内部审计师)".local
case .professionCertificate(.CMA): case .professionCertificate(.CMA):
return "CMA(美国管理会计师)" return "CMA(美国管理会计师)".local
case .professionCertificate(.CQF): case .professionCertificate(.CQF):
return "CQF(国际数量金融工程认证)" return "CQF(国际数量金融工程认证)".local
case .professionCertificate(.CIMA): case .professionCertificate(.CIMA):
return "CIMA(管理会计师考试)" return "CIMA(管理会计师考试)".local
case .professionCertificate(.ACA): case .professionCertificate(.ACA):
return "The Associate Chartered Accountant(英国皇家特许会计师)" return "The Associate Chartered Accountant(英国皇家特许会计师)".local
return "" case .degreeCategory(.accountantOrFinance):
return "会计/金融".local
case .degreeCategory(.artOrLiterature):
return "艺术及人文/文学".local
case .degreeCategory(.businessManagement):
return "工商管理".local
case .degreeCategory(.economics):
return "经济学".local
case .degreeCategory(.engineering):
return "工程学".local
case .degreeCategory(.electronicOrSoftwareEngineering):
return "咨询科技/电子及软件工程/数据科学".local
case .degreeCategory(.laws):
return "法律".local
case .degreeCategory(.lifeSciencesOrMedicine):
return "生命科学及医学".local
case .degreeCategory(.management):
return "管理学".local
case .degreeCategory(.NeoConfucianism):
return "理学".local
case .degreeCategory(.socialScience):
return "社会科学".local
case .degreeCategory(.others):
return "其他".local
} }
} }
...@@ -477,8 +531,32 @@ enum YHFormPickerViewSubType { ...@@ -477,8 +531,32 @@ enum YHFormPickerViewSubType {
return 12 return 12
case .professionCertificate(.ACA): case .professionCertificate(.ACA):
return 13 return 13
return -1
case .degreeCategory(.accountantOrFinance):
return 0
case .degreeCategory(.artOrLiterature):
return 1
case .degreeCategory(.businessManagement):
return 2
case .degreeCategory(.economics):
return 3
case .degreeCategory(.engineering):
return 4
case .degreeCategory(.electronicOrSoftwareEngineering):
return 5
case .degreeCategory(.laws):
return 6
case .degreeCategory(.lifeSciencesOrMedicine):
return 7
case .degreeCategory(.management):
return 8
case .degreeCategory(.NeoConfucianism):
return 9
case .degreeCategory(.socialScience):
return 10
case .degreeCategory(.others):
return 11
} }
} }
} }
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/V/YHFormItemAddCell.swift
View file @ ec5ee6d3
...@@ -30,7 +30,6 @@ class YHFormItemAddCell: UITableViewCell { ...@@ -30,7 +30,6 @@ class YHFormItemAddCell: UITableViewCell {
btn.titleLabel?.font = UIFont.PFSC_M(ofSize: 14) btn.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
btn.setTitleColor(btnTitleColor, for: .normal) btn.setTitleColor(btnTitleColor, for: .normal)
btn.iconInLeft(spacing: 6) btn.iconInLeft(spacing: 6)
btn.setImage(UIImage(named: "form_add_info"), for: .normal) btn.setImage(UIImage(named: "form_add_info"), for: .normal)
btn.addTarget(self, action: #selector(didClickAddBtn), for: .touchUpInside) btn.addTarget(self, action: #selector(didClickAddBtn), for: .touchUpInside)
return btn return btn
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/V/YHFormItemEnterDetailCell.swift
View file @ ec5ee6d3
...@@ -68,7 +68,6 @@ class YHFormItemEnterDetailCell: UITableViewCell { ...@@ -68,7 +68,6 @@ class YHFormItemEnterDetailCell: UITableViewCell {
label.text = "XXXXXXX" label.text = "XXXXXXX"
label.textColor = .labelTextColor2 label.textColor = .labelTextColor2
label.textAlignment = .right label.textAlignment = .right
label.numberOfLines = 0
label.font = UIFont.PFSC_R(ofSize: 14) label.font = UIFont.PFSC_R(ofSize: 14)
return label return label
}() }()
...@@ -116,25 +115,27 @@ class YHFormItemEnterDetailCell: UITableViewCell { ...@@ -116,25 +115,27 @@ class YHFormItemEnterDetailCell: UITableViewCell {
titleLabel.snp.makeConstraints { make in titleLabel.snp.makeConstraints { make in
make.top.equalToSuperview().offset(16)
make.left.equalToSuperview().offset(horizonalGap) make.left.equalToSuperview().offset(horizonalGap)
make.right.equalTo(detailLabel.snp.left).offset(-8) make.right.equalTo(detailLabel.snp.left).offset(-8)
make.centerY.equalToSuperview() make.bottom.equalTo(bottomLine.snp.top).offset(-16)
} }
detailLabel.snp.makeConstraints { make in detailLabel.snp.makeConstraints { make in
make.right.equalTo(arrowImgView.snp.left) make.right.equalTo(arrowImgView.snp.left)
make.centerY.equalToSuperview() make.width.equalTo(110.0)
make.top.equalTo(titleLabel)
} }
arrowImgView.snp.makeConstraints { make in arrowImgView.snp.makeConstraints { make in
make.size.equalTo(CGSizeMake(20, 20)) make.size.equalTo(CGSizeMake(20, 20))
make.right.equalToSuperview().offset(-horizonalGap) make.right.equalToSuperview().offset(-horizonalGap)
make.centerY.equalToSuperview() make.centerY.equalTo(detailLabel)
} }
deleteButton.snp.makeConstraints { make in deleteButton.snp.makeConstraints { make in
make.size.equalTo(CGSizeMake(64, 40)) make.size.equalTo(CGSizeMake(64, 40))
make.centerY.equalToSuperview() make.centerY.equalTo(detailLabel)
make.right.equalToSuperview() make.right.equalToSuperview()
} }
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/V/YHFormItemExpireDateCell.swift
View file @ ec5ee6d3
...@@ -35,7 +35,7 @@ class YHFormItemExpireDateCell: UITableViewCell { ...@@ -35,7 +35,7 @@ class YHFormItemExpireDateCell: UITableViewCell {
let str = (isMust ? ("*"+title) : title) let str = (isMust ? ("*"+title) : title)
let attributes: [NSAttributedString.Key: Any] = [ let attributes: [NSAttributedString.Key: Any] = [
.font: UIFont.PFSC_R(ofSize: 14), .font: UIFont.PFSC_R(ofSize: 14),
.foregroundColor: UIColor(hex:0x222222)] .foregroundColor: UIColor.mainTextColor]
let questionAttrStr = NSMutableAttributedString(string: str, attributes: attributes) let questionAttrStr = NSMutableAttributedString(string: str, attributes: attributes)
if isMust { if isMust {
let starRange = NSRange(location: 0, length: 1) let starRange = NSRange(location: 0, length: 1)
...@@ -78,7 +78,7 @@ class YHFormItemExpireDateCell: UITableViewCell { ...@@ -78,7 +78,7 @@ class YHFormItemExpireDateCell: UITableViewCell {
private lazy var detailLabel: UILabel = { private lazy var detailLabel: UILabel = {
let label = UILabel() let label = UILabel()
label.textColor = UIColor(hexString: "#222222") label.textColor = UIColor.mainTextColor
label.textAlignment = .left label.textAlignment = .left
label.font = UIFont.PFSC_R(ofSize: 14) label.font = UIFont.PFSC_R(ofSize: 14)
return label return label
...@@ -89,7 +89,7 @@ class YHFormItemExpireDateCell: UITableViewCell { ...@@ -89,7 +89,7 @@ class YHFormItemExpireDateCell: UITableViewCell {
let btn = UIButton(type: .custom) let btn = UIButton(type: .custom)
btn.setTitle("长期".local, for: .normal) btn.setTitle("长期".local, for: .normal)
btn.titleLabel?.font = UIFont.PFSC_R(ofSize: 14) btn.titleLabel?.font = UIFont.PFSC_R(ofSize: 14)
btn.setTitleColor(UIColor(hex: 0x222222), for: .normal) btn.setTitleColor(UIColor.mainTextColor, for: .normal)
btn.iconInLeft(spacing: 6) btn.iconInLeft(spacing: 6)
btn.setImage(UIImage(named: "form_square_unselect"), for: .normal) btn.setImage(UIImage(named: "form_square_unselect"), for: .normal)
btn.setImage(UIImage(named: "form_square_select"), for: .selected) btn.setImage(UIImage(named: "form_square_select"), for: .selected)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/V/YHFormItemOnlyDoubleChoiceCell.swift
View file @ ec5ee6d3
...@@ -14,7 +14,7 @@ class YHFormItemOnlyDoubleChoiceCell: UITableViewCell { ...@@ -14,7 +14,7 @@ class YHFormItemOnlyDoubleChoiceCell: UITableViewCell {
let btnWidth = 70.0 let btnWidth = 70.0
let btnHeight = 32.0 let btnHeight = 32.0
let btnTitleSelectColor = UIColor(hex: 0x4487F9) let btnTitleSelectColor = UIColor(hex: 0x4487F9)
let btnTitleDefaultColor = UIColor(hex:0x222222) let btnTitleDefaultColor = UIColor.mainTextColor
let btnBgDefaultColor = UIColor(hex:0xF8F9FB) let btnBgDefaultColor = UIColor(hex:0xF8F9FB)
let btnBgSelectColor = UIColor(hex:0x4487F9, alpha: 0.08) let btnBgSelectColor = UIColor(hex:0x4487F9, alpha: 0.08)
let answerBaseTag = 9527 let answerBaseTag = 9527
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/V/YHSaveAndSubmitView.swift
View file @ ec5ee6d3
...@@ -88,7 +88,7 @@ class YHSaveAndSubmitView: UIView { ...@@ -88,7 +88,7 @@ class YHSaveAndSubmitView: UIView {
let btn = UIButton() let btn = UIButton()
btn.setTitle("保存", for: .normal) btn.setTitle("保存", for: .normal)
btn.titleLabel?.font = UIFont.PFSC_R(ofSize: 14) btn.titleLabel?.font = UIFont.PFSC_R(ofSize: 14)
btn.setTitleColor(UIColor(hexString:"#222222"), for: .normal) btn.setTitleColor(UIColor.mainTextColor, for: .normal)
btn.backgroundColor = UIColor(hexString:"#F8F9FB") btn.backgroundColor = UIColor(hexString:"#F8F9FB")
btn.layer.cornerRadius = 8.0 btn.layer.cornerRadius = 8.0
btn.addTarget(self, action: #selector(didClickSaveBtn), for: .touchUpInside) btn.addTarget(self, action: #selector(didClickSaveBtn), for: .touchUpInside)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MainApplicantInformation/C/YHMainApplicantInformationViewController.swift → galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MainApplicantInformation(主申请人信息)/C/YHMainApplicantInformationViewController.swift
View file @ ec5ee6d3
...@@ -47,6 +47,8 @@ class YHMainApplicantInformationViewController: YHBaseViewController { ...@@ -47,6 +47,8 @@ class YHMainApplicantInformationViewController: YHBaseViewController {
} }
func setView() { func setView() {
view.backgroundColor = .contentBkgColor
stepView = { stepView = {
let step = YHStepView() let step = YHStepView()
step.dataSource = ["初始信息", "证件上传", "基本信息", "证件信息"] step.dataSource = ["初始信息", "证件上传", "基本信息", "证件信息"]
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MainApplicantInformation/C/YHSelectCountryViewController.swift → galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MainApplicantInformation(主申请人信息)/C/YHSelectCountryViewController.swift
View file @ ec5ee6d3
...@@ -36,7 +36,7 @@ class YHSelectCountryViewController: YHBaseViewController { ...@@ -36,7 +36,7 @@ class YHSelectCountryViewController: YHBaseViewController {
searchView = { searchView = {
let searchBar = UITextField() let searchBar = UITextField()
searchBar.placeholder = "搜索国家/地区" searchBar.placeholder = "搜索国家/地区"
searchBar.backgroundColor = UIColor(hex: 0xf8f9fb) searchBar.backgroundColor = UIColor.contentBkgColor
searchBar.keyboardType = .default searchBar.keyboardType = .default
searchBar.delegate = self searchBar.delegate = self
searchBar.layer.cornerRadius = 21 searchBar.layer.cornerRadius = 21
...@@ -75,8 +75,8 @@ class YHSelectCountryViewController: YHBaseViewController { ...@@ -75,8 +75,8 @@ class YHSelectCountryViewController: YHBaseViewController {
flagLabel = { flagLabel = {
let label = UILabel() let label = UILabel()
label.text = "热门国家/地区" label.text = "热门国家/地区"
label.textColor = UIColor(hex: 0x222222) label.textColor = UIColor.mainTextColor
label.font = kFont(size: 14) label.font = UIFont.PFSC_R(ofSize: 14)
return label return label
}() }()
view.addSubview(flagLabel) view.addSubview(flagLabel)
...@@ -170,7 +170,7 @@ extension YHSelectCountryViewController: UICollectionViewDelegate, UICollectionV ...@@ -170,7 +170,7 @@ extension YHSelectCountryViewController: UICollectionViewDelegate, UICollectionV
func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize { func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize {
let string = hotDataSource[indexPath.row] let string = hotDataSource[indexPath.row]
let size = (string as NSString).size(withAttributes: [NSAttributedString.Key.font : kFont(size: 13)]) let size = (string as NSString).size(withAttributes: [NSAttributedString.Key.font : UIFont.PFSC_R(ofSize: 13)])
return CGSize(width: size.width + 25, height: 32) // 这里可以根据需求设置不同的尺寸 return CGSize(width: size.width + 25, height: 32) // 这里可以根据需求设置不同的尺寸
} }
...@@ -199,9 +199,9 @@ class YHCountryCollectionViewCell: UICollectionViewCell { ...@@ -199,9 +199,9 @@ class YHCountryCollectionViewCell: UICollectionViewCell {
label = { label = {
let view = UILabel() let view = UILabel()
view.textAlignment = .center view.textAlignment = .center
view.font = kFont(size: 13) view.font = UIFont.PFSC_R(ofSize: 13)
view.textColor = UIColor(hex: 0x222222) view.textColor = UIColor.mainTextColor
view.backgroundColor = UIColor(hex: 0xf8f9fb) view.backgroundColor = UIColor.contentBkgColor
view.layer.masksToBounds = true view.layer.masksToBounds = true
view.layer.cornerRadius = 16 view.layer.cornerRadius = 16
return view return view
...@@ -240,8 +240,8 @@ class YHCountryTableViewCell: UITableViewCell { ...@@ -240,8 +240,8 @@ class YHCountryTableViewCell: UITableViewCell {
func setupUI() { func setupUI() {
titleLabel = { titleLabel = {
let label = UILabel() let label = UILabel()
label.font = kFont(size: 13) label.font = UIFont.PFSC_R(ofSize: 13)
label.textColor = UIColor(hex:0x222222) label.textColor = UIColor.mainTextColor
return label return label
}() }()
contentView.addSubview(titleLabel) contentView.addSubview(titleLabel)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MainApplicantInformation/V/YHBottomNextView.swift → galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MainApplicantInformation(主申请人信息)/V/YHBottomNextView.swift
View file @ ec5ee6d3
...@@ -28,12 +28,12 @@ class YHBottomNextView: UIView { ...@@ -28,12 +28,12 @@ class YHBottomNextView: UIView {
func setUpView() { func setUpView() {
saveButton = { saveButton = {
let button = UIButton(type: .custom) let button = UIButton(type: .custom)
button.backgroundColor = UIColor(hex:0xf8f9fb) button.backgroundColor = UIColor.contentBkgColor
button.titleLabel?.font = kBoldFont(size: 15) button.titleLabel?.font = UIFont.PFSC_M(ofSize: 15)
button.contentHorizontalAlignment = .center button.contentHorizontalAlignment = .center
button.setTitle("保存", for: .normal) button.setTitle("保存", for: .normal)
button.setTitleColor( UIColor(hex:0x222222), for: .normal) button.setTitleColor( UIColor.mainTextColor, for: .normal)
button.layer.cornerRadius = 8 button.layer.cornerRadius = kCornerRadius6
button.addTarget(self, action: #selector(save), for: .touchUpInside) button.addTarget(self, action: #selector(save), for: .touchUpInside)
return button return button
}() }()
...@@ -47,12 +47,12 @@ class YHBottomNextView: UIView { ...@@ -47,12 +47,12 @@ class YHBottomNextView: UIView {
nextButton = { nextButton = {
let button = UIButton(type: .custom) let button = UIButton(type: .custom)
button.backgroundColor = UIColor(hex:0x4d9ff8) button.titleLabel?.font = UIFont.PFSC_M(ofSize: 15)
button.titleLabel?.font = kBoldFont(size: 15)
button.contentHorizontalAlignment = .center button.contentHorizontalAlignment = .center
button.setTitle("下一步", for: .normal) button.setTitle("下一步", for: .normal)
button.setTitleColor( UIColor(hex:0xffffff), for: .normal) button.setTitleColor( UIColor(hex:0xffffff), for: .normal)
button.layer.cornerRadius = 8 button.layer.cornerRadius = kCornerRadius6
button.clipsToBounds = true
button.addTarget(self, action: #selector(goNext), for: .touchUpInside) button.addTarget(self, action: #selector(goNext), for: .touchUpInside)
return button return button
}() }()
...@@ -63,6 +63,10 @@ class YHBottomNextView: UIView { ...@@ -63,6 +63,10 @@ class YHBottomNextView: UIView {
make.height.equalTo(44) make.height.equalTo(44)
make.width.equalTo(247) make.width.equalTo(247)
} }
nextButton.layoutIfNeeded()
nextButton.backgroundGradient()
} }
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MainApplicantInformation/V/YHCardExampleView.swift → galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MainApplicantInformation(主申请人信息)/V/YHCardExampleView.swift
View file @ ec5ee6d3
...@@ -58,7 +58,7 @@ class YHCardExampleView: UIView { ...@@ -58,7 +58,7 @@ class YHCardExampleView: UIView {
centerView = { centerView = {
let view = UIView() let view = UIView()
view.backgroundColor = .white view.backgroundColor = .white
view.layer.cornerRadius = 12 view.layer.cornerRadius = kCornerRadius6
return view return view
}() }()
addSubview(centerView) addSubview(centerView)
...@@ -70,8 +70,8 @@ class YHCardExampleView: UIView { ...@@ -70,8 +70,8 @@ class YHCardExampleView: UIView {
titleLabel = { titleLabel = {
let label = UILabel() let label = UILabel()
label.text = "身份证示例模板" label.text = "身份证示例模板"
label.font = kFont(size: 17) label.font = UIFont.PFSC_M(ofSize: 17)
label.textColor = UIColor(hex:0x222222) label.textColor = UIColor.mainTextColor
label.textAlignment = .left label.textAlignment = .left
return label return label
}() }()
...@@ -97,7 +97,7 @@ class YHCardExampleView: UIView { ...@@ -97,7 +97,7 @@ class YHCardExampleView: UIView {
lineView = { lineView = {
let view = UIView() let view = UIView()
view.backgroundColor = UIColor(hex: 0xf0f0f0) view.backgroundColor = UIColor.separatorColor
return view return view
}() }()
centerView.addSubview(lineView) centerView.addSubview(lineView)
...@@ -111,8 +111,8 @@ class YHCardExampleView: UIView { ...@@ -111,8 +111,8 @@ class YHCardExampleView: UIView {
messageLabel = { messageLabel = {
let label = UILabel() let label = UILabel()
label.text = "*须使用二代身份证" label.text = "*须使用二代身份证"
label.font = kFont(size: 14) label.font = UIFont.PFSC_R(ofSize: 14)
label.textColor = UIColor(hex:0xc0c0c0) label.textColor = UIColor.placeHolderColor
label.textAlignment = .left label.textAlignment = .left
label.numberOfLines = 0 label.numberOfLines = 0
return label return label
...@@ -154,11 +154,11 @@ class YHCardExampleView: UIView { ...@@ -154,11 +154,11 @@ class YHCardExampleView: UIView {
bottomButton = { bottomButton = {
let button = UIButton(type: .custom) let button = UIButton(type: .custom)
button.backgroundColor = UIColor(hex:0x4d9ffb) button.backgroundColor = UIColor(hex:0x4d9ffb)
button.titleLabel?.font = kBoldFont(size: 16) button.titleLabel?.font = UIFont.PFSC_M(ofSize: 16)
button.contentHorizontalAlignment = .center button.contentHorizontalAlignment = .center
button.setTitle("知道了", for: .normal) button.setTitle("知道了", for: .normal)
button.setTitleColor( UIColor(hex:0xffffff), for: .normal) button.setTitleColor( UIColor(hex:0xffffff), for: .normal)
button.layer.cornerRadius = 8 button.layer.cornerRadius = kCornerRadius6
button.addTarget(self, action: #selector(dismiss), for: .touchUpInside) button.addTarget(self, action: #selector(dismiss), for: .touchUpInside)
return button return button
}() }()
...@@ -182,8 +182,8 @@ class YHCardExampleView: UIView { ...@@ -182,8 +182,8 @@ class YHCardExampleView: UIView {
} }
let label = UILabel() let label = UILabel()
label.text = array[i] label.text = array[i]
label.textColor = UIColor(hex: 0x222222) label.textColor = UIColor.mainTextColor
label.font = kFont(size: 14) label.font = UIFont.PFSC_R(ofSize: 14)
centerView.addSubview(label) centerView.addSubview(label)
label.snp.makeConstraints { make in label.snp.makeConstraints { make in
make.top.equalTo(73) make.top.equalTo(73)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MainApplicantInformation/V/YHDatePickView.swift → galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MainApplicantInformation(主申请人信息)/V/YHDatePickView.swift
View file @ ec5ee6d3
...@@ -83,8 +83,8 @@ class YHDatePickView: UIView { ...@@ -83,8 +83,8 @@ class YHDatePickView: UIView {
titleLabel = { titleLabel = {
let label = UILabel() let label = UILabel()
label.text = "选择出生日期" label.text = "选择出生日期"
label.font = kFont(size: 17) label.font = UIFont.PFSC_M(ofSize: 17)
label.textColor = UIColor(hex:0x222222) label.textColor = UIColor.mainTextColor
label.textAlignment = .center label.textAlignment = .center
return label return label
}() }()
...@@ -98,10 +98,10 @@ class YHDatePickView: UIView { ...@@ -98,10 +98,10 @@ class YHDatePickView: UIView {
closeButton = { closeButton = {
let button = UIButton(type: .custom) let button = UIButton(type: .custom)
button.titleLabel?.font = kBoldFont(size: 14) button.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
button.contentHorizontalAlignment = .center button.contentHorizontalAlignment = .center
button.setTitle("取消", for: .normal) button.setTitle("取消", for: .normal)
button.setTitleColor( UIColor(hex:0x222222), for: .normal) button.setTitleColor( UIColor.mainTextColor, for: .normal)
button.addTarget(self, action: #selector(dismiss), for: .touchUpInside) button.addTarget(self, action: #selector(dismiss), for: .touchUpInside)
return button return button
}() }()
...@@ -115,7 +115,7 @@ class YHDatePickView: UIView { ...@@ -115,7 +115,7 @@ class YHDatePickView: UIView {
sureButton = { sureButton = {
let button = UIButton(type: .custom) let button = UIButton(type: .custom)
button.titleLabel?.font = kBoldFont(size: 14) button.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
button.contentHorizontalAlignment = .center button.contentHorizontalAlignment = .center
button.setTitle("确定", for: .normal) button.setTitle("确定", for: .normal)
button.setTitleColor( UIColor(hex:0x4487f9), for: .normal) button.setTitleColor( UIColor(hex:0x4487f9), for: .normal)
...@@ -132,7 +132,7 @@ class YHDatePickView: UIView { ...@@ -132,7 +132,7 @@ class YHDatePickView: UIView {
lineView = { lineView = {
let view = UIView() let view = UIView()
view.backgroundColor = UIColor(hex: 0xf0f0f0) view.backgroundColor = UIColor.separatorColor
return view return view
}() }()
centerView.addSubview(lineView) centerView.addSubview(lineView)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MainApplicantInformation/V/YHImagePickerView.swift → galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MainApplicantInformation(主申请人信息)/V/YHImagePickerView.swift
View file @ ec5ee6d3
...@@ -57,8 +57,8 @@ class YHImagePickerView: UIView { ...@@ -57,8 +57,8 @@ class YHImagePickerView: UIView {
titleLabel = { titleLabel = {
let label = UILabel() let label = UILabel()
label.text = "请选择上传方式" label.text = "请选择上传方式"
label.font = kFont(size: 17) label.font = UIFont.PFSC_M(ofSize: 17)
label.textColor = UIColor(hex:0x222222) label.textColor = UIColor.mainTextColor
label.textAlignment = .left label.textAlignment = .left
return label return label
}() }()
...@@ -84,10 +84,10 @@ class YHImagePickerView: UIView { ...@@ -84,10 +84,10 @@ class YHImagePickerView: UIView {
takePhotoBtton = { takePhotoBtton = {
let button = UIButton(type: .custom) let button = UIButton(type: .custom)
button.titleLabel?.font = kBoldFont(size: 14) button.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
button.contentHorizontalAlignment = .center button.contentHorizontalAlignment = .center
button.setTitle("拍照上传", for: .normal) button.setTitle("拍照上传", for: .normal)
button.setTitleColor( UIColor(hex:0x222222), for: .normal) button.setTitleColor( UIColor.mainTextColor, for: .normal)
button.addTarget(self, action: #selector(takePhoto), for: .touchUpInside) button.addTarget(self, action: #selector(takePhoto), for: .touchUpInside)
return button return button
}() }()
...@@ -101,10 +101,10 @@ class YHImagePickerView: UIView { ...@@ -101,10 +101,10 @@ class YHImagePickerView: UIView {
selectPhotoButton = { selectPhotoButton = {
let button = UIButton(type: .custom) let button = UIButton(type: .custom)
button.titleLabel?.font = kBoldFont(size: 14) button.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
button.contentHorizontalAlignment = .center button.contentHorizontalAlignment = .center
button.setTitle("相册上传", for: .normal) button.setTitle("相册上传", for: .normal)
button.setTitleColor( UIColor(hex:0x222222), for: .normal) button.setTitleColor( UIColor.mainTextColor, for: .normal)
button.addTarget(self, action: #selector(selectPhoto), for: .touchUpInside) button.addTarget(self, action: #selector(selectPhoto), for: .touchUpInside)
return button return button
}() }()
...@@ -118,7 +118,7 @@ class YHImagePickerView: UIView { ...@@ -118,7 +118,7 @@ class YHImagePickerView: UIView {
cannalButton = { cannalButton = {
let button = UIButton(type: .custom) let button = UIButton(type: .custom)
button.titleLabel?.font = kBoldFont(size: 14) button.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
button.contentHorizontalAlignment = .center button.contentHorizontalAlignment = .center
button.setTitle("取消", for: .normal) button.setTitle("取消", for: .normal)
button.setTitleColor( UIColor(hex:0x909090), for: .normal) button.setTitleColor( UIColor(hex:0x909090), for: .normal)
...@@ -135,7 +135,7 @@ class YHImagePickerView: UIView { ...@@ -135,7 +135,7 @@ class YHImagePickerView: UIView {
for i in 0..<3 { for i in 0..<3 {
let view = UIView() let view = UIView()
view.backgroundColor = UIColor(hex: 0xf0f0f0) view.backgroundColor = UIColor.separatorColor
centerView.addSubview(view) centerView.addSubview(view)
view.snp.makeConstraints { make in view.snp.makeConstraints { make in
make.left.equalTo(18) make.left.equalTo(18)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MainApplicantInformation/V/YHItemView.swift → galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MainApplicantInformation(主申请人信息)/V/YHItemView.swift
View file @ ec5ee6d3
...@@ -48,6 +48,8 @@ class YHItemView: UIView { ...@@ -48,6 +48,8 @@ class YHItemView: UIView {
messageTextField = { messageTextField = {
let textField = UITextField() let textField = UITextField()
textField.delegate = self textField.delegate = self
textField.textColor = UIColor.mainTextColor
textField.font = UIFont.PFSC_M(ofSize: 14)
return textField return textField
}() }()
addSubview(messageTextField) addSubview(messageTextField)
...@@ -81,12 +83,12 @@ class YHItemView: UIView { ...@@ -81,12 +83,12 @@ class YHItemView: UIView {
rightButton = { rightButton = {
let button = UIButton(type: .custom) let button = UIButton(type: .custom)
button.backgroundColor = UIColor(hex: 0x4487f9).withAlphaComponent(0.08) button.backgroundColor = UIColor.brandMainColor.withAlphaComponent(0.08)
button.setTitleColor(UIColor(hex: 0x4487f9), for: .selected) button.setTitleColor(UIColor.brandMainColor, for: .selected)
button.setTitleColor(UIColor(hex: 0x222222), for: .normal) button.setTitleColor(UIColor.mainTextColor, for: .normal)
button.layer.cornerRadius = 16 button.layer.cornerRadius = 16
button.layer.borderWidth = 1 button.layer.borderWidth = 1
button.layer.borderColor = UIColor(hex: 0x4487f9).cgColor button.layer.borderColor = UIColor.brandMainColor.cgColor
button.isSelected = true button.isSelected = true
button.addTarget(self, action: #selector(rightClick), for: .touchUpInside) button.addTarget(self, action: #selector(rightClick), for: .touchUpInside)
return button return button
...@@ -101,9 +103,9 @@ class YHItemView: UIView { ...@@ -101,9 +103,9 @@ class YHItemView: UIView {
leftButton = { leftButton = {
let button = UIButton(type: .custom) let button = UIButton(type: .custom)
button.backgroundColor = UIColor(hex: 0xf8f9fb) button.backgroundColor = UIColor.contentBkgColor
button.setTitleColor(UIColor(hex: 0x4487f9), for: .selected) button.setTitleColor(UIColor.brandMainColor, for: .selected)
button.setTitleColor(UIColor(hex: 0x222222), for: .normal) button.setTitleColor(UIColor.mainTextColor, for: .normal)
button.layer.cornerRadius = 16 button.layer.cornerRadius = 16
button.addTarget(self, action: #selector(leftClick), for: .touchUpInside) button.addTarget(self, action: #selector(leftClick), for: .touchUpInside)
return button return button
...@@ -124,7 +126,7 @@ class YHItemView: UIView { ...@@ -124,7 +126,7 @@ class YHItemView: UIView {
let str = "*" + (dataSource.title ?? "") let str = "*" + (dataSource.title ?? "")
let attributes: [NSAttributedString.Key: Any] = [ let attributes: [NSAttributedString.Key: Any] = [
.font: UIFont.PFSC_R(ofSize: 14), .font: UIFont.PFSC_R(ofSize: 14),
.foregroundColor: UIColor(hex:0x222222) .foregroundColor: UIColor.mainTextColor
] ]
let questionAttrStr = NSMutableAttributedString(string: str, attributes: attributes) let questionAttrStr = NSMutableAttributedString(string: str, attributes: attributes)
let starRange = NSRange(location: 0, length: 1) let starRange = NSRange(location: 0, length: 1)
...@@ -133,8 +135,8 @@ class YHItemView: UIView { ...@@ -133,8 +135,8 @@ class YHItemView: UIView {
} else { } else {
let str = dataSource.title ?? "" let str = dataSource.title ?? ""
let attributes: [NSAttributedString.Key: Any] = [ let attributes: [NSAttributedString.Key: Any] = [
.font: kFont(size: 14), .font: UIFont.PFSC_R(ofSize: 14),
.foregroundColor: UIColor(hex:0x222222) .foregroundColor: UIColor.mainTextColor
] ]
let questionAttrStr = NSMutableAttributedString(string: str, attributes: attributes) let questionAttrStr = NSMutableAttributedString(string: str, attributes: attributes)
titleLabel.attributedText = questionAttrStr titleLabel.attributedText = questionAttrStr
...@@ -193,49 +195,61 @@ class YHItemView: UIView { ...@@ -193,49 +195,61 @@ class YHItemView: UIView {
leftButton.isSelected = true leftButton.isSelected = true
rightButton.isSelected = false rightButton.isSelected = false
leftButton.layer.borderWidth = 1 leftButton.layer.borderWidth = 1
leftButton.layer.borderColor = UIColor(hex: 0x4487f9).cgColor leftButton.layer.borderColor = UIColor.brandMainColor.cgColor
leftButton.backgroundColor = UIColor(hex: 0x4487f9).withAlphaComponent(0.08) leftButton.backgroundColor = UIColor.brandMainColor.withAlphaComponent(0.08)
rightButton.backgroundColor = UIColor(hex: 0xf8f9fb) rightButton.backgroundColor = UIColor.contentBkgColor
rightButton.layer.borderWidth = 0 rightButton.layer.borderWidth = 0
leftButton.titleLabel?.font = UIFont.PFSC_M(ofSize: 13)
rightButton.titleLabel?.font = UIFont.PFSC_R(ofSize: 13)
} else { } else {
rightButton.isSelected = true rightButton.isSelected = true
leftButton.isSelected = false leftButton.isSelected = false
rightButton.layer.borderWidth = 1 rightButton.layer.borderWidth = 1
rightButton.layer.borderColor = UIColor(hex: 0x4487f9).cgColor rightButton.layer.borderColor = UIColor.brandMainColor.cgColor
rightButton.backgroundColor = UIColor(hex: 0x4487f9).withAlphaComponent(0.08) rightButton.backgroundColor = UIColor.brandMainColor.withAlphaComponent(0.08)
leftButton.backgroundColor = UIColor(hex: 0xf8f9fb) leftButton.backgroundColor = UIColor.contentBkgColor
leftButton.layer.borderWidth = 0 leftButton.layer.borderWidth = 0
rightButton.titleLabel?.font = UIFont.PFSC_M(ofSize: 13)
leftButton.titleLabel?.font = UIFont.PFSC_R(ofSize: 13)
} }
} }
@objc func rightClick() { @objc func rightClick() {
rightButton.isSelected = true rightButton.isSelected = true
leftButton.isSelected = false leftButton.isSelected = false
rightButton.layer.borderWidth = 1 rightButton.layer.borderWidth = 1
rightButton.layer.borderColor = UIColor(hex: 0x4487f9).cgColor rightButton.layer.borderColor = UIColor.brandMainColor.cgColor
rightButton.backgroundColor = UIColor(hex: 0x4487f9).withAlphaComponent(0.08) rightButton.backgroundColor = UIColor.brandMainColor.withAlphaComponent(0.08)
leftButton.backgroundColor = UIColor(hex: 0xf8f9fb) leftButton.backgroundColor = UIColor.contentBkgColor
leftButton.layer.borderWidth = 0 leftButton.layer.borderWidth = 0
dataSource?.message = "0" dataSource?.message = "0"
dataSource?.value = ["0"] dataSource?.value = ["0"]
if let block = block { if let block = block {
block(dataSource ?? YHItemModel()) block(dataSource ?? YHItemModel())
} }
rightButton.titleLabel?.font = UIFont.PFSC_M(ofSize: 13)
leftButton.titleLabel?.font = UIFont.PFSC_R(ofSize: 13)
} }
@objc func leftClick() { @objc func leftClick() {
leftButton.isSelected = true leftButton.isSelected = true
rightButton.isSelected = false rightButton.isSelected = false
leftButton.layer.borderWidth = 1 leftButton.layer.borderWidth = 1
leftButton.layer.borderColor = UIColor(hex: 0x4487f9).cgColor leftButton.layer.borderColor = UIColor.brandMainColor.cgColor
leftButton.backgroundColor = UIColor(hex: 0x4487f9).withAlphaComponent(0.08) leftButton.backgroundColor = UIColor.brandMainColor.withAlphaComponent(0.08)
rightButton.backgroundColor = UIColor(hex: 0xf8f9fb) rightButton.backgroundColor = UIColor.contentBkgColor
rightButton.layer.borderWidth = 0 rightButton.layer.borderWidth = 0
dataSource?.message = "1" dataSource?.message = "1"
dataSource?.value = ["1"] dataSource?.value = ["1"]
if let block = block { if let block = block {
block(dataSource ?? YHItemModel()) block(dataSource ?? YHItemModel())
} }
leftButton.titleLabel?.font = UIFont.PFSC_M(ofSize: 13)
rightButton.titleLabel?.font = UIFont.PFSC_R(ofSize: 13)
} }
@objc func centerClick() { @objc func centerClick() {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MainApplicantInformation/V/YHMainInformationCardTableViewCell.swift → galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MainApplicantInformation(主申请人信息)/V/YHMainInformationCardTableViewCell.swift
View file @ ec5ee6d3
...@@ -66,25 +66,28 @@ class YHMainInformationCardTableViewCell: UITableViewCell { ...@@ -66,25 +66,28 @@ class YHMainInformationCardTableViewCell: UITableViewCell {
} }
func setupUI() { func setupUI() {
backgroundColor = UIColor(hex: 0xe9e9e9) contentView.backgroundColor = .clear
backgroundColor = .clear
centerView = { centerView = {
let view = UIView() let view = UIView()
view.backgroundColor = .white view.backgroundColor = .white
view.layer.cornerRadius = 12 view.layer.cornerRadius = kCornerRadius6
return view return view
}() }()
contentView.addSubview(centerView) contentView.addSubview(centerView)
centerView.snp.makeConstraints { make in centerView.snp.makeConstraints { make in
make.left.equalTo(16) make.left.equalTo(16)
make.right.equalTo(-16) make.right.equalTo(-16)
make.top.equalTo(7) make.top.equalTo(7)
make.bottom.equalTo(-7) make.bottom.equalTo(-16)
} }
titleLabel = { titleLabel = {
let label = UILabel() let label = UILabel()
label.font = kFont(size: 17) label.font = UIFont.PFSC_M(ofSize: 17)
label.textColor = UIColor(hex:0x222222) label.textColor = UIColor.mainTextColor
return label return label
}() }()
centerView.addSubview(titleLabel) centerView.addSubview(titleLabel)
...@@ -96,11 +99,11 @@ class YHMainInformationCardTableViewCell: UITableViewCell { ...@@ -96,11 +99,11 @@ class YHMainInformationCardTableViewCell: UITableViewCell {
exampleButton = { exampleButton = {
let button = UIButton(type: .custom) let button = UIButton(type: .custom)
button.backgroundColor = UIColor(hex:0x1f93ff).withAlphaComponent(0.12) button.backgroundColor = UIColor.brandMainColor.withAlphaComponent(0.08)
button.titleLabel?.font = kBoldFont(size: 10) button.titleLabel?.font = UIFont.PFSC_M(ofSize: 10)
button.contentHorizontalAlignment = .center button.contentHorizontalAlignment = .center
button.setTitle("示例模板", for: .normal) button.setTitle("示例模板", for: .normal)
button.setTitleColor( UIColor(hex:0x0085ff), for: .normal) button.setTitleColor( UIColor.brandMainColor, for: .normal)
button.layer.cornerRadius = 4 button.layer.cornerRadius = 4
button.addTarget(self, action: #selector(exampleClick), for: .touchUpInside) button.addTarget(self, action: #selector(exampleClick), for: .touchUpInside)
return button return button
...@@ -115,7 +118,7 @@ class YHMainInformationCardTableViewCell: UITableViewCell { ...@@ -115,7 +118,7 @@ class YHMainInformationCardTableViewCell: UITableViewCell {
let lineView = { let lineView = {
let view = UIView() let view = UIView()
view.backgroundColor = UIColor(hex: 0xf0f0f0) view.backgroundColor = UIColor.separatorColor
return view return view
}() }()
centerView.addSubview(lineView) centerView.addSubview(lineView)
...@@ -128,8 +131,8 @@ class YHMainInformationCardTableViewCell: UITableViewCell { ...@@ -128,8 +131,8 @@ class YHMainInformationCardTableViewCell: UITableViewCell {
frontLabel = { frontLabel = {
let label = UILabel() let label = UILabel()
label.font = kFont(size: 12) label.font = UIFont.PFSC_R(ofSize: 12)
label.textColor = UIColor(hex:0x888f98) label.textColor = UIColor.contentBkgColor
label.textAlignment = .center label.textAlignment = .center
return label return label
}() }()
...@@ -143,8 +146,8 @@ class YHMainInformationCardTableViewCell: UITableViewCell { ...@@ -143,8 +146,8 @@ class YHMainInformationCardTableViewCell: UITableViewCell {
backSurfaceLabel = { backSurfaceLabel = {
let label = UILabel() let label = UILabel()
label.font = kFont(size: 12) label.font = UIFont.PFSC_R(ofSize: 12)
label.textColor = UIColor(hex:0x888f98) label.textColor = UIColor.contentBkgColor
label.textAlignment = .center label.textAlignment = .center
return label return label
}() }()
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MainApplicantInformation/V/YHMainInformationTableViewCell.swift → galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MainApplicantInformation(主申请人信息)/V/YHMainInformationTableViewCell.swift
View file @ ec5ee6d3
...@@ -41,11 +41,13 @@ class YHMainInformationTableViewCell: UITableViewCell { ...@@ -41,11 +41,13 @@ class YHMainInformationTableViewCell: UITableViewCell {
} }
func setupUI() { func setupUI() {
backgroundColor = UIColor(hex: 0xe9e9e9) contentView.backgroundColor = .clear
backgroundColor = .clear
centerView = { centerView = {
let view = UIView() let view = UIView()
view.backgroundColor = .white view.backgroundColor = .white
view.layer.cornerRadius = 12 view.layer.cornerRadius = kCornerRadius6
return view return view
}() }()
contentView.addSubview(centerView) contentView.addSubview(centerView)
...@@ -58,8 +60,8 @@ class YHMainInformationTableViewCell: UITableViewCell { ...@@ -58,8 +60,8 @@ class YHMainInformationTableViewCell: UITableViewCell {
titleLabel = { titleLabel = {
let label = UILabel() let label = UILabel()
label.font = kFont(size: 17) label.font = UIFont.PFSC_M(ofSize: 17)
label.textColor = UIColor(hex:0x222222) label.textColor = UIColor.mainTextColor
return label return label
}() }()
centerView.addSubview(titleLabel) centerView.addSubview(titleLabel)
...@@ -73,7 +75,7 @@ class YHMainInformationTableViewCell: UITableViewCell { ...@@ -73,7 +75,7 @@ class YHMainInformationTableViewCell: UITableViewCell {
mainItemView = { mainItemView = {
let view = UIView() let view = UIView()
view.backgroundColor = .white view.backgroundColor = .white
view.layer.cornerRadius = 12 view.layer.cornerRadius = kCornerRadius6
return view return view
}() }()
centerView.addSubview(mainItemView) centerView.addSubview(mainItemView)
...@@ -88,7 +90,7 @@ class YHMainInformationTableViewCell: UITableViewCell { ...@@ -88,7 +90,7 @@ class YHMainInformationTableViewCell: UITableViewCell {
mainItemView.removeSubviews() mainItemView.removeSubviews()
for i in 0 ..< (dataSource?.models?.count ?? 0) { for i in 0 ..< (dataSource?.models?.count ?? 0) {
let line = UIView() let line = UIView()
line.backgroundColor = UIColor(hex: 0xf0f0f0) line.backgroundColor = UIColor.separatorColor
mainItemView.addSubview(line) mainItemView.addSubview(line)
line.snp.makeConstraints { make in line.snp.makeConstraints { make in
make.left.equalTo(18) make.left.equalTo(18)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MainApplicantInformation/V/YHStepView.swift → galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MainApplicantInformation(主申请人信息)/V/YHStepView.swift
View file @ ec5ee6d3
...@@ -69,10 +69,10 @@ class YHStepView: UIScrollView { ...@@ -69,10 +69,10 @@ class YHStepView: UIScrollView {
} }
let label = UILabel() let label = UILabel()
label.text = array[i] label.text = array[i]
label.font = kFont(size: 13) label.font = UIFont.PFSC_R(ofSize: 13)
label.textAlignment = .center label.textAlignment = .center
label.tag = 2000 + i label.tag = 2000 + i
label.textColor = UIColor.init(hex: 0x222222) label.textColor = UIColor.mainTextColor
addSubview(label) addSubview(label)
label.snp.makeConstraints { make in label.snp.makeConstraints { make in
make.centerX.equalTo(button.snp.centerX) make.centerX.equalTo(button.snp.centerX)
...@@ -100,13 +100,13 @@ class YHStepView: UIScrollView { ...@@ -100,13 +100,13 @@ class YHStepView: UIScrollView {
if currentIndex == i { if currentIndex == i {
button.setBackgroundImage(UIImage(named: "service_step_now"), for: .normal) button.setBackgroundImage(UIImage(named: "service_step_now"), for: .normal)
label.textColor = UIColor.init(hex: 0x4388ff) label.textColor = UIColor.brandMainColor
} else if i < currentIndex { } else if i < currentIndex {
button.setBackgroundImage(UIImage(named: "service_step_success"), for: .normal) button.setBackgroundImage(UIImage(named: "service_step_success"), for: .normal)
label.textColor = UIColor.init(hex: 0x222222) label.textColor = UIColor.mainTextColor
} else { } else {
button.setBackgroundImage(UIImage(named: "service_step_fail"), for: .normal) button.setBackgroundImage(UIImage(named: "service_step_fail"), for: .normal)
label.textColor = UIColor.init(hex: 0xc0c0c0) label.textColor = UIColor.placeHolderColor
} }
} }
} }
...@@ -125,13 +125,16 @@ class YHStepView: UIScrollView { ...@@ -125,13 +125,16 @@ class YHStepView: UIScrollView {
} }
if currentIndex == i { if currentIndex == i {
button?.setBackgroundImage(UIImage(named: "service_step_now"), for: .normal) button?.setBackgroundImage(UIImage(named: "service_step_now"), for: .normal)
lable?.textColor = UIColor.init(hex: 0x4388ff) lable?.textColor = UIColor.brandMainColor
lable?.font = UIFont.PFSC_M(ofSize: 13)
} else if i < currentIndex { } else if i < currentIndex {
button?.setBackgroundImage(UIImage(named: "service_step_success"), for: .normal) button?.setBackgroundImage(UIImage(named: "service_step_success"), for: .normal)
lable?.textColor = UIColor.init(hex: 0x222222) lable?.textColor = UIColor.mainTextColor
lable?.font = UIFont.PFSC_R(ofSize: 13)
} else { } else {
button?.setBackgroundImage(UIImage(named: "service_step_fail"), for: .normal) button?.setBackgroundImage(UIImage(named: "service_step_fail"), for: .normal)
lable?.textColor = UIColor.init(hex: 0xc0c0c0) lable?.textColor = UIColor.placeHolderColor
lable?.font = UIFont.PFSC_R(ofSize: 13)
} }
} }
} }
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MyScore(我的评分)/V/YHScoreItemCell.swift
View file @ ec5ee6d3
...@@ -20,7 +20,7 @@ class YHScoreItemCell: UITableViewCell { ...@@ -20,7 +20,7 @@ class YHScoreItemCell: UITableViewCell {
private lazy var holdView : UIView = { private lazy var holdView : UIView = {
let view = UIView() let view = UIView()
view.backgroundColor = .white view.backgroundColor = .white
view.layer.cornerRadius = 12 view.layer.cornerRadius = kCornerRadius6
view.clipsToBounds = true view.clipsToBounds = true
return view return view
}() }()
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/OtherInformation(其他信息)/C/YHOtherInfoFillViewController.swift
View file @ ec5ee6d3
...@@ -96,109 +96,22 @@ extension YHOtherInfoFillViewController { ...@@ -96,109 +96,22 @@ extension YHOtherInfoFillViewController {
private func saveData() { private func saveData() {
let model = otherInfoVM.otherInfoFillData let model = otherInfoVM.otherInfoFillData
printLog(model?.toDictionary())
//保存 //保存
// let arr = basicInfoVM.arrBasicInfoSessionDataForEdit
// if let param = model?.toDictionary() {
//
// var param : [String : Any] = ["order_id":orderId as Any,"save_type": "save"] printLog(param)
//
// for item in arr { otherInfoVM.saveOtherInfo(params: param) { success, error in
// if item.sessionTitle == "主申请人" { if success == true {
// var applicant : [String : Any] = [:] YHHUD.flash(message: "保存成功")
// for (index0,item0) in item.arrQuestionItem.enumerated() { } else {
// if index0 == 0 { let msg = error?.errorMsg ?? "保存失败"
// let value = ["answer":item0.answer,"info":item0.answer == "Y" ? item0.info : ""] YHHUD.flash(message: msg)
// applicant.updateValue(value, forKey: "has_breaking_law") }
// } else if index0 == 1 { }
// let value = ["answer":item0.answer,"info":item0.answer == "Y" ? item0.info : ""] }
// applicant.updateValue(value, forKey: "has_conviction")
// } else if index0 == 2 {
// let value = ["answer":item0.answer,"info":item0.answer == "Y" ? item0.info : ""]
// applicant.updateValue(value, forKey: "has_deny")
// } else if index0 == 3 {
// let value = ["answer":item0.answer,"info":item0.answer == "Y" ? item0.info : ""]
// applicant.updateValue(value, forKey: "has_departure")
// } else if index0 == 4 {
// let value = ["answer":item0.answer,"info":item0.answer == "Y" ? item0.info : ""]
// applicant.updateValue(value, forKey: "has_other_id")
// } else {
// printLog("其他数据没有处理")
// }
// }
// applicant.updateValue(basicInfoVM.dataModelForBasicInfo?.applicant?.id ?? 0, forKey: "id")
// param.updateValue(applicant, forKey: "applicant")
// } else if item.sessionTitle == "配偶" {
//
// var applicant : [String : Any] = [:]
// for (index0,item0) in item.arrQuestionItem.enumerated() {
// if index0 == 0 {
// let value = ["answer":item0.answer,"info":item0.answer == "Y" ? item0.info : ""]
// applicant.updateValue(value, forKey: "child_deny")
// } else if index0 == 1 {
// let value = ["answer":item0.answer,"info":item0.answer == "Y" ? item0.info : ""]
// applicant.updateValue(value, forKey: "child_departure")
// } else {
// printLog("其他数据没有处理")
// }
// }
// applicant.updateValue(basicInfoVM.dataModelForBasicInfo?.spouse?.id ?? 0, forKey: "id")
// applicant.updateValue(basicInfoVM.dataModelForBasicInfo?.spouse?.subset_name ?? 0, forKey: "subset_name")
// param.updateValue(applicant, forKey: "spouse")
// } else if item.sessionTitle.hasPrefix("子女") {
// var arr : [[String:Any]] = []
// if let tArr = param["child"] as? [[String : Any]] {
// arr = tArr
// }
//
//
// var applicant : [String : Any] = [:]
// for (index0,item0) in item.arrQuestionItem.enumerated() {
// if index0 == 0 {
// let value = ["answer":item0.answer,"info":item0.answer == "Y" ? item0.info : ""]
// applicant.updateValue(value, forKey: "child_deny")
// } else if index0 == 1 {
// let value = ["answer":item0.answer,"info":item0.answer == "Y" ? item0.info : ""]
// applicant.updateValue(value, forKey: "child_departure")
// } else {
// printLog("其他数据没有处理")
// }
// }
//
// applicant.updateValue(item.model?.id ?? 0, forKey: "id")
// applicant.updateValue(item.model?.subset_name ?? "", forKey: "subset_name")
// arr.append(applicant)
//
//
// param.updateValue(arr, forKey: "child")
// } else if item.sessionTitle == "家庭背景" {
// var applicant : [String : Any] = [:]
// for (index0,item0) in item.arrQuestionItem.enumerated() {
// if index0 == 0 {
// let value = ["answer":item0.answer,"info":item0.answer == "Y" ? item0.info : ""]
// applicant.updateValue(value, forKey: "background_member")
// } else {
// printLog("其他数据没有处理")
// }
// }
// applicant.updateValue(basicInfoVM.dataModelForBasicInfo?.spouse?.id ?? 0, forKey: "id")
// applicant.updateValue(basicInfoVM.dataModelForBasicInfo?.spouse?.subset_name ?? 0, forKey: "subset_name")
// param.updateValue(applicant, forKey: "background")
// } else {
//
// }
// }
//
// printLog(param)
//
// basicInfoVM.saveBasicInfo(params: param) { success, error in
// if success == true {
// YHHUD.flash(message: "保存成功")
// } else {
// let msg = error?.errorMsg ?? "保存失败"
// YHHUD.flash(message: msg)
// }
// }
} }
private func submitData() { private func submitData() {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/OtherInformation(其他信息)/M/YHOtherInfoFillModel.swift
View file @ ec5ee6d3
...@@ -10,11 +10,12 @@ import UIKit ...@@ -10,11 +10,12 @@ import UIKit
import SmartCodable import SmartCodable
class YHOtherInfoFillModel: SmartCodable { class YHOtherInfoFillModel: SmartCodable {
var orderID: String = "" var order_id: String = ""
var residences: [Residence] = [] var residences: [Residence] = []
var language_detail: LanguageDetail? var language_detail: LanguageDetail?
var profession: Profession? var profession: Profession?
var question: Question? var question: Question?
var is_update : Bool = false
required init() { required init() {
...@@ -28,8 +29,8 @@ class Residence : SmartCodable { ...@@ -28,8 +29,8 @@ class Residence : SmartCodable {
var start_time: String = "" var start_time: String = ""
var end_time: String = "" var end_time: String = ""
var orderID: Int = -1 var order_id: Int = -1
var endTimeChecked: Bool = false var end_time_checked: Bool = false //是否勾选 至今
required init() { required init() {
} }
...@@ -37,7 +38,7 @@ class Residence : SmartCodable { ...@@ -37,7 +38,7 @@ class Residence : SmartCodable {
// MARK: - LanguageDetail // MARK: - LanguageDetail
class LanguageDetail : SmartCodable { class LanguageDetail : SmartCodable {
var schoolAddressAboard: Bool = false var school_address_aboard: Bool = false //修读学校是否在国外
var level: Int = -1 var level: Int = -1
var levelDes : String = "" var levelDes : String = ""
var name: String = "" var name: String = ""
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/OtherInformation(其他信息)/V/YHOtherInfoFillCell.swift
View file @ ec5ee6d3
...@@ -63,6 +63,8 @@ class YHOtherInfoFillCell: UITableViewCell { ...@@ -63,6 +63,8 @@ class YHOtherInfoFillCell: UITableViewCell {
}() }()
let languageView = YHOtherSelecteItemView()
let skillView = YHOtherSelecteItemView()
} }
extension YHOtherInfoFillCell { extension YHOtherInfoFillCell {
...@@ -213,7 +215,7 @@ extension YHOtherInfoFillCell { ...@@ -213,7 +215,7 @@ extension YHOtherInfoFillCell {
} }
let view = YHOtherSelecteItemView() let view = languageView
view.updateKeyName(name: "您的语言水平与下列哪一项符合", keyValue:dataModel.language_detail?.levelDes ?? "") view.updateKeyName(name: "您的语言水平与下列哪一项符合", keyValue:dataModel.language_detail?.levelDes ?? "")
view.type = 2 view.type = 2
holdView2.addSubview(view) holdView2.addSubview(view)
...@@ -225,6 +227,10 @@ extension YHOtherInfoFillCell { ...@@ -225,6 +227,10 @@ extension YHOtherInfoFillCell {
make.height.equalTo(YHOtherSelecteItemView.getViewHBy(type: 2)) make.height.equalTo(YHOtherSelecteItemView.getViewHBy(type: 2))
make.bottom.equalToSuperview() make.bottom.equalToSuperview()
} }
let tap = UITapGestureRecognizer(target: self, action: #selector(tapViewItem))
view.addGestureRecognizer(tap)
} }
...@@ -248,7 +254,7 @@ extension YHOtherInfoFillCell { ...@@ -248,7 +254,7 @@ extension YHOtherInfoFillCell {
} }
let view = YHOtherSelecteItemView() let view = skillView
view.updateKeyName(name: "最能代表你的专业技能的行业", keyValue: dataModel.profession?.optionDes ?? "") view.updateKeyName(name: "最能代表你的专业技能的行业", keyValue: dataModel.profession?.optionDes ?? "")
view.type = 2 view.type = 2
holdView3.addSubview(view) holdView3.addSubview(view)
...@@ -260,6 +266,11 @@ extension YHOtherInfoFillCell { ...@@ -260,6 +266,11 @@ extension YHOtherInfoFillCell {
make.height.equalTo(YHOtherSelecteItemView.getViewHBy(type: 2)) make.height.equalTo(YHOtherSelecteItemView.getViewHBy(type: 2))
make.bottom.equalToSuperview() make.bottom.equalToSuperview()
} }
let tap = UITapGestureRecognizer(target: self, action: #selector(tapViewItem2))
skillView.addGestureRecognizer(tap)
} }
...@@ -392,3 +403,22 @@ extension YHOtherInfoFillCell { ...@@ -392,3 +403,22 @@ extension YHOtherInfoFillCell {
return holdView1 return holdView1
} }
} }
extension YHOtherInfoFillCell {
@objc func tapViewItem(_ gestureRecognizer: UIPanGestureRecognizer) {
YHOtherPickerView.show(type: .language) { item in
self.dataModel?.language_detail?.level = Int(item.index) ?? 0
self.dataModel?.language_detail?.levelDes = item.title
self.languageView.updateKeyName(name: "您的语言水平与下列哪一项符合", keyValue:self.dataModel?.language_detail?.levelDes ?? "")
}
}
@objc func tapViewItem2(_ gestureRecognizer: UIPanGestureRecognizer) {
YHOtherPickerView.show(type: .professionalSkill) { item in
print(item)
self.dataModel?.profession?.option = Int(item.index) ?? 0
self.dataModel?.profession?.optionDes = item.title
self.skillView.updateKeyName(name: "最能代表你的专业技能的行业", keyValue:self.dataModel?.profession?.optionDes ?? "")
}
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/OtherInformation(其他信息)/V/YHOtherInfoSessionView.swift
View file @ ec5ee6d3
...@@ -129,6 +129,12 @@ extension YHOtherInfoSessionView { ...@@ -129,6 +129,12 @@ extension YHOtherInfoSessionView {
@objc func clickDeleteBtn() { @objc func clickDeleteBtn() {
printLog("点击了 删除 按钮") printLog("点击了 删除 按钮")
block?(self.tag) YHSubmitAllInfoCheckView.showCheckView(tipMsg: "确认删除么?") { agree in
if agree == true {
self.block?(self.tag)
} else {
printLog("点击了 取消 按钮")
}
}
} }
} }
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/OtherInformation(其他信息)/V/YHOtherPickerView.swift 0 → 100644
View file @ ec5ee6d3
//
// YHOtherPickerView.swift
// galaxy
//
// Created by davidhuangA on 2024/2/22.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
import AttributedString
enum YHOtherPickerViewType: Int {
// 按自然顺序递增
case none = 0
// 语言能力
case language
// 专业技能行业
case professionalSkill
}
struct YHOtherPickerViewItemData {
let title : String
let subTitle : String
let index : String
}
class YHOtherPickerView: UIView {
private var type : YHOtherPickerViewType = .none
var arrData : [YHOtherPickerViewItemData] = []
private var selectType:YHFormPickerViewSubType?
// private var selectTitle:String? {
// didSet {
// let type:YHFormPickerViewSubType = getSubType(selectTitle)
// selectType = type
// }
// }
private var selectBlock:((YHOtherPickerViewItemData)->Void)? //回调
private var userSelectedItem : YHOtherPickerViewItemData? //用户选择的item
var title: String? {
didSet {
titleLabel.text = title
}
}
lazy var pickerView:UIPickerView = {
let view = UIPickerView()
view.dataSource = self
view.delegate = self
return view
}()
lazy var blackMaskView: UIView = {
let view = UIView()
view.backgroundColor = UIColor(hex: 0x0F1214, alpha: 0.5)
let tap = UITapGestureRecognizer(target: self, action: #selector(dismiss))
view.addGestureRecognizer(tap)
return view
}()
lazy var whiteContentView: UIView = {
let view = UIView()
view.backgroundColor = .white
return view
}()
lazy var topView:UIView = {
let view = UIView()
view.addSubview(titleLabel)
view.addSubview(cancelBtn)
view.addSubview(confirmBtn)
titleLabel.snp.makeConstraints { make in
make.edges.equalToSuperview()
}
cancelBtn.snp.makeConstraints { make in
make.left.top.bottom.equalToSuperview()
make.width.equalTo(60)
}
confirmBtn.snp.makeConstraints { make in
make.right.top.bottom.equalToSuperview()
make.width.equalTo(60)
}
return view
}()
lazy var titleLabel: UILabel = {
let label = UILabel()
label.textColor = UIColor.mainTextColor
label.textAlignment = .center
label.font = UIFont.PFSC_R(ofSize: 16)
label.text = "请选择"
return label
}()
lazy var cancelBtn: UIButton = {
let btn = UIButton()
btn.setTitle("取消".local, for: .normal)
btn.titleLabel?.font = UIFont.PFSC_R(ofSize: 14)
btn.setTitleColor(UIColor.mainTextColor, for: .normal)
btn.addTarget(self, action: #selector(didClickCancelButton), for: .touchUpInside)
return btn
}()
lazy var confirmBtn: UIButton = {
let btn = UIButton()
btn.setTitle("确定".local, for: .normal)
btn.titleLabel?.font = UIFont.PFSC_R(ofSize: 14)
btn.setTitleColor(UIColor(hex: 0x4487F9), for: .normal)
btn.addTarget(self, action: #selector(didClickConfirmButton), for: .touchUpInside)
return btn
}()
init(type: YHOtherPickerViewType) {
super.init(frame: UIScreen.main.bounds)
self.createUI()
self.type = type
initDataSource()
}
required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
func show() {
// showSelectType(&selectType)
UIApplication.shared.yhKeyWindow()?.addSubview(self)
}
static func show(type:YHOtherPickerViewType, selectType:YHFormPickerViewSubType? = nil, callBack: @escaping ((YHOtherPickerViewItemData)->Void)) {
let picker = YHOtherPickerView(type: type)
// picker.selectType = selectType
picker.selectBlock = callBack
picker.show()
}
@objc func dismiss() {
self.removeFromSuperview()
}
func createUI() {
self.addSubview(blackMaskView)
self.addSubview(whiteContentView)
whiteContentView.addSubview(topView)
whiteContentView.addSubview(pickerView)
let corner = UIRectCorner(rawValue: UIRectCorner.topLeft.rawValue | UIRectCorner.topRight.rawValue)
let path = UIBezierPath(roundedRect:bounds,byRoundingCorners: corner,cornerRadii:CGSizeMake(16.0, 16.0));
let layer = CAShapeLayer();
layer.frame = whiteContentView.bounds;
layer.path = path.cgPath;
whiteContentView.layer.mask = layer;
if let title = title {
titleLabel.text = title
} else {
titleLabel.text = getTitle(type: type)
}
blackMaskView.snp.makeConstraints { make in
make.edges.equalToSuperview()
}
whiteContentView.snp.makeConstraints { make in
make.left.right.bottom.equalToSuperview()
make.top.equalToSuperview().offset(KScreenHeight*2/3.0)
}
topView.snp.makeConstraints { make in
make.left.right.top.equalToSuperview()
make.height.equalTo(52)
}
pickerView.snp.makeConstraints { make in
make.top.equalTo(topView.snp.bottom)
make.left.right.bottom.equalToSuperview()
}
}
@objc func didClickCancelButton() {
dismiss()
}
@objc func didClickConfirmButton() {
if let item = userSelectedItem {
selectBlock?(item)
}
dismiss()
}
func showSelectType(_ selectType: inout YHFormPickerViewSubType?) {
// 处理从外部传入的选中第几行的参数
// 是否找到选中行数据
// var selectIndex:Int = -1
// if let selectType = selectType, let arr = dataDict[type], !arr.isEmpty {
// for (index, item) in arr.enumerated() {
// if selectType.index == item.type.index {
// selectIndex = index
// break
// }
// }
// }
//
// if selectIndex != -1 { // 找到了选择行
// pickerView.selectRow(selectIndex, inComponent: 0, animated: true)
// } else { // 未找到选中行数据则滚动至第一行
// if dataDict[type]?.isEmpty == true { return }
// if let arr = dataDict[type], !arr.isEmpty {
// let item = arr[0]
// selectType = item.type
// pickerView.selectRow(0, inComponent: 0, animated: true)
// }
// }
}
func getTitle(type: YHOtherPickerViewType)-> String {
switch type {
case .language:
return "选择语言能力"
case .professionalSkill:
return "选择专业技能行业"
default:
return "请选择"
}
}
}
extension YHOtherPickerView: UIPickerViewDelegate, UIPickerViewDataSource {
func numberOfComponents(in pickerView: UIPickerView) -> Int {
return 1
}
func pickerView(_ pickerView: UIPickerView, numberOfRowsInComponent component: Int) -> Int {
return arrData.count
}
// func pickerView(_ pickerView: UIPickerView, titleForRow row: Int, forComponent component: Int) -> String? {
// if 0 <= row && row < arrData.count {
// let item :YHOtherPickerViewItemData = arrData[row]
// return item.title
// }
// return ""
// }
func pickerView(_ pickerView: UIPickerView, didSelectRow row: Int, inComponent component: Int) {
if 0 <= row && row < arrData.count {
let item :YHOtherPickerViewItemData = arrData[row]
print(item)
userSelectedItem = item
}
}
func pickerView(_ pickerView: UIPickerView, rowHeightForComponent component: Int) -> CGFloat {
return 70
}
func pickerView(_ pickerView: UIPickerView, viewForRow row: Int, forComponent component: Int, reusing view: UIView?) -> UIView {
let label = UILabel()
label.textColor = UIColor.mainTextColor
label.font = UIFont.PFSC_M(ofSize: 14)
label.numberOfLines = 0
if 0 <= row && row < arrData.count {
let item :YHOtherPickerViewItemData = arrData[row]
if item.subTitle.count > 0 {
let a: ASAttributedString = .init(NSAttributedString(string: (item.title + "\n")), .font(UIFont.PFSC_M(ofSize: 14)),.foreground(UIColor.mainTextColor))
let b: ASAttributedString = .init(NSAttributedString(string: item.subTitle), .font(UIFont.PFSC_R(ofSize: 11)),.foreground(UIColor.labelTextColor2))
label.attributed.text = a + b
} else {
let a: ASAttributedString = .init(NSAttributedString(string: item.title), .font(UIFont.PFSC_M(ofSize: 14)),.foreground(UIColor.mainTextColor))
label.attributed.text = a
}
}
// 选中背景色
if #available(iOS 14.0, *), pickerView.subviews.count > 1 {
pickerView.subviews[1].backgroundColor = UIColor(hex: 0x4487F9, alpha: 0.06)
}
return label
}
}
extension YHOtherPickerView {
func initDataSource() {
//根据type 构建对应的数据源
switch type {
case .language:
let arr = YHOtherInfoFillViewModel.arrLanguage
arrData.removeAll()
arr.forEach { item in
let model = YHOtherPickerViewItemData(title: item["title"] ?? "-", subTitle: item["dec"] ?? "-", index: item["id"] ?? "-")
arrData.append(model)
}
title = getTitle(type: type)
return
case .professionalSkill:
let arr = YHOtherInfoFillViewModel.arrSkill
arrData.removeAll()
arr.forEach { item in
let model = YHOtherPickerViewItemData(title: item["title"] ?? "-", subTitle: item["dec"] ?? "-", index: item["value"] ?? "-")
arrData.append(model)
}
title = getTitle(type: type)
return
default:
return
}
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/OtherInformation(其他信息)/VM/YHOtherInfoFillViewModel.swift
View file @ ec5ee6d3
...@@ -11,7 +11,7 @@ import UIKit ...@@ -11,7 +11,7 @@ import UIKit
class YHOtherInfoFillViewModel: YHBaseViewModel { class YHOtherInfoFillViewModel: YHBaseViewModel {
var otherInfoFillData : YHOtherInfoFillModel? var otherInfoFillData : YHOtherInfoFillModel?
var arrLanguage : [[String : String]] = [ static let arrLanguage : [[String : String]] = [
["id":"1", ["id":"1",
"title": "中文及英文", "title": "中文及英文",
"dec": "国外大学（英语国家）毕业，英文授课，获得学位证。（如为中外联合办学，在中国上课的，不算）", "dec": "国外大学（英语国家）毕业，英文授课，获得学位证。（如为中外联合办学，在中国上课的，不算）",
...@@ -39,7 +39,7 @@ class YHOtherInfoFillViewModel: YHBaseViewModel { ...@@ -39,7 +39,7 @@ class YHOtherInfoFillViewModel: YHBaseViewModel {
] ]
var arrSkill : [[String : String]] = [ static let arrSkill : [[String : String]] = [
[ [
"title": "学术研究及教育", "title": "学术研究及教育",
"dec": "幼儿教育、高等教育、学术研究", "dec": "幼儿教育、高等教育、学术研究",
...@@ -172,7 +172,7 @@ extension YHOtherInfoFillViewModel { ...@@ -172,7 +172,7 @@ extension YHOtherInfoFillViewModel {
//保存其他资料信息 //保存其他资料信息
func saveOtherInfo( params:[String : Any],callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) { func saveOtherInfo( params:[String : Any],callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) {
let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Basics.updateBasicInfoApi let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Order.updateOtherInfoApi
let _ = YHNetRequest.getRequest(url: strUrl,params: params) { [weak self] json, code in let _ = YHNetRequest.getRequest(url: strUrl,params: params) { [weak self] json, code in
//1. json字符串 转 对象 //1. json字符串 转 对象
guard self != nil else { return } guard self != nil else { return }
...@@ -182,15 +182,15 @@ extension YHOtherInfoFillViewModel { ...@@ -182,15 +182,15 @@ extension YHOtherInfoFillViewModel {
return return
} }
printLog("model 是 ==> \(model)") printLog("model 是 ==> \(model)")
// let dic = model.data?.peel
// guard let resultModel = YHBasicInfoFillModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
// callBackBlock(false,nil)
// return
// }
//
// self.dataModelForBasicInfo = resultModel
//根据返回值 组装 真实的数据 //根据返回值 组装 真实的数据
callBackBlock(true,nil)
if model.code == 200 {
callBackBlock(true,nil)
} else {
let error : YHErrorModel = YHErrorModel(errorCode:Int32(model.code),errorMsg: model.msg)
callBackBlock(false,error)
}
} failBlock: { err in } failBlock: { err in
callBackBlock(false,err) callBackBlock(false,err)
} }
...@@ -204,7 +204,7 @@ extension YHOtherInfoFillViewModel { ...@@ -204,7 +204,7 @@ extension YHOtherInfoFillViewModel {
if let language = self.otherInfoFillData?.language_detail { if let language = self.otherInfoFillData?.language_detail {
if language.level > 0 { if language.level > 0 {
let target = String(language.level) let target = String(language.level)
for(_,item) in arrLanguage.enumerated() { for(_,item) in YHOtherInfoFillViewModel.arrLanguage.enumerated() {
if target == item["id"] { if target == item["id"] {
language.levelDes = item["title"] ?? "" language.levelDes = item["title"] ?? ""
...@@ -219,7 +219,7 @@ extension YHOtherInfoFillViewModel { ...@@ -219,7 +219,7 @@ extension YHOtherInfoFillViewModel {
if let profession = self.otherInfoFillData?.profession { if let profession = self.otherInfoFillData?.profession {
if profession.option > 0 { if profession.option > 0 {
let target = String(profession.option) let target = String(profession.option)
for(_,item) in arrSkill.enumerated() { for(_,item) in YHOtherInfoFillViewModel.arrSkill.enumerated() {
if target == item["value"] { if target == item["value"] {
profession.optionDes = item["title"] ?? "" profession.optionDes = item["title"] ?? ""
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息表)/V/YHPersonInfoCommonCell.swift
View file @ ec5ee6d3
...@@ -137,7 +137,7 @@ extension YHPersonInfoCommonCell { ...@@ -137,7 +137,7 @@ extension YHPersonInfoCommonCell {
for (index0,item0) in arrData.enumerated() { for (index0,item0) in arrData.enumerated() {
let lable = UILabel() let lable = UILabel()
lable.text = item0.cellTitle lable.text = item0.cellTitle
lable.textColor = UIColor(hex: 0x222222) lable.textColor = UIColor.mainTextColor
lable.font = UIFont.PFSC_M(ofSize: 14) lable.font = UIFont.PFSC_M(ofSize: 14)
holdView.addSubview(lable) holdView.addSubview(lable)
lable.snp.makeConstraints { make in lable.snp.makeConstraints { make in
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience/C/YHWorkExampleViewController.swift
View file @ ec5ee6d3
...@@ -52,8 +52,8 @@ class YHWorkExampleViewController: YHBaseViewController { ...@@ -52,8 +52,8 @@ class YHWorkExampleViewController: YHBaseViewController {
titleLabel = { titleLabel = {
let label = UILabel() let label = UILabel()
label.text = "参考示例" label.text = "参考示例"
label.font = kBoldFont(size: 17) label.font = UIFont.PFSC_M(ofSize: 17)
label.textColor = UIColor(hex:0x222222) label.textColor = UIColor.mainTextColor
label.textAlignment = .center label.textAlignment = .center
return label return label
}() }()
...@@ -67,7 +67,7 @@ class YHWorkExampleViewController: YHBaseViewController { ...@@ -67,7 +67,7 @@ class YHWorkExampleViewController: YHBaseViewController {
lineView = { lineView = {
let line = UIView() let line = UIView()
line.backgroundColor = UIColor(hex: 0xf0f0f0) line.backgroundColor = UIColor.separatorColor
return line return line
}() }()
view.addSubview(lineView) view.addSubview(lineView)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience/C/YHWorkExperienceListViewController.swift
View file @ ec5ee6d3
...@@ -72,7 +72,7 @@ class YHWorkExperienceListViewController: YHBaseViewController { ...@@ -72,7 +72,7 @@ class YHWorkExperienceListViewController: YHBaseViewController {
bottomButton = { bottomButton = {
let button = UIButton(type: .custom) let button = UIButton(type: .custom)
button.backgroundColor = UIColor(hex:0x2274ee) button.backgroundColor = UIColor(hex:0x2274ee)
button.titleLabel?.font = kBoldFont(size: 16) button.titleLabel?.font = UIFont.PFSC_M(ofSize: 16)
button.contentHorizontalAlignment = .center button.contentHorizontalAlignment = .center
button.setTitle("提交", for: .normal) button.setTitle("提交", for: .normal)
button.setTitleColor( UIColor(hex:0xffffff), for: .normal) button.setTitleColor( UIColor(hex:0xffffff), for: .normal)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience/C/YHWorkIntroductionViewController.swift
View file @ ec5ee6d3
...@@ -40,8 +40,8 @@ class YHWorkIntroductionViewController: YHBaseViewController { ...@@ -40,8 +40,8 @@ class YHWorkIntroductionViewController: YHBaseViewController {
let array = ["项目名称", "项目时间", "项目业绩/亮点"] let array = ["项目名称", "项目时间", "项目业绩/亮点"]
for i in 0..<array.count { for i in 0..<array.count {
let label = UILabel() let label = UILabel()
label.textColor = UIColor(hex: 0x222222) label.textColor = UIColor.mainTextColor
label.font = kFont(size: 14) label.font = UIFont.PFSC_R(ofSize: 14)
label.text = array[i] label.text = array[i]
view.addSubview(label) view.addSubview(label)
label.snp.makeConstraints { make in label.snp.makeConstraints { make in
...@@ -65,7 +65,7 @@ class YHWorkIntroductionViewController: YHBaseViewController { ...@@ -65,7 +65,7 @@ class YHWorkIntroductionViewController: YHBaseViewController {
nameTextField = { nameTextField = {
let textField = UITextField() let textField = UITextField()
textField.font = kFont(size: 14) textField.font = UIFont.PFSC_R(ofSize: 14)
textField.placeholder = "如方便提供，请填写" textField.placeholder = "如方便提供，请填写"
return textField return textField
}() }()
...@@ -79,7 +79,7 @@ class YHWorkIntroductionViewController: YHBaseViewController { ...@@ -79,7 +79,7 @@ class YHWorkIntroductionViewController: YHBaseViewController {
startTextField = { startTextField = {
let textField = UITextField() let textField = UITextField()
textField.font = kFont(size: 14) textField.font = UIFont.PFSC_R(ofSize: 14)
textField.placeholder = "开始时间" textField.placeholder = "开始时间"
textField.isEnabled = false textField.isEnabled = false
textField.isUserInteractionEnabled = false textField.isUserInteractionEnabled = false
...@@ -108,7 +108,7 @@ class YHWorkIntroductionViewController: YHBaseViewController { ...@@ -108,7 +108,7 @@ class YHWorkIntroductionViewController: YHBaseViewController {
endTextField = { endTextField = {
let textField = UITextField() let textField = UITextField()
textField.font = kFont(size: 14) textField.font = UIFont.PFSC_R(ofSize: 14)
textField.placeholder = "结束时间" textField.placeholder = "结束时间"
textField.isEnabled = false textField.isEnabled = false
textField.isUserInteractionEnabled = false textField.isUserInteractionEnabled = false
...@@ -136,7 +136,7 @@ class YHWorkIntroductionViewController: YHBaseViewController { ...@@ -136,7 +136,7 @@ class YHWorkIntroductionViewController: YHBaseViewController {
} }
let lineView = UIView() let lineView = UIView()
lineView.backgroundColor = UIColor(hex: 0x222222) lineView.backgroundColor = UIColor.mainTextColor
view.addSubview(lineView) view.addSubview(lineView)
lineView.snp.makeConstraints { make in lineView.snp.makeConstraints { make in
make.centerY.equalTo(startTextField.snp.centerY) make.centerY.equalTo(startTextField.snp.centerY)
...@@ -147,8 +147,8 @@ class YHWorkIntroductionViewController: YHBaseViewController { ...@@ -147,8 +147,8 @@ class YHWorkIntroductionViewController: YHBaseViewController {
messageTextField = { messageTextField = {
let textField = UITextView() let textField = UITextView()
textField.backgroundColor = UIColor(hex: 0xf8f9fb) textField.backgroundColor = UIColor.contentBkgColor
textField.font = kFont(size: 14) textField.font = UIFont.PFSC_R(ofSize: 14)
textField.layer.cornerRadius = 6 textField.layer.cornerRadius = 6
textField.delegate = self textField.delegate = self
return textField return textField
...@@ -163,7 +163,7 @@ class YHWorkIntroductionViewController: YHBaseViewController { ...@@ -163,7 +163,7 @@ class YHWorkIntroductionViewController: YHBaseViewController {
promptsLabel = { promptsLabel = {
let prompts = UILabel() let prompts = UILabel()
prompts.font = kFont(size: 14) prompts.font = UIFont.PFSC_R(ofSize: 14)
prompts.textColor = UIColor(hex: 0xc0c0c0) prompts.textColor = UIColor(hex: 0xc0c0c0)
prompts.text = "在职期间负责的核心项目，如果负责过多个项目，请分段描述：\n\n例子：\n\n模式1、本人对XX项目展开深入研究，通过对XX方法/方式，研究出XX。此外，她还指出XX问题，反映了XX。XX的研究成果对XX产生了重要性，为XX领域/方面提供参考依据；\n\n模式2、本人在司参与了XX项目，该项目具有XX突出意义。在此项目中，XX是个难点，本人通过XX方法，实现了XX成果。在XX方面，本人通过XX方式，完成了XX工作。本人凭借在XX领域的丰富经验，推动项目在中国/海外市场取得XX成果。" prompts.text = "在职期间负责的核心项目，如果负责过多个项目，请分段描述：\n\n例子：\n\n模式1、本人对XX项目展开深入研究，通过对XX方法/方式，研究出XX。此外，她还指出XX问题，反映了XX。XX的研究成果对XX产生了重要性，为XX领域/方面提供参考依据；\n\n模式2、本人在司参与了XX项目，该项目具有XX突出意义。在此项目中，XX是个难点，本人通过XX方法，实现了XX成果。在XX方面，本人通过XX方式，完成了XX工作。本人凭借在XX领域的丰富经验，推动项目在中国/海外市场取得XX成果。"
prompts.numberOfLines = 0 prompts.numberOfLines = 0
...@@ -208,7 +208,7 @@ class YHWorkIntroductionViewController: YHBaseViewController { ...@@ -208,7 +208,7 @@ class YHWorkIntroductionViewController: YHBaseViewController {
bottomButton = { bottomButton = {
let button = UIButton(type: .custom) let button = UIButton(type: .custom)
button.backgroundColor = UIColor(hex:0x2274ee) button.backgroundColor = UIColor(hex:0x2274ee)
button.titleLabel?.font = kBoldFont(size: 16) button.titleLabel?.font = UIFont.PFSC_M(ofSize: 16)
button.contentHorizontalAlignment = .center button.contentHorizontalAlignment = .center
button.setTitle("保存", for: .normal) button.setTitle("保存", for: .normal)
button.setTitleColor( UIColor(hex:0xffffff), for: .normal) button.setTitleColor( UIColor(hex:0xffffff), for: .normal)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience/V/YHWorkActionView.swift
View file @ ec5ee6d3
...@@ -55,7 +55,7 @@ class YHWorkActionView: UIView { ...@@ -55,7 +55,7 @@ class YHWorkActionView: UIView {
exampleButton = { exampleButton = {
let button = UIButton(type: .custom) let button = UIButton(type: .custom)
button.titleLabel?.font = kFont(size: 13) button.titleLabel?.font = UIFont.PFSC_R(ofSize: 13)
button.contentHorizontalAlignment = .center button.contentHorizontalAlignment = .center
button.setTitle("参考示例", for: .normal) button.setTitle("参考示例", for: .normal)
button.setTitleColor( UIColor(hex:0x2f7ef6), for: .normal) button.setTitleColor( UIColor(hex:0x2f7ef6), for: .normal)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience/V/YHWorkExampleMessageTableViewCell.swift
View file @ ec5ee6d3
...@@ -46,7 +46,7 @@ class YHWorkExampleMessageTableViewCell: UITableViewCell { ...@@ -46,7 +46,7 @@ class YHWorkExampleMessageTableViewCell: UITableViewCell {
backgroundColor = .white backgroundColor = .white
centerView = { centerView = {
let view = UIView() let view = UIView()
view.backgroundColor = UIColor(hex: 0xf8f9fb) view.backgroundColor = UIColor.contentBkgColor
view.layer.cornerRadius = 8 view.layer.cornerRadius = 8
return view return view
}() }()
...@@ -60,9 +60,9 @@ class YHWorkExampleMessageTableViewCell: UITableViewCell { ...@@ -60,9 +60,9 @@ class YHWorkExampleMessageTableViewCell: UITableViewCell {
titleLabel = { titleLabel = {
let label = UILabel() let label = UILabel()
label.font = kFont(size: 14) label.font = UIFont.PFSC_R(ofSize: 14)
label.text = "工作职责范例1" label.text = "工作职责范例1"
label.textColor = UIColor(hex:0x222222) label.textColor = UIColor.mainTextColor
return label return label
}() }()
centerView.addSubview(titleLabel) centerView.addSubview(titleLabel)
...@@ -76,7 +76,7 @@ class YHWorkExampleMessageTableViewCell: UITableViewCell { ...@@ -76,7 +76,7 @@ class YHWorkExampleMessageTableViewCell: UITableViewCell {
useButton = { useButton = {
let button = UIButton(type: .custom) let button = UIButton(type: .custom)
button.backgroundColor = UIColor(hex:0x2f7ef6).withAlphaComponent(0.08) button.backgroundColor = UIColor(hex:0x2f7ef6).withAlphaComponent(0.08)
button.titleLabel?.font = kBoldFont(size: 12) button.titleLabel?.font = UIFont.PFSC_M(ofSize: 12)
button.contentHorizontalAlignment = .center button.contentHorizontalAlignment = .center
button.setTitle("使用此模板", for: .normal) button.setTitle("使用此模板", for: .normal)
button.setTitleColor( UIColor(hex:0x2f7ef6), for: .normal) button.setTitleColor( UIColor(hex:0x2f7ef6), for: .normal)
...@@ -94,7 +94,7 @@ class YHWorkExampleMessageTableViewCell: UITableViewCell { ...@@ -94,7 +94,7 @@ class YHWorkExampleMessageTableViewCell: UITableViewCell {
lineView = { lineView = {
let line = UIView() let line = UIView()
line.backgroundColor = UIColor(hex: 0xf0f0f0) line.backgroundColor = UIColor.separatorColor
return line return line
}() }()
centerView.addSubview(lineView) centerView.addSubview(lineView)
...@@ -107,8 +107,8 @@ class YHWorkExampleMessageTableViewCell: UITableViewCell { ...@@ -107,8 +107,8 @@ class YHWorkExampleMessageTableViewCell: UITableViewCell {
messageLabel = { messageLabel = {
let label = UILabel() let label = UILabel()
label.numberOfLines = 0 label.numberOfLines = 0
label.font = kFont(size: 14) label.font = UIFont.PFSC_R(ofSize: 14)
label.textColor = UIColor(hex:0x222222) label.textColor = UIColor.mainTextColor
return label return label
}() }()
centerView.addSubview(messageLabel) centerView.addSubview(messageLabel)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience/V/YHWorkExampleMessageView.swift
View file @ ec5ee6d3
...@@ -49,10 +49,10 @@ class YHWorkExampleMessageView: UIView { ...@@ -49,10 +49,10 @@ class YHWorkExampleMessageView: UIView {
titleLabel = { titleLabel = {
let label = UILabel() let label = UILabel()
label.font = kBoldFont(size: 16) label.font = UIFont.PFSC_M(ofSize: 16)
label.text = "业务支援及人力资源" label.text = "业务支援及人力资源"
label.textAlignment = .left label.textAlignment = .left
label.textColor = UIColor(hex:0x222222) label.textColor = UIColor.mainTextColor
return label return label
}() }()
addSubview(titleLabel) addSubview(titleLabel)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience/V/YHWorkExampleTypeView.swift
View file @ ec5ee6d3
...@@ -30,10 +30,10 @@ class YHWorkExampleTypeView: UIView { ...@@ -30,10 +30,10 @@ class YHWorkExampleTypeView: UIView {
func setUpView() { func setUpView() {
titleLabel = { titleLabel = {
let label = UILabel() let label = UILabel()
label.font = kBoldFont(size: 14) label.font = UIFont.PFSC_M(ofSize: 14)
label.text = "请选择您的行业：" label.text = "请选择您的行业："
label.textAlignment = .left label.textAlignment = .left
label.textColor = UIColor(hex:0x222222) label.textColor = UIColor.mainTextColor
return label return label
}() }()
addSubview(titleLabel) addSubview(titleLabel)
...@@ -70,9 +70,9 @@ class YHWorkExampleTypeView: UIView { ...@@ -70,9 +70,9 @@ class YHWorkExampleTypeView: UIView {
let button = UIButton(type: .custom) let button = UIButton(type: .custom)
button.setTitle(dataSource[i], for: .normal) button.setTitle(dataSource[i], for: .normal)
button.setTitleColor(UIColor(hex: 0x222222), for: .normal) button.setTitleColor(UIColor.mainTextColor, for: .normal)
button.setBackgroundColor(color: UIColor(hex: 0xf8f9fb), forState: .normal) button.setBackgroundColor(color: UIColor.contentBkgColor, forState: .normal)
button.titleLabel?.font = kFont(size: 13) button.titleLabel?.font = UIFont.PFSC_R(ofSize: 13)
button.layer.cornerRadius = 16 button.layer.cornerRadius = 16
button.tag = 3000 + i button.tag = 3000 + i
button.addTarget(self, action: #selector(exampleClick(sender:)), for: .touchUpInside) button.addTarget(self, action: #selector(exampleClick(sender:)), for: .touchUpInside)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience/V/YHWorkExperienceItemView.swift
View file @ ec5ee6d3
...@@ -81,12 +81,12 @@ class YHWorkExperienceItemView: UIView { ...@@ -81,12 +81,12 @@ class YHWorkExperienceItemView: UIView {
rightButton = { rightButton = {
let button = UIButton(type: .custom) let button = UIButton(type: .custom)
button.backgroundColor = UIColor(hex: 0x4487f9).withAlphaComponent(0.08) button.backgroundColor = UIColor.brandMainColor.withAlphaComponent(0.08)
button.setTitleColor(UIColor(hex: 0x4487f9), for: .selected) button.setTitleColor(UIColor.brandMainColor, for: .selected)
button.setTitleColor(UIColor(hex: 0x222222), for: .normal) button.setTitleColor(UIColor.mainTextColor, for: .normal)
button.layer.cornerRadius = 16 button.layer.cornerRadius = 16
button.layer.borderWidth = 1 button.layer.borderWidth = 1
button.layer.borderColor = UIColor(hex: 0x4487f9).cgColor button.layer.borderColor = UIColor.brandMainColor.cgColor
button.isSelected = true button.isSelected = true
button.addTarget(self, action: #selector(rightClick), for: .touchUpInside) button.addTarget(self, action: #selector(rightClick), for: .touchUpInside)
return button return button
...@@ -101,9 +101,9 @@ class YHWorkExperienceItemView: UIView { ...@@ -101,9 +101,9 @@ class YHWorkExperienceItemView: UIView {
leftButton = { leftButton = {
let button = UIButton(type: .custom) let button = UIButton(type: .custom)
button.backgroundColor = UIColor(hex: 0xf8f9fb) button.backgroundColor = UIColor.contentBkgColor
button.setTitleColor(UIColor(hex: 0x4487f9), for: .selected) button.setTitleColor(UIColor.brandMainColor, for: .selected)
button.setTitleColor(UIColor(hex: 0x222222), for: .normal) button.setTitleColor(UIColor.mainTextColor, for: .normal)
button.layer.cornerRadius = 16 button.layer.cornerRadius = 16
button.addTarget(self, action: #selector(leftClick), for: .touchUpInside) button.addTarget(self, action: #selector(leftClick), for: .touchUpInside)
return button return button
...@@ -124,7 +124,7 @@ class YHWorkExperienceItemView: UIView { ...@@ -124,7 +124,7 @@ class YHWorkExperienceItemView: UIView {
let str = "*" + (dataSource.title ?? "") let str = "*" + (dataSource.title ?? "")
let attributes: [NSAttributedString.Key: Any] = [ let attributes: [NSAttributedString.Key: Any] = [
.font: UIFont.PFSC_R(ofSize: 14), .font: UIFont.PFSC_R(ofSize: 14),
.foregroundColor: UIColor(hex:0x222222) .foregroundColor: UIColor.mainTextColor
] ]
let questionAttrStr = NSMutableAttributedString(string: str, attributes: attributes) let questionAttrStr = NSMutableAttributedString(string: str, attributes: attributes)
let starRange = NSRange(location: 0, length: 1) let starRange = NSRange(location: 0, length: 1)
...@@ -133,8 +133,8 @@ class YHWorkExperienceItemView: UIView { ...@@ -133,8 +133,8 @@ class YHWorkExperienceItemView: UIView {
} else { } else {
let str = dataSource.title ?? "" let str = dataSource.title ?? ""
let attributes: [NSAttributedString.Key: Any] = [ let attributes: [NSAttributedString.Key: Any] = [
.font: kFont(size: 14), .font: UIFont.PFSC_R(ofSize: 14),
.foregroundColor: UIColor(hex:0x222222) .foregroundColor: UIColor.mainTextColor
] ]
let questionAttrStr = NSMutableAttributedString(string: str, attributes: attributes) let questionAttrStr = NSMutableAttributedString(string: str, attributes: attributes)
titleLabel.attributedText = questionAttrStr titleLabel.attributedText = questionAttrStr
...@@ -193,17 +193,17 @@ class YHWorkExperienceItemView: UIView { ...@@ -193,17 +193,17 @@ class YHWorkExperienceItemView: UIView {
leftButton.isSelected = true leftButton.isSelected = true
rightButton.isSelected = false rightButton.isSelected = false
leftButton.layer.borderWidth = 1 leftButton.layer.borderWidth = 1
leftButton.layer.borderColor = UIColor(hex: 0x4487f9).cgColor leftButton.layer.borderColor = UIColor.brandMainColor.cgColor
leftButton.backgroundColor = UIColor(hex: 0x4487f9).withAlphaComponent(0.08) leftButton.backgroundColor = UIColor.brandMainColor.withAlphaComponent(0.08)
rightButton.backgroundColor = UIColor(hex: 0xf8f9fb) rightButton.backgroundColor = UIColor.contentBkgColor
rightButton.layer.borderWidth = 0 rightButton.layer.borderWidth = 0
} else { } else {
rightButton.isSelected = true rightButton.isSelected = true
leftButton.isSelected = false leftButton.isSelected = false
rightButton.layer.borderWidth = 1 rightButton.layer.borderWidth = 1
rightButton.layer.borderColor = UIColor(hex: 0x4487f9).cgColor rightButton.layer.borderColor = UIColor.brandMainColor.cgColor
rightButton.backgroundColor = UIColor(hex: 0x4487f9).withAlphaComponent(0.08) rightButton.backgroundColor = UIColor.brandMainColor.withAlphaComponent(0.08)
leftButton.backgroundColor = UIColor(hex: 0xf8f9fb) leftButton.backgroundColor = UIColor.contentBkgColor
leftButton.layer.borderWidth = 0 leftButton.layer.borderWidth = 0
} }
} }
...@@ -212,9 +212,9 @@ class YHWorkExperienceItemView: UIView { ...@@ -212,9 +212,9 @@ class YHWorkExperienceItemView: UIView {
rightButton.isSelected = true rightButton.isSelected = true
leftButton.isSelected = false leftButton.isSelected = false
rightButton.layer.borderWidth = 1 rightButton.layer.borderWidth = 1
rightButton.layer.borderColor = UIColor(hex: 0x4487f9).cgColor rightButton.layer.borderColor = UIColor.brandMainColor.cgColor
rightButton.backgroundColor = UIColor(hex: 0x4487f9).withAlphaComponent(0.08) rightButton.backgroundColor = UIColor.brandMainColor.withAlphaComponent(0.08)
leftButton.backgroundColor = UIColor(hex: 0xf8f9fb) leftButton.backgroundColor = UIColor.contentBkgColor
leftButton.layer.borderWidth = 0 leftButton.layer.borderWidth = 0
dataSource?.message = "0" dataSource?.message = "0"
dataSource?.value = ["0"] dataSource?.value = ["0"]
...@@ -227,9 +227,9 @@ class YHWorkExperienceItemView: UIView { ...@@ -227,9 +227,9 @@ class YHWorkExperienceItemView: UIView {
leftButton.isSelected = true leftButton.isSelected = true
rightButton.isSelected = false rightButton.isSelected = false
leftButton.layer.borderWidth = 1 leftButton.layer.borderWidth = 1
leftButton.layer.borderColor = UIColor(hex: 0x4487f9).cgColor leftButton.layer.borderColor = UIColor.brandMainColor.cgColor
leftButton.backgroundColor = UIColor(hex: 0x4487f9).withAlphaComponent(0.08) leftButton.backgroundColor = UIColor.brandMainColor.withAlphaComponent(0.08)
rightButton.backgroundColor = UIColor(hex: 0xf8f9fb) rightButton.backgroundColor = UIColor.contentBkgColor
rightButton.layer.borderWidth = 0 rightButton.layer.borderWidth = 0
dataSource?.message = "1" dataSource?.message = "1"
dataSource?.value = ["1"] dataSource?.value = ["1"]
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience/V/YHWorkExperienceListTableViewCell.swift
View file @ ec5ee6d3
...@@ -54,7 +54,7 @@ class YHWorkExperienceListTableViewCell: UITableViewCell { ...@@ -54,7 +54,7 @@ class YHWorkExperienceListTableViewCell: UITableViewCell {
centerView = { centerView = {
let view = UIView() let view = UIView()
view.backgroundColor = .white view.backgroundColor = .white
view.layer.cornerRadius = 12 view.layer.cornerRadius = kCornerRadius6
return view return view
}() }()
contentView.addSubview(centerView) contentView.addSubview(centerView)
...@@ -67,9 +67,9 @@ class YHWorkExperienceListTableViewCell: UITableViewCell { ...@@ -67,9 +67,9 @@ class YHWorkExperienceListTableViewCell: UITableViewCell {
titleLabel = { titleLabel = {
let label = UILabel() let label = UILabel()
label.font = kFont(size: 16) label.font = UIFont.PFSC_R(ofSize: 16)
label.text = "主申请人工作经历" label.text = "主申请人工作经历"
label.textColor = UIColor(hex:0x222222) label.textColor = UIColor.mainTextColor
return label return label
}() }()
centerView.addSubview(titleLabel) centerView.addSubview(titleLabel)
...@@ -82,9 +82,9 @@ class YHWorkExperienceListTableViewCell: UITableViewCell { ...@@ -82,9 +82,9 @@ class YHWorkExperienceListTableViewCell: UITableViewCell {
subTitleLabel = { subTitleLabel = {
let label = UILabel() let label = UILabel()
label.font = kFont(size: 12) label.font = UIFont.PFSC_R(ofSize: 12)
label.text = "(从最近一份全职工作开始，直至毕业后的第一份工作）" label.text = "(从最近一份全职工作开始，直至毕业后的第一份工作）"
label.textColor = UIColor(hex:0x888f98) label.textColor = UIColor.contentBkgColor
return label return label
}() }()
centerView.addSubview(subTitleLabel) centerView.addSubview(subTitleLabel)
...@@ -97,7 +97,7 @@ class YHWorkExperienceListTableViewCell: UITableViewCell { ...@@ -97,7 +97,7 @@ class YHWorkExperienceListTableViewCell: UITableViewCell {
cannalButton = { cannalButton = {
let button = UIButton(type: .custom) let button = UIButton(type: .custom)
button.titleLabel?.font = kBoldFont(size: 14) button.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
button.contentHorizontalAlignment = .center button.contentHorizontalAlignment = .center
button.setTitle("取消操作", for: .normal) button.setTitle("取消操作", for: .normal)
button.setTitleColor( UIColor(hex:0x2f7ef6), for: .normal) button.setTitleColor( UIColor(hex:0x2f7ef6), for: .normal)
...@@ -131,7 +131,7 @@ class YHWorkExperienceListTableViewCell: UITableViewCell { ...@@ -131,7 +131,7 @@ class YHWorkExperienceListTableViewCell: UITableViewCell {
mainItemView = { mainItemView = {
let view = UIView() let view = UIView()
view.backgroundColor = .white view.backgroundColor = .white
view.layer.cornerRadius = 12 view.layer.cornerRadius = kCornerRadius6
return view return view
}() }()
centerView.addSubview(mainItemView) centerView.addSubview(mainItemView)
...@@ -163,7 +163,7 @@ class YHWorkExperienceListTableViewCell: UITableViewCell { ...@@ -163,7 +163,7 @@ class YHWorkExperienceListTableViewCell: UITableViewCell {
mainItemView.removeSubviews() mainItemView.removeSubviews()
guard let dataSource = dataSource else { guard let dataSource = dataSource else {
let line = UIView() let line = UIView()
line.backgroundColor = UIColor(hex: 0xf0f0f0) line.backgroundColor = UIColor.separatorColor
mainItemView.addSubview(line) mainItemView.addSubview(line)
line.snp.makeConstraints { make in line.snp.makeConstraints { make in
make.left.equalTo(18) make.left.equalTo(18)
...@@ -185,7 +185,7 @@ class YHWorkExperienceListTableViewCell: UITableViewCell { ...@@ -185,7 +185,7 @@ class YHWorkExperienceListTableViewCell: UITableViewCell {
for i in 0 ..< dataSource.count { for i in 0 ..< dataSource.count {
let line = UIView() let line = UIView()
line.backgroundColor = UIColor(hex: 0xf0f0f0) line.backgroundColor = UIColor.separatorColor
mainItemView.addSubview(line) mainItemView.addSubview(line)
line.snp.makeConstraints { make in line.snp.makeConstraints { make in
make.left.equalTo(18) make.left.equalTo(18)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience/V/YHWorkExperienceTableViewCell.swift
View file @ ec5ee6d3
...@@ -45,7 +45,7 @@ class YHWorkExperienceTableViewCell: UITableViewCell { ...@@ -45,7 +45,7 @@ class YHWorkExperienceTableViewCell: UITableViewCell {
centerView = { centerView = {
let view = UIView() let view = UIView()
view.backgroundColor = .white view.backgroundColor = .white
view.layer.cornerRadius = 12 view.layer.cornerRadius = kCornerRadius6
return view return view
}() }()
contentView.addSubview(centerView) contentView.addSubview(centerView)
...@@ -58,8 +58,8 @@ class YHWorkExperienceTableViewCell: UITableViewCell { ...@@ -58,8 +58,8 @@ class YHWorkExperienceTableViewCell: UITableViewCell {
titleLabel = { titleLabel = {
let label = UILabel() let label = UILabel()
label.font = kFont(size: 17) label.font = UIFont.PFSC_M(ofSize: 17)
label.textColor = UIColor(hex:0x222222) label.textColor = UIColor.mainTextColor
return label return label
}() }()
centerView.addSubview(titleLabel) centerView.addSubview(titleLabel)
...@@ -73,7 +73,7 @@ class YHWorkExperienceTableViewCell: UITableViewCell { ...@@ -73,7 +73,7 @@ class YHWorkExperienceTableViewCell: UITableViewCell {
mainItemView = { mainItemView = {
let view = UIView() let view = UIView()
view.backgroundColor = .white view.backgroundColor = .white
view.layer.cornerRadius = 12 view.layer.cornerRadius = kCornerRadius6
return view return view
}() }()
centerView.addSubview(mainItemView) centerView.addSubview(mainItemView)
...@@ -89,7 +89,7 @@ class YHWorkExperienceTableViewCell: UITableViewCell { ...@@ -89,7 +89,7 @@ class YHWorkExperienceTableViewCell: UITableViewCell {
var y = 0 var y = 0
for i in 0 ..< (dataSource?.models?.count ?? 0) { for i in 0 ..< (dataSource?.models?.count ?? 0) {
let line = UIView() let line = UIView()
line.backgroundColor = UIColor(hex: 0xf0f0f0) line.backgroundColor = UIColor.separatorColor
mainItemView.addSubview(line) mainItemView.addSubview(line)
line.snp.makeConstraints { make in line.snp.makeConstraints { make in
make.left.equalTo(18) make.left.equalTo(18)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience/V/YHWorkExperienceTextItemView.swift
View file @ ec5ee6d3
...@@ -47,7 +47,7 @@ class YHWorkExperienceTextItemView: UIView { ...@@ -47,7 +47,7 @@ class YHWorkExperienceTextItemView: UIView {
messageTextField = { messageTextField = {
let textField = UITextView() let textField = UITextView()
textField.backgroundColor = UIColor(hex: 0xf8f9fb) textField.backgroundColor = UIColor.contentBkgColor
textField.layer.cornerRadius = 4 textField.layer.cornerRadius = 4
textField.delegate = self textField.delegate = self
return textField return textField
...@@ -61,7 +61,7 @@ class YHWorkExperienceTextItemView: UIView { ...@@ -61,7 +61,7 @@ class YHWorkExperienceTextItemView: UIView {
promptsLabel = { promptsLabel = {
let textField = UILabel() let textField = UILabel()
textField.font = kFont(size: 14) textField.font = UIFont.PFSC_R(ofSize: 14)
textField.textColor = UIColor(hex: 0xc0c0c0) textField.textColor = UIColor(hex: 0xc0c0c0)
return textField return textField
}() }()
...@@ -91,7 +91,7 @@ class YHWorkExperienceTextItemView: UIView { ...@@ -91,7 +91,7 @@ class YHWorkExperienceTextItemView: UIView {
let str = "*" + (dataSource.title ?? "") let str = "*" + (dataSource.title ?? "")
let attributes: [NSAttributedString.Key: Any] = [ let attributes: [NSAttributedString.Key: Any] = [
.font: UIFont.PFSC_R(ofSize: 14), .font: UIFont.PFSC_R(ofSize: 14),
.foregroundColor: UIColor(hex:0x222222) .foregroundColor: UIColor.mainTextColor
] ]
let questionAttrStr = NSMutableAttributedString(string: str, attributes: attributes) let questionAttrStr = NSMutableAttributedString(string: str, attributes: attributes)
let starRange = NSRange(location: 0, length: 1) let starRange = NSRange(location: 0, length: 1)
...@@ -100,8 +100,8 @@ class YHWorkExperienceTextItemView: UIView { ...@@ -100,8 +100,8 @@ class YHWorkExperienceTextItemView: UIView {
} else { } else {
let str = dataSource.title ?? "" let str = dataSource.title ?? ""
let attributes: [NSAttributedString.Key: Any] = [ let attributes: [NSAttributedString.Key: Any] = [
.font: kFont(size: 14), .font: UIFont.PFSC_R(ofSize: 14),
.foregroundColor: UIColor(hex:0x222222) .foregroundColor: UIColor.mainTextColor
] ]
let questionAttrStr = NSMutableAttributedString(string: str, attributes: attributes) let questionAttrStr = NSMutableAttributedString(string: str, attributes: attributes)
titleLabel.attributedText = questionAttrStr titleLabel.attributedText = questionAttrStr
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience/V/YHWorkFileItemView.swift
View file @ ec5ee6d3
...@@ -32,9 +32,9 @@ class YHWorkFileItemView: UIView { ...@@ -32,9 +32,9 @@ class YHWorkFileItemView: UIView {
func setUpView() { func setUpView() {
titleLabel = { titleLabel = {
let label = UILabel() let label = UILabel()
label.font = kBoldFont(size: 14) label.font = UIFont.PFSC_M(ofSize: 14)
label.textAlignment = .left label.textAlignment = .left
label.textColor = UIColor(hex:0x222222) label.textColor = UIColor.mainTextColor
return label return label
}() }()
addSubview(titleLabel) addSubview(titleLabel)
...@@ -47,7 +47,7 @@ class YHWorkFileItemView: UIView { ...@@ -47,7 +47,7 @@ class YHWorkFileItemView: UIView {
deleteButton = { deleteButton = {
let button = UIButton(type: .custom) let button = UIButton(type: .custom)
button.titleLabel?.font = kFont(size: 14) button.titleLabel?.font = UIFont.PFSC_R(ofSize: 14)
button.contentHorizontalAlignment = .center button.contentHorizontalAlignment = .center
button.setTitle("删除", for: .normal) button.setTitle("删除", for: .normal)
button.setTitleColor( UIColor(hex:0xf81d22), for: .normal) button.setTitleColor( UIColor(hex:0xf81d22), for: .normal)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience/V/YHWorkFileSyncTableViewCell.swift
View file @ ec5ee6d3
...@@ -49,7 +49,7 @@ class YHWorkFileSyncTableViewCell: UITableViewCell { ...@@ -49,7 +49,7 @@ class YHWorkFileSyncTableViewCell: UITableViewCell {
centerView = { centerView = {
let view = UIView() let view = UIView()
view.backgroundColor = .white view.backgroundColor = .white
view.layer.cornerRadius = 12 view.layer.cornerRadius = kCornerRadius6
return view return view
}() }()
contentView.addSubview(centerView) contentView.addSubview(centerView)
...@@ -65,7 +65,7 @@ class YHWorkFileSyncTableViewCell: UITableViewCell { ...@@ -65,7 +65,7 @@ class YHWorkFileSyncTableViewCell: UITableViewCell {
let str = "*" + "上传文件" let str = "*" + "上传文件"
let attributes: [NSAttributedString.Key: Any] = [ let attributes: [NSAttributedString.Key: Any] = [
.font: UIFont.PFSC_R(ofSize: 17), .font: UIFont.PFSC_R(ofSize: 17),
.foregroundColor: UIColor(hex:0x222222) .foregroundColor: UIColor.mainTextColor
] ]
let questionAttrStr = NSMutableAttributedString(string: str, attributes: attributes) let questionAttrStr = NSMutableAttributedString(string: str, attributes: attributes)
let starRange = NSRange(location: 0, length: 1) let starRange = NSRange(location: 0, length: 1)
...@@ -84,7 +84,7 @@ class YHWorkFileSyncTableViewCell: UITableViewCell { ...@@ -84,7 +84,7 @@ class YHWorkFileSyncTableViewCell: UITableViewCell {
mainItemView = { mainItemView = {
let view = UIView() let view = UIView()
view.backgroundColor = .white view.backgroundColor = .white
view.layer.cornerRadius = 12 view.layer.cornerRadius = kCornerRadius6
return view return view
}() }()
centerView.addSubview(mainItemView) centerView.addSubview(mainItemView)
...@@ -117,7 +117,7 @@ class YHWorkFileSyncTableViewCell: UITableViewCell { ...@@ -117,7 +117,7 @@ class YHWorkFileSyncTableViewCell: UITableViewCell {
mainItemView.removeSubviews() mainItemView.removeSubviews()
for i in 0 ..< (dataSource?.count ?? 0) { for i in 0 ..< (dataSource?.count ?? 0) {
let line = UIView() let line = UIView()
line.backgroundColor = UIColor(hex: 0xf0f0f0) line.backgroundColor = UIColor.separatorColor
mainItemView.addSubview(line) mainItemView.addSubview(line)
line.snp.makeConstraints { make in line.snp.makeConstraints { make in
make.left.equalTo(18) make.left.equalTo(18)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience/V/YHWorkHighlightsTableViewCell.swift
View file @ ec5ee6d3
...@@ -64,7 +64,7 @@ class YHWorkHighlightsTableViewCell: UITableViewCell { ...@@ -64,7 +64,7 @@ class YHWorkHighlightsTableViewCell: UITableViewCell {
let str = "*" + "工作亮点" let str = "*" + "工作亮点"
let attributes: [NSAttributedString.Key: Any] = [ let attributes: [NSAttributedString.Key: Any] = [
.font: UIFont.PFSC_R(ofSize: 17), .font: UIFont.PFSC_R(ofSize: 17),
.foregroundColor: UIColor(hex:0x222222) .foregroundColor: UIColor.mainTextColor
] ]
let questionAttrStr = NSMutableAttributedString(string: str, attributes: attributes) let questionAttrStr = NSMutableAttributedString(string: str, attributes: attributes)
let starRange = NSRange(location: 0, length: 1) let starRange = NSRange(location: 0, length: 1)
...@@ -84,7 +84,7 @@ class YHWorkHighlightsTableViewCell: UITableViewCell { ...@@ -84,7 +84,7 @@ class YHWorkHighlightsTableViewCell: UITableViewCell {
let label = UILabel() let label = UILabel()
label.text = "温馨提示：如下模板仅供思路参考，工作内容请按您的实际填写，后期文案会基于该内容进行文书材料撰写，望悉知" label.text = "温馨提示：如下模板仅供思路参考，工作内容请按您的实际填写，后期文案会基于该内容进行文书材料撰写，望悉知"
label.textColor = UIColor(hex: 0x2f7ef6) label.textColor = UIColor(hex: 0x2f7ef6)
label.font = kFont(size: 12) label.font = UIFont.PFSC_R(ofSize: 12)
label.numberOfLines = 0 label.numberOfLines = 0
return label return label
}() }()
...@@ -98,7 +98,7 @@ class YHWorkHighlightsTableViewCell: UITableViewCell { ...@@ -98,7 +98,7 @@ class YHWorkHighlightsTableViewCell: UITableViewCell {
lineView = { lineView = {
let line = UIView() let line = UIView()
line.backgroundColor = UIColor(hex: 0xf0f0f0) line.backgroundColor = UIColor.separatorColor
return line return line
}() }()
centerView.addSubview(lineView) centerView.addSubview(lineView)
...@@ -111,7 +111,7 @@ class YHWorkHighlightsTableViewCell: UITableViewCell { ...@@ -111,7 +111,7 @@ class YHWorkHighlightsTableViewCell: UITableViewCell {
messageTextField = { messageTextField = {
let textField = UITextView() let textField = UITextView()
textField.font = kFont(size: 14) textField.font = UIFont.PFSC_R(ofSize: 14)
textField.delegate = self textField.delegate = self
return textField return textField
}() }()
...@@ -125,7 +125,7 @@ class YHWorkHighlightsTableViewCell: UITableViewCell { ...@@ -125,7 +125,7 @@ class YHWorkHighlightsTableViewCell: UITableViewCell {
promptsLabel = { promptsLabel = {
let prompts = UILabel() let prompts = UILabel()
prompts.font = kFont(size: 14) prompts.font = UIFont.PFSC_R(ofSize: 14)
prompts.textColor = UIColor(hex: 0xc0c0c0) prompts.textColor = UIColor(hex: 0xc0c0c0)
prompts.text = "示例：打破常规，超越同行或其他同事的优秀业绩；或有开创性且突破公司期望的杰出贡献，且给公司带来价值和收益。\n\n请举例2-3个工作亮点：\n\na. 是什么：某项目背景或工作目标或难点\nb.为什么：为什么出现这个项目工作/难点，旨在体现分析过程，为您后面提出解决方案做铺垫\nc.怎么处理：您是怎么把这件事做好的？用了什么技术/方法？有何突出/创新之处？\nd.有什么价值：为公司、客户或您本身带来了哪些价值？客户或您本身带来了哪些价值？\n最好用实际数据证明，比如销售业绩增加了多少，或者利润增加了多少，客户群体增加了多少等。" prompts.text = "示例：打破常规，超越同行或其他同事的优秀业绩；或有开创性且突破公司期望的杰出贡献，且给公司带来价值和收益。\n\n请举例2-3个工作亮点：\n\na. 是什么：某项目背景或工作目标或难点\nb.为什么：为什么出现这个项目工作/难点，旨在体现分析过程，为您后面提出解决方案做铺垫\nc.怎么处理：您是怎么把这件事做好的？用了什么技术/方法？有何突出/创新之处？\nd.有什么价值：为公司、客户或您本身带来了哪些价值？客户或您本身带来了哪些价值？\n最好用实际数据证明，比如销售业绩增加了多少，或者利润增加了多少，客户群体增加了多少等。"
prompts.numberOfLines = 0 prompts.numberOfLines = 0
...@@ -141,8 +141,8 @@ class YHWorkHighlightsTableViewCell: UITableViewCell { ...@@ -141,8 +141,8 @@ class YHWorkHighlightsTableViewCell: UITableViewCell {
detailLabel = { detailLabel = {
let label = UILabel() let label = UILabel()
label.text = "项目详细介绍" label.text = "项目详细介绍"
label.textColor = UIColor(hex: 0x222222) label.textColor = UIColor.mainTextColor
label.font = kFont(size: 14) label.font = UIFont.PFSC_R(ofSize: 14)
return label return label
}() }()
centerView.addSubview(detailLabel) centerView.addSubview(detailLabel)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience/V/YHWorkIntroductionItemView.swift
View file @ ec5ee6d3
...@@ -35,9 +35,9 @@ class YHWorkIntroductionItemView: UIView { ...@@ -35,9 +35,9 @@ class YHWorkIntroductionItemView: UIView {
func setUpView() { func setUpView() {
titleLabel = { titleLabel = {
let label = UILabel() let label = UILabel()
label.font = kBoldFont(size: 14) label.font = UIFont.PFSC_M(ofSize: 14)
label.textAlignment = .left label.textAlignment = .left
label.textColor = UIColor(hex:0x222222) label.textColor = UIColor.mainTextColor
return label return label
}() }()
addSubview(titleLabel) addSubview(titleLabel)
...@@ -50,9 +50,9 @@ class YHWorkIntroductionItemView: UIView { ...@@ -50,9 +50,9 @@ class YHWorkIntroductionItemView: UIView {
subTitleLabel = { subTitleLabel = {
let label = UILabel() let label = UILabel()
label.font = kBoldFont(size: 12) label.font = UIFont.PFSC_M(ofSize: 12)
label.textAlignment = .left label.textAlignment = .left
label.textColor = UIColor(hex:0x888f98) label.textColor = UIColor.contentBkgColor
return label return label
}() }()
addSubview(subTitleLabel) addSubview(subTitleLabel)
...@@ -87,7 +87,7 @@ class YHWorkIntroductionItemView: UIView { ...@@ -87,7 +87,7 @@ class YHWorkIntroductionItemView: UIView {
deleteButton = { deleteButton = {
let button = UIButton(type: .custom) let button = UIButton(type: .custom)
button.titleLabel?.font = kFont(size: 14) button.titleLabel?.font = UIFont.PFSC_R(ofSize: 14)
button.contentHorizontalAlignment = .center button.contentHorizontalAlignment = .center
button.setTitle("删除", for: .normal) button.setTitle("删除", for: .normal)
button.setTitleColor( UIColor(hex:0xf81d22), for: .normal) button.setTitleColor( UIColor(hex:0xf81d22), for: .normal)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience/V/YHWorkIntroductionTableViewCell.swift
View file @ ec5ee6d3
...@@ -51,7 +51,7 @@ class YHWorkIntroductionTableViewCell: UITableViewCell { ...@@ -51,7 +51,7 @@ class YHWorkIntroductionTableViewCell: UITableViewCell {
centerView = { centerView = {
let view = UIView() let view = UIView()
view.backgroundColor = .white view.backgroundColor = .white
view.layer.cornerRadius = 12 view.layer.cornerRadius = kCornerRadius6
return view return view
}() }()
contentView.addSubview(centerView) contentView.addSubview(centerView)
...@@ -64,9 +64,9 @@ class YHWorkIntroductionTableViewCell: UITableViewCell { ...@@ -64,9 +64,9 @@ class YHWorkIntroductionTableViewCell: UITableViewCell {
titleLabel = { titleLabel = {
let label = UILabel() let label = UILabel()
label.font = kFont(size: 16) label.font = UIFont.PFSC_R(ofSize: 16)
label.text = "项目介绍(选填)" label.text = "项目介绍(选填)"
label.textColor = UIColor(hex:0x222222) label.textColor = UIColor.mainTextColor
return label return label
}() }()
centerView.addSubview(titleLabel) centerView.addSubview(titleLabel)
...@@ -79,7 +79,7 @@ class YHWorkIntroductionTableViewCell: UITableViewCell { ...@@ -79,7 +79,7 @@ class YHWorkIntroductionTableViewCell: UITableViewCell {
cannalButton = { cannalButton = {
let button = UIButton(type: .custom) let button = UIButton(type: .custom)
button.titleLabel?.font = kBoldFont(size: 14) button.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
button.contentHorizontalAlignment = .center button.contentHorizontalAlignment = .center
button.setTitle("取消操作", for: .normal) button.setTitle("取消操作", for: .normal)
button.setTitleColor( UIColor(hex:0x2f7ef6), for: .normal) button.setTitleColor( UIColor(hex:0x2f7ef6), for: .normal)
...@@ -113,7 +113,7 @@ class YHWorkIntroductionTableViewCell: UITableViewCell { ...@@ -113,7 +113,7 @@ class YHWorkIntroductionTableViewCell: UITableViewCell {
mainItemView = { mainItemView = {
let view = UIView() let view = UIView()
view.backgroundColor = .white view.backgroundColor = .white
view.layer.cornerRadius = 12 view.layer.cornerRadius = kCornerRadius6
return view return view
}() }()
centerView.addSubview(mainItemView) centerView.addSubview(mainItemView)
...@@ -146,7 +146,7 @@ class YHWorkIntroductionTableViewCell: UITableViewCell { ...@@ -146,7 +146,7 @@ class YHWorkIntroductionTableViewCell: UITableViewCell {
mainItemView.removeSubviews() mainItemView.removeSubviews()
for i in 0 ..< (dataSource?.count ?? 0) { for i in 0 ..< (dataSource?.count ?? 0) {
let line = UIView() let line = UIView()
line.backgroundColor = UIColor(hex: 0xf0f0f0) line.backgroundColor = UIColor.separatorColor
mainItemView.addSubview(line) mainItemView.addSubview(line)
line.snp.makeConstraints { make in line.snp.makeConstraints { make in
make.left.equalTo(18) make.left.equalTo(18)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience/V/YHWorkItemView.swift
View file @ ec5ee6d3
...@@ -38,9 +38,9 @@ class YHWorkItemView: UIView { ...@@ -38,9 +38,9 @@ class YHWorkItemView: UIView {
func setUpView() { func setUpView() {
titleLabel = { titleLabel = {
let label = UILabel() let label = UILabel()
label.font = kBoldFont(size: 14) label.font = UIFont.PFSC_M(ofSize: 14)
label.textAlignment = .left label.textAlignment = .left
label.textColor = UIColor(hex:0x222222) label.textColor = UIColor.mainTextColor
return label return label
}() }()
addSubview(titleLabel) addSubview(titleLabel)
...@@ -53,9 +53,9 @@ class YHWorkItemView: UIView { ...@@ -53,9 +53,9 @@ class YHWorkItemView: UIView {
subTitleLabel = { subTitleLabel = {
let label = UILabel() let label = UILabel()
label.font = kBoldFont(size: 12) label.font = UIFont.PFSC_M(ofSize: 12)
label.textAlignment = .left label.textAlignment = .left
label.textColor = UIColor(hex:0x888f98) label.textColor = UIColor.contentBkgColor
return label return label
}() }()
addSubview(subTitleLabel) addSubview(subTitleLabel)
...@@ -67,9 +67,9 @@ class YHWorkItemView: UIView { ...@@ -67,9 +67,9 @@ class YHWorkItemView: UIView {
explainLabel = { explainLabel = {
let label = UILabel() let label = UILabel()
label.font = kBoldFont(size: 14) label.font = UIFont.PFSC_M(ofSize: 14)
label.textAlignment = .right label.textAlignment = .right
label.textColor = UIColor(hex:0x888f98) label.textColor = UIColor.contentBkgColor
return label return label
}() }()
addSubview(explainLabel) addSubview(explainLabel)
...@@ -105,7 +105,7 @@ class YHWorkItemView: UIView { ...@@ -105,7 +105,7 @@ class YHWorkItemView: UIView {
deleteButton = { deleteButton = {
let button = UIButton(type: .custom) let button = UIButton(type: .custom)
button.titleLabel?.font = kFont(size: 14) button.titleLabel?.font = UIFont.PFSC_R(ofSize: 14)
button.contentHorizontalAlignment = .center button.contentHorizontalAlignment = .center
button.setTitle("删除", for: .normal) button.setTitle("删除", for: .normal)
button.contentHorizontalAlignment = .right button.contentHorizontalAlignment = .right
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience/V/YHWorkMessageSelectTableViewCell.swift
View file @ ec5ee6d3
...@@ -42,7 +42,7 @@ class YHWorkMessageSelectTableViewCell: UITableViewCell { ...@@ -42,7 +42,7 @@ class YHWorkMessageSelectTableViewCell: UITableViewCell {
centerView = { centerView = {
let view = UIView() let view = UIView()
view.backgroundColor = .white view.backgroundColor = .white
view.layer.cornerRadius = 12 view.layer.cornerRadius = kCornerRadius6
return view return view
}() }()
contentView.addSubview(centerView) contentView.addSubview(centerView)
...@@ -55,9 +55,9 @@ class YHWorkMessageSelectTableViewCell: UITableViewCell { ...@@ -55,9 +55,9 @@ class YHWorkMessageSelectTableViewCell: UITableViewCell {
titleLabel = { titleLabel = {
let label = UILabel() let label = UILabel()
label.font = kFont(size: 17) label.font = UIFont.PFSC_M(ofSize: 17)
label.text = "信息选择" label.text = "信息选择"
label.textColor = UIColor(hex:0x222222) label.textColor = UIColor.mainTextColor
return label return label
}() }()
centerView.addSubview(titleLabel) centerView.addSubview(titleLabel)
...@@ -70,7 +70,7 @@ class YHWorkMessageSelectTableViewCell: UITableViewCell { ...@@ -70,7 +70,7 @@ class YHWorkMessageSelectTableViewCell: UITableViewCell {
lineView = { lineView = {
let line = UIView() let line = UIView()
line.backgroundColor = UIColor(hex: 0xf0f0f0) line.backgroundColor = UIColor.separatorColor
return line return line
}() }()
centerView.addSubview(lineView) centerView.addSubview(lineView)
...@@ -107,9 +107,9 @@ class YHWorkMessageSelectTableViewCell: UITableViewCell { ...@@ -107,9 +107,9 @@ class YHWorkMessageSelectTableViewCell: UITableViewCell {
let button = UIButton(type: .custom) let button = UIButton(type: .custom)
button.backgroundColor = UIColor(hex: 0x2f7ef6).withAlphaComponent(0.08) button.backgroundColor = UIColor(hex: 0x2f7ef6).withAlphaComponent(0.08)
button.setTitleColor(UIColor(hex: 0x2f7ef6), for: .selected) button.setTitleColor(UIColor(hex: 0x2f7ef6), for: .selected)
button.setTitleColor(UIColor(hex: 0x222222), for: .normal) button.setTitleColor(UIColor.mainTextColor, for: .normal)
button.setTitle("是", for: .normal) button.setTitle("是", for: .normal)
button.titleLabel?.font = kFont(size: 13) button.titleLabel?.font = UIFont.PFSC_R(ofSize: 13)
button.layer.cornerRadius = 16 button.layer.cornerRadius = 16
button.layer.borderWidth = 1 button.layer.borderWidth = 1
button.layer.borderColor = UIColor(hex: 0x2f7ef6).cgColor button.layer.borderColor = UIColor(hex: 0x2f7ef6).cgColor
...@@ -127,11 +127,11 @@ class YHWorkMessageSelectTableViewCell: UITableViewCell { ...@@ -127,11 +127,11 @@ class YHWorkMessageSelectTableViewCell: UITableViewCell {
leftButton = { leftButton = {
let button = UIButton(type: .custom) let button = UIButton(type: .custom)
button.backgroundColor = UIColor(hex: 0xf8f9fb) button.backgroundColor = UIColor.contentBkgColor
button.setTitleColor(UIColor(hex: 0x2f7ef6), for: .selected) button.setTitleColor(UIColor(hex: 0x2f7ef6), for: .selected)
button.setTitleColor(UIColor(hex: 0x222222), for: .normal) button.setTitleColor(UIColor.mainTextColor, for: .normal)
button.setTitle("否", for: .normal) button.setTitle("否", for: .normal)
button.titleLabel?.font = kFont(size: 13) button.titleLabel?.font = UIFont.PFSC_R(ofSize: 13)
button.layer.cornerRadius = 16 button.layer.cornerRadius = 16
button.addTarget(self, action: #selector(leftClick), for: .touchUpInside) button.addTarget(self, action: #selector(leftClick), for: .touchUpInside)
return button return button
...@@ -152,7 +152,7 @@ class YHWorkMessageSelectTableViewCell: UITableViewCell { ...@@ -152,7 +152,7 @@ class YHWorkMessageSelectTableViewCell: UITableViewCell {
leftButton.layer.borderWidth = 1 leftButton.layer.borderWidth = 1
leftButton.layer.borderColor = UIColor(hex: 0x2f7ef6).cgColor leftButton.layer.borderColor = UIColor(hex: 0x2f7ef6).cgColor
leftButton.backgroundColor = UIColor(hex: 0x2f7ef6).withAlphaComponent(0.08) leftButton.backgroundColor = UIColor(hex: 0x2f7ef6).withAlphaComponent(0.08)
rightButton.backgroundColor = UIColor(hex: 0xf8f9fb) rightButton.backgroundColor = UIColor.contentBkgColor
rightButton.layer.borderWidth = 0 rightButton.layer.borderWidth = 0
} else { } else {
rightButton.isSelected = true rightButton.isSelected = true
...@@ -160,7 +160,7 @@ class YHWorkMessageSelectTableViewCell: UITableViewCell { ...@@ -160,7 +160,7 @@ class YHWorkMessageSelectTableViewCell: UITableViewCell {
rightButton.layer.borderWidth = 1 rightButton.layer.borderWidth = 1
rightButton.layer.borderColor = UIColor(hex: 0x2f7ef6).cgColor rightButton.layer.borderColor = UIColor(hex: 0x2f7ef6).cgColor
rightButton.backgroundColor = UIColor(hex: 0x2f7ef6).withAlphaComponent(0.08) rightButton.backgroundColor = UIColor(hex: 0x2f7ef6).withAlphaComponent(0.08)
leftButton.backgroundColor = UIColor(hex: 0xf8f9fb) leftButton.backgroundColor = UIColor.contentBkgColor
leftButton.layer.borderWidth = 0 leftButton.layer.borderWidth = 0
} }
} }
...@@ -171,7 +171,7 @@ class YHWorkMessageSelectTableViewCell: UITableViewCell { ...@@ -171,7 +171,7 @@ class YHWorkMessageSelectTableViewCell: UITableViewCell {
rightButton.layer.borderWidth = 1 rightButton.layer.borderWidth = 1
rightButton.layer.borderColor = UIColor(hex: 0x2f7ef6).cgColor rightButton.layer.borderColor = UIColor(hex: 0x2f7ef6).cgColor
rightButton.backgroundColor = UIColor(hex: 0x2f7ef6).withAlphaComponent(0.08) rightButton.backgroundColor = UIColor(hex: 0x2f7ef6).withAlphaComponent(0.08)
leftButton.backgroundColor = UIColor(hex: 0xf8f9fb) leftButton.backgroundColor = UIColor.contentBkgColor
leftButton.layer.borderWidth = 0 leftButton.layer.borderWidth = 0
} }
...@@ -181,7 +181,7 @@ class YHWorkMessageSelectTableViewCell: UITableViewCell { ...@@ -181,7 +181,7 @@ class YHWorkMessageSelectTableViewCell: UITableViewCell {
leftButton.layer.borderWidth = 1 leftButton.layer.borderWidth = 1
leftButton.layer.borderColor = UIColor(hex: 0x2f7ef6).cgColor leftButton.layer.borderColor = UIColor(hex: 0x2f7ef6).cgColor
leftButton.backgroundColor = UIColor(hex: 0x2f7ef6).withAlphaComponent(0.08) leftButton.backgroundColor = UIColor(hex: 0x2f7ef6).withAlphaComponent(0.08)
rightButton.backgroundColor = UIColor(hex: 0xf8f9fb) rightButton.backgroundColor = UIColor.contentBkgColor
rightButton.layer.borderWidth = 0 rightButton.layer.borderWidth = 0
} }
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience/V/YHWorkResponsibilitiesTableViewCell.swift
View file @ ec5ee6d3
...@@ -62,7 +62,7 @@ class YHWorkResponsibilitiesTableViewCell: UITableViewCell { ...@@ -62,7 +62,7 @@ class YHWorkResponsibilitiesTableViewCell: UITableViewCell {
let str = "*" + "工作职责" let str = "*" + "工作职责"
let attributes: [NSAttributedString.Key: Any] = [ let attributes: [NSAttributedString.Key: Any] = [
.font: UIFont.PFSC_R(ofSize: 17), .font: UIFont.PFSC_R(ofSize: 17),
.foregroundColor: UIColor(hex:0x222222) .foregroundColor: UIColor.mainTextColor
] ]
let questionAttrStr = NSMutableAttributedString(string: str, attributes: attributes) let questionAttrStr = NSMutableAttributedString(string: str, attributes: attributes)
let starRange = NSRange(location: 0, length: 1) let starRange = NSRange(location: 0, length: 1)
...@@ -82,7 +82,7 @@ class YHWorkResponsibilitiesTableViewCell: UITableViewCell { ...@@ -82,7 +82,7 @@ class YHWorkResponsibilitiesTableViewCell: UITableViewCell {
let label = UILabel() let label = UILabel()
label.text = "温馨提示：如下模板仅供思路参考，工作内容请按您的实际填写，后期文案会基于该内容进行文书材料撰写，望悉知" label.text = "温馨提示：如下模板仅供思路参考，工作内容请按您的实际填写，后期文案会基于该内容进行文书材料撰写，望悉知"
label.textColor = UIColor(hex: 0x2f7ef6) label.textColor = UIColor(hex: 0x2f7ef6)
label.font = kFont(size: 12) label.font = UIFont.PFSC_R(ofSize: 12)
label.numberOfLines = 0 label.numberOfLines = 0
return label return label
}() }()
...@@ -96,7 +96,7 @@ class YHWorkResponsibilitiesTableViewCell: UITableViewCell { ...@@ -96,7 +96,7 @@ class YHWorkResponsibilitiesTableViewCell: UITableViewCell {
lineView = { lineView = {
let line = UIView() let line = UIView()
line.backgroundColor = UIColor(hex: 0xf0f0f0) line.backgroundColor = UIColor.separatorColor
return line return line
}() }()
centerView.addSubview(lineView) centerView.addSubview(lineView)
...@@ -109,7 +109,7 @@ class YHWorkResponsibilitiesTableViewCell: UITableViewCell { ...@@ -109,7 +109,7 @@ class YHWorkResponsibilitiesTableViewCell: UITableViewCell {
messageTextField = { messageTextField = {
let textField = UITextView() let textField = UITextView()
textField.font = kFont(size: 14) textField.font = UIFont.PFSC_R(ofSize: 14)
textField.delegate = self textField.delegate = self
return textField return textField
}() }()
...@@ -123,7 +123,7 @@ class YHWorkResponsibilitiesTableViewCell: UITableViewCell { ...@@ -123,7 +123,7 @@ class YHWorkResponsibilitiesTableViewCell: UITableViewCell {
promptsLabel = { promptsLabel = {
let prompts = UILabel() let prompts = UILabel()
prompts.font = kFont(size: 14) prompts.font = UIFont.PFSC_R(ofSize: 14)
prompts.textColor = UIColor(hex: 0xc0c0c0) prompts.textColor = UIColor(hex: 0xc0c0c0)
prompts.text = "示例：在职期间负责的核心工作职责，建议不要超过3点。如果就职过多个职位，请分段描述：\n\n例子：\n\n模式1、在司担任某某岗位，任职期间，主要负责xxxx工作；在此期间，组建了xxx。实现了xxx；\n\n模式2、在担任xxx岗位期间，主要负责xxxx工作，具体的工作职责包括如下：\n\n2.1）xxxxxxxx；\n2.2）xxxxxxxx；\n2.3）xxxxxxxx；" prompts.text = "示例：在职期间负责的核心工作职责，建议不要超过3点。如果就职过多个职位，请分段描述：\n\n例子：\n\n模式1、在司担任某某岗位，任职期间，主要负责xxxx工作；在此期间，组建了xxx。实现了xxx；\n\n模式2、在担任xxx岗位期间，主要负责xxxx工作，具体的工作职责包括如下：\n\n2.1）xxxxxxxx；\n2.2）xxxxxxxx；\n2.3）xxxxxxxx；"
prompts.numberOfLines = 0 prompts.numberOfLines = 0
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHSubmitAllInfoCheckView.swift
View file @ ec5ee6d3
...@@ -12,14 +12,15 @@ class YHSubmitAllInfoCheckView: UIView { ...@@ -12,14 +12,15 @@ class YHSubmitAllInfoCheckView: UIView {
typealias Block = (Bool) -> () typealias Block = (Bool) -> ()
var block: Block? var block: Block?
var centerView: UIView! var centerView: UIView!
var titleLabel: UILabel! // var titleLabel: UILabel!
var messageLabel: UILabel! var messageLabel: UILabel!
var agreeButton: UIButton! var agreeButton: UIButton!
var disAgressButton: UIButton! var disAgressButton: UIButton!
static func showCheckView(callBack: @escaping Block) { static func showCheckView(tipMsg: String?,callBack: @escaping Block) {
let view = YHSubmitAllInfoCheckView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: KScreenHeight)) let view = YHSubmitAllInfoCheckView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: KScreenHeight))
view.block = callBack view.block = callBack
view.messageLabel.text = tipMsg ?? "--"
let window = UIApplication.shared.yhKeyWindow() let window = UIApplication.shared.yhKeyWindow()
window?.addSubview(view) window?.addSubview(view)
} }
...@@ -44,7 +45,7 @@ class YHSubmitAllInfoCheckView: UIView { ...@@ -44,7 +45,7 @@ class YHSubmitAllInfoCheckView: UIView {
centerView = { centerView = {
let view = UIView() let view = UIView()
view.backgroundColor = .white view.backgroundColor = .white
view.layer.cornerRadius = 12 view.layer.cornerRadius = kCornerRadius6
return view return view
}() }()
addSubview(centerView) addSubview(centerView)
...@@ -57,8 +58,8 @@ class YHSubmitAllInfoCheckView: UIView { ...@@ -57,8 +58,8 @@ class YHSubmitAllInfoCheckView: UIView {
// titleLabel = { // titleLabel = {
// let label = UILabel() // let label = UILabel()
// label.text = "同意隐私协议" // label.text = "同意隐私协议"
// label.font = kFont(size: 16) // label.font = UIFont.PFSC_R(ofSize: 16)
// label.textColor = UIColor(hex:0x222222) // label.textColor = UIColor.mainTextColor
// label.textAlignment = .center // label.textAlignment = .center
// return label // return label
// }() // }()
...@@ -74,6 +75,7 @@ class YHSubmitAllInfoCheckView: UIView { ...@@ -74,6 +75,7 @@ class YHSubmitAllInfoCheckView: UIView {
label.text = "确定是否提交信息？提交后将不能修改" label.text = "确定是否提交信息？提交后将不能修改"
label.font = UIFont.PFSC_R(ofSize: 16) label.font = UIFont.PFSC_R(ofSize: 16)
label.textColor = UIColor.mainTextColor label.textColor = UIColor.mainTextColor
label.textAlignment = .center
label.numberOfLines = 0 label.numberOfLines = 0
return label return label
}() }()
......
galaxy/galaxy/Classes/Modules/Login(登录)/C/YHCodeResultViewController.swift
View file @ ec5ee6d3
...@@ -39,7 +39,7 @@ class YHCodeResultViewController: YHBaseViewController { ...@@ -39,7 +39,7 @@ class YHCodeResultViewController: YHBaseViewController {
loginTitleLabel = { loginTitleLabel = {
let label = UILabel() let label = UILabel()
label.text = "登录后更精彩" label.text = "登录后更精彩"
label.font = kBoldFont(size: 32) label.font = UIFont.PFSC_M(ofSize: 32)
label.textColor = UIColor(hex:0xffffff) label.textColor = UIColor(hex:0xffffff)
return label return label
}() }()
...@@ -53,7 +53,7 @@ class YHCodeResultViewController: YHBaseViewController { ...@@ -53,7 +53,7 @@ class YHCodeResultViewController: YHBaseViewController {
loginSubTitleLabel = { loginSubTitleLabel = {
let label = UILabel() let label = UILabel()
label.text = "香港美好生活期待与你的相遇" label.text = "香港美好生活期待与你的相遇"
label.font = kFont(size: 20) label.font = UIFont.PFSC_R(ofSize: 20)
label.textColor = UIColor(hex:0xffffff) label.textColor = UIColor(hex:0xffffff)
return label return label
}() }()
...@@ -67,7 +67,7 @@ class YHCodeResultViewController: YHBaseViewController { ...@@ -67,7 +67,7 @@ class YHCodeResultViewController: YHBaseViewController {
phoneLabel = { phoneLabel = {
let label = UILabel() let label = UILabel()
label.text = "已发送验证码至13352933800" label.text = "已发送验证码至13352933800"
label.font = kBoldFont(size: 17) label.font = UIFont.PFSC_M(ofSize: 17)
label.textAlignment = .left label.textAlignment = .left
label.textColor = UIColor(hex:0xffffff) label.textColor = UIColor(hex:0xffffff)
return label return label
...@@ -96,7 +96,7 @@ class YHCodeResultViewController: YHBaseViewController { ...@@ -96,7 +96,7 @@ class YHCodeResultViewController: YHBaseViewController {
getCodeLabel = { getCodeLabel = {
let button = UILabel() let button = UILabel()
button.font = kBoldFont(size: 16) button.font = UIFont.PFSC_M(ofSize: 16)
button.text = "重新发送（58s）" button.text = "重新发送（58s）"
button.textColor = UIColor(hex:0xffffff) button.textColor = UIColor(hex:0xffffff)
button.isHidden = false button.isHidden = false
...@@ -112,7 +112,7 @@ class YHCodeResultViewController: YHBaseViewController { ...@@ -112,7 +112,7 @@ class YHCodeResultViewController: YHBaseViewController {
getCodeButton = { getCodeButton = {
let button = UIButton(type: .custom) let button = UIButton(type: .custom)
button.titleLabel?.font = kBoldFont(size: 16) button.titleLabel?.font = UIFont.PFSC_M(ofSize: 16)
button.contentHorizontalAlignment = .left button.contentHorizontalAlignment = .left
button.setTitle("重新获取验证码", for: .normal) button.setTitle("重新获取验证码", for: .normal)
button.setTitleColor( UIColor(hex:0xffffff), for: .normal) button.setTitleColor( UIColor(hex:0xffffff), for: .normal)
......
galaxy/galaxy/Classes/Modules/Login(登录)/C/YHCodeSueecssViewController.swift
View file @ ec5ee6d3
...@@ -63,8 +63,8 @@ class YHCodeSueecssViewController: YHBaseViewController { ...@@ -63,8 +63,8 @@ class YHCodeSueecssViewController: YHBaseViewController {
loginTitleLabel = { loginTitleLabel = {
let label = UILabel() let label = UILabel()
label.text = "请输入验证码" label.text = "请输入验证码"
label.font = kBoldFont(size: 28) label.font = UIFont.PFSC_M(ofSize: 28)
label.textColor = UIColor(hex:0x222222) label.textColor = UIColor.mainTextColor
return label return label
}() }()
view.addSubview(loginTitleLabel) view.addSubview(loginTitleLabel)
...@@ -78,8 +78,8 @@ class YHCodeSueecssViewController: YHBaseViewController { ...@@ -78,8 +78,8 @@ class YHCodeSueecssViewController: YHBaseViewController {
loginSubTitleLabel = { loginSubTitleLabel = {
let label = UILabel() let label = UILabel()
label.text = "已发送至 \(phoneNumber ?? "")" label.text = "已发送至 \(phoneNumber ?? "")"
label.font = kFont(size: 13) label.font = UIFont.PFSC_R(ofSize: 13)
label.textColor = UIColor(hex:0xc0c0c0) label.textColor = UIColor.placeHolderColor
return label return label
}() }()
view.addSubview(loginSubTitleLabel) view.addSubview(loginSubTitleLabel)
...@@ -113,9 +113,9 @@ class YHCodeSueecssViewController: YHBaseViewController { ...@@ -113,9 +113,9 @@ class YHCodeSueecssViewController: YHBaseViewController {
getCodeLabel = { getCodeLabel = {
let button = UILabel() let button = UILabel()
button.font = kBoldFont(size: 12) button.font = UIFont.PFSC_M(ofSize: 12)
button.text = "重新发送（58s）" button.text = "重新发送（58s）"
button.textColor = UIColor(hex:0xc0c0c0) button.textColor = UIColor.placeHolderColor
button.textAlignment = .center button.textAlignment = .center
button.isHidden = false button.isHidden = false
button.layer.cornerRadius = 4 button.layer.cornerRadius = 4
...@@ -133,10 +133,10 @@ class YHCodeSueecssViewController: YHBaseViewController { ...@@ -133,10 +133,10 @@ class YHCodeSueecssViewController: YHBaseViewController {
getCodeButton = { getCodeButton = {
let button = UIButton(type: .custom) let button = UIButton(type: .custom)
button.titleLabel?.font = kBoldFont(size: 12) button.titleLabel?.font = UIFont.PFSC_M(ofSize: 12)
button.contentHorizontalAlignment = .center button.contentHorizontalAlignment = .center
button.setTitle("获取验证码", for: .normal) button.setTitle("获取验证码", for: .normal)
button.setTitleColor( UIColor(hex:0x222222), for: .normal) button.setTitleColor( UIColor.mainTextColor, for: .normal)
button.addTarget(self, action: #selector(startClicked), for: .touchUpInside) button.addTarget(self, action: #selector(startClicked), for: .touchUpInside)
button.isHidden = true button.isHidden = true
button.layer.cornerRadius = 4 button.layer.cornerRadius = 4
......
galaxy/galaxy/Classes/Modules/Login(登录)/C/YHLoginViewController.swift
View file @ ec5ee6d3
...@@ -55,7 +55,7 @@ class YHLoginViewController: YHBaseViewController { ...@@ -55,7 +55,7 @@ class YHLoginViewController: YHBaseViewController {
loginTitleLabel = { loginTitleLabel = {
let label = UILabel() let label = UILabel()
label.text = "登录后更精彩" label.text = "登录后更精彩"
label.font = kBoldFont(size: 32) label.font = UIFont.PFSC_M(ofSize: 32)
label.textColor = UIColor(hex:0xffffff) label.textColor = UIColor(hex:0xffffff)
return label return label
}() }()
...@@ -69,7 +69,7 @@ class YHLoginViewController: YHBaseViewController { ...@@ -69,7 +69,7 @@ class YHLoginViewController: YHBaseViewController {
loginSubTitleLabel = { loginSubTitleLabel = {
let label = UILabel() let label = UILabel()
label.text = "香港美好生活期待与你的相遇" label.text = "香港美好生活期待与你的相遇"
label.font = kFont(size: 20) label.font = UIFont.PFSC_R(ofSize: 20)
label.textColor = UIColor(hex:0xffffff) label.textColor = UIColor(hex:0xffffff)
return label return label
}() }()
...@@ -83,7 +83,7 @@ class YHLoginViewController: YHBaseViewController { ...@@ -83,7 +83,7 @@ class YHLoginViewController: YHBaseViewController {
loginPhoneLabel = { loginPhoneLabel = {
let label = UILabel() let label = UILabel()
label.text = "+86 133****3800" label.text = "+86 133****3800"
label.font = kBoldFont(size: 20) label.font = UIFont.PFSC_M(ofSize: 20)
label.textAlignment = .center label.textAlignment = .center
label.textColor = UIColor(hex:0xffffff) label.textColor = UIColor(hex:0xffffff)
return label return label
...@@ -98,7 +98,7 @@ class YHLoginViewController: YHBaseViewController { ...@@ -98,7 +98,7 @@ class YHLoginViewController: YHBaseViewController {
loginButton = { loginButton = {
let button = UIButton(type: .custom) let button = UIButton(type: .custom)
button.backgroundColor = UIColor(hex:0x4d9ff8) button.backgroundColor = UIColor(hex:0x4d9ff8)
button.titleLabel?.font = kBoldFont(size: 16) button.titleLabel?.font = UIFont.PFSC_M(ofSize: 16)
button.contentHorizontalAlignment = .center button.contentHorizontalAlignment = .center
button.setTitle("本机号码一键登录", for: .normal) button.setTitle("本机号码一键登录", for: .normal)
button.setTitleColor( UIColor(hex:0xffffff), for: .normal) button.setTitleColor( UIColor(hex:0xffffff), for: .normal)
...@@ -165,7 +165,7 @@ class YHLoginViewController: YHBaseViewController { ...@@ -165,7 +165,7 @@ class YHLoginViewController: YHBaseViewController {
promptsLabel = { promptsLabel = {
let label = UILabel() let label = UILabel()
label.text = "其他登录方式（第三方账号注册需绑定手机号）" label.text = "其他登录方式（第三方账号注册需绑定手机号）"
label.font = kFont(size: 12) label.font = UIFont.PFSC_R(ofSize: 12)
label.textColor = UIColor(hex:0xffffff) label.textColor = UIColor(hex:0xffffff)
label.textAlignment = .center label.textAlignment = .center
return label return label
......
galaxy/galaxy/Classes/Modules/Login(登录)/C/YHPhoneLoginViewController.swift
View file @ ec5ee6d3
...@@ -81,8 +81,8 @@ class YHPhoneLoginViewController: YHBaseViewController { ...@@ -81,8 +81,8 @@ class YHPhoneLoginViewController: YHBaseViewController {
loginTitleLabel = { loginTitleLabel = {
let label = UILabel() let label = UILabel()
label.text = "手机号登录" label.text = "手机号登录"
label.font = kBoldFont(size: 28) label.font = UIFont.PFSC_M(ofSize: 28)
label.textColor = UIColor(hex:0x222222) label.textColor = UIColor.mainTextColor
return label return label
}() }()
view.addSubview(loginTitleLabel) view.addSubview(loginTitleLabel)
...@@ -96,8 +96,8 @@ class YHPhoneLoginViewController: YHBaseViewController { ...@@ -96,8 +96,8 @@ class YHPhoneLoginViewController: YHBaseViewController {
loginSubTitleLabel = { loginSubTitleLabel = {
let label = UILabel() let label = UILabel()
label.text = "手机号首次登录自动注册" label.text = "手机号首次登录自动注册"
label.font = kFont(size: 13) label.font = UIFont.PFSC_R(ofSize: 13)
label.textColor = UIColor(hex:0xc0c0c0) label.textColor = UIColor.placeHolderColor
return label return label
}() }()
view.addSubview(loginSubTitleLabel) view.addSubview(loginSubTitleLabel)
...@@ -110,8 +110,8 @@ class YHPhoneLoginViewController: YHBaseViewController { ...@@ -110,8 +110,8 @@ class YHPhoneLoginViewController: YHBaseViewController {
phoneMessageView = { phoneMessageView = {
let view = YHPhoneMessageView() let view = YHPhoneMessageView()
view.backgroundColor = UIColor(hex:0xf8f9fb) view.backgroundColor = UIColor.contentBkgColor
view.layer.cornerRadius = 6 view.layer.cornerRadius = kCornerRadius6
view.layer.borderWidth = 1 view.layer.borderWidth = 1
view.layer.borderColor = UIColor(hex:0xebeef4).cgColor view.layer.borderColor = UIColor(hex:0xebeef4).cgColor
view.phoneBlock = {[weak self] count in view.phoneBlock = {[weak self] count in
...@@ -137,7 +137,7 @@ class YHPhoneLoginViewController: YHBaseViewController { ...@@ -137,7 +137,7 @@ class YHPhoneLoginViewController: YHBaseViewController {
getCodeButton = { getCodeButton = {
let button = UIButton(type: .custom) let button = UIButton(type: .custom)
button.backgroundColor = UIColor(hex:0x2274ee).withAlphaComponent(0.4) button.backgroundColor = UIColor(hex:0x2274ee).withAlphaComponent(0.4)
button.titleLabel?.font = kBoldFont(size: 16) button.titleLabel?.font = UIFont.PFSC_M(ofSize: 16)
button.contentHorizontalAlignment = .center button.contentHorizontalAlignment = .center
button.setTitle("获取验证码", for: .normal) button.setTitle("获取验证码", for: .normal)
button.setTitleColor( UIColor(hex:0xffffff), for: .normal) button.setTitleColor( UIColor(hex:0xffffff), for: .normal)
......
galaxy/galaxy/Classes/Modules/Login(登录)/C/YHPickPhoneAddressViewController.swift
View file @ ec5ee6d3
...@@ -33,7 +33,7 @@ class YHPickPhoneAddressViewController: YHBaseViewController { ...@@ -33,7 +33,7 @@ class YHPickPhoneAddressViewController: YHBaseViewController {
// loginTitleLabel = { // loginTitleLabel = {
// let label = UILabel() // let label = UILabel()
// label.text = "登录后更精彩" // label.text = "登录后更精彩"
// label.font = kBoldFont(size: 32) // label.font = UIFont.PFSC_M(ofSize: 32)
// label.textColor = UIColor(hex:0xffffff) // label.textColor = UIColor(hex:0xffffff)
// return label // return label
// }() // }()
......
galaxy/galaxy/Classes/Modules/Login(登录)/C/YHVerificationCodeLoginController.swift
View file @ ec5ee6d3
...@@ -42,7 +42,7 @@ class YHVerificationCodeLoginController: YHBaseViewController { ...@@ -42,7 +42,7 @@ class YHVerificationCodeLoginController: YHBaseViewController {
loginTitleLabel = { loginTitleLabel = {
let label = UILabel() let label = UILabel()
label.text = "登录后更精彩" label.text = "登录后更精彩"
label.font = kBoldFont(size: 32) label.font = UIFont.PFSC_M(ofSize: 32)
label.textColor = UIColor(hex:0xffffff) label.textColor = UIColor(hex:0xffffff)
return label return label
}() }()
...@@ -56,7 +56,7 @@ class YHVerificationCodeLoginController: YHBaseViewController { ...@@ -56,7 +56,7 @@ class YHVerificationCodeLoginController: YHBaseViewController {
loginSubTitleLabel = { loginSubTitleLabel = {
let label = UILabel() let label = UILabel()
label.text = "香港美好生活期待与你的相遇" label.text = "香港美好生活期待与你的相遇"
label.font = kFont(size: 20) label.font = UIFont.PFSC_R(ofSize: 20)
label.textColor = UIColor(hex:0xffffff) label.textColor = UIColor(hex:0xffffff)
return label return label
}() }()
...@@ -70,7 +70,7 @@ class YHVerificationCodeLoginController: YHBaseViewController { ...@@ -70,7 +70,7 @@ class YHVerificationCodeLoginController: YHBaseViewController {
phoneLabel = { phoneLabel = {
let label = UILabel() let label = UILabel()
label.text = "未注册手机验证后完成注册" label.text = "未注册手机验证后完成注册"
label.font = kBoldFont(size: 17) label.font = UIFont.PFSC_M(ofSize: 17)
label.textAlignment = .left label.textAlignment = .left
label.textColor = UIColor(hex:0xffffff) label.textColor = UIColor(hex:0xffffff)
return label return label
...@@ -105,7 +105,7 @@ class YHVerificationCodeLoginController: YHBaseViewController { ...@@ -105,7 +105,7 @@ class YHVerificationCodeLoginController: YHBaseViewController {
getCodeButton = { getCodeButton = {
let button = UIButton(type: .custom) let button = UIButton(type: .custom)
button.backgroundColor = UIColor(hex:0xd8d8d8).withAlphaComponent(0.8) button.backgroundColor = UIColor(hex:0xd8d8d8).withAlphaComponent(0.8)
button.titleLabel?.font = kBoldFont(size: 16) button.titleLabel?.font = UIFont.PFSC_M(ofSize: 16)
button.contentHorizontalAlignment = .center button.contentHorizontalAlignment = .center
button.setTitle("获取验证码", for: .normal) button.setTitle("获取验证码", for: .normal)
button.setTitleColor( UIColor(hex:0x979797), for: .normal) button.setTitleColor( UIColor(hex:0x979797), for: .normal)
...@@ -122,7 +122,7 @@ class YHVerificationCodeLoginController: YHBaseViewController { ...@@ -122,7 +122,7 @@ class YHVerificationCodeLoginController: YHBaseViewController {
} }
emailButton = { emailButton = {
let button = UIButton(type: .custom) let button = UIButton(type: .custom)
button.titleLabel?.font = kBoldFont(size: 16) button.titleLabel?.font = UIFont.PFSC_M(ofSize: 16)
button.setTitle("邮箱登录", for: .normal) button.setTitle("邮箱登录", for: .normal)
button.setTitleColor( UIColor(hex:0xffffff), for: .normal) button.setTitleColor( UIColor(hex:0xffffff), for: .normal)
return button return button
...@@ -150,7 +150,7 @@ class YHVerificationCodeLoginController: YHBaseViewController { ...@@ -150,7 +150,7 @@ class YHVerificationCodeLoginController: YHBaseViewController {
promptsLabel = { promptsLabel = {
let label = UILabel() let label = UILabel()
label.text = "其他登录方式（第三方账号注册需绑定手机号）" label.text = "其他登录方式（第三方账号注册需绑定手机号）"
label.font = kFont(size: 12) label.font = UIFont.PFSC_R(ofSize: 12)
label.textColor = UIColor(hex:0xffffff) label.textColor = UIColor(hex:0xffffff)
label.textAlignment = .center label.textAlignment = .center
return label return label
......
galaxy/galaxy/Classes/Modules/Login(登录)/V/YHLoginPrivacyView.swift
View file @ ec5ee6d3
...@@ -44,8 +44,8 @@ class YHLoginPrivacyView: UIView { ...@@ -44,8 +44,8 @@ class YHLoginPrivacyView: UIView {
messageLabel = { messageLabel = {
let label = UILabel() let label = UILabel()
label.text = "我已阅读并同意" label.text = "我已阅读并同意"
label.font = kFont(size: 12) label.font = UIFont.PFSC_R(ofSize: 12)
label.textColor = UIColor(hex:0x888f98) label.textColor = UIColor.contentBkgColor
label.textAlignment = .left label.textAlignment = .left
return label return label
}() }()
...@@ -58,7 +58,7 @@ class YHLoginPrivacyView: UIView { ...@@ -58,7 +58,7 @@ class YHLoginPrivacyView: UIView {
serviceButton = { serviceButton = {
let button = UIButton(type: .custom) let button = UIButton(type: .custom)
button.titleLabel?.font = kBoldFont(size: 12) button.titleLabel?.font = UIFont.PFSC_M(ofSize: 12)
button.contentHorizontalAlignment = .center button.contentHorizontalAlignment = .center
button.setTitle("《隐私协议》", for: .normal) button.setTitle("《隐私协议》", for: .normal)
button.setTitleColor(UIColor(hex: 0x2f7ef6), for: .normal) button.setTitleColor(UIColor(hex: 0x2f7ef6), for: .normal)
...@@ -74,8 +74,8 @@ class YHLoginPrivacyView: UIView { ...@@ -74,8 +74,8 @@ class YHLoginPrivacyView: UIView {
andLabel = { andLabel = {
let label = UILabel() let label = UILabel()
label.text = "和" label.text = "和"
label.font = kFont(size: 12) label.font = UIFont.PFSC_R(ofSize: 12)
label.textColor = UIColor(hex:0x888f98) label.textColor = UIColor.contentBkgColor
label.textAlignment = .left label.textAlignment = .left
return label return label
}() }()
...@@ -87,7 +87,7 @@ class YHLoginPrivacyView: UIView { ...@@ -87,7 +87,7 @@ class YHLoginPrivacyView: UIView {
} }
privacyButton = { privacyButton = {
let button = UIButton(type: .custom) let button = UIButton(type: .custom)
button.titleLabel?.font = kBoldFont(size: 12) button.titleLabel?.font = UIFont.PFSC_M(ofSize: 12)
button.contentHorizontalAlignment = .center button.contentHorizontalAlignment = .center
button.setTitle("《用户条款》", for: .normal) button.setTitle("《用户条款》", for: .normal)
button.setTitleColor(UIColor(hex: 0x2f7ef6), for: .normal) button.setTitleColor(UIColor(hex: 0x2f7ef6), for: .normal)
......
galaxy/galaxy/Classes/Modules/Login(登录)/V/YHLoginStyleButton.swift
View file @ ec5ee6d3
...@@ -32,7 +32,7 @@ class YHLoginStyleButton: UIButton { ...@@ -32,7 +32,7 @@ class YHLoginStyleButton: UIButton {
messageLabel = { messageLabel = {
let label = UILabel() let label = UILabel()
label.font = kBoldFont(size: 16) label.font = UIFont.PFSC_M(ofSize: 16)
label.textColor = UIColor(hex:0xffffff) label.textColor = UIColor(hex:0xffffff)
label.textAlignment = .right label.textAlignment = .right
return label return label
......
galaxy/galaxy/Classes/Modules/Login(登录)/V/YHPhoneMessageView.swift
View file @ ec5ee6d3
...@@ -28,7 +28,7 @@ class YHPhoneMessageView: UIView { ...@@ -28,7 +28,7 @@ class YHPhoneMessageView: UIView {
func setView() { func setView() {
messageButton = { messageButton = {
let button = UIButton(type: .custom) let button = UIButton(type: .custom)
button.titleLabel?.font = kBoldFont(size: 16) button.titleLabel?.font = UIFont.PFSC_M(ofSize: 16)
button.setTitle("+86", for: .normal) button.setTitle("+86", for: .normal)
button.setTitleColor( UIColor(hex:0x000000), for: .normal) button.setTitleColor( UIColor(hex:0x000000), for: .normal)
button.addTarget(self, action: #selector(messageClick), for: .touchUpInside) button.addTarget(self, action: #selector(messageClick), for: .touchUpInside)
...@@ -56,7 +56,7 @@ class YHPhoneMessageView: UIView { ...@@ -56,7 +56,7 @@ class YHPhoneMessageView: UIView {
phoneTextField = { phoneTextField = {
let text = UITextField() let text = UITextField()
text.placeholder = "请输入签约手机号" text.placeholder = "请输入签约手机号"
text.font = kFont(size: 16) text.font = UIFont.PFSC_R(ofSize: 16)
text.textColor = UIColor(hex:0x000000) text.textColor = UIColor(hex:0x000000)
text.textAlignment = .left text.textAlignment = .left
text.keyboardType = .phonePad text.keyboardType = .phonePad
......
galaxy/galaxy/Classes/Modules/Login(登录)/V/YHPrivacyAlertView.swift
View file @ ec5ee6d3
...@@ -38,7 +38,7 @@ class YHPrivacyAlertView: UIView { ...@@ -38,7 +38,7 @@ class YHPrivacyAlertView: UIView {
centerView = { centerView = {
let view = UIView() let view = UIView()
view.backgroundColor = .white view.backgroundColor = .white
view.layer.cornerRadius = 12 view.layer.cornerRadius = kCornerRadius6
return view return view
}() }()
addSubview(centerView) addSubview(centerView)
...@@ -81,11 +81,11 @@ class YHPrivacyAlertView: UIView { ...@@ -81,11 +81,11 @@ class YHPrivacyAlertView: UIView {
disAgressButton = { disAgressButton = {
let button = UIButton(type: .custom) let button = UIButton(type: .custom)
button.backgroundColor = UIColor(hex:0xffffff) button.backgroundColor = UIColor(hex:0xffffff)
button.titleLabel?.font = kBoldFont(size: 15) button.titleLabel?.font = UIFont.PFSC_M(ofSize: 15)
button.contentHorizontalAlignment = .center button.contentHorizontalAlignment = .center
button.setTitle("不同意", for: .normal) button.setTitle("不同意", for: .normal)
button.setTitleColor( UIColor(hex:0x3c86f8), for: .normal) button.setTitleColor( UIColor(hex:0x3c86f8), for: .normal)
button.layer.cornerRadius = 8 button.layer.cornerRadius = kCornerRadius6
button.layer.borderWidth = 1 button.layer.borderWidth = 1
button.layer.borderColor = UIColor(hex: 0x3c86f8).cgColor button.layer.borderColor = UIColor(hex: 0x3c86f8).cgColor
button.addTarget(self, action: #selector(disagree), for: .touchUpInside) button.addTarget(self, action: #selector(disagree), for: .touchUpInside)
...@@ -102,11 +102,11 @@ class YHPrivacyAlertView: UIView { ...@@ -102,11 +102,11 @@ class YHPrivacyAlertView: UIView {
agreeButton = { agreeButton = {
let button = UIButton(type: .custom) let button = UIButton(type: .custom)
button.backgroundColor = UIColor(hex:0x3c86f8) button.backgroundColor = UIColor(hex:0x3c86f8)
button.titleLabel?.font = kBoldFont(size: 15) button.titleLabel?.font = UIFont.PFSC_M(ofSize: 15)
button.contentHorizontalAlignment = .center button.contentHorizontalAlignment = .center
button.setTitle("同意", for: .normal) button.setTitle("同意", for: .normal)
button.setTitleColor( UIColor(hex:0xffffff), for: .normal) button.setTitleColor( UIColor(hex:0xffffff), for: .normal)
button.layer.cornerRadius = 8 button.layer.cornerRadius = kCornerRadius6
button.addTarget(self, action: #selector(agree), for: .touchUpInside) button.addTarget(self, action: #selector(agree), for: .touchUpInside)
return button return button
}() }()
......
galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHAboutUsViewController.swift
View file @ ec5ee6d3
...@@ -50,7 +50,7 @@ class YHAboutUsViewController: YHBaseViewController { ...@@ -50,7 +50,7 @@ class YHAboutUsViewController: YHBaseViewController {
lazy var aboutLabel = { lazy var aboutLabel = {
var label = UILabel() var label = UILabel()
label.text = "关于银河".local label.text = "关于银河".local
label.textColor = UIColor(hexString:"#222222") label.textColor = UIColor.mainTextColor
label.textAlignment = NSTextAlignment.left label.textAlignment = NSTextAlignment.left
label.font = UIFont.systemFont(ofSize: 20) label.font = UIFont.systemFont(ofSize: 20)
return label return label
...@@ -69,7 +69,7 @@ class YHAboutUsViewController: YHBaseViewController { ...@@ -69,7 +69,7 @@ class YHAboutUsViewController: YHBaseViewController {
lazy var advantageLabel = { lazy var advantageLabel = {
var label = UILabel() var label = UILabel()
label.text = "四大优势" label.text = "四大优势"
label.textColor = UIColor(hexString:"#222222") label.textColor = UIColor.mainTextColor
label.textAlignment = .center label.textAlignment = .center
label.font = UIFont.systemFont(ofSize: 15) label.font = UIFont.systemFont(ofSize: 15)
return label return label
......
galaxy/galaxy/Classes/Tools/Helper/YhConstant.swift
View file @ ec5ee6d3
...@@ -114,25 +114,6 @@ func kIsEmpty(string: String) -> Bool { ...@@ -114,25 +114,6 @@ func kIsEmpty(string: String) -> Bool {
} }
} }
/** 文字大小设置
* parameter name 字体名字 (为空时默认字体)
* parameter size 字体大小
*/
func kFont(name: String = "", size: CGFloat) -> UIFont {
if !kIsEmpty(string: name) {
return UIFont.init(name: name, size: size)!
}else {
return UIFont.systemFont(ofSize: size)
}
}
func kBoldFont(name: String = "", size: CGFloat) -> UIFont {
if !kIsEmpty(string: name) {
return UIFont.init(name: name, size: size)!
}else {
return UIFont.boldSystemFont(ofSize: size)
}
}
/// 版本号相同： /// 版本号相同：
func systemVersionEqual(version:String) -> Bool { func systemVersionEqual(version:String) -> Bool {
......
galaxy/galaxy/Classes/Tools/NetWork/YHAllApiName.swift
View file @ ec5ee6d3
...@@ -49,6 +49,20 @@ class YHAllApiName { ...@@ -49,6 +49,20 @@ class YHAllApiName {
static let getEducationDetailInfoApi = "frontend/education/detail" static let getEducationDetailInfoApi = "frontend/education/detail"
// 保存学历信息 // 保存学历信息
static let saveEducationInfoApi = "frontend/education/save" static let saveEducationInfoApi = "frontend/education/save"
// 删除学历
static let deleteEducationInfoApi = "frontend/education/del"
// 保存所有信息
static let saveAllEduAndQuaInfoApi = "frontend/education/save_all"
}
struct Qualification {
// 获取学历详情信息
static let getQualificationDetailInfoApi = "frontend/qualification/detail"
// 删除专业
static let deleteQualificationInfoApi = "frontend/qualification/del"
// 保存专业
static let saveQualificationInfoApi = "frontend/qualification/save"
} }
//Users //Users
......
galaxy/galaxy/Classes/Tools/NetWork/YHNetRequest.swift
View file @ ec5ee6d3
...@@ -94,8 +94,12 @@ class YHNetRequest: NSObject { ...@@ -94,8 +94,12 @@ class YHNetRequest: NSObject {
requestHeader.add(name:"sign",value:sign) requestHeader.add(name:"sign",value:sign)
//杜宇的账号
// requestHeader.add(name: "token", value: "eyJpdiI6Ik5aeEVDclZTK0FISEFBZUgxN2VkdGc9PSIsInZhbHVlIjoiRFRJOHlObzVrZlp4T2tVYW1MSE1ZK0Z3dXlyK3p4QlczNmxsTXdkdW5GQVY4Q2VqZlNNUDdrdVpsb0JcLytpYmJheUp2MWZTUE5pOWgrVWRLdEtIUkx4R1wvS3F6SmRSQ0dWeFVXanFINGkyRWNMTXB4TVlcLzhjXC9NSzVoMFwvZ1ZOaVIwb0VqWlo1VERPSHY2RWJhME1RdWtkXC8yanBQdm9lMWM4WXJVK1BnMDd6SncwVVlWMDNnbSswSnM3eVwveFRRck03M3pOaDFSc3g0UmlYMTJQdmZpSkhUWHVMa21RV2xRbXBkalVTTUFicmFaN2NVNXl1ZTJOeEJoKzhrMnZtdzdvM1U5Qmh4WXNiSEFERUpiZHNWNkxoM2ZkVVRUdFlMMU1MQnIyaWNxNSt4S1NocDVEbnNqeHphUCtVVk1qTlVnMk1ydVNPamJ0c2tDQ1wvWFk1SkxtSWtDMU9oT3ZqaFpuNU5aVUVicHpYVU56VnlqK01Cb20welJMbkQrcTFWOHFUbzlPK0RGdDRcLzJ1T094MjNjYTVZZmJcL2txRE93cEFUYzlKWWdVWE9cLzFnYnVwTFZ4VUtqMFQ5QlgzZitDQjhyNURpU3p0bktqblBicUxPekNBcWRWM0g0WklSOEc0T0RPVkNBMGZQdEtWV3ZqN3IrcHZDYm9UNjREdnA3U1RZY1Z1dFE3K1RRM2F2eGY0QXc2dGlha0RBUDVpVHdFWE53dzl2eVczVk9VNTJSa1Fzb1J4ZGd0c0RCdktPQ1FWOUQ5Y0krckQ3bFc4NkNJMHliSXlnNGtYU1ZCUHRZWTdCKzA5d1wvdldzWTlpeUdYaEg4eGhITHpRSUthMWpSVlZvZVhwZ3BvamxCTHFSUXJmQ1hQNThYbUNNanZnVGs0b3RDTUFmYkdsYTEzeEtnTXJpZVU0QnJHWDJoUk9sUklzaFFhUkJiNWk0Z2E0cUUwejU4RmF2RnE4Z2U0eEo3VmZ2SmFMTlVacFBvSFlZUmM2N3liVTdhTk5NWU9YS0xtalk3QUN3NWV2UTlPeE5hMmk0aHU4MSt0YjNJQytFczRMa2l6XC9jV0Jxc01QYU0yYXdTXC92RXBxTFNVOVd6SlwvRm9KM21jUHlcL2diRlMyU3REeEl0K1RxSjRuck8xaXlOaWY4NXVzMVBibXpVSEZJWkVZQnFUd2k5TUVJcDUwUEFjTmljTzYyaWFYaFkzZUtkR294d29LUzBUTFF1Y0xxbWtMNFF4ZlZkN2k4YktEUnRGekU3OEdaN2J3TUR4T2FpVHRKaGlqRWNcL2c5dlwvOUVEVmdLNUhBSk1wSGV5UXVoOFJydlczc09HU1EyeXI4SFZZQmJJQWx1cGFIaXhmK1VJNmdoNmwrOElMZXFxSHZtazQreW84RFBlOXFnVDI2bm1tZWl0K01OcU1DSGJEQXdnWW9Hc0ptWFVJbXVXdEpyT2FKUHprTzJ1MkxFSEViZGV4cFpuOWRXK3dUdVR4bmJHZ1VRRGJycFRBME5lWUtaT0JCYjViSWVvcVJ3RXllb2tQZ1VkUWFqVWo0UHQzMUQwWVMwZ05rTTU0Nk1QQUdxTm9rZFNISVYrTG5DWlArNkt5RkZxajdZN1luakRKQVdUaVpnOUhCUExYMEVKRXRRT3QyZTI4cU9TdlBrbWxVZkFLSWZFbXNha3lCZUhFRVpyTmxQOERjbVwvMytCc0JpNnZcL1Nvek9yR2pUWGF2XC9VMzN4OEY5T3VsdUNGRFNWbHZZMnBzNHhMeEdIR21majBOOUJNbEhlK1J4S3dFTnlJamdTeFQyTWlTTlhCUWxnSDF6VmNhWHIzVGpoREY5clB2XC9uZHZjSm1iTHZ1bjFIUUFRait6dUJlUk1WQ1FhdXFoN002YlQ5MVwvQVMzYzJJQ0RFR1czdEtqMFBTQT09IiwibWFjIjoiOGVlZjBmNTVmMzEwNjhkZjVmYTlkYzAwYzllMjJmNjUyZmRmN2U1ODFiZTIzNzRjMDVjMTNiOTNhOWRhMmVkYSJ9")
requestHeader.add(name: "token", value: "eyJpdiI6Iko1OGFleVJ5SVBEaDh6U0J4R0dqa1E9PSIsInZhbHVlIjoic3ZQWVBiNEVvTmpxaEFcL2pKc3NkKzlhaXZ0Qk1nallPcUdnbkVISUJZT0tNTHAyTmtzY3lUMVh3VURnUnpSTWRsZXNHVVNhR2RPeU05NnprdTlhUXMyWENyTWVFU3B4SGlxenBcL1ZnWEk2Vnl3bjRuT1NhcDVCV2k2bXl4Y3F4RXRsaXBTdWVKUUQwTjFadUx2UURvK2RZS3VsWEJpb2xETUc4RzZWdnh0ZzJVVGhzVGdoYjdOT2ZDMFpld2plU2pCVDl3elgxVEpjYmJQQnZlYnRoMTJheUlicVVURWx4XC81elVCS21nSzF4SkhhN2VNTE12ZUVMNThpWElPY3d0MVNlQkRUSW9Rd3V0ZTYwSytPaDhYSElHdDJvWSs4cWpkRkRMU3pKaUdvNW1DTmJiK3Zvdmk4REk2VWpzTCs3cERSUXFkc3hOREJaNVdGU1lEOXN2b1JQSWNZYWVCQjZBaHJCUEV0UmhLMWFrWFN3ZGx4ZGR3Q3FHVm83QjgxMEFHWDQ3aVdnMVVNYnpjS2JuTkpHdnFYK0FoNksyWkFSZGJNcXFTenhXdWpubTZsQXhmZ0g0ekc5REVkQW1xbEVTYktiTmRaMTN6blF4NkFZQzNxMlp0bDlDcGpsdGFpWFNtRmVVa1FYSEtjZUJKbUhWZ2VZanh6VEpWRHpWK0RPZlJKN0UxOHJHcmpFZ1d3XC94WlplOWZHSlNBVnRJKzNFTzNtMk9uXC8xb1hzS3pjalJmYktCa1hqdFJjSVwvMWNWUnlqYU14R01Lbko5TjZHNGlxZnUyOEpnamw5ZEFQK3M1MVZJYjI5RWhON3Q5YlVyMWZYbUNtMmpjTDFVemtjUVVRQmwzSEp6TFZZRytja3A5Q2hSS2xycDF2RXZUbUdzTWVHNHNjVG81UUZqeUV2ck9QdHczS3hHYkpPR09vQ0ZkK0kwVEZoaVFUajF4XC9vSFBJUllNbFlqWUFYYzRRMGJabGxBV2RmTUtOSmNRcVZpM0lNVVpNWWdhNEJLWXlkVG82c3pcLzFsSkNyQmhkNFZ6WTcwbEloSkFndCtEUDNwVkF1MG9GUGQ1allBT3Q4Q0hsSFkrK2lveWxaVHE4UFNDR0JvTERoc1BYdnp0UFVSYWlxQjFCbVdkdGl5YWFnZVRpK1YzUzVBa1I4cU91V0pkSnBcL0o0K1pqbzJQZVRuR0wzXC9cLzVna0JiWVhlRXFwRXljN3N0NURhdkZFV001TU9QdFBXQjM0bXplSnl3T1RjMFBqbCtkSytIZ0tyME5vdEpSMnd0Z3pvRHpSWUkydEFCb2plYlpPQW9WaVRMcmxyYkxPZnd6RllkR2VoQTBEZVZjNjRTcWVlS1AxT0wybXVuQWJZQzhOVW44K3RJT000endabjEyR3d5OHhhbzNyT0hpdEd2VWRiallmc1ZuQkhaWmF2ODhVclpNb2lGUDB6Z3dqMVdVczh3RGQ4WnZ1a1o2Qzh5XC8yS1pmRjJ2TkhWXC9QTkFuY0NGR0FIc1BJcThadk1ZTFFxeXJKZ05XT2t4SzFQa1RnaTg2WXBhMnNzM0k4bk90aEQ1aFwvXC9lY1dpVFFzYUVoNGVhdWhsNEQwczJGTWtncTA0aDQ5SDlDTGtOREVYNVJQNU9HaURnZ01wR2JWaWkyWVVlK2FcL3JNZVB4d2dcLzR6MjNPYTJrcW83T2cyVVFONWVnMTRXczB3azVteHVzMGVYUEhVVEt4SmpROCtLZGwrRW5HbVpxV3F4cHZOZ2x6M1ZoNFFHRmxnZGs4alEwaU9cL09WSDZpSkRsYitzdzNWT1IrZk5VN0R1QkZDUGw4WGhVZnhjQ1lmNmJhU0VCYVp2VUNiUVlcL1VvbTY0bzAzdEFzbVJLQUhUWW1UT2RcL1Bqbmh5XC9keDRGRThzNlY2aFFVbEpqMnc9PSIsIm1hYyI6IjFjMDE1NmZiNDc4ZWE2ZWUwZDI0N2I3MTc3N2QxMmZjNzE4OTExNGYwNDIwMzgzNTA1YWQyOGMyNzIwYjllMDUifQ==")
//明杰的账号
requestHeader.add(name: "token", value: "eyJpdiI6InM0a3dcL1hQYUtPOENKOXNJYzRoMHJnPT0iLCJ2YWx1ZSI6Ik12dW9PUWI2SGRIZDF1cGVrREZ0b2tyd3ZLeUJkVXp5am9vRWhhYVVNRnRyT0FNNWdlNW9cL1BpMFBSS1RKd3B6Y2dyaVM0aHV0NXlIcXJkc1MxdG11d3hMZ3RsZHJ4aGNiRnZLZDJ0Q0NSYndUMUNuODRaYW1lQk1KZ0FqTFFVbTZ1TllMTGdtY1dlV0ZkRm5TeW9Vc1FYY09ZMFMrbGo4TmRnZ0syOWRhUFFRbjBjWDFDKzEwQWxLWjExNWJ5R3VxRGNEbWN0K0Z6Z1VieFIrMmdSbTZ6dU9CZGdFcDJlTktPMTY2cHYyeGhKVXpSNVhxT0VTQjRCa05OTE9aalQzWVFPczRpS1lldk16Zk9BUmZYbnRybDVoVXdRZWM3V1BUV3J0NkIxRHBCT3JDd1czQ0Q3YjU4cnVxVE5Lb0ZnbnlmMWN1RU9ocnU1ZE5pUmVDS21CbmhWTDdxTmYrRCtNNHZLQzdNXC9Bb0lRWXdNcE5HNW5ielwvWGtCZmpKNlNHWW9MaE94TXNSOURlemVSSkNkUXVveFJkUHVWbFIyeXNVZFJ3K0pXNElUWVhLSXpvUGNQek1cLzRBc3BaRE1lUVdKSENCS0FJdjFyeUVBSnNXeTZcL0RNajJIeFF0QUdndzBWRllOQ2R5UzZMK3lqdFZTanRxbXhmeGFrRVRJOE95enA1cUl0VzVjUytpVnBkRTFXMm9uQytobG1vWTlRQWhvNGN4THdRSTUyS0tub29xK25VZkNIb1FVOEh6YktGbjgzdjQ0NlA1cVc0aWNqYWp6OElSb3Vlb0ZPWmVzdVRLQW5SejVJa09kUDIrZW5jbmVtTzYyOFwvQnRTV3ExZVFhOWh4XC9BbDUxaHNRSDlIXC96QThkVGlBcEVkOUZCelBIV21WVXZ0OFlQaWtsclFPOXJzOXFoeGc1QXcyeEgwU2NqcWxXb2g4aTJBK2tCZkxoNjBTU1VrNDEwWWxVUW50STcyMFwvQjlCU2lxc3RSRGFOemdJTDN5NGRhN1RLSHVXVlFVRHdWN1dIVGppTVFNZEkzMWU4ckpXZ1lcL3BKRENnZGpuR0ZaTlpBVFowMVRWc1dpOFEzcERUY3RjXC9nUGYrTkxLdkFGSlc3b0dSUWVuQkRVR2tzZVN2UDFEdCtKNnNMMHNQZnJaT0tGV293OHMxXC9WZ1V5Z0dmM1VLeFM5QVdvVGVcL2IrS0Y3M0Zya0tQbXl6ZTNkWm00V1hZUUdiY3p5UVwvZWthUVlkNGV6cVlNaDMwazJNS0FoejlLT3FlZlBzWklnWkRZclhwUmFqTzk1VWF2eHJ1c1pqYzI2eThqOEJVZDZIbUt1dE81VjZoM0xiWm1NOVBrcjlhM1djOUJvb3VLTjJ2VTJvMzd3MHA1cmRuSWxTMGgzclYrUHF0NnFRN1BPSE4rM1ZTWWF5VlBTWE56aTV0U3Y5M0NrcDNBYVFHTTJvOUsyR1Y4S2k3N05CZUFDMk4xUVwvVWZKSUdiMjdmOXIxSXZjSTdvaGhMSHFISk12N2xDdlRrZUloaVBMS0cyMkVrclhcL3loenQ1MTF2V0lORDZyVmZMaytiWVJyMnk4SzhDRktQSFRQR1FoTFpQZHBzUllRbUUza3NaXC9lMXFSSFZud05JTWo1UkVTTXZjZmZucUF3Mzh2OVpkT2QyaVQ2VXRFVHltRW1MQjlzaHh1Ym02YW1LRUphSVNUeEltMWN5WGxRdlgzSE96V0ErbDdldnQ0ZkRjdGxsQVVpRFZCdnlMSnVrSW5aS3BrT3FRbDh0NWR0TWoxdjNMb3ZUVEJwbkVMbzJjeHRibGJJTGlMOHhSU0tNaTk5VHJxSk9xanRIOTMreVVmZm5lXC82SThIXC9iVXFudW9VOVd1S1RNYlwvbzF5b2V0bDVtRWNkalBTdkVVRGFPVlE9PSIsIm1hYyI6IjNkOTZlZDhiOTVlNmUxZmVlMzZmNDIyYmMzYTc4N2Y2ZmE0ZTI3MGI2YjQxZGVkZGRmMTY0N2IyOGZiM2RhNjYifQ==")
headers = requestHeader headers = requestHeader
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment