Merge branch 'davidhuang' into develop

* davidhuang:
  itemView 的 title 字体 和颜色 调整
  1、统一使用 使用圆角 6

galaxy/galaxy/Classes/Base/V/YHTwoOptionAlertView.swift

@@ -46,7 +46,7 @@ class YHTwoOptionAlertView: UIView {
             centerView = {
                 let view = UIView()
                 view.backgroundColor = .white
-                view.layer.cornerRadius = 12
+                view.layer.cornerRadius = kCornerRadius6
                 return view
             }()
             addSubview(centerView)
@@ -55,7 +55,7 @@ class YHTwoOptionAlertView: UIView {
                 let label = UILabel()
                 label.text = ""
                 label.font = kFont(size: 16)
-                label.textColor = UIColor(hex:0x222222)
+                label.textColor = UIColor.mainTextColor
                 label.textAlignment = .center
                 label.numberOfLines = 0
                 return label

galaxy/galaxy/Classes/Modules/Home(首页)/V/YHDavidCell1.swift

@@ -43,7 +43,7 @@ class YHDavidCell1: UITableViewCell {
     lazy var subContentView : UIView = {
         let view = UIView()
         view.backgroundColor = UIColor(hex: 0x999999, alpha: 1.0)
-        view.layer.cornerRadius = 12
+        view.layer.cornerRadius = kCornerRadius6
         return view
     }()
     

galaxy/galaxy/Classes/Modules/Home(首页)/V/YHDavidCell2.swift

@@ -43,7 +43,7 @@ class YHDavidCell2: UITableViewCell {
     lazy var subContentView : UIView = {
         let view = UIView()
         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.cornerRadius = 10

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/V/YHFormItemExpireDateCell.swift

@@ -35,7 +35,7 @@ class YHFormItemExpireDateCell: UITableViewCell {
                 let str = (isMust ? ("*"+title) : title)
                 let attributes: [NSAttributedString.Key: Any] = [
                     .font: UIFont.PFSC_R(ofSize: 14),
-                    .foregroundColor: UIColor(hex:0x222222)]
+                    .foregroundColor: UIColor.mainTextColor]
                 let questionAttrStr = NSMutableAttributedString(string: str, attributes: attributes)
                 if isMust {
                     let starRange = NSRange(location: 0, length: 1)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/V/YHFormItemOnlyDoubleChoiceCell.swift

@@ -14,7 +14,7 @@ class YHFormItemOnlyDoubleChoiceCell: UITableViewCell {
     let btnWidth = 70.0
     let btnHeight = 32.0
     let btnTitleSelectColor = UIColor(hex: 0x4487F9)
-    let btnTitleDefaultColor = UIColor(hex:0x222222)
+    let btnTitleDefaultColor = UIColor.mainTextColor
     let btnBgDefaultColor = UIColor(hex:0xF8F9FB)
     let btnBgSelectColor = UIColor(hex:0x4487F9, alpha: 0.08)
     let answerBaseTag  = 9527

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MainApplicantInformation(主申请人信息)/C/YHMainApplicantInformationViewController.swift

@@ -47,6 +47,8 @@ class YHMainApplicantInformationViewController: YHBaseViewController {
     }
     
     func setView() {
+        view.backgroundColor = .contentBkgColor
+        
         stepView = {
             let step = YHStepView()
             step.dataSource = ["初始信息", "证件上传", "基本信息", "证件信息"]

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MainApplicantInformation(主申请人信息)/C/YHSelectCountryViewController.swift

@@ -76,7 +76,7 @@ class YHSelectCountryViewController: YHBaseViewController {
             let label = UILabel()
             label.text = "热门国家/地区"
             label.textColor = UIColor(hex: 0x222222)
-            label.font = kFont(size: 14)
+            label.font = UIFont.PFSC_R(ofSize: 14)
             return label
         }()
         view.addSubview(flagLabel)
@@ -241,7 +241,7 @@ class YHCountryTableViewCell: UITableViewCell {
         titleLabel = {
             let label = UILabel()
             label.font = UIFont.PFSC_R(ofSize: 13)
-            label.textColor = UIColor(hex:0x222222)
+            label.textColor = UIColor.mainTextColor
             return label
         }()
         contentView.addSubview(titleLabel)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MainApplicantInformation(主申请人信息)/V/YHBottomNextView.swift

@@ -32,7 +32,7 @@ class YHBottomNextView: UIView {
             button.titleLabel?.font = kBoldFont(size: 15)
             button.contentHorizontalAlignment = .center
             button.setTitle("保存", for: .normal)
-            button.setTitleColor( UIColor(hex:0x222222), for: .normal)
+            button.setTitleColor( UIColor.mainTextColor, for: .normal)
             button.layer.cornerRadius = 8
             button.addTarget(self, action: #selector(save), for: .touchUpInside)
             return button

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MainApplicantInformation(主申请人信息)/V/YHCardExampleView.swift

@@ -58,7 +58,7 @@ class YHCardExampleView: UIView {
         centerView = {
             let view = UIView()
             view.backgroundColor = .white
-            view.layer.cornerRadius = 12
+            view.layer.cornerRadius = kCornerRadius6
             return view
         }()
         addSubview(centerView)
@@ -70,8 +70,8 @@ class YHCardExampleView: UIView {
         titleLabel = {
             let label = UILabel()
             label.text = "身份证示例模板"
-            label.font = kFont(size: 17)
-            label.textColor = UIColor(hex:0x222222)
+            label.font = UIFont.PFSC_M(ofSize: 17)
+            label.textColor = UIColor.mainTextColor
             label.textAlignment = .left
             return label
         }()
@@ -97,7 +97,7 @@ class YHCardExampleView: UIView {
         
         lineView = {
             let view = UIView()
-            view.backgroundColor = UIColor(hex: 0xf0f0f0)
+            view.backgroundColor = UIColor.separatorColor
             return view
         }()
         centerView.addSubview(lineView)
@@ -111,7 +111,7 @@ class YHCardExampleView: UIView {
         messageLabel = {
             let label = UILabel()
             label.text = "*须使用二代身份证"
-            label.font = kFont(size: 14)
+            label.font = UIFont.PFSC_R(ofSize: 14)
             label.textColor = UIColor(hex:0xc0c0c0)
             label.textAlignment = .left
             label.numberOfLines = 0
@@ -183,7 +183,7 @@ class YHCardExampleView: UIView {
             let label = UILabel()
             label.text = array[i]
             label.textColor = UIColor(hex: 0x222222)
-            label.font = kFont(size: 14)
+            label.font = UIFont.PFSC_R(ofSize: 14)
             centerView.addSubview(label)
             label.snp.makeConstraints { make in
                 make.top.equalTo(73)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MainApplicantInformation(主申请人信息)/V/YHDatePickView.swift

@@ -83,8 +83,8 @@ class YHDatePickView: UIView {
         titleLabel = {
             let label = UILabel()
             label.text = "选择出生日期"
-            label.font = kFont(size: 17)
-            label.textColor = UIColor(hex:0x222222)
+            label.font = UIFont.PFSC_M(ofSize: 17)
+            label.textColor = UIColor.mainTextColor
             label.textAlignment = .center
             return label
         }()
@@ -101,7 +101,7 @@ class YHDatePickView: UIView {
             button.titleLabel?.font = kBoldFont(size: 14)
             button.contentHorizontalAlignment = .center
             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)
             return button
         }()
@@ -132,7 +132,7 @@ class YHDatePickView: UIView {
         
         lineView = {
             let view = UIView()
-            view.backgroundColor = UIColor(hex: 0xf0f0f0)
+            view.backgroundColor = UIColor.separatorColor
             return view
         }()
         centerView.addSubview(lineView)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MainApplicantInformation(主申请人信息)/V/YHImagePickerView.swift

@@ -57,8 +57,8 @@ class YHImagePickerView: UIView {
         titleLabel = {
             let label = UILabel()
             label.text = "请选择上传方式"
-            label.font = kFont(size: 17)
-            label.textColor = UIColor(hex:0x222222)
+            label.font = UIFont.PFSC_M(ofSize: 17)
+            label.textColor = UIColor.mainTextColor
             label.textAlignment = .left
             return label
         }()
@@ -87,7 +87,7 @@ class YHImagePickerView: UIView {
             button.titleLabel?.font = kBoldFont(size: 14)
             button.contentHorizontalAlignment = .center
             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)
             return button
         }()
@@ -104,7 +104,7 @@ class YHImagePickerView: UIView {
             button.titleLabel?.font = kBoldFont(size: 14)
             button.contentHorizontalAlignment = .center
             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)
             return button
         }()
@@ -135,7 +135,7 @@ class YHImagePickerView: UIView {
         
         for i in 0..<3 {
             let view = UIView()
-            view.backgroundColor = UIColor(hex: 0xf0f0f0)
+            view.backgroundColor = UIColor.separatorColor
             centerView.addSubview(view)
             view.snp.makeConstraints { make in
                 make.left.equalTo(18)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MainApplicantInformation(主申请人信息)/V/YHItemView.swift

@@ -48,6 +48,8 @@ class YHItemView: UIView {
         messageTextField = {
             let textField = UITextField()
             textField.delegate = self
+            textField.textColor = UIColor.mainTextColor
+            textField.font = UIFont.PFSC_M(ofSize: 14)
             return textField
         }()
         addSubview(messageTextField)
@@ -124,7 +126,7 @@ class YHItemView: UIView {
             let str = "*" + (dataSource.title ?? "")
             let attributes: [NSAttributedString.Key: Any] = [
                 .font: UIFont.PFSC_R(ofSize: 14),
-                .foregroundColor: UIColor(hex:0x222222)
+                .foregroundColor: UIColor.mainTextColor
             ]
             let questionAttrStr = NSMutableAttributedString(string: str, attributes: attributes)
             let starRange = NSRange(location: 0, length: 1)
@@ -133,8 +135,8 @@ class YHItemView: UIView {
         } else {
             let str = dataSource.title ?? ""
             let attributes: [NSAttributedString.Key: Any] = [
-                .font: kFont(size: 14),
-                .foregroundColor: UIColor(hex:0x222222)
+                .font: UIFont.PFSC_R(ofSize: 14),
+                .foregroundColor: UIColor.mainTextColor
             ]
             let questionAttrStr = NSMutableAttributedString(string: str, attributes: attributes)
             titleLabel.attributedText = questionAttrStr

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MainApplicantInformation(主申请人信息)/V/YHMainInformationCardTableViewCell.swift

@@ -66,25 +66,28 @@ class YHMainInformationCardTableViewCell: UITableViewCell {
     }
     
     func setupUI() {
-        backgroundColor = UIColor(hex: 0xe9e9e9)
+        contentView.backgroundColor = .clear
+        backgroundColor = .clear
+        
         centerView = {
             let view = UIView()
             view.backgroundColor = .white
-            view.layer.cornerRadius = 12
+            view.layer.cornerRadius = kCornerRadius6
             return view
         }()
+        
         contentView.addSubview(centerView)
         centerView.snp.makeConstraints { make in
             make.left.equalTo(16)
             make.right.equalTo(-16)
             make.top.equalTo(7)
-            make.bottom.equalTo(-7)
+            make.bottom.equalTo(-16)
         }
         
         titleLabel = {
             let label = UILabel()
-            label.font = kFont(size: 17)
-            label.textColor = UIColor(hex:0x222222)
+            label.font = UIFont.PFSC_M(ofSize: 17)
+            label.textColor = UIColor.mainTextColor
             return label
         }()
         centerView.addSubview(titleLabel)
@@ -115,7 +118,7 @@ class YHMainInformationCardTableViewCell: UITableViewCell {
         
         let lineView = {
             let view = UIView()
-            view.backgroundColor = UIColor(hex: 0xf0f0f0)
+            view.backgroundColor = UIColor.separatorColor
             return view
         }()
         centerView.addSubview(lineView)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MainApplicantInformation(主申请人信息)/V/YHMainInformationTableViewCell.swift

@@ -41,11 +41,13 @@ class YHMainInformationTableViewCell: UITableViewCell {
     }
     
     func setupUI() {
-        backgroundColor = UIColor(hex: 0xe9e9e9)
+        contentView.backgroundColor = .clear
+        backgroundColor = .clear
+        
         centerView = {
             let view = UIView()
             view.backgroundColor = .white
-            view.layer.cornerRadius = 12
+            view.layer.cornerRadius = kCornerRadius6
             return view
         }()
         contentView.addSubview(centerView)
@@ -58,8 +60,8 @@ class YHMainInformationTableViewCell: UITableViewCell {
         
         titleLabel = {
             let label = UILabel()
-            label.font = kFont(size: 17)
-            label.textColor = UIColor(hex:0x222222)
+            label.font = UIFont.PFSC_M(ofSize: 17)
+            label.textColor = UIColor.mainTextColor
             return label
         }()
         centerView.addSubview(titleLabel)
@@ -73,7 +75,7 @@ class YHMainInformationTableViewCell: UITableViewCell {
         mainItemView = {
             let view = UIView()
             view.backgroundColor = .white
-            view.layer.cornerRadius = 12
+            view.layer.cornerRadius = kCornerRadius6
             return view
         }()
         centerView.addSubview(mainItemView)
@@ -88,7 +90,7 @@ class YHMainInformationTableViewCell: UITableViewCell {
         mainItemView.removeSubviews()
         for i in 0 ..< (dataSource?.models?.count ?? 0) {
             let line = UIView()
-            line.backgroundColor = UIColor(hex: 0xf0f0f0)
+            line.backgroundColor = UIColor.separatorColor
             mainItemView.addSubview(line)
             line.snp.makeConstraints { make in
                 make.left.equalTo(18)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MyScore(我的评分)/V/YHScoreItemCell.swift

@@ -20,7 +20,7 @@ class YHScoreItemCell: UITableViewCell {
     private lazy var holdView : UIView = {
         let view = UIView()
         view.backgroundColor = .white
-        view.layer.cornerRadius = 12
+        view.layer.cornerRadius = kCornerRadius6
         view.clipsToBounds = true
         return view
     }()

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience/C/YHWorkExampleViewController.swift

@@ -53,7 +53,7 @@ class YHWorkExampleViewController: YHBaseViewController {
             let label = UILabel()
             label.text = "参考示例"
             label.font = kBoldFont(size: 17)
-            label.textColor = UIColor(hex:0x222222)
+            label.textColor = UIColor.mainTextColor
             label.textAlignment = .center
             return label
         }()
@@ -67,7 +67,7 @@ class YHWorkExampleViewController: YHBaseViewController {
         
         lineView = {
             let line = UIView()
-            line.backgroundColor = UIColor(hex: 0xf0f0f0)
+            line.backgroundColor = UIColor.separatorColor
             return line
         }()
         view.addSubview(lineView)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience/C/YHWorkIntroductionViewController.swift

@@ -41,7 +41,7 @@ class YHWorkIntroductionViewController: YHBaseViewController {
         for i in 0..<array.count {
             let label = UILabel()
             label.textColor = UIColor(hex: 0x222222)
-            label.font = kFont(size: 14)
+            label.font = UIFont.PFSC_R(ofSize: 14)
             label.text = array[i]
             view.addSubview(label)
             label.snp.makeConstraints { make in
@@ -65,7 +65,7 @@ class YHWorkIntroductionViewController: YHBaseViewController {
 
         nameTextField = {
             let textField = UITextField()
-            textField.font = kFont(size: 14)
+            textField.font = UIFont.PFSC_R(ofSize: 14)
             textField.placeholder = "如方便提供，请填写"
             return textField
         }()
@@ -79,7 +79,7 @@ class YHWorkIntroductionViewController: YHBaseViewController {
         
         startTextField = {
             let textField = UITextField()
-            textField.font = kFont(size: 14)
+            textField.font = UIFont.PFSC_R(ofSize: 14)
             textField.placeholder = "开始时间"
             textField.isEnabled = false
             textField.isUserInteractionEnabled = false
@@ -108,7 +108,7 @@ class YHWorkIntroductionViewController: YHBaseViewController {
         
         endTextField = {
             let textField = UITextField()
-            textField.font = kFont(size: 14)
+            textField.font = UIFont.PFSC_R(ofSize: 14)
             textField.placeholder = "结束时间"
             textField.isEnabled = false
             textField.isUserInteractionEnabled = false
@@ -148,7 +148,7 @@ class YHWorkIntroductionViewController: YHBaseViewController {
         messageTextField = {
             let textField = UITextView()
             textField.backgroundColor = UIColor(hex: 0xf8f9fb)
-            textField.font = kFont(size: 14)
+            textField.font = UIFont.PFSC_R(ofSize: 14)
             textField.layer.cornerRadius = 6
             textField.delegate = self
             return textField
@@ -163,7 +163,7 @@ class YHWorkIntroductionViewController: YHBaseViewController {
     
         promptsLabel = {
             let prompts = UILabel()
-            prompts.font = kFont(size: 14)
+            prompts.font = UIFont.PFSC_R(ofSize: 14)
             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.numberOfLines = 0

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience/V/YHWorkExampleMessageTableViewCell.swift

@@ -60,9 +60,9 @@ class YHWorkExampleMessageTableViewCell: UITableViewCell {
         
         titleLabel = {
             let label = UILabel()
-            label.font = kFont(size: 14)
+            label.font = UIFont.PFSC_R(ofSize: 14)
             label.text = "工作职责范例1"
-            label.textColor = UIColor(hex:0x222222)
+            label.textColor = UIColor.mainTextColor
             return label
         }()
         centerView.addSubview(titleLabel)
@@ -94,7 +94,7 @@ class YHWorkExampleMessageTableViewCell: UITableViewCell {
         
         lineView = {
             let line = UIView()
-            line.backgroundColor = UIColor(hex: 0xf0f0f0)
+            line.backgroundColor = UIColor.separatorColor
             return line
         }()
         centerView.addSubview(lineView)
@@ -107,8 +107,8 @@ class YHWorkExampleMessageTableViewCell: UITableViewCell {
         messageLabel = {
             let label = UILabel()
             label.numberOfLines = 0
-            label.font = kFont(size: 14)
-            label.textColor = UIColor(hex:0x222222)
+            label.font = UIFont.PFSC_R(ofSize: 14)
+            label.textColor = UIColor.mainTextColor
             return label
         }()
         centerView.addSubview(messageLabel)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience/V/YHWorkExampleMessageView.swift

@@ -52,7 +52,7 @@ class YHWorkExampleMessageView: UIView {
             label.font = kBoldFont(size: 16)
             label.text = "业务支援及人力资源"
             label.textAlignment = .left
-            label.textColor = UIColor(hex:0x222222)
+            label.textColor = UIColor.mainTextColor
             return label
         }()
         addSubview(titleLabel)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience/V/YHWorkExampleTypeView.swift

@@ -33,7 +33,7 @@ class YHWorkExampleTypeView: UIView {
             label.font = kBoldFont(size: 14)
             label.text = "请选择您的行业："
             label.textAlignment = .left
-            label.textColor = UIColor(hex:0x222222)
+            label.textColor = UIColor.mainTextColor
             return label
         }()
         addSubview(titleLabel)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience/V/YHWorkExperienceItemView.swift

@@ -124,7 +124,7 @@ class YHWorkExperienceItemView: UIView {
             let str = "*" + (dataSource.title ?? "")
             let attributes: [NSAttributedString.Key: Any] = [
                 .font: UIFont.PFSC_R(ofSize: 14),
-                .foregroundColor: UIColor(hex:0x222222)
+                .foregroundColor: UIColor.mainTextColor
             ]
             let questionAttrStr = NSMutableAttributedString(string: str, attributes: attributes)
             let starRange = NSRange(location: 0, length: 1)
@@ -133,8 +133,8 @@ class YHWorkExperienceItemView: UIView {
         } else {
             let str = dataSource.title ?? ""
             let attributes: [NSAttributedString.Key: Any] = [
-                .font: kFont(size: 14),
-                .foregroundColor: UIColor(hex:0x222222)
+                .font: UIFont.PFSC_R(ofSize: 14),
+                .foregroundColor: UIColor.mainTextColor
             ]
             let questionAttrStr = NSMutableAttributedString(string: str, attributes: attributes)
             titleLabel.attributedText = questionAttrStr

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience/V/YHWorkExperienceListTableViewCell.swift

@@ -52,7 +52,7 @@ class YHWorkExperienceListTableViewCell: UITableViewCell {
         centerView = {
             let view = UIView()
             view.backgroundColor = .white
-            view.layer.cornerRadius = 12
+            view.layer.cornerRadius = kCornerRadius6
             return view
         }()
         contentView.addSubview(centerView)
@@ -67,7 +67,7 @@ class YHWorkExperienceListTableViewCell: UITableViewCell {
             let label = UILabel()
             label.font = kFont(size: 16)
             label.text = "主申请人工作经历"
-            label.textColor = UIColor(hex:0x222222)
+            label.textColor = UIColor.mainTextColor
             return label
         }()
         centerView.addSubview(titleLabel)
@@ -129,7 +129,7 @@ class YHWorkExperienceListTableViewCell: UITableViewCell {
         mainItemView = {
             let view = UIView()
             view.backgroundColor = .white
-            view.layer.cornerRadius = 12
+            view.layer.cornerRadius = kCornerRadius6
             return view
         }()
         centerView.addSubview(mainItemView)
@@ -155,7 +155,7 @@ class YHWorkExperienceListTableViewCell: UITableViewCell {
         mainItemView.removeSubviews()
         guard let dataSource = dataSource else {
             let line = UIView()
-            line.backgroundColor = UIColor(hex: 0xf0f0f0)
+            line.backgroundColor = UIColor.separatorColor
             mainItemView.addSubview(line)
             line.snp.makeConstraints { make in
                 make.left.equalTo(18)
@@ -177,7 +177,7 @@ class YHWorkExperienceListTableViewCell: UITableViewCell {
         
         for i in 0 ..< dataSource.count {
             let line = UIView()
-            line.backgroundColor = UIColor(hex: 0xf0f0f0)
+            line.backgroundColor = UIColor.separatorColor
             mainItemView.addSubview(line)
             line.snp.makeConstraints { make in
                 make.left.equalTo(18)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience/V/YHWorkExperienceTableViewCell.swift

@@ -45,7 +45,7 @@ class YHWorkExperienceTableViewCell: UITableViewCell {
         centerView = {
             let view = UIView()
             view.backgroundColor = .white
-            view.layer.cornerRadius = 12
+            view.layer.cornerRadius = kCornerRadius6
             return view
         }()
         contentView.addSubview(centerView)
@@ -58,8 +58,8 @@ class YHWorkExperienceTableViewCell: UITableViewCell {
         
         titleLabel = {
             let label = UILabel()
-            label.font = kFont(size: 17)
-            label.textColor = UIColor(hex:0x222222)
+            label.font = UIFont.PFSC_M(ofSize: 17)
+            label.textColor = UIColor.mainTextColor
             return label
         }()
         centerView.addSubview(titleLabel)
@@ -73,7 +73,7 @@ class YHWorkExperienceTableViewCell: UITableViewCell {
         mainItemView = {
             let view = UIView()
             view.backgroundColor = .white
-            view.layer.cornerRadius = 12
+            view.layer.cornerRadius = kCornerRadius6
             return view
         }()
         centerView.addSubview(mainItemView)
@@ -89,7 +89,7 @@ class YHWorkExperienceTableViewCell: UITableViewCell {
         var y = 0
         for i in 0 ..< (dataSource?.models?.count ?? 0) {
             let line = UIView()
-            line.backgroundColor = UIColor(hex: 0xf0f0f0)
+            line.backgroundColor = UIColor.separatorColor
             mainItemView.addSubview(line)
             line.snp.makeConstraints { make in
                 make.left.equalTo(18)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience/V/YHWorkExperienceTextItemView.swift

@@ -61,7 +61,7 @@ class YHWorkExperienceTextItemView: UIView {
         
         promptsLabel = {
             let textField = UILabel()
-            textField.font = kFont(size: 14)
+            textField.font = UIFont.PFSC_R(ofSize: 14)
             textField.textColor = UIColor(hex: 0xc0c0c0)
             return textField
         }()
@@ -91,7 +91,7 @@ class YHWorkExperienceTextItemView: UIView {
             let str = "*" + (dataSource.title ?? "")
             let attributes: [NSAttributedString.Key: Any] = [
                 .font: UIFont.PFSC_R(ofSize: 14),
-                .foregroundColor: UIColor(hex:0x222222)
+                .foregroundColor: UIColor.mainTextColor
             ]
             let questionAttrStr = NSMutableAttributedString(string: str, attributes: attributes)
             let starRange = NSRange(location: 0, length: 1)
@@ -100,8 +100,8 @@ class YHWorkExperienceTextItemView: UIView {
         } else {
             let str = dataSource.title ?? ""
             let attributes: [NSAttributedString.Key: Any] = [
-                .font: kFont(size: 14),
-                .foregroundColor: UIColor(hex:0x222222)
+                .font: UIFont.PFSC_R(ofSize: 14),
+                .foregroundColor: UIColor.mainTextColor
             ]
             let questionAttrStr = NSMutableAttributedString(string: str, attributes: attributes)
             titleLabel.attributedText = questionAttrStr

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience/V/YHWorkFileItemView.swift

@@ -34,7 +34,7 @@ class YHWorkFileItemView: UIView {
             let label = UILabel()
             label.font = kBoldFont(size: 14)
             label.textAlignment = .left
-            label.textColor = UIColor(hex:0x222222)
+            label.textColor = UIColor.mainTextColor
             return label
         }()
         addSubview(titleLabel)
@@ -47,7 +47,7 @@ class YHWorkFileItemView: UIView {
         
         deleteButton = {
             let button = UIButton(type: .custom)
-            button.titleLabel?.font = kFont(size: 14)
+            button.titleLabel?.font = UIFont.PFSC_R(ofSize: 14)
             button.contentHorizontalAlignment = .center
             button.setTitle("删除", for: .normal)
             button.setTitleColor( UIColor(hex:0xf81d22), for: .normal)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience/V/YHWorkFileSyncTableViewCell.swift

@@ -49,7 +49,7 @@ class YHWorkFileSyncTableViewCell: UITableViewCell {
         centerView = {
             let view = UIView()
             view.backgroundColor = .white
-            view.layer.cornerRadius = 12
+            view.layer.cornerRadius = kCornerRadius6
             return view
         }()
         contentView.addSubview(centerView)
@@ -65,7 +65,7 @@ class YHWorkFileSyncTableViewCell: UITableViewCell {
             let str = "*" + "上传文件"
             let attributes: [NSAttributedString.Key: Any] = [
                 .font: UIFont.PFSC_R(ofSize: 17),
-                .foregroundColor: UIColor(hex:0x222222)
+                .foregroundColor: UIColor.mainTextColor
             ]
             let questionAttrStr = NSMutableAttributedString(string: str, attributes: attributes)
             let starRange = NSRange(location: 0, length: 1)
@@ -84,7 +84,7 @@ class YHWorkFileSyncTableViewCell: UITableViewCell {
         mainItemView = {
             let view = UIView()
             view.backgroundColor = .white
-            view.layer.cornerRadius = 12
+            view.layer.cornerRadius = kCornerRadius6
             return view
         }()
         centerView.addSubview(mainItemView)
@@ -117,7 +117,7 @@ class YHWorkFileSyncTableViewCell: UITableViewCell {
         mainItemView.removeSubviews()
         for i in 0 ..< (dataSource?.count ?? 0) {
             let line = UIView()
-            line.backgroundColor = UIColor(hex: 0xf0f0f0)
+            line.backgroundColor = UIColor.separatorColor
             mainItemView.addSubview(line)
             line.snp.makeConstraints { make in
                 make.left.equalTo(18)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience/V/YHWorkHighlightsTableViewCell.swift

@@ -64,7 +64,7 @@ class YHWorkHighlightsTableViewCell: UITableViewCell {
             let str = "*" + "工作亮点"
             let attributes: [NSAttributedString.Key: Any] = [
                 .font: UIFont.PFSC_R(ofSize: 17),
-                .foregroundColor: UIColor(hex:0x222222)
+                .foregroundColor: UIColor.mainTextColor
             ]
             let questionAttrStr = NSMutableAttributedString(string: str, attributes: attributes)
             let starRange = NSRange(location: 0, length: 1)
@@ -98,7 +98,7 @@ class YHWorkHighlightsTableViewCell: UITableViewCell {
         
         lineView = {
             let line = UIView()
-            line.backgroundColor = UIColor(hex: 0xf0f0f0)
+            line.backgroundColor = UIColor.separatorColor
             return line
         }()
         centerView.addSubview(lineView)
@@ -111,7 +111,7 @@ class YHWorkHighlightsTableViewCell: UITableViewCell {
         
         messageTextField = {
             let textField = UITextView()
-            textField.font = kFont(size: 14)
+            textField.font = UIFont.PFSC_R(ofSize: 14)
             textField.delegate = self
             return textField
         }()
@@ -125,7 +125,7 @@ class YHWorkHighlightsTableViewCell: UITableViewCell {
     
         promptsLabel = {
             let prompts = UILabel()
-            prompts.font = kFont(size: 14)
+            prompts.font = UIFont.PFSC_R(ofSize: 14)
             prompts.textColor = UIColor(hex: 0xc0c0c0)
             prompts.text = "示例：打破常规，超越同行或其他同事的优秀业绩；或有开创性且突破公司期望的杰出贡献，且给公司带来价值和收益。\n\n请举例2-3个工作亮点：\n\na. 是什么：某项目背景或工作目标或难点\nb.为什么：为什么出现这个项目工作/难点，旨在体现分析过程，为您后面提出解决方案做铺垫\nc.怎么处理：您是怎么把这件事做好的？用了什么技术/方法？有何突出/创新之处？\nd.有什么价值：为公司、客户或您本身带来了哪些价值？客户或您本身带来了哪些价值？\n最好用实际数据证明，比如销售业绩增加了多少，或者利润增加了多少，客户群体增加了多少等。"
             prompts.numberOfLines = 0
@@ -142,7 +142,7 @@ class YHWorkHighlightsTableViewCell: UITableViewCell {
             let label = UILabel()
             label.text = "项目详细介绍"
             label.textColor = UIColor(hex: 0x222222)
-            label.font = kFont(size: 14)
+            label.font = UIFont.PFSC_R(ofSize: 14)
             return label
         }()
         centerView.addSubview(detailLabel)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience/V/YHWorkIntroductionItemView.swift

@@ -37,7 +37,7 @@ class YHWorkIntroductionItemView: UIView {
             let label = UILabel()
             label.font = kBoldFont(size: 14)
             label.textAlignment = .left
-            label.textColor = UIColor(hex:0x222222)
+            label.textColor = UIColor.mainTextColor
             return label
         }()
         addSubview(titleLabel)
@@ -87,7 +87,7 @@ class YHWorkIntroductionItemView: UIView {
         
         deleteButton = {
             let button = UIButton(type: .custom)
-            button.titleLabel?.font = kFont(size: 14)
+            button.titleLabel?.font = UIFont.PFSC_R(ofSize: 14)
             button.contentHorizontalAlignment = .center
             button.setTitle("删除", for: .normal)
             button.setTitleColor( UIColor(hex:0xf81d22), for: .normal)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience/V/YHWorkIntroductionTableViewCell.swift

@@ -51,7 +51,7 @@ class YHWorkIntroductionTableViewCell: UITableViewCell {
         centerView = {
             let view = UIView()
             view.backgroundColor = .white
-            view.layer.cornerRadius = 12
+            view.layer.cornerRadius = kCornerRadius6
             return view
         }()
         contentView.addSubview(centerView)
@@ -66,7 +66,7 @@ class YHWorkIntroductionTableViewCell: UITableViewCell {
             let label = UILabel()
             label.font = kFont(size: 16)
             label.text = "项目介绍(选填)"
-            label.textColor = UIColor(hex:0x222222)
+            label.textColor = UIColor.mainTextColor
             return label
         }()
         centerView.addSubview(titleLabel)
@@ -113,7 +113,7 @@ class YHWorkIntroductionTableViewCell: UITableViewCell {
         mainItemView = {
             let view = UIView()
             view.backgroundColor = .white
-            view.layer.cornerRadius = 12
+            view.layer.cornerRadius = kCornerRadius6
             return view
         }()
         centerView.addSubview(mainItemView)
@@ -146,7 +146,7 @@ class YHWorkIntroductionTableViewCell: UITableViewCell {
         mainItemView.removeSubviews()
         for i in 0 ..< (dataSource?.count ?? 0) {
             let line = UIView()
-            line.backgroundColor = UIColor(hex: 0xf0f0f0)
+            line.backgroundColor = UIColor.separatorColor
             mainItemView.addSubview(line)
             line.snp.makeConstraints { make in
                 make.left.equalTo(18)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience/V/YHWorkItemView.swift

@@ -40,7 +40,7 @@ class YHWorkItemView: UIView {
             let label = UILabel()
             label.font = kBoldFont(size: 14)
             label.textAlignment = .left
-            label.textColor = UIColor(hex:0x222222)
+            label.textColor = UIColor.mainTextColor
             return label
         }()
         addSubview(titleLabel)
@@ -105,7 +105,7 @@ class YHWorkItemView: UIView {
         
         deleteButton = {
             let button = UIButton(type: .custom)
-            button.titleLabel?.font = kFont(size: 14)
+            button.titleLabel?.font = UIFont.PFSC_R(ofSize: 14)
             button.contentHorizontalAlignment = .center
             button.setTitle("删除", for: .normal)
             button.contentHorizontalAlignment = .right

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience/V/YHWorkMessageSelectTableViewCell.swift

@@ -42,7 +42,7 @@ class YHWorkMessageSelectTableViewCell: UITableViewCell {
         centerView = {
             let view = UIView()
             view.backgroundColor = .white
-            view.layer.cornerRadius = 12
+            view.layer.cornerRadius = kCornerRadius6
             return view
         }()
         contentView.addSubview(centerView)
@@ -55,9 +55,9 @@ class YHWorkMessageSelectTableViewCell: UITableViewCell {
         
         titleLabel = {
             let label = UILabel()
-            label.font = kFont(size: 17)
+            label.font = UIFont.PFSC_M(ofSize: 17)
             label.text = "信息选择"
-            label.textColor = UIColor(hex:0x222222)
+            label.textColor = UIColor.mainTextColor
             return label
         }()
         centerView.addSubview(titleLabel)
@@ -70,7 +70,7 @@ class YHWorkMessageSelectTableViewCell: UITableViewCell {
         
         lineView = {
             let line = UIView()
-            line.backgroundColor = UIColor(hex: 0xf0f0f0)
+            line.backgroundColor = UIColor.separatorColor
             return line
         }()
         centerView.addSubview(lineView)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience/V/YHWorkResponsibilitiesTableViewCell.swift

@@ -62,7 +62,7 @@ class YHWorkResponsibilitiesTableViewCell: UITableViewCell {
             let str = "*" + "工作职责"
             let attributes: [NSAttributedString.Key: Any] = [
                 .font: UIFont.PFSC_R(ofSize: 17),
-                .foregroundColor: UIColor(hex:0x222222)
+                .foregroundColor: UIColor.mainTextColor
             ]
             let questionAttrStr = NSMutableAttributedString(string: str, attributes: attributes)
             let starRange = NSRange(location: 0, length: 1)
@@ -96,7 +96,7 @@ class YHWorkResponsibilitiesTableViewCell: UITableViewCell {
         
         lineView = {
             let line = UIView()
-            line.backgroundColor = UIColor(hex: 0xf0f0f0)
+            line.backgroundColor = UIColor.separatorColor
             return line
         }()
         centerView.addSubview(lineView)
@@ -109,7 +109,7 @@ class YHWorkResponsibilitiesTableViewCell: UITableViewCell {
         
         messageTextField = {
             let textField = UITextView()
-            textField.font = kFont(size: 14)
+            textField.font = UIFont.PFSC_R(ofSize: 14)
             textField.delegate = self
             return textField
         }()
@@ -123,7 +123,7 @@ class YHWorkResponsibilitiesTableViewCell: UITableViewCell {
     
         promptsLabel = {
             let prompts = UILabel()
-            prompts.font = kFont(size: 14)
+            prompts.font = UIFont.PFSC_R(ofSize: 14)
             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.numberOfLines = 0

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHSubmitAllInfoCheckView.swift

@@ -44,7 +44,7 @@ class YHSubmitAllInfoCheckView: UIView {
         centerView = {
             let view = UIView()
             view.backgroundColor = .white
-            view.layer.cornerRadius = 12
+            view.layer.cornerRadius = kCornerRadius6
             return view
         }()
         addSubview(centerView)
@@ -58,7 +58,7 @@ class YHSubmitAllInfoCheckView: UIView {
 //            let label = UILabel()
 //            label.text = "同意隐私协议"
 //            label.font = kFont(size: 16)
-//            label.textColor = UIColor(hex:0x222222)
+//            label.textColor = UIColor.mainTextColor
 //            label.textAlignment = .center
 //            return label
 //        }()

galaxy/galaxy/Classes/Modules/Login(登录)/C/YHCodeSueecssViewController.swift

@@ -64,7 +64,7 @@ class YHCodeSueecssViewController: YHBaseViewController {
             let label = UILabel()
             label.text = "请输入验证码"
             label.font = kBoldFont(size: 28)
-            label.textColor = UIColor(hex:0x222222)
+            label.textColor = UIColor.mainTextColor
             return label
         }()
         view.addSubview(loginTitleLabel)
@@ -136,7 +136,7 @@ class YHCodeSueecssViewController: YHBaseViewController {
             button.titleLabel?.font = kBoldFont(size: 12)
             button.contentHorizontalAlignment = .center
             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.isHidden = true
             button.layer.cornerRadius = 4

galaxy/galaxy/Classes/Modules/Login(登录)/C/YHPhoneLoginViewController.swift

@@ -82,7 +82,7 @@ class YHPhoneLoginViewController: YHBaseViewController {
             let label = UILabel()
             label.text = "手机号登录"
             label.font = kBoldFont(size: 28)
-            label.textColor = UIColor(hex:0x222222)
+            label.textColor = UIColor.mainTextColor
             return label
         }()
         view.addSubview(loginTitleLabel)

galaxy/galaxy/Classes/Modules/Login(登录)/V/YHPrivacyAlertView.swift

@@ -38,7 +38,7 @@ class YHPrivacyAlertView: UIView {
         centerView = {
             let view = UIView()
             view.backgroundColor = .white
-            view.layer.cornerRadius = 12
+            view.layer.cornerRadius = kCornerRadius6
             return view
         }()
         addSubview(centerView)