1、添加 收入证明

2、家庭 成员信息

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/PersonInfoList(个人信息预览)/C/YHPreviewControllerHoldViewController.swift

@@ -25,7 +25,7 @@ class YHPreviewControllerHoldViewController: UIViewController {
         }
     }
     
-    let arrItemTitles = ["主申请人信息","家庭成员信息","基本资料","学历/专业资格","工作经验","其他信息"]
+    let arrItemTitles = ["主申请人信息","家庭成员信息","基本资料","学历/专业资格","工作经验","收入证明","其他信息"]
     var arrItemVCs : [YHPreviewBaseViewController] = []
     var segmentedView : JXSegmentedView = JXSegmentedView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: 55))
     lazy var segmentedDataSource: JXSegmentedBaseDataSource = {
@@ -78,6 +78,13 @@ class YHPreviewControllerHoldViewController: UIViewController {
             let vc = YHPreviewWorkExpViewController()
             arrItemVCs.append(vc)
         }
+        
+        do {
+            //收入证明 //for test hjl
+            let vc = YHPreviewOtherInformationViewController()
+            arrItemVCs.append(vc)
+        }
+        
         do {
             //其他信息
             let vc = YHPreviewOtherInformationViewController()

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/PersonInfoList(个人信息预览)/C/YHPreviewFamilyMemberViewController.swift

@@ -29,10 +29,10 @@ class YHPreviewFamilyMemberViewController: YHPreviewBaseViewController {
         return view
     }()
     
-    private var parentButton : UIButton!
+//    private var parentButton : UIButton!
     private var spouseButton : UIButton!
     private var childrenButton : UIButton!
-    private var brotherButton : UIButton!
+//    private var brotherButton : UIButton!
     
     private var arrButtons : [UIButton] = []
 }
@@ -72,36 +72,36 @@ private extension YHPreviewFamilyMemberViewController {
         }
         
         
-        parentButton = createButton()
-        parentButton.setTitle("父母", for: .normal)
-        buttonHoldView.addSubview(parentButton)
-        parentButton.snp.makeConstraints { make in
-            make.centerY.equalToSuperview()
-            make.left.equalTo(childrenButton.snp.right).offset(12)
-            make.height.equalTo(32)
-            make.width.equalTo(68)
-           
-        }
-        
-        
-       
+//        parentButton = createButton()
+//        parentButton.setTitle("父母", for: .normal)
+//        buttonHoldView.addSubview(parentButton)
+//        parentButton.snp.makeConstraints { make in
+//            make.centerY.equalToSuperview()
+//            make.left.equalTo(childrenButton.snp.right).offset(12)
+//            make.height.equalTo(32)
+//            make.width.equalTo(68)
+//           
+//        }
+//        
+//        
+//       
+//        
+//        
+//        brotherButton = createButton()
+//        brotherButton.setTitle("兄弟姐妹", for: .normal)
+//        buttonHoldView.addSubview(brotherButton)
+//        brotherButton.snp.makeConstraints { make in
+//            make.centerY.equalToSuperview()
+//            make.left.equalTo(parentButton.snp.right).offset(12)
+//            make.height.equalTo(32)
+//            make.width.equalTo(84)
+//        }
         
         
-        brotherButton = createButton()
-        brotherButton.setTitle("兄弟姐妹", for: .normal)
-        buttonHoldView.addSubview(brotherButton)
-        brotherButton.snp.makeConstraints { make in
-            make.centerY.equalToSuperview()
-            make.left.equalTo(parentButton.snp.right).offset(12)
-            make.height.equalTo(32)
-            make.width.equalTo(84)
-        }
-        
-        
-        arrButtons.append(parentButton)
+//        arrButtons.append(parentButton)
         arrButtons.append(spouseButton)
         arrButtons.append(childrenButton)
-        arrButtons.append(brotherButton)
+//        arrButtons.append(brotherButton)
         
         
         homeTableView.snp.removeConstraints()
@@ -119,8 +119,8 @@ private extension YHPreviewFamilyMemberViewController {
     private func layouButtons() {
         spouseButton.snp.removeConstraints()
         childrenButton.snp.removeConstraints()
-        parentButton.snp.removeConstraints()
-        brotherButton.snp.removeConstraints()
+//        parentButton.snp.removeConstraints()
+//        brotherButton.snp.removeConstraints()
         
         var lastTagView : UIView? = nil
         
@@ -167,55 +167,55 @@ private extension YHPreviewFamilyMemberViewController {
         
         
         
-        //父母
-        if previewVM.arrDataForParents.isEmpty == false {
-            parentButton.isHidden = false
-            if let lastTagView = lastTagView {
-                parentButton.snp.makeConstraints { make in
-                    make.centerY.equalToSuperview()
-                    make.left.equalTo(lastTagView.snp.right).offset(12)
-                    make.height.equalTo(32)
-                    make.width.equalTo(68)
-                }
-            } else {
-                parentButton.snp.makeConstraints { make in
-                    make.centerY.equalToSuperview()
-                    make.left.equalToSuperview()
-                    make.height.equalTo(32)
-                    make.width.equalTo(68)
-                }
-            }
-            
-            lastTagView = parentButton
-        } else {
-            parentButton.isHidden = true
-        }
+//        //父母
+//        if previewVM.arrDataForParents.isEmpty == false {
+//            parentButton.isHidden = false
+//            if let lastTagView = lastTagView {
+//                parentButton.snp.makeConstraints { make in
+//                    make.centerY.equalToSuperview()
+//                    make.left.equalTo(lastTagView.snp.right).offset(12)
+//                    make.height.equalTo(32)
+//                    make.width.equalTo(68)
+//                }
+//            } else {
+//                parentButton.snp.makeConstraints { make in
+//                    make.centerY.equalToSuperview()
+//                    make.left.equalToSuperview()
+//                    make.height.equalTo(32)
+//                    make.width.equalTo(68)
+//                }
+//            }
+//            
+//            lastTagView = parentButton
+//        } else {
+//            parentButton.isHidden = true
+//        }
         
         
         
-        //兄弟姐妹
-        if previewVM.arrDataForBrother.isEmpty == false {
-            brotherButton.isHidden = false
-            if let lastTagView = lastTagView {
-                brotherButton.snp.makeConstraints { make in
-                    make.centerY.equalToSuperview()
-                    make.left.equalTo(lastTagView.snp.right).offset(12)
-                    make.height.equalTo(32)
-                    make.width.equalTo(68)
-                }
-            } else {
-                brotherButton.snp.makeConstraints { make in
-                    make.centerY.equalToSuperview()
-                    make.left.equalToSuperview()
-                    make.height.equalTo(32)
-                    make.width.equalTo(68)
-                }
-            }
-            
-            lastTagView = brotherButton
-        } else {
-            brotherButton.isHidden = true
-        }
+//        //兄弟姐妹
+//        if previewVM.arrDataForBrother.isEmpty == false {
+//            brotherButton.isHidden = false
+//            if let lastTagView = lastTagView {
+//                brotherButton.snp.makeConstraints { make in
+//                    make.centerY.equalToSuperview()
+//                    make.left.equalTo(lastTagView.snp.right).offset(12)
+//                    make.height.equalTo(32)
+//                    make.width.equalTo(68)
+//                }
+//            } else {
+//                brotherButton.snp.makeConstraints { make in
+//                    make.centerY.equalToSuperview()
+//                    make.left.equalToSuperview()
+//                    make.height.equalTo(32)
+//                    make.width.equalTo(68)
+//                }
+//            }
+//            
+//            lastTagView = brotherButton
+//        } else {
+//            brotherButton.isHidden = true
+//        }
     }
     
     
@@ -243,15 +243,19 @@ private extension YHPreviewFamilyMemberViewController {
         sender.backgroundColor = .brandMainColor
         sender.setTitleColor(.white, for: .normal)
         
-        if sender == parentButton {
-            previewVM.arrDataForMainApplicationInfo = previewVM.arrDataForParents
-        } else if sender == childrenButton {
-            previewVM.arrDataForMainApplicationInfo = previewVM.arrDataForChildren
-        } else if sender == brotherButton {
-            previewVM.arrDataForMainApplicationInfo = previewVM.arrDataForBrother
-        } else if sender == spouseButton {
+        if sender == spouseButton {
             previewVM.arrDataForMainApplicationInfo = previewVM.arrDataForSpouse
-        } else {
+        }
+//        else if sender == parentButton {
+//            previewVM.arrDataForMainApplicationInfo = previewVM.arrDataForParents
+//        }
+        else if sender == childrenButton {
+            previewVM.arrDataForMainApplicationInfo = previewVM.arrDataForChildren
+        }
+//        else if sender == brotherButton {
+//            previewVM.arrDataForMainApplicationInfo = previewVM.arrDataForBrother
+//        }
+        else {
             previewVM.arrDataForMainApplicationInfo = []
         }
         homeTableView.reloadData()
@@ -289,15 +293,15 @@ private extension YHPreviewFamilyMemberViewController {
             return
         }
         
-        if !parentButton.isHidden {
-            clickButton(sender:parentButton)
-            return
-        }
-        
-        if !brotherButton.isHidden {
-            clickButton(sender:brotherButton)
-            return
-        }
+//        if !parentButton.isHidden {
+//            clickButton(sender:parentButton)
+//            return
+//        }
+//        
+//        if !brotherButton.isHidden {
+//            clickButton(sender:brotherButton)
+//            return
+//        }
         
     }
 }