// 预览UI修复

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/BaseInformation(基本资料)/V/YHBasicInfoFillCell.swift

@@ -61,8 +61,8 @@ extension YHBasicInfoFillCell {
         holdView1.addSubview(sessionView)
         sessionView.snp.makeConstraints { make in
             make.top.equalToSuperview()
-            make.right.equalToSuperview().offset(-18)
-            make.left.equalToSuperview().offset(18)
+            make.right.equalToSuperview().offset(0)
+            make.left.equalToSuperview().offset(0)
             make.height.equalTo(YHPreviewInfoSingleLineTitleView.viewH)
         }
         

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/M/YHFamilyInitialInfo.swift

@@ -438,9 +438,9 @@ class YHFormDetailItem : YHFormItemProtocol {
         case .certificateNumber:
             return "证件号码".local
         case .chinaIdentityCardNumber:
-            return "中国身份证号".local
+            return "身份证号码".local
         case .traverlPassportNumber:
-            return "证件号码".local
+            return "旅行证件号码".local
         case .certificateSignDate:
             return "签发日期".local
         case .certificateValidDate:

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

@@ -59,7 +59,7 @@ private extension YHPreviewFamilyMemberViewController {
             make.top.equalToSuperview()
             make.left.equalTo(kMargin)
             make.right.equalTo(-kMargin)
-            make.height.equalTo(56)
+            make.height.equalTo(44)
         }
         
         

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

@@ -18,6 +18,7 @@ enum YHPreviewInfoSessionModelType: Int {
 }
 
 struct YHPreviewInfoSessionModel {
+    var index: Int = -1
     var cellType : YHPreviewInfoSessionModelType = .countryInfoType
     var cellTitle : String = ""
     var cellData0 : [YHPreviewQuestionAndAnswerModel]?

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

@@ -45,8 +45,8 @@ extension YHPreviewInfoCell {
         holdView.removeSubviews()
         contentView.addSubview(holdView)
         
-        holdView.snp.makeConstraints { make in
-            make.top.equalTo(14)
+        holdView.snp.remakeConstraints { make in
+            make.top.equalTo(model?.index == 0 ? 0.0 : 14.0)
             make.left.equalToSuperview()
             make.bottom.equalToSuperview()
             make.width.equalTo(contentView.snp.width)

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

@@ -30,8 +30,8 @@ extension YHPreviewInfoCertificateInformationItemsView {
         addSubview(sessionView)
         sessionView.snp.makeConstraints { make in
             make.top.equalToSuperview()
-            make.right.equalToSuperview().offset(-18)
-            make.left.equalToSuperview().offset(18)
+            make.right.equalToSuperview().offset(0)
+            make.left.equalToSuperview().offset(0)
             make.height.equalTo(YHPreviewInfoSingleLineTitleView.viewH)
         }
         

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

@@ -30,8 +30,8 @@ extension YHPreviewInfoCertificatePictureItemsView {
         addSubview(sessionView)
         sessionView.snp.makeConstraints { make in
             make.top.equalToSuperview()
-            make.right.equalToSuperview().offset(-18)
-            make.left.equalToSuperview().offset(18)
+            make.right.equalToSuperview().offset(-0)
+            make.left.equalToSuperview().offset(0)
             make.height.equalTo(YHPreviewInfoSingleLineTitleView.viewH)
         }
         

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

@@ -28,8 +28,8 @@ extension YHPreviewInfoNameAndSubNameItemsView {
             addSubview(sessionView)
             sessionView.snp.makeConstraints { make in
                 make.top.equalToSuperview()
-                make.right.equalToSuperview().offset(-kMargin)
-                make.left.equalToSuperview().offset(kMargin)
+                make.right.equalToSuperview().offset(0)
+                make.left.equalToSuperview().offset(0)
                 make.height.equalTo(YHPreviewInfoSingleLineTitleView.viewH)
             }
             lastTagView = sessionView

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

@@ -29,8 +29,8 @@ extension YHPreviewInfoQuestionAndAnswerItemsView {
             addSubview(sessionView)
             sessionView.snp.makeConstraints { make in
                 make.top.equalToSuperview()
-                make.right.equalToSuperview().offset(-kMargin)
-                make.left.equalToSuperview().offset(kMargin)
+                make.right.equalToSuperview().offset(-0)
+                make.left.equalToSuperview().offset(0)
                 make.height.equalTo(YHPreviewInfoSingleLineTitleView.viewH)
             }
             lastTagView = sessionView

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

@@ -29,8 +29,8 @@ extension YHPreviewInfoQuestionAndAnswerItemsView2 {
             addSubview(sessionView)
             sessionView.snp.makeConstraints { make in
                 make.top.equalToSuperview()
-                make.right.equalToSuperview().offset(-kMargin)
-                make.left.equalToSuperview().offset(kMargin)
+                make.right.equalToSuperview().offset(0)
+                make.left.equalToSuperview().offset(0)
                 make.height.equalTo(YHPreviewInfoSingleLineTitleView.viewH)
             }
             lastTagView = sessionView

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

@@ -42,7 +42,8 @@ class YHPreviewInfoSingleLineTitleView: UIView {
         
         addSubview(nameLable)
         nameLable.snp.makeConstraints { make in
-            make.left.right.equalToSuperview()
+            make.left.equalTo(18)
+            make.right.equalToSuperview()
             make.top.equalToSuperview()
             make.bottom.equalTo(bottomLine.snp.top)
         }

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

@@ -28,8 +28,8 @@ private extension  YHPreviewInfoWorkExpView {
             addSubview(sessionView)
             sessionView.snp.makeConstraints { make in
                 make.top.equalToSuperview()
-                make.right.equalToSuperview().offset(-18)
-                make.left.equalToSuperview().offset(18)
+                make.right.equalToSuperview().offset(-0)
+                make.left.equalToSuperview().offset(0)
                 make.height.equalTo(YHPreviewInfoSingleLineTitleView.viewH)
             }
             

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

@@ -41,7 +41,7 @@ class YHGCPreviewControllerHoldViewController: UIViewController {
         dataSource.titles = arrItemTitles
         
         dataSource.titleNormalFont = UIFont.PFSC_R(ofSize: 16)
-        dataSource.titleSelectedColor = UIColor.labelTextColor2
+        dataSource.titleNormalColor = UIColor.init(hex: 0x435163)
         
         dataSource.titleSelectedFont = UIFont.PFSC_M(ofSize: 16)
         dataSource.titleSelectedColor = UIColor.brandMainColor

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

@@ -67,8 +67,7 @@ private extension YHGCPreviewFamilyMemberViewController {
         spouseButton.setTitle("配偶", for: .normal)
         buttonHoldView.addSubview(spouseButton)
         spouseButton.snp.makeConstraints { make in
-            
-            make.centerY.equalToSuperview()
+            make.top.equalTo(12)
             make.left.equalToSuperview()
             make.height.equalTo(32)
             make.width.equalTo(68)
@@ -80,7 +79,7 @@ private extension YHGCPreviewFamilyMemberViewController {
         childrenButton.setTitle("子女", for: .normal)
         buttonHoldView.addSubview(childrenButton)
         childrenButton.snp.makeConstraints { make in
-            make.centerY.equalToSuperview()
+            make.top.equalTo(12)
             make.left.equalTo(spouseButton.snp.right).offset(12)
             make.height.equalTo(32)
             make.width.equalTo(68)
@@ -121,7 +120,7 @@ private extension YHGCPreviewFamilyMemberViewController {
         
         homeTableView.snp.removeConstraints()
         homeTableView.snp.makeConstraints { make in
-            make.top.equalTo(buttonHoldView.snp.bottom)
+            make.top.equalTo(buttonHoldView.snp.bottom).offset(0)
             make.bottom.equalToSuperview()
             make.left.equalTo(kMargin)
             make.right.equalTo(-kMargin)
@@ -132,6 +131,14 @@ private extension YHGCPreviewFamilyMemberViewController {
     
     
     private func layouButtons() {
+        
+        buttonHoldView.snp.remakeConstraints { make in
+            make.top.equalToSuperview()
+            make.left.equalTo(kMargin)
+            make.right.equalTo(-kMargin)
+            make.height.equalTo(56)
+        }
+        
         spouseButton.snp.removeConstraints()
         childrenButton.snp.removeConstraints()
 //        parentButton.snp.removeConstraints()
@@ -142,8 +149,8 @@ private extension YHGCPreviewFamilyMemberViewController {
         //配偶
         if previewVM.arrDataForSpouse.isEmpty == false {
             spouseButton.isHidden = false
-            spouseButton.snp.makeConstraints { make in
-                make.centerY.equalToSuperview()
+            spouseButton.snp.remakeConstraints { make in
+                make.top.equalTo(12)
                 make.left.equalToSuperview()
                 make.height.equalTo(32)
                 make.width.equalTo(68)
@@ -159,15 +166,15 @@ private extension YHGCPreviewFamilyMemberViewController {
             childrenButton.isHidden = false
             
             if let lastTagView = lastTagView {
-                childrenButton.snp.makeConstraints { make in
-                    make.centerY.equalToSuperview()
+                childrenButton.snp.remakeConstraints { make in
+                    make.top.equalTo(12)
                     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()
+                childrenButton.snp.remakeConstraints { make in
+                    make.top.equalTo(12)
                     make.left.equalToSuperview()
                     make.height.equalTo(32)
                     make.width.equalTo(68)
@@ -343,6 +350,7 @@ extension YHGCPreviewFamilyMemberViewController {
         let cell = tableView.dequeueReusableCell(withClass: YHPreviewInfoCell.self)
         cell.selectionStyle = .none
         cell.model = previewVM.arrDataForMainApplicationInfo[indexPath.row]
+        cell.updateTopMargin = (indexPath.row == 0 ? 0.0 : 14.0)
         return cell
     }
 }