新增受养人bug修复

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters(2新增受养人)/C/YHAddAdoptersViewController.swift

@@ -15,6 +15,7 @@ class YHAddAdoptersViewController: YHBaseViewController {
     var clickIndex = 2
     let viewModel = YHAddpterViewModel()
     var orderId: Int = 0
+    var isMore: Bool = false
 
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -157,6 +158,15 @@ extension YHAddAdoptersViewController: UITableViewDelegate, UITableViewDataSourc
         } else if indexPath.row == 2 {
             let cell = tableView.dequeueReusableCell(withClass: YHAdopterAddNewTableViewCell.self)
             cell.dataSource = self.viewModel.model?.dependent
+            if isMore {
+                cell.more()
+            } else {
+                cell.cannal()
+            }
+            cell.isMoreBlock = {[weak self] isMore in
+                guard let self = self else { return }
+                self.isMore = isMore
+            }
             cell.newAdopterBlock = {[weak self] in
                 guard let self = self else { return }
                 var items: [YHCertificateEditItem] = []

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters(2新增受养人)/C/YHAdoptedChinaTravelViewController.swift

@@ -73,7 +73,7 @@ class YHAdoptedChinaTravelViewController: YHBaseViewController {
             make.bottom.equalTo(-8 - k_Height_safeAreaInsetsBottom())
             make.height.equalTo(48)
         }
-        if model.status == 1 || model.status == 2 {
+        if model.status == 1 || model.status == 3 {
             nextButton.isHidden = true
         } else {
             tableView.snp.remakeConstraints { make in

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters(2新增受养人)/C/YHAdopterBirthViewController.swift

@@ -73,7 +73,7 @@ class YHAdopterBirthViewController: YHBaseViewController {
             make.bottom.equalTo(-8 - k_Height_safeAreaInsetsBottom())
             make.height.equalTo(48)
         }
-        if model.status == 1 || model.status == 2 {
+        if model.status == 1 || model.status == 3 {
             nextButton.isHidden = true
         } else {
             tableView.snp.remakeConstraints { make in

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters(2新增受养人)/C/YHAdopterChinaLifeViewController.swift

@@ -73,7 +73,7 @@ class YHAdopterChinaLifeViewController: YHBaseViewController {
             make.bottom.equalTo(-8 - k_Height_safeAreaInsetsBottom())
             make.height.equalTo(48)
         }
-        if model.status == 1 || model.status == 2 {
+        if model.status == 1 || model.status == 3 {
             nextButton.isHidden = true
         } else {
             tableView.snp.remakeConstraints { make in

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters(2新增受养人)/C/YHAdopterChinaViewController.swift

@@ -76,7 +76,7 @@ class YHAdopterChinaViewController: YHBaseViewController {
             make.bottom.equalTo(-8 - k_Height_safeAreaInsetsBottom())
             make.height.equalTo(48)
         }
-        if model.status == 1 || model.status == 2 {
+        if model.status == 1 || model.status == 3 {
             nextButton.isHidden = true
         } else {
             tableView.snp.remakeConstraints { make in
@@ -199,6 +199,9 @@ extension YHAdopterChinaViewController: UITableViewDelegate, UITableViewDataSour
         if isShow && message.count == 0 && isNeed {
             return 52 + 20
         } else {
+            if model.id == .id25 && message == "0" {
+                return 52 + 20
+            }
             return 52
         }
     }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters(2新增受养人)/C/YHAdopterIdCardViewController.swift

@@ -73,7 +73,7 @@ class YHAdopterIdCardViewController: YHBaseViewController {
             make.bottom.equalTo(-8 - k_Height_safeAreaInsetsBottom())
             make.height.equalTo(48)
         }
-        if model.status == 1 || model.status == 2 {
+        if model.status == 1 || model.status == 3 {
             nextButton.isHidden = true
         } else {
             tableView.snp.remakeConstraints { make in

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters(2新增受养人)/C/YHAdopterMarryViewController.swift

@@ -72,7 +72,7 @@ class YHAdopterMarryViewController: YHBaseViewController {
             make.bottom.equalTo(-8 - k_Height_safeAreaInsetsBottom())
             make.height.equalTo(48)
         }
-        if model.status == 1 || model.status == 2 {
+        if model.status == 1 || model.status == 3 {
             nextButton.isHidden = true
         } else {
             tableView.snp.remakeConstraints { make in

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters(2新增受养人)/C/YHAdopterOtherViewController.swift

@@ -71,7 +71,7 @@ class YHAdopterOtherViewController: YHBaseViewController {
             make.bottom.equalTo(-8 - k_Height_safeAreaInsetsBottom())
             make.height.equalTo(48)
         }
-        if model.status == 1 || model.status == 2 {
+        if model.status == 1 || model.status == 3 {
             nextButton.isHidden = true
         } else {
             tableView.snp.remakeConstraints { make in

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters(2新增受养人)/C/YHAdopterResidentViewController.swift

@@ -73,7 +73,7 @@ class YHAdopterResidentViewController: YHBaseViewController {
             make.bottom.equalTo(-8 - k_Height_safeAreaInsetsBottom())
             make.height.equalTo(48)
         }
-        if model.status == 1 || model.status == 2 {
+        if model.status == 1 || model.status == 3 {
             nextButton.isHidden = true
         } else {
             tableView.snp.remakeConstraints { make in

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters(2新增受养人)/C/YHAdopterTravelViewController.swift

@@ -76,7 +76,7 @@ class YHAdopterTravelViewController: YHBaseViewController {
             make.bottom.equalTo(-8 - k_Height_safeAreaInsetsBottom())
             make.height.equalTo(48)
         }
-        if model.status == 1 || model.status == 2 {
+        if model.status == 1 || model.status == 3 {
             nextButton.isHidden = true
         } else {
             tableView.snp.remakeConstraints { make in

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters(2新增受养人)/V/YHAdopterCardExplainTableViewCell.swift

@@ -111,12 +111,12 @@ class YHAdopterCardExplainTableViewCell: UITableViewCell {
             subTitleLabel.backgroundColor = UIColor(hex: 0xfff5eb)
             subTitleLabel.text = "审核中"
         }
-        if data.status == 2 {
+        if data.status == 3 {
             subTitleLabel.textColor = UIColor(hex: 0x3cc694)
             subTitleLabel.backgroundColor = UIColor(hex: 0xf0fbf7)
-            subTitleLabel.text = "已完成"
+            subTitleLabel.text = "已通过"
         }
-        if data.status == 3 {
+        if data.status == 2 {
             subTitleLabel.textColor = UIColor(hex: 0xf81d22)
             subTitleLabel.backgroundColor = UIColor(hex: 0xfff2f2)
             subTitleLabel.text = "已驳回"

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters(2新增受养人)/V/YHAdopterIncomeTitleTableViewCell.swift

@@ -188,7 +188,7 @@ class YHAdopterIncomeTitleTableViewCell: UITableViewCell {
             subTitleLabel.backgroundColor = UIColor(hex: 0xf0fbf7)
             failImageView.isHidden = true
             failLabel.isHidden = true
-            subTitleLabel.text = "已完成"
+            subTitleLabel.text = "已通过"
         }
         if data.status == 2 {
             subTitleLabel.textColor = UIColor(hex: 0xf81d22)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/MainApplicantInformation(主申请人信息)/V/YHItemView.swift

@@ -312,7 +312,9 @@ class YHItemView: UIView {
         if dataSource.isShowPrompts ?? false && dataSource.isNeed ?? false {
             if dataSource.message?.count != 0 {
                 showPromptLabel.isHidden = true
-                
+                if dataSource.type == .sex && dataSource.message == "0" {
+                    showPromptLabel.isHidden = false
+                }
                 //特殊处理身份证
                 if dataSource.id == .id8 {
                     if let message = dataSource.message,message.count == 18 {