Merge commit '9fd764fd' into davidhuang

* commit '9fd764fd':
  // 兄弟姐妹信息填写
  // 选择器

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -29,6 +29,7 @@
 		042FBBC92B64DC8900F9DE23 /* YHFormItemExpireDateCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 042FBBC82B64DC8900F9DE23 /* YHFormItemExpireDateCell.swift */; };
 		042FBBCB2B65058000F9DE23 /* YHChildBasicInfoVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 042FBBCA2B65058000F9DE23 /* YHChildBasicInfoVC.swift */; };
 		042FBBD42B67A2FE00F9DE23 /* YHFormPickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 042FBBD32B67A2F900F9DE23 /* YHFormPickerView.swift */; };
+		042FBBD62B67BDD500F9DE23 /* YHBrotherInfoVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 042FBBD52B67BDD500F9DE23 /* YHBrotherInfoVC.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 */; };
@@ -213,6 +214,7 @@
 		042FBBC82B64DC8900F9DE23 /* YHFormItemExpireDateCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFormItemExpireDateCell.swift; sourceTree = "<group>"; };
 		042FBBCA2B65058000F9DE23 /* YHChildBasicInfoVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHChildBasicInfoVC.swift; sourceTree = "<group>"; };
 		042FBBD32B67A2F900F9DE23 /* YHFormPickerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHFormPickerView.swift; sourceTree = "<group>"; };
+		042FBBD52B67BDD500F9DE23 /* YHBrotherInfoVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHBrotherInfoVC.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>"; };
@@ -425,6 +427,7 @@
 				042FBBC22B63DA4C00F9DE23 /* YHParentInfoVC.swift */,
 				042FBBC62B64CFBF00F9DE23 /* YHChildInitialInfoVC.swift */,
 				042FBBCA2B65058000F9DE23 /* YHChildBasicInfoVC.swift */,
+				042FBBD52B67BDD500F9DE23 /* YHBrotherInfoVC.swift */,
 			);
 			path = C;
 			sourceTree = "<group>";
@@ -1244,6 +1247,7 @@
 				042FBBB92B627C0F00F9DE23 /* YHCertificateInfo.swift in Sources */,
 				A5ACE93F2B4564F7002C94D2 /* UIViewController+Extension.swift in Sources */,
 				A5FD63E12B66592300D1D9DA /* YHScoreItemCellForAge.swift in Sources */,
+				042FBBD62B67BDD500F9DE23 /* YHBrotherInfoVC.swift in Sources */,
 				A5ACE9472B4564F7002C94D2 /* YHHUD.swift in Sources */,
 				A5ACE9412B4564F7002C94D2 /* Dictionary+Extension.swift in Sources */,
 				A5C5B3102B57677300A7C5D1 /* YHGestureTableView.swift in Sources */,

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

@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import IQKeyboardManagerSwift
 
 enum YHFormTitleItemEditType:Int {
     case none = 1
@@ -628,11 +629,11 @@ extension YHFamilyMemberFormVC : UITableViewDelegate, UITableViewDataSource {
     
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         
-        let picker = YHFormPickerView(type: .marriage)
-        picker.selectTitle = "女"
-        picker.selectType = .marriage(.separated)
-        picker.show()
-        return
+        IQKeyboardManager.shared.enable = true
+                
+        let caseList = YHFormTitleItemType.allCases.map({ "\($0)" }).joined(separator: ", ")
+        print(caseList)
+        
         
         let arr = items[indexPath.section]
         let item:YHFormItemProtocol = arr[indexPath.row]
@@ -677,6 +678,15 @@ extension YHFamilyMemberFormVC : UITableViewDelegate, UITableViewDataSource {
             self.navigationController?.pushViewController(vc)
             return
         }
+        
+        // 兄弟姐妹
+        if item is YHBrother {
+            let brother = item as! YHBrother
+            let vc = YHBrotherInfoVC()
+            vc.brotherInfo = brother
+            self.navigationController?.pushViewController(vc)
+            return
+        }
     }
         
     func createCorner(cell:UITableViewCell, arr:Array<Any>, indexPath:IndexPath) {

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

@@ -493,7 +493,7 @@ extension YHFormPickerView: UIPickerViewDelegate, UIPickerViewDataSource {
             }
         }
         // 选中背景色
-        if #available(iOS 14.0, *), self.subviews.count > 1 {
+        if #available(iOS 14.0, *), pickerView.subviews.count > 1 {
            pickerView.subviews[1].backgroundColor = UIColor(hex: 0x4487F9, alpha: 0.06)
         }
         return label