Merge commit 'c7c21a7e' into xiezhaolin

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)
@@ -54,8 +54,8 @@ class YHTwoOptionAlertView: UIView {
             messageLabel = {
                 let label = UILabel()
                 label.text = ""
-                label.font = kFont(size: 16)
-                label.textColor = UIColor(hex:0x222222)
+                label.font = UIFont.PFSC_R(ofSize: 16)
+                label.textColor = UIColor.mainTextColor
                 label.textAlignment = .center
                 label.numberOfLines = 0
                 return label
@@ -65,11 +65,11 @@ class YHTwoOptionAlertView: UIView {
             leftButton = {
                 let button = UIButton(type: .custom)
                 button.backgroundColor =  UIColor(hex:0xffffff)
-                button.titleLabel?.font = kBoldFont(size: 14)
+                button.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
                 button.contentHorizontalAlignment = .center
                 button.setTitle("取消".local, for: .normal)
                 button.setTitleColor( UIColor(hex:0x3c86f8), for: .normal)
-                button.layer.cornerRadius = 8
+                button.layer.cornerRadius = kCornerRadius6
                 button.layer.borderWidth = 1
                 button.layer.borderColor = UIColor(hex: 0x3c86f8).cgColor
                 button.addTarget(self, action: #selector(disagree), for: .touchUpInside)
@@ -80,11 +80,11 @@ class YHTwoOptionAlertView: UIView {
             rightButton = {
                 let button = UIButton(type: .custom)
                 button.backgroundColor =  UIColor(hex:0x3c86f8)
-                button.titleLabel?.font = kBoldFont(size: 14)
+                button.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
                 button.contentHorizontalAlignment = .center
                 button.setTitle("确认".local, 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)
                 return button
             }()

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

@@ -23,7 +23,7 @@ class YHBbxCollectionViewCell: UICollectionViewCell {
     lazy var descripeLable:UILabel = {
         let label = UILabel()
         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.text = "证件办理"
 //        label.backgroundColor = .blue

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/Home(首页)/V/YHDavidCell3.swift

@@ -63,7 +63,7 @@ class YHDavidCell3: UITableViewCell {
         let bbxLable = UILabel()
         bbxLable.text = "银河推荐官"
         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)
         bbxLable.snp.makeConstraints { make in
@@ -75,7 +75,7 @@ class YHDavidCell3: UITableViewCell {
         desLable.text = "邀请拉新，合作共赢"
         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.font = kFont(size: 10)
+        desLable.font = UIFont.PFSC_R(ofSize: 10)
         subContentView.addSubview(desLable)
         desLable.snp.makeConstraints { make in
             make.left.equalTo(bbxLable.snp.right).offset(11)

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

@@ -67,7 +67,7 @@ class YHDavidCell5: UITableViewCell {
         let bbxLable = UILabel()
         bbxLable.text = "百宝箱"
         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)
         bbxLable.snp.makeConstraints { make in
@@ -79,7 +79,7 @@ class YHDavidCell5: UITableViewCell {
         desLable.text = "香港本地宝，智慧小助手"
         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.font = kFont(size: 10)
+        desLable.font = UIFont.PFSC_R(ofSize: 10)
         subContentView.addSubview(desLable)
         desLable.snp.makeConstraints { make in
             make.left.equalTo(bbxLable.snp.right).offset(11)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHInformationPerfectListVC.swift

@@ -139,7 +139,9 @@ extension YHInformationPerfectListVC {
     }
     
     @objc func clickSubmitBtn() {
-        YHSubmitAllInfoCheckView.showCheckView { agree in
+
+        
+        YHSubmitAllInfoCheckView.showCheckView(tipMsg: "确定是否提交信息？提交后将不能修改") { agree in
             if agree == true {
                 printLog("点击了 确认 按钮")
                 
@@ -155,6 +157,8 @@ extension YHInformationPerfectListVC {
                 printLog("点击了 取消 按钮")
             }
         }
+        
+        
     }
     
     func setupUI() {
@@ -334,7 +338,7 @@ extension YHInformationPerfectListVC : UITableViewDelegate,UITableViewDataSource
             navigationController?.pushViewController(vc)
         } else if indexPath.row == 3 {
             //学历/专业资格
-            let vc = YHEducationalQualificationVC()
+            let vc = YHEducationInfoListVC()
 //            vc.orderId = orderId
             vc.orderId = 133971
             navigationController?.pushViewController(vc)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/Education&Qualification(学历专业资格填写)/C/YHCollegeSearchViewController.swift

+//
+//  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(流程)/学历专业资格填写/M/YHEducationInfo.swift → galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/Education&Qualification(学历专业资格填写)/M/YHEducationInfo.swift

@@ -34,8 +34,8 @@ class YHEducationListInfo: SmartCodable {
 }
 
 class YHEducationInfo: SmartCodable {
-    var id: Int = -1
-    var orderId: Int = -1
+    var id: Int = 0
+    var orderId: Int = 0
     var college: String?
     var background: String?
     var professional: String?
@@ -60,8 +60,8 @@ class YHEducationInfo: SmartCodable {
 }
 
 class YHQualificationInfo: SmartCodable {
-    var id: Int = -1
-    var orderId: Int = -1
+    var id: Int = 0
+    var orderId: Int = 0
     var qualification: String?
     var vacantNum: Int = 0
 
@@ -82,25 +82,25 @@ class YHEducationDetailInfo: SmartCodable {
     
     var id: Int = 0
     var orderId: Int = 0
-    var college: String?
+    var college: String = ""
     var isTop: Int = 0
-    var type: String?
-    var admissionTime: String?
-    var graduateTime: String?
-    var background: String?
-    var professional: String?
-    var degreeType: String?
-    var remark: String?
-    var average: String?
-    var schoolAddress: YHSchoolAddress?
+    var type: String = ""
+    var admissionTime: String = ""
+    var graduateTime: String = ""
+    var background: String = ""
+    var professional: String = ""
+    var degreeType: String = ""
+    var remark: String = ""
+    var average: String = ""
+    var schoolAddress: YHCollegeAddress = YHCollegeAddress()
     var schoolAddressAboard: Int = 0
     var oldId: Int = 0
-    var createdAt: String?
-    var updatedAt: String?
-    var deletedAt: SmartAny?
+    var createdAt: String = ""
+    var updatedAt: String = ""
+    var deletedAt: String = ""
     var isShow: Int = 0
-    var operatorName: SmartAny?
-    var operatorEnglishName: SmartAny?
+    var operatorName: String = ""
+    var operatorEnglishName: String = ""
     var operatorId: Int = 0
     var matchListing: Int = 0
     var createFromAppid: Int = 0
@@ -141,30 +141,89 @@ class YHEducationDetailInfo: SmartCodable {
     }
     // 学校是否在国外 默认是在国内
     func isSchoolInAboard() -> Bool {
-        guard let schoolAddress = schoolAddress else { return false }
-        guard let country = schoolAddress.country else { return false }
-        if country.contains("中国") {
+        if schoolAddress.country.isEmpty { return false }
+        if schoolAddress.country.contains("中国") {
             return false
         }
         return true
     }
 }
 
-class YHSchoolAddress: Codable {
-    var area: [String]?
-    var country: String?
-    var foreign: String?
+class YHCollegeAddress: Codable {
+   
+    var area: [String] = []
+    var country: String = ""
+    var details: String = ""
+    var foreign: String = ""
 
     enum CodingKeys: String, CodingKey {
         case area = "area"
         case country = "country"
+        case details = "details"
         case foreign = "foreign"
     }
 
-    required init(area: [String]?, country: String?, foreign: String?) {
-        self.area = area
-        self.country = country
-        self.foreign = foreign
+    required init() {
+    
+    }
+}
+
+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

@@ -12,7 +12,9 @@ class YHEducationRequestViewModel {
     // 学历和专业信息
     var educationInfo: YHEducationListInfo?
     // 学历详情信息
-    var educationDetailInfo:YHEducationDetailInfo?
+    var educationDetailInfo: YHEducationDetailInfo?
+    // 专业详情信息
+    var qualificationDetailInfo: YHQualificationDetailInfo?
     
     // 请求学历和专业证书信息
     func requestEducationInfo(params:[String:Any], callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) {
@@ -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

+//
+//  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

@@ -12,6 +12,14 @@ class YHEducationInfoCell: UITableViewCell {
     
     static let cellReuseIdentifier = "YHEducationInfoCell"
     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 = {
         let label = UILabel()
@@ -38,6 +46,17 @@ class YHEducationInfoCell: UITableViewCell {
         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 = {
         let imgView = UIImageView(image: UIImage(named: "form_right_arrow"))
         return imgView
@@ -66,6 +85,13 @@ class YHEducationInfoCell: UITableViewCell {
         setupUI()
     }
     
+    @objc func didClickDeleteBtn(btn:UIButton) {
+        
+        if let deleteBlock = deleteBlock {
+            deleteBlock()
+        }
+    }
+    
     func setupUI() {
         
         self.selectionStyle = .none
@@ -74,6 +100,7 @@ class YHEducationInfoCell: UITableViewCell {
         contentView.addSubview(timeLabel)
         contentView.addSubview(arrowImgView)
         contentView.addSubview(bottomLine)
+        contentView.addSubview(deleteButton)
         
         titleLabel.setContentCompressionResistancePriority(.required, for: .horizontal)
         
@@ -88,6 +115,12 @@ class YHEducationInfoCell: UITableViewCell {
             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
             make.width.height.equalTo(20.0)
             make.centerY.equalTo(titleLabel)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/Education&Qualification(学历专业资格填写)/V/YHSearchBar.swift

+//
+//  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

@@ -104,7 +104,7 @@ class YHFormPickerView: UIView {
     
     lazy var titleLabel: UILabel = {
         let label = UILabel()
-        label.textColor = UIColor(hexString:"#222222")
+        label.textColor = UIColor.mainTextColor
         label.textAlignment = .center
         label.font = UIFont.PFSC_R(ofSize: 16)
         label.text = "请选择"
@@ -115,7 +115,7 @@ class YHFormPickerView: UIView {
         let btn = UIButton()
         btn.setTitle("取消".local, for: .normal)
         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)
         return btn
     }()
@@ -228,6 +228,21 @@ class YHFormPickerView: UIView {
              YHFormPickerViewItem(type: .professionCertificate(.CQF)),
              YHFormPickerViewItem(type: .professionCertificate(.CIMA)),
              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 {
             return "职业"
         case .professionCertificate:
             return "选择证书名称"
+        case .degreeCategory:
+            return "选择学位类型"
         }
     }
 }
@@ -425,7 +442,7 @@ extension YHFormPickerView: UIPickerViewDelegate, UIPickerViewDataSource {
     func pickerView(_ pickerView: UIPickerView, viewForRow row: Int, forComponent component: Int, reusing view: UIView?) -> UIView {
 
         let label = UILabel()
-        label.textColor = UIColor(hexString:"#222222")
+        label.textColor = UIColor.mainTextColor
         label.textAlignment = .center
         label.font = UIFont.PFSC_R(ofSize: 14)
         label.text = ""
@@ -619,7 +636,42 @@ extension YHFormPickerView {
             } else if title.contains("英国皇家特许会计师") {
                 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
    }

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

@@ -33,7 +33,8 @@ enum YHFormPickerViewType: Int {
     case degreeLocation
     // 专业证书
     case professionCertificate
-    
+    // 学位类型
+    case degreeCategory
 }
 
 enum YHPickerViewMarriageType: Int {
@@ -188,6 +189,34 @@ enum YHPickerViewProfessionalCertificateType:Int {
     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 {
     
     case none
@@ -202,6 +231,7 @@ enum YHFormPickerViewSubType {
     case degreeLocation(YHPickerViewDegreeLocationType)
     case profession(YHPicerViewProfessionType)
     case professionCertificate(YHPickerViewProfessionalCertificateType)
+    case degreeCategory(YHPickerViewDegreedegreeCategoryType)
     
     var title:String {
         switch self {
@@ -312,33 +342,57 @@ enum YHFormPickerViewSubType {
             return "其他".local
             
         case .professionCertificate(.CFA):
-            return "CFA(注册金融分析师)"
+            return "CFA(注册金融分析师)".local
         case .professionCertificate(.CFP):
-            return "CFP(CFP证书是目前世界上权威的权威理财顾问认证项目之一)"
+            return "CFP(CFP证书是目前世界上权威的权威理财顾问认证项目之一)".local
         case .professionCertificate(.FRM):
-            return "FRM(金融风险管理师)"
+            return "FRM(金融风险管理师)".local
         case .professionCertificate(.FIA):
-            return "FIA(保险精算师)"
+            return "FIA(保险精算师)".local
         case .professionCertificate(.CPA):
-            return "CPA(注册会计师)"
+            return "CPA(注册会计师)".local
         case .professionCertificate(.CIIA):
-            return "CIIA(注册国际投资分析师)"
+            return "CIIA(注册国际投资分析师)".local
         case .professionCertificate(.RFC):
-            return "RFC(财务顾问师)"
+            return "RFC(财务顾问师)".local
         case .professionCertificate(.ACCA):
-            return "ACCA(特许公认会计师)"
+            return "ACCA(特许公认会计师)".local
         case .professionCertificate(.CIA):
-            return "CIA(国际注册内部审计师)"
+            return "CIA(国际注册内部审计师)".local
         case .professionCertificate(.CMA):
-            return "CMA(美国管理会计师)"
+            return "CMA(美国管理会计师)".local
         case .professionCertificate(.CQF):
-            return "CQF(国际数量金融工程认证)"
+            return "CQF(国际数量金融工程认证)".local
         case .professionCertificate(.CIMA):
-            return "CIMA(管理会计师考试)"
+            return "CIMA(管理会计师考试)".local
         case .professionCertificate(.ACA):
-            return "The Associate Chartered Accountant(英国皇家特许会计师)"
-
-        return ""
+            return "The Associate Chartered Accountant(英国皇家特许会计师)".local
+            
+        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 {
             return 12
         case .professionCertificate(.ACA):
             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

@@ -30,7 +30,6 @@ class YHFormItemAddCell: UITableViewCell {
         btn.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
         btn.setTitleColor(btnTitleColor, for: .normal)
         btn.iconInLeft(spacing: 6)
-        
         btn.setImage(UIImage(named: "form_add_info"), for: .normal)
         btn.addTarget(self, action: #selector(didClickAddBtn), for: .touchUpInside)
         return btn

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

@@ -68,7 +68,6 @@ class YHFormItemEnterDetailCell: UITableViewCell {
         label.text = "XXXXXXX"
         label.textColor = .labelTextColor2
         label.textAlignment = .right
-        label.numberOfLines = 0
         label.font = UIFont.PFSC_R(ofSize: 14)
         return label
     }()
@@ -116,25 +115,27 @@ class YHFormItemEnterDetailCell: UITableViewCell {
 
 
         titleLabel.snp.makeConstraints { make in
+            make.top.equalToSuperview().offset(16)
             make.left.equalToSuperview().offset(horizonalGap)
             make.right.equalTo(detailLabel.snp.left).offset(-8)
-            make.centerY.equalToSuperview()
+            make.bottom.equalTo(bottomLine.snp.top).offset(-16)
         }
         
         detailLabel.snp.makeConstraints { make in
             make.right.equalTo(arrowImgView.snp.left)
-            make.centerY.equalToSuperview()
+            make.width.equalTo(110.0)
+            make.top.equalTo(titleLabel)
         }
         
         arrowImgView.snp.makeConstraints { make in
             make.size.equalTo(CGSizeMake(20, 20))
             make.right.equalToSuperview().offset(-horizonalGap)
-            make.centerY.equalToSuperview()
+            make.centerY.equalTo(detailLabel)
         }
         
         deleteButton.snp.makeConstraints { make in
             make.size.equalTo(CGSizeMake(64, 40))
-            make.centerY.equalToSuperview()
+            make.centerY.equalTo(detailLabel)
             make.right.equalToSuperview()
         }
         

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)
@@ -78,7 +78,7 @@ class YHFormItemExpireDateCell: UITableViewCell {
     
     private lazy var detailLabel: UILabel = {
         let label = UILabel()
-        label.textColor = UIColor(hexString: "#222222")
+        label.textColor = UIColor.mainTextColor
         label.textAlignment = .left
         label.font = UIFont.PFSC_R(ofSize: 14)
         return label
@@ -89,7 +89,7 @@ class YHFormItemExpireDateCell: UITableViewCell {
         let btn = UIButton(type: .custom)
         btn.setTitle("长期".local, for: .normal)
         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.setImage(UIImage(named: "form_square_unselect"), for: .normal)
         btn.setImage(UIImage(named: "form_square_select"), for: .selected)

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(流程)/FamilyMember(家庭成员信息表)/V/YHSaveAndSubmitView.swift

@@ -88,7 +88,7 @@ class YHSaveAndSubmitView: UIView {
         let btn = UIButton()
         btn.setTitle("保存", for: .normal)
         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.layer.cornerRadius = 8.0
         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

@@ -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 → galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MainApplicantInformation(主申请人信息)/C/YHSelectCountryViewController.swift

@@ -36,7 +36,7 @@ class YHSelectCountryViewController: YHBaseViewController {
         searchView = {
             let searchBar = UITextField()
             searchBar.placeholder = "搜索国家/地区"
-            searchBar.backgroundColor = UIColor(hex: 0xf8f9fb)
+            searchBar.backgroundColor = UIColor.contentBkgColor
             searchBar.keyboardType = .default
             searchBar.delegate = self
             searchBar.layer.cornerRadius = 21
@@ -75,8 +75,8 @@ class YHSelectCountryViewController: YHBaseViewController {
         flagLabel = {
             let label = UILabel()
             label.text = "热门国家/地区"
-            label.textColor = UIColor(hex: 0x222222)
-            label.font = kFont(size: 14)
+            label.textColor = UIColor.mainTextColor
+            label.font = UIFont.PFSC_R(ofSize: 14)
             return label
         }()
         view.addSubview(flagLabel)
@@ -170,7 +170,7 @@ extension YHSelectCountryViewController: UICollectionViewDelegate, UICollectionV
     
     func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize {
         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) // 这里可以根据需求设置不同的尺寸
     }
     
@@ -199,9 +199,9 @@ class YHCountryCollectionViewCell: UICollectionViewCell {
         label = {
             let view = UILabel()
             view.textAlignment = .center
-            view.font = kFont(size: 13)
-            view.textColor = UIColor(hex: 0x222222)
-            view.backgroundColor = UIColor(hex: 0xf8f9fb)
+            view.font = UIFont.PFSC_R(ofSize: 13)
+            view.textColor = UIColor.mainTextColor
+            view.backgroundColor = UIColor.contentBkgColor
             view.layer.masksToBounds = true
             view.layer.cornerRadius = 16
             return view
@@ -240,8 +240,8 @@ class YHCountryTableViewCell: UITableViewCell {
     func setupUI() {
         titleLabel = {
             let label = UILabel()
-            label.font = kFont(size: 13)
-            label.textColor = UIColor(hex:0x222222)
+            label.font = UIFont.PFSC_R(ofSize: 13)
+            label.textColor = UIColor.mainTextColor
             return label
         }()
         contentView.addSubview(titleLabel)

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

@@ -28,12 +28,12 @@ class YHBottomNextView: UIView {
     func setUpView() {
         saveButton = {
             let button = UIButton(type: .custom)
-            button.backgroundColor =  UIColor(hex:0xf8f9fb)
-            button.titleLabel?.font = kBoldFont(size: 15)
+            button.backgroundColor =  UIColor.contentBkgColor
+            button.titleLabel?.font = UIFont.PFSC_M(ofSize: 15)
             button.contentHorizontalAlignment = .center
             button.setTitle("保存", for: .normal)
-            button.setTitleColor( UIColor(hex:0x222222), for: .normal)
-            button.layer.cornerRadius = 8
+            button.setTitleColor( UIColor.mainTextColor, for: .normal)
+            button.layer.cornerRadius = kCornerRadius6
             button.addTarget(self, action: #selector(save), for: .touchUpInside)
             return button
         }()
@@ -47,12 +47,12 @@ class YHBottomNextView: UIView {
         
         nextButton = {
             let button = UIButton(type: .custom)
-            button.backgroundColor =  UIColor(hex:0x4d9ff8)
-            button.titleLabel?.font = kBoldFont(size: 15)
+            button.titleLabel?.font = UIFont.PFSC_M(ofSize: 15)
             button.contentHorizontalAlignment = .center
             button.setTitle("下一步", 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)
             return button
         }()
@@ -63,6 +63,10 @@ class YHBottomNextView: UIView {
             make.height.equalTo(44)
             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

@@ -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,8 +111,8 @@ class YHCardExampleView: UIView {
         messageLabel = {
             let label = UILabel()
             label.text = "*须使用二代身份证"
-            label.font = kFont(size: 14)
-            label.textColor = UIColor(hex:0xc0c0c0)
+            label.font = UIFont.PFSC_R(ofSize: 14)
+            label.textColor = UIColor.placeHolderColor
             label.textAlignment = .left
             label.numberOfLines = 0
             return label
@@ -154,11 +154,11 @@ class YHCardExampleView: UIView {
         bottomButton = {
             let button = UIButton(type: .custom)
             button.backgroundColor =  UIColor(hex:0x4d9ffb)
-            button.titleLabel?.font = kBoldFont(size: 16)
+            button.titleLabel?.font = UIFont.PFSC_M(ofSize: 16)
             button.contentHorizontalAlignment = .center
             button.setTitle("知道了", 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)
             return button
         }()
@@ -182,8 +182,8 @@ class YHCardExampleView: UIView {
             }
             let label = UILabel()
             label.text = array[i]
-            label.textColor = UIColor(hex: 0x222222)
-            label.font = kFont(size: 14)
+            label.textColor = UIColor.mainTextColor
+            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 → 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
         }()
@@ -98,10 +98,10 @@ class YHDatePickView: UIView {
         
         closeButton = {
             let button = UIButton(type: .custom)
-            button.titleLabel?.font = kBoldFont(size: 14)
+            button.titleLabel?.font = UIFont.PFSC_M(ofSize: 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
         }()
@@ -115,7 +115,7 @@ class YHDatePickView: UIView {
         
         sureButton = {
             let button = UIButton(type: .custom)
-            button.titleLabel?.font = kBoldFont(size: 14)
+            button.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
             button.contentHorizontalAlignment = .center
             button.setTitle("确定", for: .normal)
             button.setTitleColor( UIColor(hex:0x4487f9), for: .normal)
@@ -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 → 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
         }()
@@ -84,10 +84,10 @@ class YHImagePickerView: UIView {
         
         takePhotoBtton = {
             let button = UIButton(type: .custom)
-            button.titleLabel?.font = kBoldFont(size: 14)
+            button.titleLabel?.font = UIFont.PFSC_M(ofSize: 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
         }()
@@ -101,10 +101,10 @@ class YHImagePickerView: UIView {
         
         selectPhotoButton = {
             let button = UIButton(type: .custom)
-            button.titleLabel?.font = kBoldFont(size: 14)
+            button.titleLabel?.font = UIFont.PFSC_M(ofSize: 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
         }()
@@ -118,7 +118,7 @@ class YHImagePickerView: UIView {
         
         cannalButton = {
             let button = UIButton(type: .custom)
-            button.titleLabel?.font = kBoldFont(size: 14)
+            button.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
             button.contentHorizontalAlignment = .center
             button.setTitle("取消", for: .normal)
             button.setTitleColor( UIColor(hex:0x909090), for: .normal)
@@ -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 → 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)
@@ -81,12 +83,12 @@ class YHItemView: UIView {
         
         rightButton = {
             let button = UIButton(type: .custom)
-            button.backgroundColor = UIColor(hex: 0x4487f9).withAlphaComponent(0.08)
-            button.setTitleColor(UIColor(hex: 0x4487f9), for: .selected)
-            button.setTitleColor(UIColor(hex: 0x222222), for: .normal)
+            button.backgroundColor = UIColor.brandMainColor.withAlphaComponent(0.08)
+            button.setTitleColor(UIColor.brandMainColor, for: .selected)
+            button.setTitleColor(UIColor.mainTextColor, for: .normal)
             button.layer.cornerRadius = 16
             button.layer.borderWidth = 1
-            button.layer.borderColor = UIColor(hex: 0x4487f9).cgColor
+            button.layer.borderColor = UIColor.brandMainColor.cgColor
             button.isSelected = true
             button.addTarget(self, action: #selector(rightClick), for: .touchUpInside)
             return button
@@ -101,9 +103,9 @@ class YHItemView: UIView {
         
         leftButton = {
             let button = UIButton(type: .custom)
-            button.backgroundColor = UIColor(hex: 0xf8f9fb)
-            button.setTitleColor(UIColor(hex: 0x4487f9), for: .selected)
-            button.setTitleColor(UIColor(hex: 0x222222), for: .normal)
+            button.backgroundColor = UIColor.contentBkgColor
+            button.setTitleColor(UIColor.brandMainColor, for: .selected)
+            button.setTitleColor(UIColor.mainTextColor, for: .normal)
             button.layer.cornerRadius = 16
             button.addTarget(self, action: #selector(leftClick), for: .touchUpInside)
             return button
@@ -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
@@ -193,49 +195,61 @@ class YHItemView: UIView {
             leftButton.isSelected = true
             rightButton.isSelected = false
             leftButton.layer.borderWidth = 1
-            leftButton.layer.borderColor = UIColor(hex: 0x4487f9).cgColor
-            leftButton.backgroundColor = UIColor(hex: 0x4487f9).withAlphaComponent(0.08)
-            rightButton.backgroundColor = UIColor(hex: 0xf8f9fb)
+            leftButton.layer.borderColor = UIColor.brandMainColor.cgColor
+            leftButton.backgroundColor = UIColor.brandMainColor.withAlphaComponent(0.08)
+            rightButton.backgroundColor = UIColor.contentBkgColor
             rightButton.layer.borderWidth = 0
+            
+            leftButton.titleLabel?.font = UIFont.PFSC_M(ofSize: 13)
+            rightButton.titleLabel?.font = UIFont.PFSC_R(ofSize: 13)
         } else {
             rightButton.isSelected = true
             leftButton.isSelected = false
             rightButton.layer.borderWidth = 1
-            rightButton.layer.borderColor = UIColor(hex: 0x4487f9).cgColor
-            rightButton.backgroundColor = UIColor(hex: 0x4487f9).withAlphaComponent(0.08)
-            leftButton.backgroundColor = UIColor(hex: 0xf8f9fb)
+            rightButton.layer.borderColor = UIColor.brandMainColor.cgColor
+            rightButton.backgroundColor = UIColor.brandMainColor.withAlphaComponent(0.08)
+            leftButton.backgroundColor = UIColor.contentBkgColor
             leftButton.layer.borderWidth = 0
+            
+            rightButton.titleLabel?.font = UIFont.PFSC_M(ofSize: 13)
+            leftButton.titleLabel?.font = UIFont.PFSC_R(ofSize: 13)
         }
+        
     }
     
     @objc func rightClick() {
         rightButton.isSelected = true
         leftButton.isSelected = false
         rightButton.layer.borderWidth = 1
-        rightButton.layer.borderColor = UIColor(hex: 0x4487f9).cgColor
-        rightButton.backgroundColor = UIColor(hex: 0x4487f9).withAlphaComponent(0.08)
-        leftButton.backgroundColor = UIColor(hex: 0xf8f9fb)
+        rightButton.layer.borderColor = UIColor.brandMainColor.cgColor
+        rightButton.backgroundColor = UIColor.brandMainColor.withAlphaComponent(0.08)
+        leftButton.backgroundColor = UIColor.contentBkgColor
         leftButton.layer.borderWidth = 0
         dataSource?.message = "0"
         dataSource?.value = ["0"]
         if let block = block {
             block(dataSource ?? YHItemModel())
         }
+        
+        rightButton.titleLabel?.font = UIFont.PFSC_M(ofSize: 13)
+        leftButton.titleLabel?.font = UIFont.PFSC_R(ofSize: 13)
     }
     
     @objc func leftClick() {
         leftButton.isSelected = true
         rightButton.isSelected = false
         leftButton.layer.borderWidth = 1
-        leftButton.layer.borderColor = UIColor(hex: 0x4487f9).cgColor
-        leftButton.backgroundColor = UIColor(hex: 0x4487f9).withAlphaComponent(0.08)
-        rightButton.backgroundColor = UIColor(hex: 0xf8f9fb)
+        leftButton.layer.borderColor = UIColor.brandMainColor.cgColor
+        leftButton.backgroundColor = UIColor.brandMainColor.withAlphaComponent(0.08)
+        rightButton.backgroundColor = UIColor.contentBkgColor
         rightButton.layer.borderWidth = 0
         dataSource?.message = "1"
         dataSource?.value = ["1"]
         if let block = block {
             block(dataSource ?? YHItemModel())
         }
+        leftButton.titleLabel?.font = UIFont.PFSC_M(ofSize: 13)
+        rightButton.titleLabel?.font = UIFont.PFSC_R(ofSize: 13)
     }
     
     @objc func centerClick() {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MainApplicantInformation/V/YHMainInformationCardTableViewCell.swift → 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)
@@ -96,11 +99,11 @@ class YHMainInformationCardTableViewCell: UITableViewCell {
         
         exampleButton = {
             let button = UIButton(type: .custom)
-            button.backgroundColor =  UIColor(hex:0x1f93ff).withAlphaComponent(0.12)
-            button.titleLabel?.font = kBoldFont(size: 10)
+            button.backgroundColor =  UIColor.brandMainColor.withAlphaComponent(0.08)
+            button.titleLabel?.font = UIFont.PFSC_M(ofSize: 10)
             button.contentHorizontalAlignment = .center
             button.setTitle("示例模板", for: .normal)
-            button.setTitleColor( UIColor(hex:0x0085ff), for: .normal)
+            button.setTitleColor( UIColor.brandMainColor, for: .normal)
             button.layer.cornerRadius = 4
             button.addTarget(self, action: #selector(exampleClick), for: .touchUpInside)
             return button
@@ -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)
@@ -128,8 +131,8 @@ class YHMainInformationCardTableViewCell: UITableViewCell {
         
         frontLabel = {
             let label = UILabel()
-            label.font = kFont(size: 12)
-            label.textColor = UIColor(hex:0x888f98)
+            label.font = UIFont.PFSC_R(ofSize: 12)
+            label.textColor = UIColor.contentBkgColor
             label.textAlignment = .center
             return label
         }()
@@ -143,8 +146,8 @@ class YHMainInformationCardTableViewCell: UITableViewCell {
         
         backSurfaceLabel = {
             let label = UILabel()
-            label.font = kFont(size: 12)
-            label.textColor = UIColor(hex:0x888f98)
+            label.font = UIFont.PFSC_R(ofSize: 12)
+            label.textColor = UIColor.contentBkgColor
             label.textAlignment = .center
             return label
         }()

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MainApplicantInformation/V/YHMainInformationTableViewCell.swift → 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(流程)/MainApplicantInformation/V/YHStepView.swift → galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MainApplicantInformation(主申请人信息)/V/YHStepView.swift

@@ -69,10 +69,10 @@ class YHStepView: UIScrollView {
             }
             let label = UILabel()
             label.text = array[i]
-            label.font = kFont(size: 13)
+            label.font = UIFont.PFSC_R(ofSize: 13)
             label.textAlignment = .center
             label.tag = 2000 + i
-            label.textColor = UIColor.init(hex: 0x222222)
+            label.textColor = UIColor.mainTextColor
             addSubview(label)
             label.snp.makeConstraints { make in
                 make.centerX.equalTo(button.snp.centerX)
@@ -100,13 +100,13 @@ class YHStepView: UIScrollView {
             
             if currentIndex == i {
                 button.setBackgroundImage(UIImage(named: "service_step_now"), for: .normal)
-                label.textColor = UIColor.init(hex: 0x4388ff)
+                label.textColor = UIColor.brandMainColor
             } else if i < currentIndex {
                 button.setBackgroundImage(UIImage(named: "service_step_success"), for: .normal)
-                label.textColor = UIColor.init(hex: 0x222222)
+                label.textColor = UIColor.mainTextColor
             } else {
                 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 {
             }
             if currentIndex == i {
                 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 {
                 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 {
                 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

@@ -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(流程)/OtherInformation(其他信息)/C/YHOtherInfoFillViewController.swift

@@ -96,109 +96,22 @@ extension YHOtherInfoFillViewController {
     private func saveData() {
         
         let model = otherInfoVM.otherInfoFillData
-        printLog(model?.toDictionary())
+        
         //保存
-//        let arr = basicInfoVM.arrBasicInfoSessionDataForEdit
-//        
-//        
-//        var param : [String : Any] = ["order_id":orderId as Any,"save_type": "save"]
-//        
-//        for item in arr {
-//            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: "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)
-//            }
-//        }
+        
+        if let param = model?.toDictionary() {
+            
+            printLog(param)
+            
+            otherInfoVM.saveOtherInfo(params: param) { success, error in
+                if success == true {
+                    YHHUD.flash(message: "保存成功")
+                } else {
+                    let msg = error?.errorMsg ?? "保存失败"
+                    YHHUD.flash(message: msg)
+                }
+            }
+        }
     }
     
     private func submitData() {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/OtherInformation(其他信息)/M/YHOtherInfoFillModel.swift

@@ -10,11 +10,12 @@ import UIKit
 import SmartCodable
 
 class YHOtherInfoFillModel: SmartCodable {
-    var orderID: String = ""
+    var order_id: String = ""
     var residences: [Residence] = []
     var language_detail: LanguageDetail?
     var profession: Profession?
     var question: Question?
+    var is_update : Bool = false
     
     required init() {
         
@@ -28,8 +29,8 @@ class Residence : SmartCodable {
     var start_time: String = ""
     var end_time: String = ""
     
-    var orderID: Int = -1
-    var endTimeChecked: Bool = false
+    var order_id: Int = -1
+    var end_time_checked: Bool = false //是否勾选 至今
     
     required init() {
     }
@@ -37,7 +38,7 @@ class Residence : SmartCodable {
 
 // MARK: - LanguageDetail
 class LanguageDetail : SmartCodable  {
-    var schoolAddressAboard: Bool = false
+    var school_address_aboard: Bool = false //修读学校是否在国外
     var level: Int = -1
     var levelDes : String = ""
     var name: String = ""

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/OtherInformation(其他信息)/V/YHOtherInfoFillCell.swift

@@ -63,6 +63,8 @@ class YHOtherInfoFillCell: UITableViewCell {
     }()
     
     
+    let languageView = YHOtherSelecteItemView()
+    let skillView = YHOtherSelecteItemView()
 }
 
 extension YHOtherInfoFillCell {
@@ -213,7 +215,7 @@ extension YHOtherInfoFillCell {
             }
             
             
-            let view = YHOtherSelecteItemView()
+            let view = languageView
             view.updateKeyName(name: "您的语言水平与下列哪一项符合", keyValue:dataModel.language_detail?.levelDes ?? "")
             view.type = 2
             holdView2.addSubview(view)
@@ -225,6 +227,10 @@ extension YHOtherInfoFillCell {
                 make.height.equalTo(YHOtherSelecteItemView.getViewHBy(type: 2))
                 make.bottom.equalToSuperview()
             }
+            
+            let tap = UITapGestureRecognizer(target: self, action: #selector(tapViewItem))
+            view.addGestureRecognizer(tap)
+            
         }
         
         
@@ -248,7 +254,7 @@ extension YHOtherInfoFillCell {
             }
             
             
-            let view = YHOtherSelecteItemView()
+            let view = skillView
             view.updateKeyName(name: "最能代表你的专业技能的行业", keyValue: dataModel.profession?.optionDes ?? "")
             view.type = 2
             holdView3.addSubview(view)
@@ -260,6 +266,11 @@ extension YHOtherInfoFillCell {
                 make.height.equalTo(YHOtherSelecteItemView.getViewHBy(type: 2))
                 make.bottom.equalToSuperview()
             }
+            
+            
+            let tap = UITapGestureRecognizer(target: self, action: #selector(tapViewItem2))
+            skillView.addGestureRecognizer(tap)
+            
         }
         
         
@@ -392,3 +403,22 @@ extension YHOtherInfoFillCell {
         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

@@ -129,6 +129,12 @@ extension YHOtherInfoSessionView {
     
     @objc func clickDeleteBtn() {
         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(其他信息)/VM/YHOtherInfoFillViewModel.swift

@@ -11,7 +11,7 @@ import UIKit
 class YHOtherInfoFillViewModel: YHBaseViewModel {
     var otherInfoFillData : YHOtherInfoFillModel?
     
-    var arrLanguage : [[String : String]] =  [
+    static let arrLanguage : [[String : String]] =  [
         ["id":"1",
          "title": "中文及英文",
          "dec": "国外大学（英语国家）毕业，英文授课，获得学位证。（如为中外联合办学，在中国上课的，不算）",
@@ -39,7 +39,7 @@ class YHOtherInfoFillViewModel: YHBaseViewModel {
     ]
     
     
-    var arrSkill : [[String : String]] =  [
+    static let arrSkill : [[String : String]] =  [
         [
             "title": "学术研究及教育",
             "dec": "幼儿教育、高等教育、学术研究",
@@ -172,7 +172,7 @@ extension YHOtherInfoFillViewModel {
     
     //保存其他资料信息
     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
             //1. json字符串 转 对象
             guard self != nil else { return }
@@ -182,15 +182,15 @@ extension YHOtherInfoFillViewModel {
                 return
             }
             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
             callBackBlock(false,err)
         }
@@ -204,7 +204,7 @@ extension YHOtherInfoFillViewModel {
         if let language = self.otherInfoFillData?.language_detail {
             if language.level > 0 {
                 let target = String(language.level)
-                for(_,item) in arrLanguage.enumerated() {
+                for(_,item) in YHOtherInfoFillViewModel.arrLanguage.enumerated() {
                     
                     if target == item["id"] {
                         language.levelDes = item["title"] ?? ""
@@ -219,7 +219,7 @@ extension YHOtherInfoFillViewModel {
         if let profession = self.otherInfoFillData?.profession {
             if profession.option > 0 {
                 let target = String(profession.option)
-                for(_,item) in arrSkill.enumerated() {
+                for(_,item) in YHOtherInfoFillViewModel.arrSkill.enumerated() {
                     
                     if target == item["value"] {
                         profession.optionDes = item["title"] ?? ""

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息表)/V/YHPersonInfoCommonCell.swift

@@ -137,7 +137,7 @@ extension YHPersonInfoCommonCell {
             for (index0,item0) in arrData.enumerated() {
                 let lable = UILabel()
                 lable.text = item0.cellTitle
-                lable.textColor = UIColor(hex: 0x222222)
+                lable.textColor = UIColor.mainTextColor
                 lable.font = UIFont.PFSC_M(ofSize: 14)
                 holdView.addSubview(lable)
                 lable.snp.makeConstraints { make in

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

@@ -52,8 +52,8 @@ class YHWorkExampleViewController: YHBaseViewController {
         titleLabel = {
             let label = UILabel()
             label.text = "参考示例"
-            label.font = kBoldFont(size: 17)
-            label.textColor = UIColor(hex:0x222222)
+            label.font = UIFont.PFSC_M(ofSize: 17)
+            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/YHWorkExperienceListViewController.swift

@@ -72,7 +72,7 @@ class YHWorkExperienceListViewController: YHBaseViewController {
         bottomButton = {
             let button = UIButton(type: .custom)
             button.backgroundColor =  UIColor(hex:0x2274ee)
-            button.titleLabel?.font = kBoldFont(size: 16)
+            button.titleLabel?.font = UIFont.PFSC_M(ofSize: 16)
             button.contentHorizontalAlignment = .center
             button.setTitle("提交", for: .normal)
             button.setTitleColor( UIColor(hex:0xffffff), for: .normal)

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

@@ -40,8 +40,8 @@ class YHWorkIntroductionViewController: YHBaseViewController {
         let array = ["项目名称", "项目时间", "项目业绩/亮点"]
         for i in 0..<array.count {
             let label = UILabel()
-            label.textColor = UIColor(hex: 0x222222)
-            label.font = kFont(size: 14)
+            label.textColor = UIColor.mainTextColor
+            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
@@ -136,7 +136,7 @@ class YHWorkIntroductionViewController: YHBaseViewController {
         }
         
         let lineView = UIView()
-        lineView.backgroundColor = UIColor(hex: 0x222222)
+        lineView.backgroundColor = UIColor.mainTextColor
         view.addSubview(lineView)
         lineView.snp.makeConstraints { make in
             make.centerY.equalTo(startTextField.snp.centerY)
@@ -147,8 +147,8 @@ class YHWorkIntroductionViewController: YHBaseViewController {
         
         messageTextField = {
             let textField = UITextView()
-            textField.backgroundColor = UIColor(hex: 0xf8f9fb)
-            textField.font = kFont(size: 14)
+            textField.backgroundColor = UIColor.contentBkgColor
+            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
@@ -208,7 +208,7 @@ class YHWorkIntroductionViewController: YHBaseViewController {
         bottomButton = {
             let button = UIButton(type: .custom)
             button.backgroundColor =  UIColor(hex:0x2274ee)
-            button.titleLabel?.font = kBoldFont(size: 16)
+            button.titleLabel?.font = UIFont.PFSC_M(ofSize: 16)
             button.contentHorizontalAlignment = .center
             button.setTitle("保存", for: .normal)
             button.setTitleColor( UIColor(hex:0xffffff), for: .normal)

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

@@ -55,7 +55,7 @@ class YHWorkActionView: UIView {
         
         exampleButton = {
             let button = UIButton(type: .custom)
-            button.titleLabel?.font = kFont(size: 13)
+            button.titleLabel?.font = UIFont.PFSC_R(ofSize: 13)
             button.contentHorizontalAlignment = .center
             button.setTitle("参考示例", for: .normal)
             button.setTitleColor( UIColor(hex:0x2f7ef6), for: .normal)

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

@@ -46,7 +46,7 @@ class YHWorkExampleMessageTableViewCell: UITableViewCell {
         backgroundColor = .white
         centerView = {
             let view = UIView()
-            view.backgroundColor = UIColor(hex: 0xf8f9fb)
+            view.backgroundColor = UIColor.contentBkgColor
             view.layer.cornerRadius = 8
             return view
         }()
@@ -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)
@@ -76,7 +76,7 @@ class YHWorkExampleMessageTableViewCell: UITableViewCell {
         useButton = {
             let button = UIButton(type: .custom)
             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.setTitle("使用此模板", for: .normal)
             button.setTitleColor( UIColor(hex:0x2f7ef6), for: .normal)
@@ -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

@@ -49,10 +49,10 @@ class YHWorkExampleMessageView: UIView {
         
         titleLabel = {
             let label = UILabel()
-            label.font = kBoldFont(size: 16)
+            label.font = UIFont.PFSC_M(ofSize: 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

@@ -30,10 +30,10 @@ class YHWorkExampleTypeView: UIView {
     func setUpView() {
         titleLabel = {
             let label = UILabel()
-            label.font = kBoldFont(size: 14)
+            label.font = UIFont.PFSC_M(ofSize: 14)
             label.text = "请选择您的行业："
             label.textAlignment = .left
-            label.textColor = UIColor(hex:0x222222)
+            label.textColor = UIColor.mainTextColor
             return label
         }()
         addSubview(titleLabel)
@@ -70,9 +70,9 @@ class YHWorkExampleTypeView: UIView {
             
             let button = UIButton(type: .custom)
             button.setTitle(dataSource[i], for: .normal)
-            button.setTitleColor(UIColor(hex: 0x222222), for: .normal)
-            button.setBackgroundColor(color: UIColor(hex: 0xf8f9fb), forState: .normal)
-            button.titleLabel?.font = kFont(size: 13)
+            button.setTitleColor(UIColor.mainTextColor, for: .normal)
+            button.setBackgroundColor(color: UIColor.contentBkgColor, forState: .normal)
+            button.titleLabel?.font = UIFont.PFSC_R(ofSize: 13)
             button.layer.cornerRadius = 16
             button.tag = 3000 + i
             button.addTarget(self, action: #selector(exampleClick(sender:)), for: .touchUpInside)

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

@@ -81,12 +81,12 @@ class YHWorkExperienceItemView: UIView {
         
         rightButton = {
             let button = UIButton(type: .custom)
-            button.backgroundColor = UIColor(hex: 0x4487f9).withAlphaComponent(0.08)
-            button.setTitleColor(UIColor(hex: 0x4487f9), for: .selected)
-            button.setTitleColor(UIColor(hex: 0x222222), for: .normal)
+            button.backgroundColor = UIColor.brandMainColor.withAlphaComponent(0.08)
+            button.setTitleColor(UIColor.brandMainColor, for: .selected)
+            button.setTitleColor(UIColor.mainTextColor, for: .normal)
             button.layer.cornerRadius = 16
             button.layer.borderWidth = 1
-            button.layer.borderColor = UIColor(hex: 0x4487f9).cgColor
+            button.layer.borderColor = UIColor.brandMainColor.cgColor
             button.isSelected = true
             button.addTarget(self, action: #selector(rightClick), for: .touchUpInside)
             return button
@@ -101,9 +101,9 @@ class YHWorkExperienceItemView: UIView {
         
         leftButton = {
             let button = UIButton(type: .custom)
-            button.backgroundColor = UIColor(hex: 0xf8f9fb)
-            button.setTitleColor(UIColor(hex: 0x4487f9), for: .selected)
-            button.setTitleColor(UIColor(hex: 0x222222), for: .normal)
+            button.backgroundColor = UIColor.contentBkgColor
+            button.setTitleColor(UIColor.brandMainColor, for: .selected)
+            button.setTitleColor(UIColor.mainTextColor, for: .normal)
             button.layer.cornerRadius = 16
             button.addTarget(self, action: #selector(leftClick), for: .touchUpInside)
             return button
@@ -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
@@ -193,17 +193,17 @@ class YHWorkExperienceItemView: UIView {
             leftButton.isSelected = true
             rightButton.isSelected = false
             leftButton.layer.borderWidth = 1
-            leftButton.layer.borderColor = UIColor(hex: 0x4487f9).cgColor
-            leftButton.backgroundColor = UIColor(hex: 0x4487f9).withAlphaComponent(0.08)
-            rightButton.backgroundColor = UIColor(hex: 0xf8f9fb)
+            leftButton.layer.borderColor = UIColor.brandMainColor.cgColor
+            leftButton.backgroundColor = UIColor.brandMainColor.withAlphaComponent(0.08)
+            rightButton.backgroundColor = UIColor.contentBkgColor
             rightButton.layer.borderWidth = 0
         } else {
             rightButton.isSelected = true
             leftButton.isSelected = false
             rightButton.layer.borderWidth = 1
-            rightButton.layer.borderColor = UIColor(hex: 0x4487f9).cgColor
-            rightButton.backgroundColor = UIColor(hex: 0x4487f9).withAlphaComponent(0.08)
-            leftButton.backgroundColor = UIColor(hex: 0xf8f9fb)
+            rightButton.layer.borderColor = UIColor.brandMainColor.cgColor
+            rightButton.backgroundColor = UIColor.brandMainColor.withAlphaComponent(0.08)
+            leftButton.backgroundColor = UIColor.contentBkgColor
             leftButton.layer.borderWidth = 0
         }
     }
@@ -212,9 +212,9 @@ class YHWorkExperienceItemView: UIView {
         rightButton.isSelected = true
         leftButton.isSelected = false
         rightButton.layer.borderWidth = 1
-        rightButton.layer.borderColor = UIColor(hex: 0x4487f9).cgColor
-        rightButton.backgroundColor = UIColor(hex: 0x4487f9).withAlphaComponent(0.08)
-        leftButton.backgroundColor = UIColor(hex: 0xf8f9fb)
+        rightButton.layer.borderColor = UIColor.brandMainColor.cgColor
+        rightButton.backgroundColor = UIColor.brandMainColor.withAlphaComponent(0.08)
+        leftButton.backgroundColor = UIColor.contentBkgColor
         leftButton.layer.borderWidth = 0
         dataSource?.message = "0"
         dataSource?.value = ["0"]
@@ -227,9 +227,9 @@ class YHWorkExperienceItemView: UIView {
         leftButton.isSelected = true
         rightButton.isSelected = false
         leftButton.layer.borderWidth = 1
-        leftButton.layer.borderColor = UIColor(hex: 0x4487f9).cgColor
-        leftButton.backgroundColor = UIColor(hex: 0x4487f9).withAlphaComponent(0.08)
-        rightButton.backgroundColor = UIColor(hex: 0xf8f9fb)
+        leftButton.layer.borderColor = UIColor.brandMainColor.cgColor
+        leftButton.backgroundColor = UIColor.brandMainColor.withAlphaComponent(0.08)
+        rightButton.backgroundColor = UIColor.contentBkgColor
         rightButton.layer.borderWidth = 0
         dataSource?.message = "1"
         dataSource?.value = ["1"]

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

@@ -54,7 +54,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,9 +67,9 @@ class YHWorkExperienceListTableViewCell: UITableViewCell {
         
         titleLabel = {
             let label = UILabel()
-            label.font = kFont(size: 16)
+            label.font = UIFont.PFSC_R(ofSize: 16)
             label.text = "主申请人工作经历"
-            label.textColor = UIColor(hex:0x222222)
+            label.textColor = UIColor.mainTextColor
             return label
         }()
         centerView.addSubview(titleLabel)
@@ -82,9 +82,9 @@ class YHWorkExperienceListTableViewCell: UITableViewCell {
         
         subTitleLabel = {
             let label = UILabel()
-            label.font = kFont(size: 12)
+            label.font = UIFont.PFSC_R(ofSize: 12)
             label.text = "(从最近一份全职工作开始，直至毕业后的第一份工作）"
-            label.textColor = UIColor(hex:0x888f98)
+            label.textColor = UIColor.contentBkgColor
             return label
         }()
         centerView.addSubview(subTitleLabel)
@@ -97,7 +97,7 @@ class YHWorkExperienceListTableViewCell: UITableViewCell {
         
         cannalButton = {
             let button = UIButton(type: .custom)
-            button.titleLabel?.font = kBoldFont(size: 14)
+            button.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
             button.contentHorizontalAlignment = .center
             button.setTitle("取消操作", for: .normal)
             button.setTitleColor( UIColor(hex:0x2f7ef6), for: .normal)
@@ -131,7 +131,7 @@ class YHWorkExperienceListTableViewCell: UITableViewCell {
         mainItemView = {
             let view = UIView()
             view.backgroundColor = .white
-            view.layer.cornerRadius = 12
+            view.layer.cornerRadius = kCornerRadius6
             return view
         }()
         centerView.addSubview(mainItemView)
@@ -163,7 +163,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)
@@ -185,7 +185,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

@@ -47,7 +47,7 @@ class YHWorkExperienceTextItemView: UIView {
         
         messageTextField = {
             let textField = UITextView()
-            textField.backgroundColor = UIColor(hex: 0xf8f9fb)
+            textField.backgroundColor = UIColor.contentBkgColor
             textField.layer.cornerRadius = 4
             textField.delegate = self
             return textField
@@ -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

@@ -32,9 +32,9 @@ class YHWorkFileItemView: UIView {
     func setUpView() {
         titleLabel = {
             let label = UILabel()
-            label.font = kBoldFont(size: 14)
+            label.font = UIFont.PFSC_M(ofSize: 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)
@@ -84,7 +84,7 @@ class YHWorkHighlightsTableViewCell: UITableViewCell {
             let label = UILabel()
             label.text = "温馨提示：如下模板仅供思路参考，工作内容请按您的实际填写，后期文案会基于该内容进行文书材料撰写，望悉知"
             label.textColor = UIColor(hex: 0x2f7ef6)
-            label.font = kFont(size: 12)
+            label.font = UIFont.PFSC_R(ofSize: 12)
             label.numberOfLines = 0
             return label
         }()
@@ -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
@@ -141,8 +141,8 @@ class YHWorkHighlightsTableViewCell: UITableViewCell {
         detailLabel = {
             let label = UILabel()
             label.text = "项目详细介绍"
-            label.textColor = UIColor(hex: 0x222222)
-            label.font = kFont(size: 14)
+            label.textColor = UIColor.mainTextColor
+            label.font = UIFont.PFSC_R(ofSize: 14)
             return label
         }()
         centerView.addSubview(detailLabel)

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

@@ -35,9 +35,9 @@ class YHWorkIntroductionItemView: UIView {
     func setUpView() {
         titleLabel = {
             let label = UILabel()
-            label.font = kBoldFont(size: 14)
+            label.font = UIFont.PFSC_M(ofSize: 14)
             label.textAlignment = .left
-            label.textColor = UIColor(hex:0x222222)
+            label.textColor = UIColor.mainTextColor
             return label
         }()
         addSubview(titleLabel)
@@ -50,9 +50,9 @@ class YHWorkIntroductionItemView: UIView {
         
         subTitleLabel = {
             let label = UILabel()
-            label.font = kBoldFont(size: 12)
+            label.font = UIFont.PFSC_M(ofSize: 12)
             label.textAlignment = .left
-            label.textColor = UIColor(hex:0x888f98)
+            label.textColor = UIColor.contentBkgColor
             return label
         }()
         addSubview(subTitleLabel)
@@ -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)
@@ -64,9 +64,9 @@ class YHWorkIntroductionTableViewCell: UITableViewCell {
         
         titleLabel = {
             let label = UILabel()
-            label.font = kFont(size: 16)
+            label.font = UIFont.PFSC_R(ofSize: 16)
             label.text = "项目介绍(选填)"
-            label.textColor = UIColor(hex:0x222222)
+            label.textColor = UIColor.mainTextColor
             return label
         }()
         centerView.addSubview(titleLabel)
@@ -79,7 +79,7 @@ class YHWorkIntroductionTableViewCell: UITableViewCell {
         
         cannalButton = {
             let button = UIButton(type: .custom)
-            button.titleLabel?.font = kBoldFont(size: 14)
+            button.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
             button.contentHorizontalAlignment = .center
             button.setTitle("取消操作", for: .normal)
             button.setTitleColor( UIColor(hex:0x2f7ef6), for: .normal)
@@ -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

@@ -38,9 +38,9 @@ class YHWorkItemView: UIView {
     func setUpView() {
         titleLabel = {
             let label = UILabel()
-            label.font = kBoldFont(size: 14)
+            label.font = UIFont.PFSC_M(ofSize: 14)
             label.textAlignment = .left
-            label.textColor = UIColor(hex:0x222222)
+            label.textColor = UIColor.mainTextColor
             return label
         }()
         addSubview(titleLabel)
@@ -53,9 +53,9 @@ class YHWorkItemView: UIView {
         
         subTitleLabel = {
             let label = UILabel()
-            label.font = kBoldFont(size: 12)
+            label.font = UIFont.PFSC_M(ofSize: 12)
             label.textAlignment = .left
-            label.textColor = UIColor(hex:0x888f98)
+            label.textColor = UIColor.contentBkgColor
             return label
         }()
         addSubview(subTitleLabel)
@@ -67,9 +67,9 @@ class YHWorkItemView: UIView {
         
         explainLabel = {
             let label = UILabel()
-            label.font = kBoldFont(size: 14)
+            label.font = UIFont.PFSC_M(ofSize: 14)
             label.textAlignment = .right
-            label.textColor = UIColor(hex:0x888f98)
+            label.textColor = UIColor.contentBkgColor
             return label
         }()
         addSubview(explainLabel)
@@ -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)
@@ -107,9 +107,9 @@ class YHWorkMessageSelectTableViewCell: UITableViewCell {
             let button = UIButton(type: .custom)
             button.backgroundColor = UIColor(hex: 0x2f7ef6).withAlphaComponent(0.08)
             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.titleLabel?.font = kFont(size: 13)
+            button.titleLabel?.font = UIFont.PFSC_R(ofSize: 13)
             button.layer.cornerRadius = 16
             button.layer.borderWidth = 1
             button.layer.borderColor = UIColor(hex: 0x2f7ef6).cgColor
@@ -127,11 +127,11 @@ class YHWorkMessageSelectTableViewCell: UITableViewCell {
         
         leftButton = {
             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: 0x222222), for: .normal)
+            button.setTitleColor(UIColor.mainTextColor, 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.addTarget(self, action: #selector(leftClick), for: .touchUpInside)
             return button
@@ -152,7 +152,7 @@ class YHWorkMessageSelectTableViewCell: UITableViewCell {
             leftButton.layer.borderWidth = 1
             leftButton.layer.borderColor = UIColor(hex: 0x2f7ef6).cgColor
             leftButton.backgroundColor = UIColor(hex: 0x2f7ef6).withAlphaComponent(0.08)
-            rightButton.backgroundColor = UIColor(hex: 0xf8f9fb)
+            rightButton.backgroundColor = UIColor.contentBkgColor
             rightButton.layer.borderWidth = 0
         } else {
             rightButton.isSelected = true
@@ -160,7 +160,7 @@ class YHWorkMessageSelectTableViewCell: UITableViewCell {
             rightButton.layer.borderWidth = 1
             rightButton.layer.borderColor = UIColor(hex: 0x2f7ef6).cgColor
             rightButton.backgroundColor = UIColor(hex: 0x2f7ef6).withAlphaComponent(0.08)
-            leftButton.backgroundColor = UIColor(hex: 0xf8f9fb)
+            leftButton.backgroundColor = UIColor.contentBkgColor
             leftButton.layer.borderWidth = 0
         }
     }
@@ -171,7 +171,7 @@ class YHWorkMessageSelectTableViewCell: UITableViewCell {
         rightButton.layer.borderWidth = 1
         rightButton.layer.borderColor = UIColor(hex: 0x2f7ef6).cgColor
         rightButton.backgroundColor = UIColor(hex: 0x2f7ef6).withAlphaComponent(0.08)
-        leftButton.backgroundColor = UIColor(hex: 0xf8f9fb)
+        leftButton.backgroundColor = UIColor.contentBkgColor
         leftButton.layer.borderWidth = 0
     }
     
@@ -181,7 +181,7 @@ class YHWorkMessageSelectTableViewCell: UITableViewCell {
         leftButton.layer.borderWidth = 1
         leftButton.layer.borderColor = UIColor(hex: 0x2f7ef6).cgColor
         leftButton.backgroundColor = UIColor(hex: 0x2f7ef6).withAlphaComponent(0.08)
-        rightButton.backgroundColor = UIColor(hex: 0xf8f9fb)
+        rightButton.backgroundColor = UIColor.contentBkgColor
         rightButton.layer.borderWidth = 0
     }
    

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)
@@ -82,7 +82,7 @@ class YHWorkResponsibilitiesTableViewCell: UITableViewCell {
             let label = UILabel()
             label.text = "温馨提示：如下模板仅供思路参考，工作内容请按您的实际填写，后期文案会基于该内容进行文书材料撰写，望悉知"
             label.textColor = UIColor(hex: 0x2f7ef6)
-            label.font = kFont(size: 12)
+            label.font = UIFont.PFSC_R(ofSize: 12)
             label.numberOfLines = 0
             return label
         }()
@@ -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

@@ -12,14 +12,15 @@ class YHSubmitAllInfoCheckView: UIView {
     typealias Block = (Bool) -> ()
     var block: Block?
     var centerView: UIView!
-    var titleLabel: UILabel!
+//    var titleLabel: UILabel!
     var messageLabel: UILabel!
     var agreeButton: 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))
         view.block = callBack
+        view.messageLabel.text = tipMsg ?? "--"
         let window = UIApplication.shared.yhKeyWindow()
         window?.addSubview(view)
     }
@@ -44,7 +45,7 @@ class YHSubmitAllInfoCheckView: UIView {
         centerView = {
             let view = UIView()
             view.backgroundColor = .white
-            view.layer.cornerRadius = 12
+            view.layer.cornerRadius = kCornerRadius6
             return view
         }()
         addSubview(centerView)
@@ -57,8 +58,8 @@ class YHSubmitAllInfoCheckView: UIView {
 //        titleLabel = {
 //            let label = UILabel()
 //            label.text = "同意隐私协议"
-//            label.font = kFont(size: 16)
-//            label.textColor = UIColor(hex:0x222222)
+//            label.font = UIFont.PFSC_R(ofSize: 16)
+//            label.textColor = UIColor.mainTextColor
 //            label.textAlignment = .center
 //            return label
 //        }()
@@ -74,6 +75,7 @@ class YHSubmitAllInfoCheckView: UIView {
             label.text = "确定是否提交信息？提交后将不能修改"
             label.font = UIFont.PFSC_R(ofSize: 16)
             label.textColor = UIColor.mainTextColor
+            label.textAlignment = .center
             label.numberOfLines = 0
             return label
         }()

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

@@ -39,7 +39,7 @@ class YHCodeResultViewController: YHBaseViewController {
         loginTitleLabel = {
             let label = UILabel()
             label.text = "登录后更精彩"
-            label.font = kBoldFont(size: 32)
+            label.font = UIFont.PFSC_M(ofSize: 32)
             label.textColor = UIColor(hex:0xffffff)
             return label
         }()
@@ -53,7 +53,7 @@ class YHCodeResultViewController: YHBaseViewController {
         loginSubTitleLabel = {
             let label = UILabel()
             label.text = "香港美好生活期待与你的相遇"
-            label.font = kFont(size: 20)
+            label.font = UIFont.PFSC_R(ofSize: 20)
             label.textColor =  UIColor(hex:0xffffff)
             return label
         }()
@@ -67,7 +67,7 @@ class YHCodeResultViewController: YHBaseViewController {
         phoneLabel = {
             let label = UILabel()
             label.text = "已发送验证码至13352933800"
-            label.font = kBoldFont(size: 17)
+            label.font = UIFont.PFSC_M(ofSize: 17)
             label.textAlignment = .left
             label.textColor =  UIColor(hex:0xffffff)
             return label
@@ -96,7 +96,7 @@ class YHCodeResultViewController: YHBaseViewController {
         
         getCodeLabel = {
             let button = UILabel()
-            button.font = kBoldFont(size: 16)
+            button.font = UIFont.PFSC_M(ofSize: 16)
             button.text = "重新发送（58s）"
             button.textColor = UIColor(hex:0xffffff)
             button.isHidden = false
@@ -112,7 +112,7 @@ class YHCodeResultViewController: YHBaseViewController {
         
         getCodeButton = {
             let button = UIButton(type: .custom)
-            button.titleLabel?.font = kBoldFont(size: 16)
+            button.titleLabel?.font = UIFont.PFSC_M(ofSize: 16)
             button.contentHorizontalAlignment = .left
             button.setTitle("重新获取验证码", for: .normal)
             button.setTitleColor( UIColor(hex:0xffffff), for: .normal)

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

@@ -63,8 +63,8 @@ class YHCodeSueecssViewController: YHBaseViewController {
         loginTitleLabel = {
             let label = UILabel()
             label.text = "请输入验证码"
-            label.font = kBoldFont(size: 28)
-            label.textColor = UIColor(hex:0x222222)
+            label.font = UIFont.PFSC_M(ofSize: 28)
+            label.textColor = UIColor.mainTextColor
             return label
         }()
         view.addSubview(loginTitleLabel)
@@ -78,8 +78,8 @@ class YHCodeSueecssViewController: YHBaseViewController {
         loginSubTitleLabel = {
             let label = UILabel()
             label.text = "已发送至 \(phoneNumber ?? "")"
-            label.font = kFont(size: 13)
-            label.textColor =  UIColor(hex:0xc0c0c0)
+            label.font = UIFont.PFSC_R(ofSize: 13)
+            label.textColor =  UIColor.placeHolderColor
             return label
         }()
         view.addSubview(loginSubTitleLabel)
@@ -113,9 +113,9 @@ class YHCodeSueecssViewController: YHBaseViewController {
         
         getCodeLabel = {
             let button = UILabel()
-            button.font = kBoldFont(size: 12)
+            button.font = UIFont.PFSC_M(ofSize: 12)
             button.text = "重新发送（58s）"
-            button.textColor = UIColor(hex:0xc0c0c0)
+            button.textColor = UIColor.placeHolderColor
             button.textAlignment = .center
             button.isHidden = false
             button.layer.cornerRadius = 4
@@ -133,10 +133,10 @@ class YHCodeSueecssViewController: YHBaseViewController {
         
         getCodeButton = {
             let button = UIButton(type: .custom)
-            button.titleLabel?.font = kBoldFont(size: 12)
+            button.titleLabel?.font = UIFont.PFSC_M(ofSize: 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/YHLoginViewController.swift

@@ -55,7 +55,7 @@ class YHLoginViewController: YHBaseViewController {
         loginTitleLabel = {
             let label = UILabel()
             label.text = "登录后更精彩"
-            label.font = kBoldFont(size: 32)
+            label.font = UIFont.PFSC_M(ofSize: 32)
             label.textColor = UIColor(hex:0xffffff)
             return label
         }()
@@ -69,7 +69,7 @@ class YHLoginViewController: YHBaseViewController {
         loginSubTitleLabel = {
             let label = UILabel()
             label.text = "香港美好生活期待与你的相遇"
-            label.font = kFont(size: 20)
+            label.font = UIFont.PFSC_R(ofSize: 20)
             label.textColor =  UIColor(hex:0xffffff)
             return label
         }()
@@ -83,7 +83,7 @@ class YHLoginViewController: YHBaseViewController {
         loginPhoneLabel = {
             let label = UILabel()
             label.text = "+86  133****3800"
-            label.font = kBoldFont(size: 20)
+            label.font = UIFont.PFSC_M(ofSize: 20)
             label.textAlignment = .center
             label.textColor =  UIColor(hex:0xffffff)
             return label
@@ -98,7 +98,7 @@ class YHLoginViewController: YHBaseViewController {
         loginButton = {
             let button = UIButton(type: .custom)
             button.backgroundColor =  UIColor(hex:0x4d9ff8)
-            button.titleLabel?.font = kBoldFont(size: 16)
+            button.titleLabel?.font = UIFont.PFSC_M(ofSize: 16)
             button.contentHorizontalAlignment = .center
             button.setTitle("本机号码一键登录", for: .normal)
             button.setTitleColor( UIColor(hex:0xffffff), for: .normal)
@@ -165,7 +165,7 @@ class YHLoginViewController: YHBaseViewController {
         promptsLabel = {
             let label = UILabel()
             label.text = "其他登录方式（第三方账号注册需绑定手机号）"
-            label.font = kFont(size: 12)
+            label.font = UIFont.PFSC_R(ofSize: 12)
             label.textColor =  UIColor(hex:0xffffff)
             label.textAlignment = .center
             return label

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

@@ -81,8 +81,8 @@ class YHPhoneLoginViewController: YHBaseViewController {
         loginTitleLabel = {
             let label = UILabel()
             label.text = "手机号登录"
-            label.font = kBoldFont(size: 28)
-            label.textColor = UIColor(hex:0x222222)
+            label.font = UIFont.PFSC_M(ofSize: 28)
+            label.textColor = UIColor.mainTextColor
             return label
         }()
         view.addSubview(loginTitleLabel)
@@ -96,8 +96,8 @@ class YHPhoneLoginViewController: YHBaseViewController {
         loginSubTitleLabel = {
             let label = UILabel()
             label.text = "手机号首次登录自动注册"
-            label.font = kFont(size: 13)
-            label.textColor =  UIColor(hex:0xc0c0c0)
+            label.font = UIFont.PFSC_R(ofSize: 13)
+            label.textColor =  UIColor.placeHolderColor
             return label
         }()
         view.addSubview(loginSubTitleLabel)
@@ -110,8 +110,8 @@ class YHPhoneLoginViewController: YHBaseViewController {
         
         phoneMessageView = {
             let view = YHPhoneMessageView()
-            view.backgroundColor =  UIColor(hex:0xf8f9fb)
-            view.layer.cornerRadius = 6
+            view.backgroundColor =  UIColor.contentBkgColor
+            view.layer.cornerRadius = kCornerRadius6
             view.layer.borderWidth = 1
             view.layer.borderColor = UIColor(hex:0xebeef4).cgColor
             view.phoneBlock = {[weak self] count in
@@ -137,7 +137,7 @@ class YHPhoneLoginViewController: YHBaseViewController {
         getCodeButton = {
             let button = UIButton(type: .custom)
             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.setTitle("获取验证码", for: .normal)
             button.setTitleColor( UIColor(hex:0xffffff), for: .normal)

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

@@ -33,7 +33,7 @@ class YHPickPhoneAddressViewController: YHBaseViewController {
 //        loginTitleLabel = {
 //            let label = UILabel()
 //            label.text = "登录后更精彩"
-//            label.font = kBoldFont(size: 32)
+//            label.font = UIFont.PFSC_M(ofSize: 32)
 //            label.textColor = UIColor(hex:0xffffff)
 //            return label
 //        }()

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

@@ -42,7 +42,7 @@ class YHVerificationCodeLoginController: YHBaseViewController {
         loginTitleLabel = {
             let label = UILabel()
             label.text = "登录后更精彩"
-            label.font = kBoldFont(size: 32)
+            label.font = UIFont.PFSC_M(ofSize: 32)
             label.textColor = UIColor(hex:0xffffff)
             return label
         }()
@@ -56,7 +56,7 @@ class YHVerificationCodeLoginController: YHBaseViewController {
         loginSubTitleLabel = {
             let label = UILabel()
             label.text = "香港美好生活期待与你的相遇"
-            label.font = kFont(size: 20)
+            label.font = UIFont.PFSC_R(ofSize: 20)
             label.textColor =  UIColor(hex:0xffffff)
             return label
         }()
@@ -70,7 +70,7 @@ class YHVerificationCodeLoginController: YHBaseViewController {
         phoneLabel = {
             let label = UILabel()
             label.text = "未注册手机验证后完成注册"
-            label.font = kBoldFont(size: 17)
+            label.font = UIFont.PFSC_M(ofSize: 17)
             label.textAlignment = .left
             label.textColor =  UIColor(hex:0xffffff)
             return label
@@ -105,7 +105,7 @@ class YHVerificationCodeLoginController: YHBaseViewController {
         getCodeButton = {
             let button = UIButton(type: .custom)
             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.setTitle("获取验证码", for: .normal)
             button.setTitleColor( UIColor(hex:0x979797), for: .normal)
@@ -122,7 +122,7 @@ class YHVerificationCodeLoginController: YHBaseViewController {
         }
         emailButton = {
             let button = UIButton(type: .custom)
-            button.titleLabel?.font = kBoldFont(size: 16)
+            button.titleLabel?.font = UIFont.PFSC_M(ofSize: 16)
             button.setTitle("邮箱登录", for: .normal)
             button.setTitleColor( UIColor(hex:0xffffff), for: .normal)
             return button
@@ -150,7 +150,7 @@ class YHVerificationCodeLoginController: YHBaseViewController {
         promptsLabel = {
             let label = UILabel()
             label.text = "其他登录方式（第三方账号注册需绑定手机号）"
-            label.font = kFont(size: 12)
+            label.font = UIFont.PFSC_R(ofSize: 12)
             label.textColor =  UIColor(hex:0xffffff)
             label.textAlignment = .center
             return label

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

@@ -44,8 +44,8 @@ class YHLoginPrivacyView: UIView {
         messageLabel = {
             let label = UILabel()
             label.text = "我已阅读并同意"
-            label.font = kFont(size: 12)
-            label.textColor = UIColor(hex:0x888f98)
+            label.font = UIFont.PFSC_R(ofSize: 12)
+            label.textColor = UIColor.contentBkgColor
             label.textAlignment = .left
             return label
         }()
@@ -58,7 +58,7 @@ class YHLoginPrivacyView: UIView {
         
         serviceButton = {
             let button = UIButton(type: .custom)
-            button.titleLabel?.font = kBoldFont(size: 12)
+            button.titleLabel?.font = UIFont.PFSC_M(ofSize: 12)
             button.contentHorizontalAlignment = .center
             button.setTitle("《隐私协议》", for: .normal)
             button.setTitleColor(UIColor(hex: 0x2f7ef6), for: .normal)
@@ -74,8 +74,8 @@ class YHLoginPrivacyView: UIView {
         andLabel = {
             let label = UILabel()
             label.text = "和"
-            label.font = kFont(size: 12)
-            label.textColor = UIColor(hex:0x888f98)
+            label.font = UIFont.PFSC_R(ofSize: 12)
+            label.textColor = UIColor.contentBkgColor
             label.textAlignment = .left
             return label
         }()
@@ -87,7 +87,7 @@ class YHLoginPrivacyView: UIView {
         }
         privacyButton = {
             let button = UIButton(type: .custom)
-            button.titleLabel?.font = kBoldFont(size: 12)
+            button.titleLabel?.font = UIFont.PFSC_M(ofSize: 12)
             button.contentHorizontalAlignment = .center
             button.setTitle("《用户条款》", for: .normal)
             button.setTitleColor(UIColor(hex: 0x2f7ef6), for: .normal)

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

@@ -32,7 +32,7 @@ class YHLoginStyleButton: UIButton {
         
         messageLabel = {
             let label = UILabel()
-            label.font = kBoldFont(size: 16)
+            label.font = UIFont.PFSC_M(ofSize: 16)
             label.textColor = UIColor(hex:0xffffff)
             label.textAlignment = .right
             return label

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

@@ -28,7 +28,7 @@ class YHPhoneMessageView: UIView {
     func setView() {
         messageButton = {
             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.setTitleColor( UIColor(hex:0x000000), for: .normal)
             button.addTarget(self, action: #selector(messageClick), for: .touchUpInside)
@@ -56,7 +56,7 @@ class YHPhoneMessageView: UIView {
         phoneTextField = {
             let text = UITextField()
             text.placeholder = "请输入签约手机号"
-            text.font = kFont(size: 16)
+            text.font = UIFont.PFSC_R(ofSize: 16)
             text.textColor = UIColor(hex:0x000000)
             text.textAlignment = .left
             text.keyboardType = .phonePad

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)
@@ -81,11 +81,11 @@ class YHPrivacyAlertView: UIView {
         disAgressButton = {
             let button = UIButton(type: .custom)
             button.backgroundColor =  UIColor(hex:0xffffff)
-            button.titleLabel?.font = kBoldFont(size: 15)
+            button.titleLabel?.font = UIFont.PFSC_M(ofSize: 15)
             button.contentHorizontalAlignment = .center
             button.setTitle("不同意", for: .normal)
             button.setTitleColor( UIColor(hex:0x3c86f8), for: .normal)
-            button.layer.cornerRadius = 8
+            button.layer.cornerRadius = kCornerRadius6
             button.layer.borderWidth = 1
             button.layer.borderColor = UIColor(hex: 0x3c86f8).cgColor
             button.addTarget(self, action: #selector(disagree), for: .touchUpInside)
@@ -102,11 +102,11 @@ class YHPrivacyAlertView: UIView {
         agreeButton = {
             let button = UIButton(type: .custom)
             button.backgroundColor =  UIColor(hex:0x3c86f8)
-            button.titleLabel?.font = kBoldFont(size: 15)
+            button.titleLabel?.font = UIFont.PFSC_M(ofSize: 15)
             button.contentHorizontalAlignment = .center
             button.setTitle("同意", 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)
             return button
         }()

galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHAboutUsViewController.swift

@@ -50,7 +50,7 @@ class YHAboutUsViewController: YHBaseViewController {
     lazy var aboutLabel = {
             var label = UILabel()
             label.text = "关于银河".local
-            label.textColor = UIColor(hexString:"#222222")
+            label.textColor = UIColor.mainTextColor
             label.textAlignment = NSTextAlignment.left
             label.font = UIFont.systemFont(ofSize: 20)
             return label
@@ -69,7 +69,7 @@ class YHAboutUsViewController: YHBaseViewController {
     lazy var advantageLabel = {
         var label = UILabel()
         label.text = "四大优势"
-        label.textColor = UIColor(hexString:"#222222")
+        label.textColor = UIColor.mainTextColor
         label.textAlignment = .center
         label.font = UIFont.systemFont(ofSize: 15)
         return label

galaxy/galaxy/Classes/Tools/Helper/YhConstant.swift

@@ -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 {

galaxy/galaxy/Classes/Tools/NetWork/YHAllApiName.swift

@@ -49,6 +49,20 @@ class YHAllApiName {
         static let getEducationDetailInfoApi = "frontend/education/detail"
         // 保存学历信息
         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

galaxy/galaxy/Classes/Tools/NetWork/YHNetRequest.swift

@@ -94,8 +94,12 @@ class YHNetRequest: NSObject {
         
         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
     }