Merge branch 'develop' into davidhuang

* develop:
  // 父母信息
  // 配偶基本信息
  配偶基本信息

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -15,13 +15,16 @@
 		041B52932B5E6CBA007EBCEB /* YHFormItemTitleCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 041B52922B5E6CBA007EBCEB /* YHFormItemTitleCell.swift */; };
 		041B52952B5E7037007EBCEB /* YHFormItemAddCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 041B52942B5E7037007EBCEB /* YHFormItemAddCell.swift */; };
 		041B52982B5E8EA0007EBCEB /* YHFamilyMemberFormVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 041B52972B5E8EA0007EBCEB /* YHFamilyMemberFormVC.swift */; };
-		041B52D62B5F899E007EBCEB /* YHSpouseFormVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 041B52D52B5F899E007EBCEB /* YHSpouseFormVC.swift */; };
+		041B52D62B5F899E007EBCEB /* YHSpouseInitialInfoVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 041B52D52B5F899E007EBCEB /* YHSpouseInitialInfoVC.swift */; };
 		041B52D92B5F8B07007EBCEB /* YHConsortInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 041B52D82B5F8B07007EBCEB /* YHConsortInfo.swift */; };
 		041B52DB2B5FDF8E007EBCEB /* YHFamilyInitialInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 041B52DA2B5FDF8E007EBCEB /* YHFamilyInitialInfo.swift */; };
 		041B52DD2B60A889007EBCEB /* YHTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 041B52DC2B60A889007EBCEB /* YHTest.swift */; };
 		042FBBB92B627C0F00F9DE23 /* YHCertificateInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 042FBBB82B627C0E00F9DE23 /* YHCertificateInfo.swift */; };
 		042FBBBB2B62806D00F9DE23 /* YHCertificateViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 042FBBBA2B62806D00F9DE23 /* YHCertificateViewController.swift */; };
 		042FBBBD2B63519C00F9DE23 /* YHFormItemSelectSheetCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 042FBBBC2B63519C00F9DE23 /* YHFormItemSelectSheetCell.swift */; };
+		042FBBBF2B639F0300F9DE23 /* YHSpouseBasicInfoVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 042FBBBE2B639F0300F9DE23 /* YHSpouseBasicInfoVC.swift */; };
+		042FBBC12B63B21700F9DE23 /* YHFormItemDegreeInfoCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 042FBBC02B63B21700F9DE23 /* YHFormItemDegreeInfoCell.swift */; };
+		042FBBC32B63DA4C00F9DE23 /* YHParentViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 042FBBC22B63DA4C00F9DE23 /* YHParentViewController.swift */; };
 		0468D4202B49320900CFB916 /* YHVerificationCodeLoginController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0468D41F2B49320900CFB916 /* YHVerificationCodeLoginController.swift */; };
 		0468D4222B493A5E00CFB916 /* YHPhoneMessageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0468D4212B493A5E00CFB916 /* YHPhoneMessageView.swift */; };
 		0468D4242B494BEA00CFB916 /* YHCodeResultViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0468D4232B494BEA00CFB916 /* YHCodeResultViewController.swift */; };
@@ -174,13 +177,16 @@
 		041B52922B5E6CBA007EBCEB /* YHFormItemTitleCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFormItemTitleCell.swift; sourceTree = "<group>"; };
 		041B52942B5E7037007EBCEB /* YHFormItemAddCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFormItemAddCell.swift; sourceTree = "<group>"; };
 		041B52972B5E8EA0007EBCEB /* YHFamilyMemberFormVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFamilyMemberFormVC.swift; sourceTree = "<group>"; };
-		041B52D52B5F899E007EBCEB /* YHSpouseFormVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHSpouseFormVC.swift; sourceTree = "<group>"; };
+		041B52D52B5F899E007EBCEB /* YHSpouseInitialInfoVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHSpouseInitialInfoVC.swift; sourceTree = "<group>"; };
 		041B52D82B5F8B07007EBCEB /* YHConsortInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHConsortInfo.swift; sourceTree = "<group>"; };
 		041B52DA2B5FDF8E007EBCEB /* YHFamilyInitialInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFamilyInitialInfo.swift; sourceTree = "<group>"; };
 		041B52DC2B60A889007EBCEB /* YHTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHTest.swift; sourceTree = "<group>"; };
 		042FBBB82B627C0E00F9DE23 /* YHCertificateInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateInfo.swift; sourceTree = "<group>"; };
 		042FBBBA2B62806D00F9DE23 /* YHCertificateViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateViewController.swift; sourceTree = "<group>"; };
 		042FBBBC2B63519C00F9DE23 /* YHFormItemSelectSheetCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFormItemSelectSheetCell.swift; sourceTree = "<group>"; };
+		042FBBBE2B639F0300F9DE23 /* YHSpouseBasicInfoVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHSpouseBasicInfoVC.swift; sourceTree = "<group>"; };
+		042FBBC02B63B21700F9DE23 /* YHFormItemDegreeInfoCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFormItemDegreeInfoCell.swift; sourceTree = "<group>"; };
+		042FBBC22B63DA4C00F9DE23 /* YHParentViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHParentViewController.swift; sourceTree = "<group>"; };
 		0468D41F2B49320900CFB916 /* YHVerificationCodeLoginController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHVerificationCodeLoginController.swift; sourceTree = "<group>"; };
 		0468D4212B493A5E00CFB916 /* YHPhoneMessageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPhoneMessageView.swift; sourceTree = "<group>"; };
 		0468D4232B494BEA00CFB916 /* YHCodeResultViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCodeResultViewController.swift; sourceTree = "<group>"; };
@@ -350,13 +356,14 @@
 		041B52892B5E14EB007EBCEB /* View */ = {
 			isa = PBXGroup;
 			children = (
+				041B52922B5E6CBA007EBCEB /* YHFormItemTitleCell.swift */,
+				041B52942B5E7037007EBCEB /* YHFormItemAddCell.swift */,
 				041B528A2B5E15F1007EBCEB /* YHFormItemQuestionCell.swift */,
 				041B528C2B5E58FA007EBCEB /* YHFormItemDoubleChoiceCell.swift */,
 				041B528E2B5E620E007EBCEB /* YHFormItemInputTextCell.swift */,
 				041B52902B5E67F3007EBCEB /* YHFormItemEnterDetailCell.swift */,
 				042FBBBC2B63519C00F9DE23 /* YHFormItemSelectSheetCell.swift */,
-				041B52922B5E6CBA007EBCEB /* YHFormItemTitleCell.swift */,
-				041B52942B5E7037007EBCEB /* YHFormItemAddCell.swift */,
+				042FBBC02B63B21700F9DE23 /* YHFormItemDegreeInfoCell.swift */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -365,8 +372,10 @@
 			isa = PBXGroup;
 			children = (
 				041B52972B5E8EA0007EBCEB /* YHFamilyMemberFormVC.swift */,
-				041B52D52B5F899E007EBCEB /* YHSpouseFormVC.swift */,
+				041B52D52B5F899E007EBCEB /* YHSpouseInitialInfoVC.swift */,
 				042FBBBA2B62806D00F9DE23 /* YHCertificateViewController.swift */,
+				042FBBBE2B639F0300F9DE23 /* YHSpouseBasicInfoVC.swift */,
+				042FBBC22B63DA4C00F9DE23 /* YHParentViewController.swift */,
 			);
 			path = C;
 			sourceTree = "<group>";
@@ -1085,6 +1094,7 @@
 				A5ACE9452B4564F7002C94D2 /* BsHUDContainerView.swift in Sources */,
 				A5ACE93A2B4564F7002C94D2 /* NSAttributedString+Extension.swift in Sources */,
 				04AF58C42B4FC51C0066011A /* YHLocalizable.swift in Sources */,
+				042FBBBF2B639F0300F9DE23 /* YHSpouseBasicInfoVC.swift in Sources */,
 				A5C5B2E82B4EC95600A7C5D1 /* YHDavidTestCollectionViewCell.swift in Sources */,
 				041B52DB2B5FDF8E007EBCEB /* YHFamilyInitialInfo.swift in Sources */,
 				0468D4222B493A5E00CFB916 /* YHPhoneMessageView.swift in Sources */,
@@ -1128,6 +1138,7 @@
 				A5C5B3102B57677300A7C5D1 /* YHGestureTableView.swift in Sources */,
 				A5ACE9312B4564F7002C94D2 /* YHPersonalCenterCell.swift in Sources */,
 				A5ACE9532B4564F7002C94D2 /* YHBaseViewController.swift in Sources */,
+				042FBBC32B63DA4C00F9DE23 /* YHParentViewController.swift in Sources */,
 				A5ACE9392B4564F7002C94D2 /* UIDevice+Extension.swift in Sources */,
 				041B52912B5E67F3007EBCEB /* YHFormItemEnterDetailCell.swift in Sources */,
 				A5ACE9422B4564F7002C94D2 /* AppDelegate+Extension.swift in Sources */,
@@ -1135,7 +1146,7 @@
 				A510441A2B495DD0006B60BB /* UIView+Extension.swift in Sources */,
 				A5ACE93E2B4564F7002C94D2 /* UIImage+Extension.swift in Sources */,
 				A5ACE94C2B4564F7002C94D2 /* BsHUDErrorView.swift in Sources */,
-				041B52D62B5F899E007EBCEB /* YHSpouseFormVC.swift in Sources */,
+				041B52D62B5F899E007EBCEB /* YHSpouseInitialInfoVC.swift in Sources */,
 				A5D6AB1B2B46A1CC001C10A5 /* YHHomeModel.swift in Sources */,
 				A5D6AB1D2B46AAFB001C10A5 /* YHHomePageViewModel.swift in Sources */,
 				A5ACE9552B4564F7002C94D2 /* YHTabBarViewController.swift in Sources */,
@@ -1148,6 +1159,7 @@
 				A5ACE9482B4564F7002C94D2 /* BsHUDWariningView.swift in Sources */,
 				A5C5B3252B57C74900A7C5D1 /* YHDavidCell3.swift in Sources */,
 				A5C382CC2B5EA11800C5E65C /* YHContractCell.swift in Sources */,
+				042FBBC12B63B21700F9DE23 /* YHFormItemDegreeInfoCell.swift in Sources */,
 				A5ACE9492B4564F7002C94D2 /* BsHUDSuccessView.swift in Sources */,
 				A5ACE9432B4564F7002C94D2 /* UILable+Extension.swift in Sources */,
 				A5ACE9382B4564F7002C94D2 /* UIApplication+Extension.swift in Sources */,

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

@@ -179,6 +179,8 @@ extension YHCertificateViewController : UITableViewDelegate, UITableViewDataSour
     
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         
+        let vc = YHSpouseBasicInfoVC()
+        self.navigationController?.pushViewController(vc)
     }
         
     func createCorner(cell:UITableViewCell, arr:Array<Any>, indexPath:IndexPath) {

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

@@ -44,7 +44,11 @@ class YHFamilyMemberFormVC: YHBaseViewController {
     }()
     
     lazy var submitBtn:UIButton = {
-        let btn = UIButton.bs_button(title: "提交".local, font: UIFont.PFSCR(ofSize: 14), normalColor: .white)
+        
+        let btn = UIButton()
+        btn.setTitle("提交".local, for: .normal)
+        btn.titleLabel?.font = UIFont.PFSCR(ofSize: 14)
+        btn.setTitleColor(.white, for: .normal)
         btn.backgroundColor = UIColor(hexString:"#4388FF")
         btn.layer.cornerRadius = 8.0
         btn.addTarget(self, action: #selector(didClickSubmitBtn), for: .touchUpInside)
@@ -625,7 +629,7 @@ extension YHFamilyMemberFormVC : UITableViewDelegate, UITableViewDataSource {
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         
         if let spouse = familyMemberInfo?.spouse {
-            let vc = YHSpouseFormVC()
+            let vc = YHSpouseInitialInfoVC()
             vc.spouse = spouse
             self.navigationController?.pushViewController(vc)
         }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/C/YHSpouseFormVC.swift → galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/C/YHSpouseInitialInfoVC.swift

@@ -8,7 +8,7 @@
 
 import UIKit
 
-class YHSpouseFormVC: YHBaseViewController {
+class YHSpouseInitialInfoVC: YHBaseViewController {
     
     var spouse:YHSpouse?
     
@@ -36,7 +36,10 @@ class YHSpouseFormVC: YHBaseViewController {
     }()
     
     lazy var submitBtn:UIButton = {
-        let btn = UIButton.bs_button(title: "提交".local, font: UIFont.PFSCR(ofSize: 14), normalColor: .white)
+        let btn = UIButton()
+        btn.setTitle("提交".local, for: .normal)
+        btn.titleLabel?.font = UIFont.PFSCR(ofSize: 14)
+        btn.setTitleColor(.white, for: .normal)
         btn.backgroundColor = UIColor(hexString:"#4388FF")
         btn.layer.cornerRadius = 8.0
         btn.addTarget(self, action: #selector(didClickSubmitBtn), for: .touchUpInside)
@@ -44,7 +47,10 @@ class YHSpouseFormVC: YHBaseViewController {
     }()
     
     lazy var saveBtn:UIButton = {
-        let btn = UIButton.bs_button(title: "保存".local, font: UIFont.PFSCR(ofSize: 14), normalColor: UIColor(hexString:"#222222"))
+        let btn = UIButton()
+        btn.setTitle("保存", for: .normal)
+        btn.titleLabel?.font = UIFont.PFSCR(ofSize: 14)
+        btn.setTitleColor(UIColor(hexString:"#222222"), for: .normal)
         btn.backgroundColor = UIColor(hexString:"#F8F9FB")
         btn.layer.cornerRadius = 8.0
         btn.addTarget(self, action: #selector(didClickSaveBtn), for: .touchUpInside)
@@ -89,6 +95,7 @@ class YHSpouseFormVC: YHBaseViewController {
             // 居住信息
             let title2 = YHFormTitleItem(type: .liveInfo)
             let item20 = YHFormDetailItem(type: .isLiveTother)
+            item20.isLiveTogether = (spouse.finishFollow == 1)
             let item21 = YHFormDetailItem(type: .liveContry)
             let item22 = YHFormDetailItem(type: .liveCity)
             let item23 = YHFormDetailItem(type: .detailAddress)
@@ -97,9 +104,8 @@ class YHSpouseFormVC: YHBaseViewController {
             // 港澳通信证
             let title3 = YHFormTitleItem(type: .getHKPassport)
             let item30 = YHFormDetailItem(type: .hkPassport)
-            item30.isHandleHkPassport = true
+            item30.isHandleHkPassport = (spouse.isHandled == 1)
             let arr3:[YHFormItemProtocol] = [title3, item30]
-
             items.append(contentsOf:[arr1, arr2, arr3])
 
         }
@@ -151,7 +157,7 @@ class YHSpouseFormVC: YHBaseViewController {
 }
 
 
-extension YHSpouseFormVC : UITableViewDelegate, UITableViewDataSource {
+extension YHSpouseInitialInfoVC : UITableViewDelegate, UITableViewDataSource {
     
     func numberOfSections(in tableView: UITableView) -> Int {
         return items.count
@@ -224,6 +230,8 @@ extension YHSpouseFormVC : UITableViewDelegate, UITableViewDataSource {
                         
                     } else if detailItem.type == .isLiveTother { // 是否与主申请人同住
                         let isLiveTother = (selectItem.title == "是".local ? 1 : 0)
+                        self?.spouse?.finishFollow = (selectItem.title == "是".local ? 1 : 0)
+                        self?.loadSponseInfo()
                     }
                 }
                 return cell

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/M/YHFamilyInitialInfo.swift

@@ -32,6 +32,23 @@ enum YHFormTitleItemType:Int {
     case chinaIdCardInfo = 9
     // 护照
     case passPortInfo = 10
+    
+    // 配偶信息
+    case spouseInfo = 11
+    // 职业信息
+    case occupationInfo = 12
+    // 学历学位信息
+    case degreeInfo = 13
+    // 在港信息
+    case inHongKongInfo = 14
+    // 香港身份证
+    case hkIdentityCardInfo = 15
+    
+    // 父亲信息
+    case fatherInfo = 16
+    // 父亲信息
+    case motherInfo = 17
+    
 }
 
 // 表单添加条目类型
@@ -39,6 +56,7 @@ enum YHFormAddItemType:Int {
     
     case addChild = 1
     case addBrother = 2
+    case addDegree = 3
 }
 
 // 表单具体条目类型
@@ -63,6 +81,46 @@ enum YHFormDetailItemType:Int {
     // 签发地
     case certificateSignPlace = 12
     
+    // 配偶姓名
+    case spouseName = 13
+    // 曾用名
+    case everName = 14
+    // 婚前姓氏
+    case befourMarryFirstName = 15
+    // 出生日期
+    case birthday = 16
+    // 出生国家/地区
+    case birthNation = 17
+    // 出生城市
+    case birthCity = 18
+    // 职业
+    case occupation = 19
+    // 职业名称
+    case occupationName = 20
+    // 是否拥有学位
+    case ownDegree = 21
+    // 目前是否在港
+    case isNowInHK = 22
+    // 获准逗留至
+    case stayHKDate = 23
+    // 在港身份
+    case roleInHK = 24
+    // 是否办理过(香港身份证)
+    case isHaveHkIdentityCard = 25
+    // 香港身份证号码
+    case hkIdentityCardNumber = 26
+    // 学位信息X
+    case degreeDetailInfo = 27
+    
+    // 父亲姓名
+    case fatherName = 28
+    // 母亲姓名
+    case motherName = 29
+    // 婚姻状况
+    case marriageState = 30
+    // 现居住国家/地区
+    case liveNation = 31
+
 }
 
 //添加item
@@ -80,6 +138,8 @@ class YHFormAddItem : YHFormItemProtocol
             return "新增子女".local
         case .addBrother:
             return "新增兄弟姐妹".local
+        case .addDegree:
+            return "增加学位信息".local
         }
     }
     
@@ -120,6 +180,20 @@ class YHFormTitleItem : YHFormItemProtocol {
                 return "中国身份证".local
             case .passPortInfo:
                 return String(format: "%@(%@)", "护照及其他旅行证件".local, "选填".local)
+            case .spouseInfo:
+                return "配偶信息".local
+            case .occupationInfo:
+                return "职业信息".local
+            case .degreeInfo:
+                return "学历学位信息".local
+            case .inHongKongInfo:
+                return "在港信息".local
+            case .hkIdentityCardInfo:
+                return "香港身份证".local
+            case .fatherInfo:
+                return "父亲信息".local
+            case .motherInfo:
+                return "母亲信息".local
             
         }
     }
@@ -146,6 +220,20 @@ class YHFormTitleItem : YHFormItemProtocol {
                 return "".local
             case .passPortInfo:
                 return "".local
+            case .spouseInfo:
+                return "".local
+            case .occupationInfo:
+                return "".local
+            case .degreeInfo:
+                return "".local
+            case .inHongKongInfo:
+                return "".local
+            case .hkIdentityCardInfo:
+                return "".local
+            case .fatherInfo:
+                return "".local
+            case .motherInfo:
+                return "".local
             
             
         }
@@ -213,6 +301,58 @@ class YHFormDetailItem : YHFormItemProtocol {
                 return "届满日期".local
             case .certificateSignPlace:
                 return "签发地".local
+            // 配偶姓名
+            case .spouseName:
+                return "配偶姓名".local
+                // 曾用名
+            case .everName:
+                return "曾用名".local
+                // 婚前姓氏
+            case .befourMarryFirstName:
+                return "婚前姓氏".local
+                // 出生日期
+            case .birthday:
+                return "出生日期".local
+                // 出生国家/地区
+            case .birthNation:
+                return "出生国家/地区".local
+                // 出生城市
+            case .birthCity:
+                return "出生城市".local
+                // 职业
+            case .occupation:
+                return "职业".local
+                // 职业名称
+            case .occupationName:
+                return "职业名称".local
+                // 是否拥有学位
+            case .ownDegree:
+                return "是否拥有学位".local
+                // 目前是否在港
+            case .isNowInHK:
+                return "目前是否在港".local
+                // 获准逗留至
+            case .stayHKDate:
+                return "获准逗留至".local
+                // 在港身份
+            case .roleInHK:
+                return "在港身份".local
+                // 是否办理过(香港身份证)
+            case .isHaveHkIdentityCard:
+                return "是否办理过".local
+                // 香港身份证号码
+            case .hkIdentityCardNumber:
+                return "香港身份证号码".local
+            case .degreeDetailInfo:
+                return "学位信息X".local
+            case .fatherName:
+                return "父亲姓名".local
+            case .motherName:
+                return "母亲姓名".local
+            case .marriageState:
+                return "婚姻状况".local
+            case .liveNation:
+                return "现居住国家/地区".local
         }
     }
     

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/View/YHFormItemAddCell.swift

@@ -18,8 +18,17 @@ class YHFormItemAddCell: UITableViewCell {
     
     var clickBlock:(()->Void)?
     
+    var title:String? {
+        didSet {
+            addBtn.setTitle(title, for: .normal)
+        }
+    }
+    
     lazy var addBtn: UIButton = {
-        let btn = UIButton.bs_button(title: "新增信息", font: UIFont.PFSCR(ofSize: 14), normalColor: btnTitleColor)
+        let btn = UIButton()
+        btn.setTitle("新增信息".local, for: .normal)
+        btn.titleLabel?.font = UIFont.PFSCR(ofSize: 14)
+        btn.setTitleColor(btnTitleColor, for: .normal) 
         btn.iconInLeft(spacing: 10)
         btn.setImage(UIImage(named: "form_add_info"), for: .normal)
         btn.addTarget(self, action: #selector(didClickAddBtn), for: .touchUpInside)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/View/YHFormItemDegreeInfoCell.swift

+//
+//  YHFormItemDegreeInfoCell.swift
+//  galaxy
+//
+//  Created by edy on 2024/1/26.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHFormItemDegreeInfoCell: UITableViewCell {
+
+    static let cellReuseIdentifier = "YHFormItemDegreeInfoCell"
+
+    var deleteBlock: (()->Void)?
+    var title:String? {
+        didSet {
+            
+            if let title = title {
+                let str = "*"+title
+                let attributes: [NSAttributedString.Key: Any] = [
+                    .font: UIFont.PFSCR(ofSize: 14),
+                    .foregroundColor: UIColor(hex:0x222222)
+                ]
+                let questionAttrStr = NSMutableAttributedString(string: str, attributes: attributes)
+                let starRange = NSRange(location: 0, length: 1)
+                questionAttrStr.addAttribute(NSAttributedString.Key.foregroundColor, value: UIColor(hex:0xFF3A3A), range: starRange)
+                
+                titleLabel.attributedText = questionAttrStr
+            }
+        }
+    }
+    
+    lazy var titleLabel: UILabel = {
+        let label = UILabel()
+        label.textColor = UIColor(hexString:"#333333")
+        label.textAlignment = .left
+        label.numberOfLines = 0
+        label.font = UIFont.PFSCR(ofSize: 16)
+        return label
+    }()
+    
+    lazy var deleteButton: UIButton = {
+        
+        let btn = UIButton()
+        btn.setTitle("删除", for: .normal)
+        btn.titleLabel?.font = UIFont.PFSCR(ofSize: 14)
+        btn.setTitleColor(UIColor(hex: 0xF81D22), for: .normal)
+        btn.addTarget(self, action: #selector(didClickDeleteBtn(btn:)), for: .touchUpInside)
+//        btn.isHidden = true
+        return btn
+    }()
+    
+    lazy var degreeView:HKDegreeInfoItemView = {
+        let view = HKDegreeInfoItemView(frame: .zero)
+        return view
+    }()
+    
+    lazy var areaView:HKDegreeInfoItemView = {
+        let view = HKDegreeInfoItemView(frame: .zero)
+        return view
+    }()
+    
+    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)
+        contentView.addSubview(deleteButton)
+        contentView.addSubview(degreeView)
+        contentView.addSubview(areaView)
+        
+        titleLabel.text = "学位信息"
+        
+        titleLabel.snp.makeConstraints { make in
+            make.height.equalTo(52)
+            make.top.equalToSuperview()
+            make.left.equalToSuperview().offset(16)
+            make.right.equalTo(deleteButton.snp.left)
+        }
+        
+        deleteButton.snp.makeConstraints { make in
+            make.size.equalTo(CGSize(width: 64, height: 52))
+            make.centerY.equalTo(titleLabel)
+            make.right.equalToSuperview()
+        }
+        
+        degreeView.snp.makeConstraints { make in
+            make.left.right.equalToSuperview()
+            make.top.equalTo(titleLabel.snp.bottom)
+            make.height.equalTo(52)
+        }
+        
+        areaView.snp.makeConstraints { make in
+            make.left.right.equalToSuperview()
+            make.top.equalTo(degreeView.snp.bottom)
+            make.height.equalTo(52)
+            make.bottom.equalToSuperview()
+        }
+    }
+    
+    @objc func didClickDeleteBtn(btn:UIButton) {
+        
+        if let deleteBlock = deleteBlock {
+            deleteBlock()
+        }
+    }
+}
+
+class HKDegreeInfoItemView: UIView {
+    
+    lazy var titleLabel: UILabel = {
+        let label = UILabel()
+        label.textColor = UIColor(hexString:"#333333")
+        label.textAlignment = .left
+        label.numberOfLines = 0
+        label.font = UIFont.PFSCR(ofSize: 14)
+        return label
+    }()
+    
+    lazy var detailLabel: UILabel = {
+        let label = UILabel()
+        label.textColor = UIColor(hexString: "#222222")
+        label.textAlignment = .left
+        label.font = UIFont.PFSCR(ofSize: 14)
+        label.isHidden = true
+        return label
+    }()
+    
+    private lazy var tipsLabel: UILabel = {
+        let label = UILabel()
+        label.textColor = UIColor(hexString: "#C0C0C0")
+        label.text = "请选择".local
+        label.textAlignment = .left
+        label.font = UIFont.PFSCR(ofSize: 14)
+        label.isHidden = false
+        return label
+    }()
+    
+    lazy var arrowImgView: UIImageView = {
+        let imgView = UIImageView(image: UIImage(named: "form_right_arrow"))
+        return imgView
+    }()
+    
+    lazy var topLineView:UIView = {
+        let view = UIView()
+        view.backgroundColor = UIColor(hex: 0xF0F0F0)
+        return view
+    }()
+    
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        createUI()
+    }
+    
+    required init?(coder: NSCoder) {
+        super.init(coder: coder)
+    }
+    
+    func createUI() {
+        
+        self.addSubview(titleLabel)
+        self.addSubview(detailLabel)
+        self.addSubview(tipsLabel)
+        self.addSubview(arrowImgView)
+        self.addSubview(topLineView)
+        
+        titleLabel.text = "XXXXXX"
+        detailLabel.text = "xxxxxxxx"
+        
+        topLineView.snp.makeConstraints { make in
+            make.left.equalToSuperview().offset(16)
+            make.right.equalToSuperview().offset(-16)
+            make.top.equalToSuperview()
+            make.height.equalTo(1.0)
+        }
+        
+        titleLabel.snp.makeConstraints { make in
+            make.left.equalToSuperview().offset(16)
+            make.right.equalTo(detailLabel.snp.left).offset(-8)
+            make.width.equalTo(120)
+            make.centerY.equalToSuperview()
+        }
+        
+        detailLabel.snp.makeConstraints { make in
+            make.right.equalTo(arrowImgView.snp.left)
+            make.centerY.equalToSuperview()
+        }
+        
+        tipsLabel.snp.makeConstraints { make in
+            make.edges.equalTo(detailLabel)
+        }
+        arrowImgView.snp.makeConstraints { make in
+            make.size.equalTo(CGSizeMake(20, 20))
+            make.right.equalToSuperview().offset(-16)
+            make.centerY.equalToSuperview()
+        }
+    }
+}
+

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/View/YHFormItemDoubleChoiceCell.swift

@@ -80,8 +80,6 @@ class YHFormItemDoubleChoiceCell: UITableViewCell {
         btn.backgroundColor = (isSelect ? btnBgSelectColor : btnBgDefaultColor)
     }
     
-    
-    
     lazy var titleLabel: UILabel = {
         let label = UILabel()
         label.textColor = UIColor(hexString:"#333333")
@@ -92,7 +90,11 @@ class YHFormItemDoubleChoiceCell: UITableViewCell {
     }()
     
     lazy var answer1Btn: UIButton = {
-        let btn = UIButton.bs_button(title: "", font: UIFont.PFSCR(ofSize: 14), normalColor: btnTitleDefaultColor)
+        
+        let btn = UIButton()
+        btn.setTitle("", for: .normal)
+        btn.titleLabel?.font = UIFont.PFSCR(ofSize: 14)
+        btn.setTitleColor(btnTitleDefaultColor, for: .normal)
         btn.backgroundColor = btnBgDefaultColor
         btn.layer.cornerRadius = btnHeight/2.0
         btn.layer.masksToBounds = true
@@ -104,7 +106,10 @@ class YHFormItemDoubleChoiceCell: UITableViewCell {
     }()
     
     lazy var answer2Btn: UIButton = {
-        let btn = UIButton.bs_button(title: "", font: UIFont.PFSCR(ofSize: 14), normalColor: btnTitleDefaultColor)
+        let btn = UIButton()
+        btn.setTitle("", for: .normal)
+        btn.titleLabel?.font = UIFont.PFSCR(ofSize: 14)
+        btn.setTitleColor(btnTitleDefaultColor, for: .normal)
         btn.backgroundColor = btnBgDefaultColor
         btn.layer.cornerRadius = btnHeight/2.0
         btn.layer.masksToBounds = true

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/View/YHFormItemEnterDetailCell.swift

@@ -68,7 +68,11 @@ class YHFormItemEnterDetailCell: UITableViewCell {
     }()
     
     lazy var deleteButton: UIButton = {
-        let btn = UIButton.bs_button(title: "删除".local, font: UIFont.PFSCR(ofSize: 14), normalColor: UIColor(hex: 0xF81D22))
+        
+        let btn = UIButton()
+        btn.setTitle("删除".local, for: .normal)
+        btn.titleLabel?.font = UIFont.PFSCR(ofSize: 14)
+        btn.setTitleColor(UIColor(hex: 0xF81D22), for: .normal)
         btn.addTarget(self, action: #selector(didClickDeleteBtn(btn:)), for: .touchUpInside)
         btn.isHidden = true
         return btn

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/View/YHFormItemQuestionCell.swift

@@ -57,7 +57,11 @@ class YHFormItemQuestionCell: UITableViewCell {
     }()
     
     lazy var confirmBtn: UIButton = {
-        let btn = UIButton.bs_button(title: "是".local, font: UIFont.PFSCR(ofSize: 14), normalColor: btnTitleDefaultColor)
+        
+        let btn = UIButton()
+        btn.setTitle("是".local, for: .normal)
+        btn.titleLabel?.font = UIFont.PFSCR(ofSize: 14)
+        btn.setTitleColor(btnTitleDefaultColor, for: .normal)
         btn.backgroundColor = btnBgColor
         btn.layer.cornerRadius = btnHeight/2.0
         btn.layer.masksToBounds = true
@@ -68,7 +72,10 @@ class YHFormItemQuestionCell: UITableViewCell {
     }()
     
     lazy var negativeBtn: UIButton = {
-        let btn = UIButton.bs_button(title: "否".local, font: UIFont.PFSCR(ofSize: 14), normalColor: btnTitleDefaultColor)
+        let btn = UIButton()
+        btn.setTitle("否".local, for: .normal)
+        btn.titleLabel?.font = UIFont.PFSCR(ofSize: 14)
+        btn.setTitleColor(btnTitleDefaultColor, for: .normal)
         btn.backgroundColor = btnBgColor
         btn.layer.cornerRadius = btnHeight/2.0
         btn.layer.masksToBounds = true

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/View/YHFormItemTitleCell.swift

@@ -36,7 +36,11 @@ class YHFormItemTitleCell: UITableViewCell {
     }()
     
     lazy var cancelButton: UIButton = {
-        let btn = UIButton.bs_button(title: "取消操作".local, font: UIFont.PFSCR(ofSize: 14), normalColor: UIColor(hex: 0x4487F9))
+        
+        let btn = UIButton()
+        btn.setTitle("取消操作".local, for: .normal)
+        btn.titleLabel?.font = UIFont.PFSCR(ofSize: 14)
+        btn.setTitleColor(UIColor(hex: 0x4487F9), for: .normal)
         btn.tag = cancelTag
         btn.addTarget(self, action: #selector(didClickOperatorBtn(btn:)), for: .touchUpInside)
         btn.isHidden = true