处理 小的展示问题

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

@@ -47,25 +47,18 @@ private extension YHPreviewFamilyMemberViewController {
             make.height.equalTo(56)
         }
         
-        parentButton = createButton()
-        parentButton.setTitle("父母", for: .normal)
-        buttonHoldView.addSubview(parentButton)
-        parentButton.snp.makeConstraints { make in
-            make.centerY.equalToSuperview()
-            make.left.equalToSuperview()
-            make.height.equalTo(32)
-            make.width.equalTo(68)
-        }
-        
         
         spouseButton = createButton()
         spouseButton.setTitle("配偶", for: .normal)
         buttonHoldView.addSubview(spouseButton)
         spouseButton.snp.makeConstraints { make in
+            
             make.centerY.equalToSuperview()
-            make.left.equalTo(parentButton.snp.right).offset(12)
+            make.left.equalToSuperview()
             make.height.equalTo(32)
             make.width.equalTo(68)
+            
+           
         }
         
         childrenButton = createButton()
@@ -79,12 +72,27 @@ 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)
+           
+        }
+        
+        
+       
+        
+        
         brotherButton = createButton()
         brotherButton.setTitle("兄弟姐妹", for: .normal)
         buttonHoldView.addSubview(brotherButton)
         brotherButton.snp.makeConstraints { make in
             make.centerY.equalToSuperview()
-            make.left.equalTo(childrenButton.snp.right).offset(12)
+            make.left.equalTo(parentButton.snp.right).offset(12)
             make.height.equalTo(32)
             make.width.equalTo(84)
         }
@@ -113,6 +121,112 @@ private extension YHPreviewFamilyMemberViewController {
         }
     }
     
+    
+    private func layouButtons() {
+        spouseButton.snp.removeConstraints()
+        childrenButton.snp.removeConstraints()
+        parentButton.snp.removeConstraints()
+        brotherButton.snp.removeConstraints()
+        
+        var lastTagView : UIView? = nil
+        
+        //配偶
+        if previewVM.arrDataForSpouse.isEmpty == false {
+            spouseButton.isHidden = false
+            spouseButton.snp.makeConstraints { make in
+                make.centerY.equalToSuperview()
+                make.left.equalToSuperview()
+                make.height.equalTo(32)
+                make.width.equalTo(68)
+            }
+            lastTagView = spouseButton
+        } else {
+            spouseButton.isHidden = true
+        }
+        
+        
+        //子女
+        if previewVM.arrDataForChildren.isEmpty == false {
+            childrenButton.isHidden = false
+            
+            if let lastTagView = lastTagView {
+                childrenButton.snp.makeConstraints { make in
+                    make.centerY.equalToSuperview()
+                    make.left.equalTo(lastTagView.snp.right).offset(12)
+                    make.height.equalTo(32)
+                    make.width.equalTo(68)
+                }
+            } else {
+                childrenButton.snp.makeConstraints { make in
+                    make.centerY.equalToSuperview()
+                    make.left.equalToSuperview()
+                    make.height.equalTo(32)
+                    make.width.equalTo(68)
+                }
+            }
+            
+            lastTagView = childrenButton
+        } else {
+            childrenButton.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
+        }
+    }
+    
+    
+    
+    
     func createButton() -> UIButton {
         let btn = UIButton(type: .custom)
         btn.backgroundColor = UIColor.white
@@ -163,12 +277,14 @@ private extension YHPreviewFamilyMemberViewController {
                 } else {
                     
                 }
+                self.layouButtons()
                 self.homeTableView.reloadData()
                 return
             }
         } else {
             printLog("error : orderID 为空")
         }
+        self.layouButtons()
         self.homeTableView.reloadData()
     }
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息预览)/C/YHPreviewMainApplicantInfoViewController.swift

@@ -17,6 +17,11 @@ class YHPreviewMainApplicantInfoViewController: YHPreviewBaseViewController {
         setupUI()
         loadData()
     }
+    
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        homeTableView.reloadData()
+    }
 }
 
 private extension YHPreviewMainApplicantInfoViewController {

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

@@ -65,14 +65,21 @@ extension YHPreviewInfoNameAndSubNameItemView {
         subtitleLable.text = subtitle
         
         //处理特长的字符
-        if title.contains("相关工作是否属国际工作经验：") || title.contains("公司营业额/港元(近一年)：") || title.contains("是否在海外居住满1年及以上：")  {
+        if title.contains("相关工作是否属国际工作经验：") || title.contains("公司营业额/港元(近一年)：") || title.contains("是否在海外居住满1年及以上：")   {
             nameLable.snp.remakeConstraints { make in
                 make.top.equalToSuperview().offset(18)
                 make.left.equalToSuperview()
-                make.width.lessThanOrEqualTo(200)
+                make.width.lessThanOrEqualTo(240)
                 make.height.equalTo(20)
             }
             nameLable.setContentCompressionResistancePriority(.required, for: .horizontal)
+        } else if title.contains("主申请人或现配偶是否拥有孩子护养权：") {
+            nameLable.snp.remakeConstraints { make in
+                make.top.equalToSuperview().offset(18)
+                make.left.equalToSuperview()
+                make.width.lessThanOrEqualTo(260)
+                make.height.equalTo(20)
+            }
         }
     }
 }