产品问题走查

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

@@ -102,7 +102,9 @@ class YHAddAdoptersViewController: YHBaseViewController {
     }
     
     @objc func nextStep() {
-        self.navigationController?.popViewController(animated: true)
+        let vc = YHCertificateAppointViewController()
+        vc.orderId = orderId
+        navigationController?.pushViewController(vc)
     }
 
     func showDeleteAlert(_ model: YHAdopterDependentModel) {

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

@@ -139,7 +139,7 @@ class YHAdopterNewPeopleViewController: YHBaseViewController {
                             }
                             self.stepView.currentIndex = self.stepView.currentIndex + 1
                             self.updateDataSource()
-                            if self.viewModel.mainModel.info.is_read_agreement == 0 {
+                            if self.viewModel.mainModel.info.is_read_agreement == 0 &&  titleText == "新增子女" {
                                 let view = YHAdopterCardOtherGuideView.sheetView()
                                 view.ischeckBeforeFlag = false
                                 view.block = {

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

@@ -45,6 +45,8 @@ class YHAdopterOtherViewController: YHBaseViewController {
             tableView.register(cellWithClass: YHAdopterOtherCardTableViewCell.self)
             tableView.register(cellWithClass: YHAdopterCardExplainTableViewCell.self)
             tableView.register(cellWithClass: YHAdopterIncomeFileCountTableViewCell.self)
+            let view = UIView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: 20))
+            tableView.tableFooterView = view
             return tableView
         }()
         view.addSubview(tableView)
@@ -171,8 +173,11 @@ extension YHAdopterOtherViewController: UITableViewDelegate, UITableViewDataSour
             return 84
         }
         if indexPath.row == 2 {
-            let count = urls.count/2
-            return CGFloat(173 + count * 173)
+            var count = urls.count/2
+            if count > 4 {
+                count = 4
+            }
+            return CGFloat(173 + count * 143)
         }
         return 45
     }

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

@@ -115,7 +115,7 @@ class YHAdopterCardTableViewCell: UITableViewCell {
         }()
         centerView.addSubview(moreButton)
         moreButton.snp.makeConstraints { make in
-            make.centerY.equalTo(titleLabel.snp.centerY)
+            make.centerY.equalToSuperview()
             make.right.equalTo(-14)
             make.height.equalTo(20)
             make.width.equalTo(62)

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

@@ -71,7 +71,7 @@ class YHAdopterIncomeTableViewCell: UITableViewCell {
         centerView.addSubview(titleLabel)
         titleLabel.snp.makeConstraints { make in
             make.left.equalTo(18)
-            make.top.equalTo(16)
+            make.top.equalTo(23)
             make.height.equalTo(24)
             make.right.equalTo(-18)
         }

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

@@ -320,21 +320,22 @@ class YHAdopterMarryCardTableViewCell: UITableViewCell {
         }
         YHImagePickerView.show() {[weak self] image in
             guard let self = self else { return }
-            self.thirdImageButton.setContent("card_loading", "上传中")
-            self.thirdImageButton.startRotationAnimation()
+            self.backSurfaceImageButton.setContent("card_loading", "上传中")
+            self.backSurfaceImageButton.startRotationAnimation()
             self.viewModel.uploadImage(image) {[weak self] success, error in
                 guard let self = self else { return }
-                self.thirdImageButton.stopRotationAnimation()
-                self.thirdImageButton.setContent("", "")
+                self.backSurfaceImageButton.stopRotationAnimation()
+                self.backSurfaceImageButton.setContent("", "")
                 
                 guard let url = success else { return }
-                self.thirdImageButton.setBackgroundImage(image, for: .normal)
-                self.thirdDeleteButton.isHidden = false
+                self.backSurfaceImageButton.setBackgroundImage(image, for: .normal)
+                self.backSurfaceDeleteButton.isHidden = false
                 if let block = self.urlBlock {
                     block(url, 1)
                 }
             }
         }
+        
     }
     
     @objc func thirdImageClick() {
@@ -349,16 +350,16 @@ class YHAdopterMarryCardTableViewCell: UITableViewCell {
         }
         YHImagePickerView.show() {[weak self] image in
             guard let self = self else { return }
-            self.backSurfaceImageButton.setContent("card_loading", "上传中")
-            self.backSurfaceImageButton.startRotationAnimation()
+            self.thirdImageButton.setContent("card_loading", "上传中")
+            self.thirdImageButton.startRotationAnimation()
             self.viewModel.uploadImage(image) {[weak self] success, error in
                 guard let self = self else { return }
-                self.backSurfaceImageButton.stopRotationAnimation()
-                self.backSurfaceImageButton.setContent("", "")
+                self.thirdImageButton.stopRotationAnimation()
+                self.thirdImageButton.setContent("", "")
                 
                 guard let url = success else { return }
-                self.backSurfaceImageButton.setBackgroundImage(image, for: .normal)
-                self.backSurfaceDeleteButton.isHidden = false
+                self.thirdImageButton.setBackgroundImage(image, for: .normal)
+                self.thirdDeleteButton.isHidden = false
                 if let block = self.urlBlock {
                     block(url, 2)
                 }

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

@@ -86,8 +86,11 @@ class YHAdopterOtherCardTableViewCell: UITableViewCell {
 extension YHAdopterOtherCardTableViewCell: UICollectionViewDelegate, UICollectionViewDataSource {
     
     func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
+        if self.dataSource.count < 10 {
             return self.dataSource.count
         }
+        return 10
+    }
     
     func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
         let cell = collectionView.dequeueReusableCell(withReuseIdentifier: YHAdopterOtherCardCollectionViewCell.cellReuseIdentifier, for: indexPath) as! YHAdopterOtherCardCollectionViewCell
@@ -136,7 +139,7 @@ class YHAdopterOtherCardCollectionViewCell: UICollectionViewCell {
     }
     var state: Int = 0 {
         didSet {
-            if self.state == 1 || self.state == 2 {
+            if self.state == 1 || self.state == 3 {
                 imagePickView.state = true
             }
         }