新增受养人细节

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

@@ -35,6 +35,13 @@ class YHAddAdoptersViewController: YHBaseViewController {
             guard let self = self else { return }
             self.clickIndex = self.viewModel.model?.has_dependent ?? 2
             tableView.reloadData()
+            if self.viewModel.model?.is_reserved_open == 1 && self.viewModel.model?.has_dependent == 0 {
+                self.bottonView.isHidden = false
+                self.nextButton.isHidden = false
+            } else {
+                self.bottonView.isHidden = true
+                self.nextButton.isHidden = true
+            }
         }
     }
     
@@ -135,7 +142,7 @@ extension YHAddAdoptersViewController: UITableViewDelegate, UITableViewDataSourc
             cell.newAdopterBlock = {[weak self] in
                 guard let self = self else { return }
                 var items: [YHCertificateEditItem] = []
-                if self.viewModel.model?.has_spouse ?? false {
+                if !(self.viewModel.model?.has_spouse ?? false) {
                     items.append(YHCertificateEditItem(type:.rename, title:"新增配偶"))
                 }
                 items.append(YHCertificateEditItem(type:.preview, title:"新增子女"))

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

@@ -38,6 +38,11 @@ class YHAdopterNewPeopleViewController: YHBaseViewController {
         self.updateDataSource()
         viewModel.getDependentsData(id: id) {[weak self] success, error in
             guard let self = self else { return }
+            if self.viewModel.isCanNext(self.stepView.currentIndex) {
+                self.stepView.currentIndex = 1
+            } else {
+                self.stepView.currentIndex = 0
+            }
             self.updateDataSource()
         }
     }
@@ -48,7 +53,15 @@ class YHAdopterNewPeopleViewController: YHBaseViewController {
             self.bottomView.nextButton.setTitle("下一步", for: .normal)
         } else if self.stepView.currentIndex == 1 {
             self.cardDataSource = self.viewModel.mainModel.docList
-//            self.bottomView.nextButton.setTitle("下一步", for: .normal)
+            self.bottomView.nextButton.isEnabled = true
+            self.bottomView.saveButton.isHidden = false
+            self.bottomView.nextButton.setTitle("确认，保存", for: .normal)
+            self.bottomView.nextButton.snp.remakeConstraints { make in
+                make.right.equalTo(-16)
+                make.top.equalTo(10)
+                make.height.equalTo(44)
+                make.left.equalTo(self.bottomView.saveButton.snp.right).offset(10)
+            }
         }
         self.tableView.reloadData()
     }
@@ -146,7 +159,7 @@ class YHAdopterNewPeopleViewController: YHBaseViewController {
             bottom.saveBlock = { [weak self] in
                 guard let self = self else { return }
                 self.stepView.currentIndex = 0
-                self.getData()
+                self.updateDataSource()
                 bottom.saveButton.setTitle("上一步", for: .normal)
                 bottom.saveButton.isHidden = true
                 bottom.nextButton.snp.remakeConstraints { make in

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

@@ -17,6 +17,7 @@ class YHAdopterMainModel: SmartCodable {
     var spouse_id : Int = 0
     var has_spouse : Bool = false //是否有配偶
     var has_deposit : Bool = false //是否有旅行证件
+    var is_reserved_open: Int = 0 // 0 不显示 1 显示 
     var dependent: [YHAdopterDependentModel] = [] // 受养人数组
     var deposit: YHAdopterDepositModel = YHAdopterDepositModel()
     

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

@@ -60,6 +60,33 @@ class YHAdopterCardExampleView: UIView {
                     make.height.equalTo(701)
                 }
             }
+            
+            if type == .travel {
+                titleLabel.text = "港澳通行证 (逗留D) 示例 (仅供参考)"
+                data = ["service_adopter_example_travel"]
+                centerView.snp.remakeConstraints { make in
+                    make.left.right.bottom.equalToSuperview()
+                    make.height.equalTo(689)
+                }
+            }
+            
+            if type == .chinaLife {
+                titleLabel.text = "中国居留许可签证 (仅供参考)"
+                data = ["service_adopter_example_chinalife"]
+                centerView.snp.remakeConstraints { make in
+                    make.left.right.bottom.equalToSuperview()
+                    make.height.equalTo(422)
+                }
+            }
+            
+            if type == .chinaTravel {
+                titleLabel.text = "护照示例 (仅供参考)"
+                data = ["service_adopter_example_chinatravel"]
+                centerView.snp.remakeConstraints { make in
+                    make.left.right.bottom.equalToSuperview()
+                    make.height.equalTo(659)
+                }
+            }
         }
     }
     
@@ -217,6 +244,15 @@ extension YHAdopterCardExampleView: UITableViewDelegate, UITableViewDataSource {
         if type == .marry {
             return 968 + 20
         }
+        if type == .travel {
+            return 508 + 20
+        }
+        if type == .chinaLife {
+            return 238 + 20
+        }
+        if type == .chinaTravel {
+            return 476 + 20
+        }
         if type == .other {
             if indexPath.row == 0 {
                 return 204 + 20

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

@@ -63,6 +63,7 @@ class YHAdopterCardTableViewCell: UITableViewCell {
             label.font = UIFont.PFSC_R(ofSize: 17)
             label.textColor = UIColor.mainTextColor
             label.text = "主申请人资料"
+            label.numberOfLines = 0
             let str = "*" + "受养人信息核实"
             let attributes: [NSAttributedString.Key: Any] = [
                 .font: UIFont.PFSC_R(ofSize: 17),
@@ -77,9 +78,9 @@ class YHAdopterCardTableViewCell: UITableViewCell {
         centerView.addSubview(titleLabel)
         titleLabel.snp.makeConstraints { make in
             make.left.equalTo(20)
-            make.top.equalTo(20)
-            make.height.equalTo(22)
-            make.right.equalTo(-18)
+            make.top.equalToSuperview()
+            make.bottom.equalToSuperview()
+            make.right.equalTo(-80)
         }
         
         selectLabel = {
@@ -141,13 +142,7 @@ class YHAdopterCardTableViewCell: UITableViewCell {
             questionAttrStr.addAttribute(NSAttributedString.Key.foregroundColor, value: UIColor.failColor, range: starRange)
             titleLabel.attributedText = questionAttrStr
         } else {
-            let str = data.dep_name
-            let attributes: [NSAttributedString.Key: Any] = [
-                .font: UIFont.PFSC_R(ofSize: 16),
-                .foregroundColor: UIColor.mainTextColor
-            ]
-            let questionAttrStr = NSMutableAttributedString(string: str, attributes: attributes)
-            titleLabel.attributedText = questionAttrStr
+            titleLabel.text = data.dep_name
         }
         
         if data.dep_type == 1 {
@@ -175,9 +170,9 @@ class YHAdopterCardTableViewCell: UITableViewCell {
             selectLabel.attributed.text = a
             titleLabel.snp.remakeConstraints { make in
                 make.left.equalTo(20)
-                make.top.equalTo(20)
-                make.height.equalTo(22)
-                make.right.equalTo(-18)
+                make.top.equalToSuperview()
+                make.bottom.equalToSuperview()
+                make.right.equalTo(-80)
             }
         }
         

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

@@ -134,7 +134,7 @@ class YHAdopterIncomeTableViewCell: UITableViewCell {
         }()
         centerView.addSubview(moreButton)
         moreButton.snp.makeConstraints { make in
-            make.bottom.equalTo(-16)
+            make.centerY.equalTo(selectLabel.snp.centerY)
             make.right.equalTo(-20)
             make.height.equalTo(20)
             make.width.equalTo(69)

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

@@ -59,7 +59,7 @@ class YHAdopterItemView: UIView {
         addSubview(explainLabel)
         explainLabel.snp.makeConstraints { make in
             make.right.equalTo(-24)
-            make.left.equalTo(titleLabel.snp.right)
+            make.left.equalToSuperview()
             make.height.equalTo(20)
             make.centerY.equalToSuperview()
         }
@@ -116,7 +116,7 @@ class YHAdopterItemView: UIView {
         }
         titleLabel.text = spouse + "(\(dataSource.dep_name))"
         if dataSource.status == 0 {
-            explainLabel.text = "待上传"
+            explainLabel.text = "待完善"
             explainLabel.textColor = UIColor.brandMainColor
             nextStepImageView.image = UIImage(named: "service_adopter_income_start")
         }

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/新增受养人/service_adopter_example_chinalife.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "service_adopter_example_chinalife@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "service_adopter_example_chinalife@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/新增受养人/service_adopter_example_chinatravel.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "service_adopter_example_chinatravel@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "service_adopter_example_chinatravel@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/新增受养人/service_adopter_example_travel.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "service_adopter_example_travel@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "service_adopter_example_travel@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}