Merge commit 'caeaaaa5' into xiezhaolin

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -752,6 +752,45 @@
 			path = PickerView;
 			sourceTree = "<group>";
 		};
+		04594FCF2B9EEEEC00C34B15 /* MyCertificates(我的证书) */ = {
+			isa = PBXGroup;
+			children = (
+				04594FD32B9EEF5100C34B15 /* M */,
+				04594FD22B9EEF2900C34B15 /* VM */,
+				04594FD12B9EEF1700C34B15 /* V */,
+				04594FD02B9EEF1000C34B15 /* C */,
+			);
+			path = "MyCertificates(我的证书)";
+			sourceTree = "<group>";
+		};
+		04594FD02B9EEF1000C34B15 /* C */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = C;
+			sourceTree = "<group>";
+		};
+		04594FD12B9EEF1700C34B15 /* V */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = V;
+			sourceTree = "<group>";
+		};
+		04594FD22B9EEF2900C34B15 /* VM */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = VM;
+			sourceTree = "<group>";
+		};
+		04594FD32B9EEF5100C34B15 /* M */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = M;
+			sourceTree = "<group>";
+		};
 		0468D4292B55017400CFB916 /* Analytics */ = {
 			isa = PBXGroup;
 			children = (
@@ -1706,6 +1745,7 @@
 		A5C382C82B5E101E00C5E65C /* ServiceProcess(流程) */ = {
 			isa = PBXGroup;
 			children = (
+				04594FCF2B9EEEEC00C34B15 /* MyCertificates(我的证书) */,
 				047294F62B9B0C5D008E0B84 /* MyDocuments(我的文书) */,
 				047294F22B9B0C49008E0B84 /* MySignature(我的签字) */,
 				04E86E222B81EA1000A35F4B /* WorkExperience(工作经验) */,
@@ -2364,7 +2404,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -2384,7 +2424,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.1.7;
+				MARKETING_VERSION = 0.1.8;
 				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2406,7 +2446,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -2426,7 +2466,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.1.7;
+				MARKETING_VERSION = 0.1.8;
 				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHomeViewController.swift

@@ -271,11 +271,11 @@ extension YHHomeViewController {
         
         
         self.homeTableView.es.addPullToRefresh {
-            self.loadFirstItem()
+            self.loadFirstItem()//for test hjl
         }
         self.homeTableView.es.startPullToRefresh()
         self.homeTableView.es.addInfiniteScrolling {
-            self.loadFakeData()
+            self.loadFakeData()//for test hjl
         }
     }
     
@@ -308,10 +308,12 @@ extension YHHomeViewController : UITableViewDelegate,UITableViewDataSource {
     }
     
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        if section == 0 {
-            return 6
-        }
-        return 1
+//        if section == 0 {
+//            return 6
+//        }
+//        return 1//for test hjl
+        
+        return 0 //for test hjl
     }
     
     

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHInformationPerfectListVC.swift

@@ -395,10 +395,10 @@ extension YHInformationPerfectListVC : UITableViewDelegate,UITableViewDataSource
     
     private func  handleJumpLogicDebug(tapIndex : Int) {
         
-        if self.serviceCenterMainReqVM.myInfoFillStep > 6 {
-            goInfoListVCOp(index:tapIndex)
-            return
-        }
+//        if self.serviceCenterMainReqVM.myInfoFillStep > 6 {
+//            goInfoListVCOp(index:tapIndex)
+//            return
+//        }
         
         if tapIndex == 0 {
             //主申请人信息

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/BaseInformation(基本资料)/C/YHBasicInfoFillViewController.swift

@@ -222,7 +222,8 @@ extension YHBasicInfoFillViewController {
         
         self.basicInfoVM.saveBasicInfo(params: param) {[weak self] success, error in
             if success == true {
-                YHHUD.flash(message: "操作成功")
+                let title = isSaveFlag ? "保存成功" : "提交成功"
+                YHHUD.flash(message: title)
                 
                 if isSaveFlag == false {
                     DispatchQueue.main.asyncAfter(deadline: .now() + 1.5) {
@@ -230,7 +231,9 @@ extension YHBasicInfoFillViewController {
                     }
                 }
             } else {
-                let msg = error?.errorMsg ?? "操作失败"
+                
+                let title = isSaveFlag ? "保存失败" : "提交失败"
+                let msg = error?.errorMsg ?? title
                 YHHUD.flash(message: msg)
             }
         }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/Education&Qualification(学历专业资格填写)/C/YHCollegeSearchViewController.swift

@@ -30,7 +30,7 @@ class YHCollegeSearchViewController: YHBaseViewController {
             tableView.contentInsetAdjustmentBehavior = .never
         }
         tableView.showsVerticalScrollIndicator = false
-        tableView.backgroundColor = .clear
+        tableView.backgroundColor = .white
         tableView.separatorStyle = .none
         tableView.delegate = self
         tableView.dataSource = self
@@ -91,7 +91,7 @@ class YHCollegeSearchViewController: YHBaseViewController {
            [weak self]  text in
             guard let self = self else { return }
             searchCollegeName = text
-            if Date().timeIntervalSince1970 * 1000 - lastSearchTime * 1000 >= 500 {
+            if Date().timeIntervalSince1970  - lastSearchTime >= 1.0 {
                 lastSearchTime = Date().timeIntervalSince1970
                 searchCollege()
             }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/Education&Qualification(学历专业资格填写)/C/YHEducationDetailVC.swift

@@ -28,13 +28,15 @@ class YHEducationDetailVC: YHBaseViewController {
     
     lazy var tableView: UITableView = {
         
-        let tableView = UITableView(frame:.zero, style:.plain)
+        let tableView = UITableView(frame:.zero, style:.grouped)
         
         if #available(iOS 11.0, *) {
             tableView.contentInsetAdjustmentBehavior = .never
         }
+        tableView.estimatedSectionHeaderHeight = 14.0
+        tableView.estimatedSectionFooterHeight = 1.0
         tableView.showsVerticalScrollIndicator = false
-        tableView.backgroundColor = .clear
+        tableView.backgroundColor = UIColor(hexString:"#F8F8F8")
         tableView.separatorStyle = .none
         tableView.delegate = self
         tableView.dataSource = self
@@ -54,6 +56,7 @@ class YHEducationDetailVC: YHBaseViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         self.gk_navTitle = "学历".local
+        self.gk_navigationBar.backgroundColor = .white
         view.backgroundColor = UIColor(hexString:"#F8F8F8")
         createUI()
     }
@@ -266,12 +269,13 @@ extension YHEducationDetailVC : UITableViewDelegate, UITableViewDataSource {
         return UITableView.automaticDimension
     }
     
-    func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
+    
+    func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
         
         return UIView()
     }
     
-    private func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> CGFloat {
+    private func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> CGFloat {
         return 14.0
     }
     

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/Education&Qualification(学历专业资格填写)/C/YHEducationInfoListVC.swift

@@ -25,13 +25,15 @@ class YHEducationInfoListVC: YHBaseViewController {
     
     lazy var tableView: UITableView = {
         
-        let tableView = UITableView(frame:.zero, style:.plain)
+        let tableView = UITableView(frame:.zero, style:.grouped)
         
         if #available(iOS 11.0, *) {
             tableView.contentInsetAdjustmentBehavior = .never
         }
+        tableView.estimatedSectionHeaderHeight = 14.0
+        tableView.estimatedSectionFooterHeight = 1.0
         tableView.showsVerticalScrollIndicator = false
-        tableView.backgroundColor = .clear
+        tableView.backgroundColor = UIColor(hexString:"#F8F8F8")
         tableView.separatorStyle = .none
         tableView.delegate = self
         tableView.dataSource = self
@@ -53,6 +55,7 @@ class YHEducationInfoListVC: YHBaseViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         self.gk_navTitle = "学历/专业资格填写".local
+        self.gk_navigationBar.backgroundColor = .white
         view.backgroundColor = UIColor(hexString:"#F8F8F8")
         createUI()
     }
@@ -407,9 +410,21 @@ extension YHEducationInfoListVC : UITableViewDelegate, UITableViewDataSource {
         return UIView()
     }
     
+    func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
+        
+        return UIView()
+    }
+    
+    private func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> CGFloat {
+        return 14.0
+    }
+    
     private func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> CGFloat {
+        if section == items.count-1 {
             return 14.0
         }
+        return 1.0
+    }
     
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/Education&Qualification(学历专业资格填写)/C/YHQualificationDetailVC.swift

@@ -27,13 +27,15 @@ class YHQualificationDetailVC: YHBaseViewController {
     
     lazy var tableView: UITableView = {
         
-        let tableView = UITableView(frame:.zero, style:.plain)
+        let tableView = UITableView(frame:.zero, style:.grouped)
         
         if #available(iOS 11.0, *) {
             tableView.contentInsetAdjustmentBehavior = .never
         }
+        tableView.estimatedSectionHeaderHeight = 14.0
+        tableView.estimatedSectionFooterHeight = 1.0
         tableView.showsVerticalScrollIndicator = false
-        tableView.backgroundColor = .clear
+        tableView.backgroundColor = UIColor(hexString:"#F8F8F8")
         tableView.separatorStyle = .none
         tableView.delegate = self
         tableView.dataSource = self
@@ -53,6 +55,7 @@ class YHQualificationDetailVC: YHBaseViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         self.gk_navTitle = "专业资格及会员资格".local
+        self.gk_navigationBar.backgroundColor = .white
         view.backgroundColor = UIColor(hexString:"#F8F8F8")
         createUI()
     }
@@ -239,12 +242,12 @@ extension YHQualificationDetailVC : UITableViewDelegate, UITableViewDataSource {
         return UITableView.automaticDimension
     }
     
-    func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
+    func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
         
         return UIView()
     }
     
-    private func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> CGFloat {
+    private func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> CGFloat {
         return 14.0
     }
     

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/Education&Qualification(学历专业资格填写)/V/YHCollegeNameCell.swift

@@ -33,6 +33,8 @@ class YHCollegeNameCell: UITableViewCell {
     func setupUI() {
         
         self.selectionStyle = .none
+        contentView.backgroundColor = .white
+        
         contentView.addSubview(titleLabel)
         
         titleLabel.snp.makeConstraints { make in

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/Education&Qualification(学历专业资格填写)/V/YHEducationInfoCell.swift

@@ -94,6 +94,8 @@ class YHEducationInfoCell: UITableViewCell {
     func setupUI() {
         
         self.selectionStyle = .none
+        contentView.backgroundColor = .white
+
         contentView.addSubview(titleLabel)
         contentView.addSubview(subTitleLabel)
         contentView.addSubview(timeLabel)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/Certificates(证书上传和证书信息)/YHCertificateInfoController.swift

@@ -26,7 +26,7 @@ class YHCertificateInfoController: YHBaseViewController, YHFamilyMemberProtol {
         tableView.estimatedSectionHeaderHeight = 14.0
         tableView.estimatedSectionFooterHeight = 1.0
         tableView.showsVerticalScrollIndicator = false
-        tableView.backgroundColor = .clear
+        tableView.backgroundColor = UIColor(hexString:"#F8F8F8")
         tableView.separatorStyle = .none
         tableView.delegate = self
         tableView.dataSource = self
@@ -45,6 +45,7 @@ class YHCertificateInfoController: YHBaseViewController, YHFamilyMemberProtol {
     override func viewDidLoad() {
         super.viewDidLoad()
         gk_navigationBar.isHidden = true
+        view.backgroundColor = UIColor(hexString:"#F8F8F8")
         createUI()
         loadInfo()
     }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/Certificates(证书上传和证书信息)/YHCertificateUploadVC.swift

@@ -42,7 +42,7 @@ class YHCertificateUploadVC: YHBaseViewController, YHFamilyMemberProtol {
             if #available(iOS 11.0, *) {
                 tableView.contentInsetAdjustmentBehavior = .never
             }
-            tableView.backgroundColor = .clear
+            tableView.backgroundColor = UIColor(hexString:"#F8F8F8")
             tableView.separatorStyle = .none
             tableView.delegate = self
             tableView.dataSource = self

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/Child(子女)/YHChildBasicInfoVC.swift

@@ -18,7 +18,7 @@ class YHChildBasicInfoVC: YHBaseViewController, YHFamilyMemberProtol {
     
     lazy var tableView: UITableView = {
         
-        let tableView = UITableView(frame:.zero, style:.plain)
+        let tableView = UITableView(frame:.zero, style:.grouped)
 
         if #available(iOS 11.0, *) {
             tableView.contentInsetAdjustmentBehavior = .never
@@ -26,7 +26,7 @@ class YHChildBasicInfoVC: YHBaseViewController, YHFamilyMemberProtol {
         tableView.estimatedSectionHeaderHeight = 14.0
         tableView.estimatedSectionFooterHeight = 1.0
         tableView.showsVerticalScrollIndicator = false
-        tableView.backgroundColor = .clear
+        tableView.backgroundColor = UIColor(hexString:"#F8F8F8")
         tableView.separatorStyle = .none
         tableView.delegate = self
         tableView.dataSource = self
@@ -44,6 +44,7 @@ class YHChildBasicInfoVC: YHBaseViewController, YHFamilyMemberProtol {
     override func viewDidLoad() {
         super.viewDidLoad()
         gk_navigationBar.isHidden = true
+        view.backgroundColor = UIColor(hexString:"#F8F8F8")
         createUI()
         loadInfo()
     }
@@ -403,21 +404,26 @@ extension YHChildBasicInfoVC : UITableViewDelegate, UITableViewDataSource {
         return UITableView.automaticDimension
     }
     
-    func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
+    func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
+        
         return UIView()
     }
     
-    func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
+    func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
+        
         return UIView()
     }
     
-    private func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> CGFloat {
-        return 1.0
+    private func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> CGFloat {
+        return 14.0
     }
     
-    private func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> CGFloat {
+    private func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> CGFloat {
+        if section == items.count-1 {
             return 14.0
         }
+        return 1.0
+    }
     
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/Child(子女)/YHChildInfoContainerVC.swift

@@ -83,6 +83,9 @@ class YHChildInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
     override func viewDidLoad() {
         super.viewDidLoad()
         gk_navTitle = "子女信息填写".local
+        gk_navigationBar.backgroundColor = .white
+        view.backgroundColor = UIColor(hexString:"#F8F8F8")
+
         createUI()
     }
     

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/Child(子女)/YHChildPrimaryInfoVC.swift

@@ -20,7 +20,7 @@ class YHChildPrimaryInfoVC: YHBaseViewController, YHFamilyMemberProtol {
     
     lazy var tableView: UITableView = {
         
-        let tableView = UITableView(frame:.zero, style:.plain)
+        let tableView = UITableView(frame:.zero, style:.grouped)
 
         if #available(iOS 11.0, *) {
             tableView.contentInsetAdjustmentBehavior = .never
@@ -28,7 +28,7 @@ class YHChildPrimaryInfoVC: YHBaseViewController, YHFamilyMemberProtol {
         tableView.estimatedSectionHeaderHeight = 14.0
         tableView.estimatedSectionFooterHeight = 1.0
         tableView.showsVerticalScrollIndicator = false
-        tableView.backgroundColor = .clear
+        tableView.backgroundColor = UIColor(hexString:"#F8F8F8")
         tableView.separatorStyle = .none
         tableView.delegate = self
         tableView.dataSource = self
@@ -47,6 +47,7 @@ class YHChildPrimaryInfoVC: YHBaseViewController, YHFamilyMemberProtol {
     override func viewDidLoad() {
         super.viewDidLoad()
         gk_navigationBar.isHidden = true
+        view.backgroundColor = UIColor(hexString:"#F8F8F8")
         createUI()
         loadInfo()
     }
@@ -295,7 +296,7 @@ extension YHChildPrimaryInfoVC : UITableViewDelegate, UITableViewDataSource {
                     guard let child = child else { return }
 
                     if detailItem.type == .detailAddress {
-                        if child.address.isInChina() {
+                        if child.isLiveInChina() {
                             child.address.details = text ?? ""
                         } else {
                             child.address.foreign = text ?? ""
@@ -332,21 +333,26 @@ extension YHChildPrimaryInfoVC : UITableViewDelegate, UITableViewDataSource {
         return UITableView.automaticDimension
     }
     
-    func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
+    func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
+        
         return UIView()
     }
     
-    func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
+    func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
+        
         return UIView()
     }
     
-    private func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> CGFloat {
-        return 1.0
+    private func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> CGFloat {
+        return 14.0
     }
     
-    private func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> CGFloat {
+    private func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> CGFloat {
+        if section == items.count-1 {
             return 14.0
         }
+        return 1.0
+    }
     
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
 
@@ -466,7 +472,7 @@ extension YHChildPrimaryInfoVC {
             if isEmptyString(child.address.country) {
                 return false
             }
-            if child.address.isInChina() {
+            if child.isLiveInChina() {
                 if isEmptyArray(child.address.area) {
                     return false
                 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/Parents&Brothers(父母和兄弟姐妹)/YHBrotherInfoVC.swift

@@ -26,13 +26,15 @@ class YHBrotherInfoVC: YHBaseViewController {
     
     lazy var tableView: UITableView = {
         
-        let tableView = UITableView(frame:.zero, style:.plain)
+        let tableView = UITableView(frame:.zero, style:.grouped)
 
         if #available(iOS 11.0, *) {
             tableView.contentInsetAdjustmentBehavior = .never
         }
+        tableView.estimatedSectionHeaderHeight = 14.0
+        tableView.estimatedSectionFooterHeight = 1.0
         tableView.showsVerticalScrollIndicator = false
-        tableView.backgroundColor = .clear
+        tableView.backgroundColor = UIColor(hexString:"#F8F8F8")
         tableView.separatorStyle = .none
         tableView.delegate = self
         tableView.dataSource = self
@@ -51,6 +53,8 @@ class YHBrotherInfoVC: YHBaseViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         gk_navTitle = "兄弟姐妹信息填写".local
+        gk_navigationBar.backgroundColor = .white
+        view.backgroundColor = UIColor(hexString:"#F8F8F8")
         createUI()
         loadInfo()
     }
@@ -379,9 +383,21 @@ extension YHBrotherInfoVC : UITableViewDelegate, UITableViewDataSource {
         return UIView()
     }
     
+    func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
+        
+        return UIView()
+    }
+    
+    private func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> CGFloat {
+        return 14.0
+    }
+    
     private func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> CGFloat {
+        if section == items.count-1 {
             return 14.0
         }
+        return 1.0
+    }
     
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
 

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/Parents&Brothers(父母和兄弟姐妹)/YHParentInfoVC.swift

@@ -26,13 +26,15 @@ class YHParentInfoVC: YHBaseViewController {
     
     lazy var tableView: UITableView = {
         
-        let tableView = UITableView(frame:.zero, style:.plain)
+        let tableView = UITableView(frame:.zero, style:.grouped)
 
         if #available(iOS 11.0, *) {
             tableView.contentInsetAdjustmentBehavior = .never
         }
+        tableView.estimatedSectionHeaderHeight = 14.0
+        tableView.estimatedSectionFooterHeight = 1.0
         tableView.showsVerticalScrollIndicator = false
-        tableView.backgroundColor = .clear
+        tableView.backgroundColor = UIColor(hexString:"#F8F8F8")
         tableView.separatorStyle = .none
         tableView.delegate = self
         tableView.dataSource = self
@@ -53,6 +55,8 @@ class YHParentInfoVC: YHBaseViewController {
         if let parentInfo = parentInfo {
             gk_navTitle = parentInfo.relationType == .father ?  "父亲信息填写".local :  "母亲信息填写".local
         }
+        gk_navigationBar.backgroundColor = .white
+        view.backgroundColor = UIColor(hexString:"#F8F8F8")
         createUI()
         loadInfo()
     }
@@ -424,9 +428,21 @@ extension YHParentInfoVC : UITableViewDelegate, UITableViewDataSource {
         return UIView()
     }
     
+    func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
+        
+        return UIView()
+    }
+    
+    private func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> CGFloat {
+        return 14.0
+    }
+    
     private func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> CGFloat {
+        if section == items.count-1 {
             return 14.0
         }
+        return 1.0
+    }
     
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
 

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/Spouse(配偶)/YHSpouseBasicInfoVC.swift

@@ -40,7 +40,7 @@ class YHSpouseBasicInfoVC: YHBaseViewController, YHFamilyMemberProtol {
         tableView.estimatedSectionHeaderHeight = 14.0
         tableView.estimatedSectionFooterHeight = 1.0
         tableView.showsVerticalScrollIndicator = false
-        tableView.backgroundColor = .clear
+        tableView.backgroundColor = UIColor(hexString:"#F8F8F8")
         tableView.separatorStyle = .none
         tableView.delegate = self
         tableView.dataSource = self
@@ -60,6 +60,7 @@ class YHSpouseBasicInfoVC: YHBaseViewController, YHFamilyMemberProtol {
     override func viewDidLoad() {
         super.viewDidLoad()
         gk_navigationBar.isHidden = true
+        view.backgroundColor = UIColor(hexString:"#F8F8F8")
         createUI()
         loadInfo()
     }
@@ -591,21 +592,26 @@ extension YHSpouseBasicInfoVC : UITableViewDelegate, UITableViewDataSource {
         return UITableView.automaticDimension
     }
     
-    func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
+    func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
+        
         return UIView()
     }
     
-    func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
+    func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
+        
         return UIView()
     }
     
-    private func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> CGFloat {
-        return 1.0
+    private func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> CGFloat {
+        return 14.0
     }
     
-    private func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> CGFloat {
+    private func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> CGFloat {
+        if section == items.count-1 {
             return 14.0
         }
+        return 1.0
+    }
     
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/Spouse(配偶)/YHSpouseInfoContainerVC.swift

@@ -100,6 +100,8 @@ class YHSpouseInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
     override func viewDidLoad() {
         super.viewDidLoad()
         gk_navTitle = "配偶信息填写".local
+        gk_navigationBar.backgroundColor = .white
+        view.backgroundColor = UIColor(hexString:"#F8F8F8")
         createUI()
     }
     

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/Spouse(配偶)/YHSpousePrimaryInfoVC.swift

@@ -30,7 +30,7 @@ class YHSpousePrimaryInfoVC: YHBaseViewController, YHFamilyMemberProtol {
         tableView.estimatedSectionHeaderHeight = 14.0
         tableView.estimatedSectionFooterHeight = 1.0
         tableView.showsVerticalScrollIndicator = false
-        tableView.backgroundColor = .clear
+        tableView.backgroundColor = UIColor(hexString:"#F8F8F8")
         tableView.separatorStyle = .none
         tableView.delegate = self
         tableView.dataSource = self
@@ -46,6 +46,7 @@ class YHSpousePrimaryInfoVC: YHBaseViewController, YHFamilyMemberProtol {
     override func viewDidLoad() {
         super.viewDidLoad()
         gk_navigationBar.isHidden = true
+        view.backgroundColor = UIColor(hexString:"#F8F8F8")
         createUI()
         loadInfo()
     }
@@ -250,7 +251,7 @@ extension YHSpousePrimaryInfoVC : UITableViewDelegate, UITableViewDataSource {
                     
                     if detailItem.type == .detailAddress {
                         
-                        if spouse.address.isInChina() {
+                        if spouse.isLiveInChina() {
                             spouse.address.details = text ?? ""
                         } else {
                             spouse.address.foreign = text ?? ""
@@ -286,21 +287,26 @@ extension YHSpousePrimaryInfoVC : UITableViewDelegate, UITableViewDataSource {
         return UITableView.automaticDimension
     }
     
-    func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
+    func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
+        
         return UIView()
     }
     
-    func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
+    func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
+        
         return UIView()
     }
     
-    private func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> CGFloat {
-        return 1.0
+    private func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> CGFloat {
+        return 14.0
     }
     
-    private func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> CGFloat {
+    private func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> CGFloat {
+        if section == items.count-1 {
             return 14.0
         }
+        return 1.0
+    }
     
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         
@@ -387,7 +393,7 @@ extension YHSpousePrimaryInfoVC : UITableViewDelegate, UITableViewDataSource {
             if isEmptyString(spouse.address.country) {
                 return false
             }
-            if spouse.address.isInChina() {
+            if spouse.isLiveInChina() {
                 if isEmptyArray(spouse.address.area) {
                     return false
                 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/YHFamilyMemberInfoListVC.swift

@@ -27,13 +27,15 @@ class YHFamilyMemberInfoListVC: YHBaseViewController {
     
     lazy var tableView: UITableView = {
         
-        let tableView = UITableView(frame:.zero, style:.plain)
+        let tableView = UITableView(frame:.zero, style:.grouped)
 
         if #available(iOS 11.0, *) {
             tableView.contentInsetAdjustmentBehavior = .never
         }
         tableView.showsVerticalScrollIndicator = false
-        tableView.backgroundColor = .clear
+        tableView.estimatedSectionHeaderHeight = 14.0
+        tableView.estimatedSectionFooterHeight = 1.0
+        tableView.backgroundColor = UIColor(hexString:"#F8F8F8")
         tableView.separatorStyle = .none
         tableView.delegate = self
         tableView.dataSource = self
@@ -69,6 +71,7 @@ class YHFamilyMemberInfoListVC: YHBaseViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         self.gk_navTitle = "家庭成员信息填写".local
+        gk_navigationBar.backgroundColor = .white
         view.backgroundColor = UIColor(hexString:"#F8F8F8")
         createUI()
     }
@@ -235,7 +238,7 @@ extension YHFamilyMemberInfoListVC {
     // 请求家庭成员信息
     func requestFamilyInfo() {
         
-        self.familyRequest.getFamilyInfo(params: ["order_id": self.orderId]) { [weak self] detail, error in
+        self.familyRequest.getFamilyInfoList(orderId:orderId) { [weak self] detail, error in
             guard let self = self else { return }
             if let detail = detail {
                 familyMemberInfo = detail
@@ -527,9 +530,21 @@ extension YHFamilyMemberInfoListVC : UITableViewDelegate, UITableViewDataSource
         return UIView()
     }
     
+    func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
+        
+        return UIView()
+    }
+    
+    private func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> CGFloat {
+        return 14.0
+    }
+    
     private func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> CGFloat {
+        if section == items.count-1 {
             return 14.0
         }
+        return 1.0
+    }
     
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         

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

@@ -666,11 +666,6 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol {
             isLiveOverseaYear = 2
         }
     
-        if sex != 1 && sex != 2 { // 默认为男性
-            sex = 1
-        }
-        
-                
         return self
     }
 
@@ -874,6 +869,16 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol {
         self.childStepchild.has = (val ? "Y" : "N")
     }
     
+    // 是否住在中国
+    func isLiveInChina() ->Bool {
+        // 默认在中国
+        if isEmptyString(self.address.country) { return true }
+        if self.address.country.contains("中国") {
+            return true
+        }
+        return false
+    }
+    
     // 根据生日推算年龄
     func getAge(birthday:String) ->Int {
         let arr = birthday.components(separatedBy: YHDatePickView.separator)
@@ -986,16 +991,6 @@ class YHAddress: SmartCodable {
         
     }
     
-    // 是否在中国
-    func isInChina() ->Bool {
-        // 默认在中国
-        if isEmptyString(country) { return true }
-        if country.contains("中国") {
-            return true
-        }
-        return false
-    }
-    
     // 清空地址信息
     func clearAddress() {
         self.area = []

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/M/YHFamilyRequestViewModel.swift

@@ -10,17 +10,15 @@
 class YHFamilyRequestViewModel {
     
     //请求所有家庭成员信息
-     func getFamilyInfo(params:[String:Any], callBackBlock:@escaping (_ listInfo: YHFamilyMemberGroupInfo?,_ error:YHErrorModel?)->()) {
+     func getFamilyInfoList(orderId:Int, callBackBlock:@escaping (_ listInfo: YHFamilyMemberGroupInfo?,_ error:YHErrorModel?)->()) {
         
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Family.familyInfoApi
-         
+        let params = ["order_id": orderId]
          YHHUD.show(.progress(message: "数据加载中..."))
         
-        let _ = YHNetRequest.getRequest(url: strUrl, params:params) {[weak self] json, code in
+        let _ = YHNetRequest.getRequest(url: strUrl, params:params) { json, code in
             YHHUD.hide()
                          
-            guard let self = self else { return }
-             
             printLog("model 是 ==> \(json)")
             let dic = json.data
             
@@ -50,14 +48,12 @@ class YHFamilyRequestViewModel {
         }
 
        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Family.familyInfoApi
-//       let strUrl = "http://192.168.34.187:8808/" + YHAllApiName.Family.familyInfoApi
        
-       let _ = YHNetRequest.postRequest(url: strUrl, params:params) {[weak self] json, code in
+       let _ = YHNetRequest.postRequest(url: strUrl, params:params) { json, code in
            
            if isShowLoading {
                YHHUD.hide()
            }
-           guard let self = self else { return }
            printLog("model 是 ==> \(json)")
            if json.code == NetWorkCode.success.rawValue {
                callBackBlock(true,nil)
@@ -144,8 +140,8 @@ class YHFamilyRequestViewModel {
     func requestFamilyMemberDetailInfo(memberType:YHFamilyMemberType, orderId:Int, callBack:((_ detail:YHFamilyMember?)->Void)?) {
         
         let params:[String:Any] =  ["order_id": orderId]
-        self.getFamilyInfo(params:params) { 
-            [weak self] listInfo, error in
+        self.getFamilyInfoList(orderId:orderId) {
+            listInfo, error in
             guard let callBack = callBack else { return }
             if let listInfo = listInfo {
                 if memberType == .spouse {
@@ -154,6 +150,8 @@ class YHFamilyRequestViewModel {
                     callBack(listInfo.father)
                 } else if memberType == .mother {
                     callBack(listInfo.mother)
+                } else {
+                    callBack(nil)
                 }
             }
         }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/V/PickerView/YHSheetPickerView.swift

@@ -248,8 +248,8 @@ class YHSheetPickerView: UIView {
                 
             // 学位颁发地区
             .degreeLocation:
-                [YHSheetPickerViewItem(title:"国内 (颁发)".local, index:0),
-                 YHSheetPickerViewItem(title:"国外 (颁发)".local, index:1),
+                [YHSheetPickerViewItem(title:"国内 (颁发)".local, index:1),
+                 YHSheetPickerViewItem(title:"国外 (颁发)".local, index:2),
                 ],
     
             // 专业证书

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/V/YHFormItemAddCell.swift

@@ -63,6 +63,8 @@ class YHFormItemAddCell: UITableViewCell {
     func setupUI() {
         
         self.selectionStyle = .none
+        contentView.backgroundColor = .white
+
         contentView.addSubview(addBtn)
         addBtn.layer.addSublayer(dotLineLayer)
 

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/V/YHFormItemDegreeInfoCell.swift

@@ -104,6 +104,7 @@ class YHFormItemDegreeInfoCell: UITableViewCell {
     func setupUI() {
         
         self.selectionStyle = .none
+        contentView.backgroundColor = .white
 
         contentView.addSubview(titleLabel)
         contentView.addSubview(deleteButton)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/V/YHFormItemDoubleChoiceCell.swift

@@ -164,6 +164,7 @@ class YHFormItemDoubleChoiceCell: UITableViewCell {
     func setupUI() {
         
         self.selectionStyle = .none
+        contentView.backgroundColor = .white
 
         contentView.addSubview(titleLabel)
         contentView.addSubview(answer2Btn)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/V/YHFormItemEnterDetailCell.swift

@@ -106,6 +106,8 @@ class YHFormItemEnterDetailCell: UITableViewCell {
     func setupUI() {
         
         self.selectionStyle = .none
+        contentView.backgroundColor = .white
+
         contentView.addSubview(titleLabel)
         contentView.addSubview(detailLabel)
         contentView.addSubview(arrowImgView)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/V/YHFormItemExpireDateCell.swift

@@ -123,6 +123,8 @@ class YHFormItemExpireDateCell: UITableViewCell {
     func setupUI() {
         
         self.selectionStyle = .none
+        contentView.backgroundColor = .white
+
         detail = ""
         
         contentView.addSubview(titleLabel)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/V/YHFormItemInputTextCell.swift

@@ -109,6 +109,8 @@ class YHFormItemInputTextCell: UITableViewCell {
     func setupUI() {
         
         self.selectionStyle = .none
+        contentView.backgroundColor = .white
+
         contentView.addSubview(titleLabel)
         contentView.addSubview(textField)
         contentView.addSubview(tipsLabel)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/V/YHFormItemOnlyDoubleChoiceCell.swift

@@ -94,6 +94,8 @@ class YHFormItemOnlyDoubleChoiceCell: UITableViewCell {
     func setupUI() {
         
         self.selectionStyle = .none
+        contentView.backgroundColor = .white
+
         contentView.addSubview(answer1Btn)
         contentView.addSubview(answer2Btn)
         

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/V/YHFormItemQuestionsCell.swift

@@ -151,6 +151,7 @@ class YHFormItemQuestionsCell: UITableViewCell {
     func setupUI() {
         
         self.selectionStyle = .none
+        contentView.backgroundColor = .white
 
         contentView.addSubview(titleLabel)
         contentView.addSubview(answer2Btn)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/V/YHFormItemSelectSheetCell.swift

@@ -129,6 +129,8 @@ class YHFormItemSelectSheetCell: UITableViewCell {
     func setupUI() {
         
         self.selectionStyle = .none
+        contentView.backgroundColor = .white
+
         contentView.addSubview(titleLabel)
         contentView.addSubview(detailLabel)
         contentView.addSubview(arrowImgView)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/V/YHFormItemTitleCell.swift

@@ -91,6 +91,8 @@ class YHFormItemTitleCell: UITableViewCell {
     func setupUI() {
         
         self.selectionStyle = .none
+        contentView.backgroundColor = .white
+        
         contentView.addSubview(titleLabel)
         contentView.addSubview(editButton)
         contentView.addSubview(cancelButton)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MyScore(我的评分)/V/YHScoreOptionsView.swift

@@ -60,6 +60,8 @@ class YHScoreOptionsView: UIView {
 
 private extension YHScoreOptionsView {
     func setupUI() {
+        backgroundColor = .white
+        
         addSubview(bottomLine)
         bottomLine.snp.makeConstraints { make in
             make.bottom.left.right.equalToSuperview()

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/OtherInformation(其他信息)/C/YHOtherInfoFillViewController.swift

@@ -121,14 +121,19 @@ extension YHOtherInfoFillViewController {
             
             otherInfoVM.saveOtherInfo(params: param) { success, error in
                 if success == true {
-                    YHHUD.flash(message: "操作成功")
+                    
+                    let msg = flag ? "提交成功" : "保存成功"
+                    
+                    YHHUD.flash(message:msg)
                     if flag == true {
                         DispatchQueue.main.asyncAfter(wallDeadline: .now() + 1.5) {[weak self] in
                             self?.navigationController?.popViewController(animated: true)
                         }
                     }
                 } else {
-                    let msg = error?.errorMsg ?? "操作失败"
+                    
+                    let tips = flag ? "提交失败" : "保存失败"
+                    let msg = error?.errorMsg ?? tips
                     YHHUD.flash(message: msg)
                 }
             }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/OtherInformation(其他信息)/M/YHOtherInfoFillModel.swift

@@ -52,6 +52,7 @@ class LanguageDetail : SmartCodable  {
     var levelDes : String = ""
     var name: String = ""
     var remark: String = ""
+    var localRemark : String = ""
     
     
     //以下为本地使用的参数

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/OtherInformation(其他信息)/V/YHOtherInfoFillCell.swift

@@ -385,7 +385,7 @@ extension YHOtherInfoFillCell {
             
             //7、其他奖励
             let fzView7 = YHOtherTextViewItemView(frame: .zero)
-            fzView7.updateUI(title: "7、其他奖励", value: dataModel.question?.other_information ?? "",type: .otherAwards)
+            fzView7.updateUI(title: "7、其他资料", value: dataModel.question?.other_information ?? "",type: .otherAwards)
             fzView7.block = { txt in
                 dataModel.question?.other_information = txt
             }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/OtherInformation(其他信息)/V/YHOtherSelecteItemView.swift

@@ -282,7 +282,8 @@ extension YHOtherSelecteItemView {
                 if longTimeButton.isSelected {
                     
                     longTimeButton.snp.remakeConstraints { make in
-                        make.centerX.equalToSuperview()
+
+                        make.left.equalTo(titleLabel.snp.right).offset(40)
                         make.centerY.equalToSuperview()
                         make.height.equalTo(32)
                         make.width.equalTo(43)

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

@@ -69,10 +69,17 @@ extension YHPreviewInfoNameAndSubNameItemView {
             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)
+            }
         }
     }
 }

galaxy/galaxy/Classes/Modules/Login(登录)/C/YHPhoneLoginViewController.swift

@@ -186,6 +186,11 @@ class YHPhoneLoginViewController: YHBaseViewController {
                     self.navigationController?.pushViewController(vc)
                 } else {
                     YHHUD.flash(message: error?.errorMsg ?? "")
+#if DEBUG
+                    let vc = YHCodeSueecssViewController()
+                    vc.phoneNumber = self.phoneMessageView.phoneTextField.text
+                    self.navigationController?.pushViewController(vc)
+#endif
                 }
             })
         } else {

galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMySettingViewController.swift

@@ -17,7 +17,7 @@ class YHMySettingViewController: YHBaseViewController, ConstraintRelatableTarget
         if #available(iOS 11.0, *) {
             tableView.contentInsetAdjustmentBehavior = .never
         }
-        tableView.backgroundColor = .clear
+        tableView.backgroundColor = .white
         tableView.separatorStyle = .none
         tableView.register(YHMySettingCell.self, forCellReuseIdentifier: YHMySettingCell.cellReuseIdentifier)
         tableView.delegate = self

galaxy/galaxy/Classes/Modules/Mine（我的）/V/YHMySettingCell.swift

@@ -38,6 +38,8 @@ class YHMySettingCell: UITableViewCell {
     func setupUI() {
         
         self.selectionStyle = .none
+        contentView.backgroundColor = .white
+        
         contentView.addSubview(titleLabel)
         contentView.addSubview(arrowImgView)