Merge branch 'develop' into davidhuang

* develop:
  扩展了屏幕适配属性
  //  OCR
  扩展fix属性
  //
  新增受养人 细节调整 大屏幕适配等
  // 比较日期
  //  旅行
  //  旅行
  // 旅行

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

@@ -200,6 +200,11 @@ extension YHAddAdoptersViewController: UITableViewDelegate, UITableViewDataSourc
                 guard let self = self else { return }
                 let vc = YHAdopterNewPeopleViewController()
                 vc.id = model.id
+                var spouse = "子女"
+                if model.is_spouse == 1 {
+                    spouse = "配偶"
+                }
+                vc.titleText = "新增" + spouse
                 self.navigationController?.pushViewController(vc)
             }
             return cell

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

@@ -115,6 +115,7 @@ extension YHAdoptedChinaTravelViewController: UITableViewDelegate, UITableViewDa
         if indexPath.row == 1 {
             let cell = tableView.dequeueReusableCell(withClass: YHAdopterResidentTableViewCell.self)
             cell.firstImageName = "service_adopter_card_china_travel_front"
+            cell.firstLabelName = "中国旅行证"
             cell.urls = urls
             cell.state = model.status
             cell.urlBlock = { [weak self] url, index in

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

@@ -126,6 +126,7 @@ extension YHAdopterBirthViewController: UITableViewDelegate, UITableViewDataSour
         if indexPath.row == 2 {
             let cell = tableView.dequeueReusableCell(withClass: YHAdopterResidentTableViewCell.self)
             cell.firstImageName = "service_adopter_card_birth_front"
+            cell.firstLabelName = "出生医学证明页"
             cell.urls = urls
             cell.state = model.status
             cell.urlBlock = { [weak self] url, index in

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

@@ -115,6 +115,7 @@ extension YHAdopterChinaLifeViewController: UITableViewDelegate, UITableViewData
         if indexPath.row == 1 {
             let cell = tableView.dequeueReusableCell(withClass: YHAdopterResidentTableViewCell.self)
             cell.firstImageName = "service_adopter_card_china_life_front"
+            cell.firstLabelName = "中国居留许可签证"
             cell.urls = urls
             cell.state = model.status
             cell.urlBlock = { [weak self] url, index in

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

@@ -143,6 +143,8 @@ extension YHAdopterChinaViewController: UITableViewDelegate, UITableViewDataSour
                 let cell = tableView.dequeueReusableCell(withClass: YHAdopterTravelCardTableViewCell.self)
                 cell.firstImageName = "service_adopter_card_id_front"
                 cell.lastImageName = "service_adopter_card_id_back"
+                cell.firstLabelName = "身份证人像面"
+                cell.lastLabelName = "身份证国徽面"
                 cell.urls = urls
                 cell.state = model.status
                 cell.urlBlock = { [weak self] url, index in

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

@@ -116,6 +116,7 @@ extension YHAdopterIdCardViewController: UITableViewDelegate, UITableViewDataSou
         if indexPath.row == 1 {
             let cell = tableView.dequeueReusableCell(withClass: YHAdopterResidentTableViewCell.self)
             cell.firstImageName = "service_adopter_card_idcard_front"
+            cell.firstLabelName = "证件照"
             cell.urls = urls
             cell.state = model.status
             cell.urlBlock = { [weak self] url, index in

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

@@ -72,7 +72,11 @@ class YHAdopterNewPeopleViewController: YHBaseViewController {
         
         stepView = {
             let step = YHStepView()
-            step.dataSource = ["完善配偶信息", "上传配偶资料"]
+            if titleText == "新增子女" {
+                step.dataSource = ["完善子女信息", "上传子女资料"]
+            } else {
+                step.dataSource = ["完善配偶信息", "上传配偶资料"]
+            }
             return step
         }()
         view.addSubview(stepView)

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

@@ -126,6 +126,7 @@ extension YHAdopterResidentViewController: UITableViewDelegate, UITableViewDataS
         if indexPath.row == 2 {
             let cell = tableView.dequeueReusableCell(withClass: YHAdopterResidentTableViewCell.self)
             cell.firstImageName = "service_adopter_card_resident_front"
+            cell.firstLabelName = "户口个人页"
             cell.urls = urls
             cell.state = model.status
             cell.urlBlock = { [weak self] url, index in

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

@@ -133,6 +133,8 @@ extension YHAdopterTravelViewController: UITableViewDelegate, UITableViewDataSou
                 let cell = tableView.dequeueReusableCell(withClass: YHAdopterTravelCardTableViewCell.self)
                 cell.firstImageName = "service_adopter_card_travel_front"
                 cell.lastImageName = "service_adopter_card_travel_back"
+                cell.firstLabelName = "证件页1"
+                cell.lastLabelName = "证件页2"
                 cell.urls = urls
                 cell.state = model.status
                 cell.urlBlock = { [weak self] url, index in

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

@@ -24,7 +24,7 @@ class YHAdopterCardExampleView: UIView {
                 data = ["service_adopter_example_china"]
                 centerView.snp.remakeConstraints { make in
                     make.left.right.bottom.equalToSuperview()
-                    make.height.equalTo(691)
+                    make.height.equalTo(691.fix)
                 }
             }
             if type == .resident {
@@ -32,7 +32,7 @@ class YHAdopterCardExampleView: UIView {
                 data = ["service_adopter_example_resident"]
                 centerView.snp.remakeConstraints { make in
                     make.left.right.bottom.equalToSuperview()
-                    make.height.equalTo(667)
+                    make.height.equalTo(667.fix)
                 }
             }
             if type == .birth {
@@ -40,15 +40,15 @@ class YHAdopterCardExampleView: UIView {
                 data = ["service_adopter_example_birth"]
                 centerView.snp.remakeConstraints { make in
                     make.left.right.bottom.equalToSuperview()
-                    make.height.equalTo(453)
+                    make.height.equalTo(453.fix)
                 }
             }
             if type == .marry {
-                titleLabel.text = "出生医学证明示例 (仅供参考)"
+                titleLabel.text = "结婚证示例模版"
                 data = ["service_adopter_example_marry"]
                 centerView.snp.remakeConstraints { make in
                     make.left.right.bottom.equalToSuperview()
-                    make.height.equalTo(691)
+                    make.height.equalTo(691.fix)
                 }
             }
             if type == .other {
@@ -57,7 +57,7 @@ class YHAdopterCardExampleView: UIView {
                 data = ["service_adopter_example_other1", "service_adopter_example_other2","service_adopter_example_other3","service_adopter_example_other4"]
                 centerView.snp.remakeConstraints { make in
                     make.left.right.bottom.equalToSuperview()
-                    make.height.equalTo(701)
+                    make.height.equalTo(801.fix)
                 }
             }
             
@@ -66,7 +66,7 @@ class YHAdopterCardExampleView: UIView {
                 data = ["service_adopter_example_travel"]
                 centerView.snp.remakeConstraints { make in
                     make.left.right.bottom.equalToSuperview()
-                    make.height.equalTo(689)
+                    make.height.equalTo(689.fix)
                 }
             }
             
@@ -75,7 +75,7 @@ class YHAdopterCardExampleView: UIView {
                 data = ["service_adopter_example_chinalife"]
                 centerView.snp.remakeConstraints { make in
                     make.left.right.bottom.equalToSuperview()
-                    make.height.equalTo(422)
+                    make.height.equalTo(422.fix)
                 }
             }
             
@@ -84,7 +84,7 @@ class YHAdopterCardExampleView: UIView {
                 data = ["service_adopter_example_chinatravel"]
                 centerView.snp.remakeConstraints { make in
                     make.left.right.bottom.equalToSuperview()
-                    make.height.equalTo(659)
+                    make.height.equalTo(659.fix)
                 }
             }
         }
@@ -245,38 +245,38 @@ extension YHAdopterCardExampleView: UITableViewDelegate, UITableViewDataSource {
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
         guard let type = type else { return 0 }
         if type == .china {
-            return 507 + 20
+            return 507.fix + 20
         }
         if type == .resident {
-            return 482 + 20
+            return 482.fix + 20
         }
         if type == .birth {
-            return 269 + 20
+            return 269.fix + 20
         }
         if type == .marry {
-            return 968 + 20
+            return 968.fix + 20
         }
         if type == .travel {
-            return 508 + 20
+            return 508.fix + 20
         }
         if type == .chinaLife {
-            return 238 + 20
+            return 238.fix + 20
         }
         if type == .chinaTravel {
-            return 476 + 20
+            return 476.fix + 20
         }
         if type == .other {
             if indexPath.row == 0 {
-                return 204 + 20
+                return 204.fix + 20
             }
             if indexPath.row == 1 {
-                return 147 + 20
+                return 147.fix + 20
             }
             if indexPath.row == 2 {
-                return 91 + 20
+                return 91.fix + 20
             }
             if indexPath.row == 3 {
-                return 91 + 20
+                return 91.fix + 20
             }
         }
         

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

@@ -263,19 +263,19 @@ extension YHAdopterCardOtherGuideView: UITableViewDelegate, UITableViewDataSourc
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
         
         if indexPath.row == 1 {
-            return 204 + 20
+            return 204.fix  + 20
         }
         if indexPath.row == 2 {
-            return 147 + 20
+            return 147.fix + 20
         }
         if indexPath.row == 3 {
-            return 91 + 20
+            return 91.fix + 20
         }
         if indexPath.row == 4 {
-            return 91 + 20
+            return 91.fix + 20
         }
         
-        return 68 + 20
+        return 68.fix + 20
     }
     
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {

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

@@ -192,7 +192,7 @@ class YHAdopterCardTableViewCell: UITableViewCell {
             moreButton.setImage(UIImage(named: "service_adopter_income_fail"), for: .normal)
         }
         if data.status == 3 {
-            moreButton.setTitle("已完成", for: .normal)
+            moreButton.setTitle("已通过", for: .normal)
             moreButton.setTitleColor(UIColor(hex: 0x3cc694), for: .normal)
             moreButton.setImage(UIImage(named: "service_adopter_income_success"), for: .normal)
         }

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

@@ -183,14 +183,14 @@ class YHAdopterIncomeTitleTableViewCell: UITableViewCell {
             failLabel.isHidden = true
             subTitleLabel.text = "审核中"
         }
-        if data.status == 2 {
+        if data.status == 3 {
             subTitleLabel.textColor = UIColor(hex: 0x3cc694)
             subTitleLabel.backgroundColor = UIColor(hex: 0xf0fbf7)
             failImageView.isHidden = true
             failLabel.isHidden = true
             subTitleLabel.text = "已完成"
         }
-        if data.status == 3 {
+        if data.status == 2 {
             subTitleLabel.textColor = UIColor(hex: 0xf81d22)
             subTitleLabel.backgroundColor = UIColor(hex: 0xfff2f2)
             failImageView.isHidden = false

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

@@ -34,7 +34,7 @@ class YHAdopterMarryCardTableViewCell: UITableViewCell {
                 guard let url = success else { return }
                 self.frontImageButton.kf.setBackgroundImage(with: URL(string: url), for: .normal, completionHandler:  { _ in
                     self.frontDeleteButton.isHidden = false
-                    if self.state == 1 || self.state == 2 {
+                    if self.state == 1 || self.state == 3 {
                         self.frontDeleteButton.isHidden = true
                     }
                 })
@@ -47,7 +47,7 @@ class YHAdopterMarryCardTableViewCell: UITableViewCell {
                 guard let url = success else { return }
                 self.frontImageButton.kf.setBackgroundImage(with: URL(string: url), for: .normal, completionHandler:  { _ in
                     self.thirdDeleteButton.isHidden = false
-                    if self.state == 1 || self.state == 2 {
+                    if self.state == 1 || self.state == 3 {
                         self.thirdDeleteButton.isHidden = true
                     }
                 })
@@ -60,7 +60,7 @@ class YHAdopterMarryCardTableViewCell: UITableViewCell {
                 guard let url = success else { return }
                 self.backSurfaceImageButton.kf.setBackgroundImage(with: URL(string: url), for: .normal, completionHandler:  { _ in
                     self.backSurfaceDeleteButton.isHidden = false
-                    if self.state == 1 || self.state == 2 {
+                    if self.state == 1 || self.state == 3 {
                         self.backSurfaceDeleteButton.isHidden = true
                     }
                 })
@@ -72,7 +72,7 @@ class YHAdopterMarryCardTableViewCell: UITableViewCell {
 
     var state: Int? {
         didSet {
-            if state == 1 || state == 2 {
+            if state == 1 || state == 3 {
                 frontDeleteButton.isHidden = true
                 backSurfaceDeleteButton.isHidden = true
                 thirdDeleteButton.isHidden = true
@@ -179,7 +179,7 @@ class YHAdopterMarryCardTableViewCell: UITableViewCell {
             make.left.equalTo(20)
             make.top.equalTo(60)
             make.height.equalTo(99)
-            make.width.equalTo(160)
+            make.width.equalTo(CGFloat(160).fix)
         }
         
         frontDeleteButton = {
@@ -211,7 +211,7 @@ class YHAdopterMarryCardTableViewCell: UITableViewCell {
             make.right.equalTo(-20)
             make.top.equalTo(60)
             make.height.equalTo(99)
-            make.width.equalTo(160)
+            make.width.equalTo(CGFloat(160).fix)
         }
 
         backSurfaceDeleteButton = {
@@ -243,7 +243,7 @@ class YHAdopterMarryCardTableViewCell: UITableViewCell {
             make.left.equalTo(20)
             make.top.equalTo(219)
             make.height.equalTo(99)
-            make.width.equalTo(160)
+            make.width.equalTo(CGFloat(160).fix)
         }
         
         thirdDeleteButton = {

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

@@ -104,7 +104,7 @@ extension YHAdopterOtherCardTableViewCell: UICollectionViewDelegate, UICollectio
 
 extension YHAdopterOtherCardTableViewCell : CollectionViewWaterfallLayoutDelegate {
     func collectionView(_ collectionView: UICollectionView, layout: UICollectionViewLayout, sizeForItemAtIndexPath indexPath: NSIndexPath) -> CGSize {
-        return CGSize(width: CGFloat(168).scaleSizeFrom375px(size: 168), height: 133)
+        return CGSize(width: 168.fix, height: 133)
     }
 }
 

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

@@ -22,6 +22,11 @@ class YHAdopterResidentTableViewCell: UITableViewCell {
             frontImageButton.setBackgroundImage(UIImage(named: firstImageName), for: .normal)
         }
     }
+    var firstLabelName: String = "" {
+        didSet {
+            frontLabel.text = firstLabelName
+        }
+    }
     var urls: [String]? {
         didSet {
             guard let firstUrl = urls?.first, firstUrl.count != 0 else { return }
@@ -31,7 +36,7 @@ class YHAdopterResidentTableViewCell: UITableViewCell {
                 guard let url = success else { return }
                 self.frontImageButton.kf.setBackgroundImage(with: URL(string: url), for: .normal, completionHandler:  { _ in
                     self.frontDeleteButton.isHidden = false
-                    if self.state == 1 || self.state == 2 {
+                    if self.state == 1 || self.state == 3 {
                         self.frontDeleteButton.isHidden = true
                     }
                 })
@@ -42,7 +47,7 @@ class YHAdopterResidentTableViewCell: UITableViewCell {
 
     var state: Int? {
         didSet {
-            if state == 1 || state == 2 {
+            if state == 1 || state == 3 {
                 frontDeleteButton.isHidden = true
             }
         }
@@ -115,7 +120,7 @@ class YHAdopterResidentTableViewCell: UITableViewCell {
             make.left.equalTo(20)
             make.top.equalTo(60)
             make.height.equalTo(99)
-            make.width.equalTo(160)
+            make.width.equalTo(CGFloat(160).fix)
         }
         
         frontDeleteButton = {

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

@@ -28,7 +28,17 @@ class YHAdopterTravelCardTableViewCell: UITableViewCell {
     }
     var lastImageName: String = "" {
         didSet {
-            backSurfaceImageButton.setBackgroundImage(UIImage(named: firstImageName), for: .normal)
+            backSurfaceImageButton.setBackgroundImage(UIImage(named: lastImageName), for: .normal)
+        }
+    }
+    var firstLabelName: String = "" {
+        didSet {
+            frontLabel.text = firstLabelName
+        }
+    }
+    var lastLabelName: String = "" {
+        didSet {
+            backSurfaceLabel.text = firstLabelName
         }
     }
     var urls: [String]? {
@@ -40,7 +50,7 @@ class YHAdopterTravelCardTableViewCell: UITableViewCell {
                 guard let url = success else { return }
                 self.frontImageButton.kf.setBackgroundImage(with: URL(string: url), for: .normal, completionHandler:  { _ in
                     self.frontDeleteButton.isHidden = false
-                    if self.state == 1 || self.state == 2 {
+                    if self.state == 1 || self.state == 3 {
                         self.frontDeleteButton.isHidden = true
                     }
                 })
@@ -53,7 +63,7 @@ class YHAdopterTravelCardTableViewCell: UITableViewCell {
                 guard let url = success else { return }
                 self.backSurfaceImageButton.kf.setBackgroundImage(with: URL(string: url), for: .normal, completionHandler:  { _ in
                     self.backSurfaceDeleteButton.isHidden = false
-                    if self.state == 1 || self.state == 2 {
+                    if self.state == 1 || self.state == 3 {
                         self.backSurfaceDeleteButton.isHidden = true
                     }
                 })
@@ -65,7 +75,7 @@ class YHAdopterTravelCardTableViewCell: UITableViewCell {
 
     var state: Int? {
         didSet {
-            if state == 1 || state == 2 {
+            if state == 1 || state == 3 {
                 frontDeleteButton.isHidden = true
                 backSurfaceDeleteButton.isHidden = true
             }
@@ -156,7 +166,7 @@ class YHAdopterTravelCardTableViewCell: UITableViewCell {
             make.left.equalTo(20)
             make.top.equalTo(60)
             make.height.equalTo(99)
-            make.width.equalTo(160)
+            make.width.equalTo(CGFloat(160).fix)
         }
         
         frontDeleteButton = {
@@ -188,7 +198,7 @@ class YHAdopterTravelCardTableViewCell: UITableViewCell {
             make.right.equalTo(-20)
             make.top.equalTo(60)
             make.height.equalTo(99)
-            make.width.equalTo(160)
+            make.width.equalTo(CGFloat(160).fix)
         }
 
         backSurfaceDeleteButton = {

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

@@ -19,6 +19,7 @@ class YHCardUploadView: UIView {
     var viewModel: YHBaseViewModel = YHBaseViewModel()
     var firstUrl: String = ""
     var defaultImageName: String = "service_adopter_card_other_front"
+    var defaultName: String = "相关证件1"
     var url: String? {
         didSet {
             guard let firstUrl = url, firstUrl.count != 0 else {
@@ -71,7 +72,7 @@ class YHCardUploadView: UIView {
             let label = UILabel()
             label.font = UIFont.PFSC_R(ofSize: 12)
             label.textColor = UIColor.subTextColor
-            label.text = "证件页1"
+            label.text = defaultName
             label.textAlignment = .center
             return label
         }()

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/TravelDocumentsPreparation(6 旅行证件准备)/C/YHTravelDocsPreparationDetailVC.swift

@@ -156,6 +156,7 @@ class YHTravelDocsPreparationDetailVC: YHBaseViewController {
             
         } else { // 没有上传过证件
             
+            let age = self.viewModel.travelDetailModel?.age ?? 0
             var userId = 0
             if let uid = YHLoginManager.shared.userModel?.id {
                 userId = Int(uid) ?? 0
@@ -171,7 +172,7 @@ class YHTravelDocsPreparationDetailVC: YHBaseViewController {
                 } else if self.type == .HK {
                     type = 3
                 }
-                let cerModel1 = YHTravelDocsPreparationDetailItemModel(type: type, order_id: self.orderId, order_sn: "", img_back: "", img_front: "", status: 0, issue_start: "", issue_end: "", user_id:userId  , user_type: dataModel.type, remark: "", nationality: "\(dataModel.nationality)")
+                let cerModel1 = YHTravelDocsPreparationDetailItemModel(type: type, order_id: self.orderId, order_sn: "", img_back: "", img_front: "", status: 0, issue_start: "", issue_end: "", user_id:userId  , user_type: dataModel.type, remark: "", nationality: "\(dataModel.nationality)", age: age)
                 
                 cerModel1.latest_validaty_date = self.viewModel.travelDetailModel?.latest_validaty_date ?? ""
                 cerModel1.china_travel_latest_validate_date = self.viewModel.travelDetailModel?.china_travel_latest_validate_date ?? ""
@@ -183,7 +184,7 @@ class YHTravelDocsPreparationDetailVC: YHBaseViewController {
                 
                 // 外国护照
                 let item1 = YHTravelCerSectionItem(type: .certificate, tipsArr: [])
-                let cerModel1 = YHTravelDocsPreparationDetailItemModel(type: 1, order_id: self.orderId, order_sn: "", img_back: "", img_front: "", status: 0, issue_start: "", issue_end: "", user_id:userId  , user_type: dataModel.type, remark: "", nationality: "\(dataModel.nationality)")
+                let cerModel1 = YHTravelDocsPreparationDetailItemModel(type: 1, order_id: self.orderId, order_sn: "", img_back: "", img_front: "", status: 0, issue_start: "", issue_end: "", user_id:userId  , user_type: dataModel.type, remark: "", nationality: "\(dataModel.nationality)", age: age)
                 cerModel1.latest_validaty_date = self.viewModel.travelDetailModel?.latest_validaty_date ?? ""
                 cerModel1.china_travel_latest_validate_date = self.viewModel.travelDetailModel?.china_travel_latest_validate_date ?? ""
                 cerModel1.isCanEdit = true
@@ -192,7 +193,7 @@ class YHTravelDocsPreparationDetailVC: YHBaseViewController {
                 
                 // 中国居留许可签证
                 let item2 = YHTravelCerSectionItem(type: .certificate, tipsArr: [])
-                let cerModel2 = YHTravelDocsPreparationDetailItemModel(type: 2, order_id: self.orderId, order_sn: "", img_back: "", img_front: "", status: 0, issue_start: "", issue_end: "", user_id:userId  , user_type: dataModel.type, remark: "", nationality: "\(dataModel.nationality)")
+                let cerModel2 = YHTravelDocsPreparationDetailItemModel(type: 2, order_id: self.orderId, order_sn: "", img_back: "", img_front: "", status: 0, issue_start: "", issue_end: "", user_id:userId  , user_type: dataModel.type, remark: "", nationality: "\(dataModel.nationality)", age: age)
                 cerModel2.isCanEdit = true
                 item2.cerDetailModel = cerModel2
                 sectionItems.append(item2)
@@ -213,7 +214,8 @@ class YHTravelDocsPreparationDetailVC: YHBaseViewController {
         if !checkInfo() {
             return
         }
-        saveAllTravelCertificate()
+        
+//        saveAllTravelCertificate()
     }
     
     func checkInfo() -> Bool {
@@ -260,6 +262,7 @@ class YHTravelDocsPreparationDetailVC: YHBaseViewController {
                                 item.cerDetailModel.isNeedCheckCer = true
                                 if item.cerDetailModel.type == 2, item.cerDetailModel.china_travel_latest_validate_date.isEmpty {
                                     // 这个情况直接弹toast
+                                    YHHUD.flash(message: "赴港行程尚未成功预约，请前往检查")
                                     
                                 } else {
                                     item.cerDetailModel.checkTips = "有效期不足，请核查文件"

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/TravelDocumentsPreparation(6 旅行证件准备)/M/YHTravelDocsPreparationDetailModel.swift

@@ -13,6 +13,7 @@ class YHTravelDocsPreparationDetailModel: SmartCodable {
     var ttl : Int = -1 //电子签证有效期
     var latest_validaty_date : String = "" //有效期最晚时间
     var china_travel_latest_validate_date: String = "" // 中国居留许可签证有效期最晚时间
+    var age: Int = 0
     var list : [YHTravelDocsPreparationDetailItemModel?] = [] //电子签证有效期
     
     required init() {
@@ -46,6 +47,7 @@ class YHTravelDocsPreparationDetailItemModel: SmartCodable {
     
     var latest_validaty_date : String = "" //有效期最晚时间
     var china_travel_latest_validate_date: String = "" // 中国居留许可签证有效期最晚时间
+    var age: Int = 0
 
     // 是否检测时间
     var isNeedCheckDate: Bool = false
@@ -58,7 +60,7 @@ class YHTravelDocsPreparationDetailItemModel: SmartCodable {
         
     }
     
-    init(type: Int, order_id: Int, order_sn: String, img_back: String, img_front: String, status: Int, issue_start: String, issue_end: String, user_id: Int, user_type: String, remark: String, nationality: String) {
+    init(type: Int, order_id: Int, order_sn: String, img_back: String, img_front: String, status: Int, issue_start: String, issue_end: String, user_id: Int, user_type: String, remark: String, nationality: String, age: Int) {
         
         self.type = type
         self.order_id = order_id
@@ -72,22 +74,28 @@ class YHTravelDocsPreparationDetailItemModel: SmartCodable {
         self.user_type = user_type
         self.remark = remark
         self.nationality = nationality
+        self.age = age
+
     }
     
     func isValidCer() -> Bool {
-        var latestDate = self.latest_validaty_date
-        if self.type == 2 { // 中国居留许可签证
-            latestDate = self.china_travel_latest_validate_date
-        }
         
-        if latestDate.isEmpty {
-            if self.type == 2 {
-                YHHUD.flash(message: "赴港行程尚未预约，请前往预约")
+        if self.type == 2 { // 中国居留许可签证
+            if self.age < 11 { // 小于11岁的不检测
+                return true
+            }
+            if self.china_travel_latest_validate_date.isEmpty { // 截止日期为空
                 return false
             }
+            let isValid = self.compareDates(dateString1: self.issue_end, dateString2: self.china_travel_latest_validate_date)
+            return isValid
+        }
+        
+        if self.latest_validaty_date.isEmpty { // 截止日期为空
             return true
         }
-        let isValid = self.compareDates(dateString1: latestDate, dateString2: self.issue_end)
+        
+        let isValid = self.compareDates(dateString1: self.issue_end, dateString2: self.latest_validaty_date)
         return isValid
     }
     

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/TravelDocumentsPreparation(6 旅行证件准备)/V/YHTravelCertificateUploadCell.swift

@@ -121,10 +121,8 @@ class YHTravelCertificateUploadCell: UITableViewCell {
             [weak self] url, index in
             guard let self = self else { return }
             if self.dataModel.type == 3 { // 港澳通行证
-                self.dataModel.img_front = url
-                if self.dataModel.isCanEdit {
-                    self.getOCR(url: url, isBack: 0)
-                }
+                  self.dataModel.img_front = url
+                  self.getOCR(url: url, isBack: 0)
 
             } else {
                 self.dataModel.img_front = url
@@ -499,10 +497,6 @@ extension YHTravelCertificateUploadCell {
     
     func getOCR(url: String, isBack:Int) {
         
-        if self.dataModel.type != 3 { // 非港澳通行证 不用进行OCR识别
-            return
-        }
-
         self.viewModel.getPublicImageUrl(url) {
             
             [weak self] success, error in

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/TravelDocumentsPreparation(6 旅行证件准备)/VM/YHTravelDocsPreparationViewModel.swift

@@ -70,6 +70,7 @@ extension YHTravelDocsPreparationViewModel {
                     if let item = item {
                         item.latest_validaty_date = self.travelDetailModel?.latest_validaty_date ?? ""
                         item.china_travel_latest_validate_date = self.travelDetailModel?.china_travel_latest_validate_date ?? ""
+                        item.age = resultModel.age
                     }
                 }
                 callBackBlock(true, nil)
@@ -121,7 +122,12 @@ extension YHTravelDocsPreparationViewModel {
         
         if type == 1 {
             let a = ASAttributedString.init("办理逗留D签注", .font(UIFont.PFSC_R(ofSize:14)), .foreground(UIColor.mainTextColor(alpha: 0.5)))
-            let b = ASAttributedString.init("《港澳通行证逗留 (D) -办理操作指引》", .font(UIFont.PFSC_R(ofSize:14)),.foreground(UIColor.brandMainColor))
+            let b = ASAttributedString.init("《港澳通行证逗留 (D) -办理操作指引》", .font(UIFont.PFSC_R(ofSize:14)), 
+                .underline([.single]),
+                .foreground(UIColor.brandMainColor),
+                .action {
+                    YHTravelHKDLGuideSheetView.sheetView().show()
+            })
             let c = ASAttributedString.init("点击查看", .font(UIFont.PFSC_R(ofSize:14)),.foreground(UIColor.mainTextColor(alpha: 0.5)))
             return a+b+c
         }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/OfficialApproval(正式批)/C/YHOfficialApprovalResultVC.swift

@@ -244,9 +244,9 @@ private extension YHOfficialApprovalResultVC {
         view.addSubview(paperImageV)
         paperImageV.snp.makeConstraints { make in
             make.left.equalToSuperview()
-            make.top.equalToSuperview().offset(CGFloat(200).scaleSizeFrom375px(size: 200))
-            make.width.equalTo(CGFloat(294).scaleSizeFrom375px(size: 294))
-            make.height.equalTo(CGFloat(530).scaleSizeFrom375px(size: 530))
+            make.top.equalToSuperview().offset(200.fix)
+            make.width.equalTo(294.fix)
+            make.height.equalTo(530.fix)
         }
         paperImageV.layer.zPosition = 0
         
@@ -254,27 +254,27 @@ private extension YHOfficialApprovalResultVC {
         view.addSubview(docImageV)
         docImageV.snp.makeConstraints { make in
             make.right.equalToSuperview()
-            make.top.equalToSuperview().offset(CGFloat(64).scaleSizeFrom375px(size: 64))
-            make.width.equalTo(CGFloat(294).scaleSizeFrom375px(size: 294))
-            make.height.equalTo(CGFloat(530).scaleSizeFrom375px(size: 530))
+            make.top.equalToSuperview().offset(64.fix)
+            make.width.equalTo(294.fix)
+            make.height.equalTo(530.fix)
         }
         docImageV.layer.zPosition = 1
         
         docImageV.addSubview(contentView)
         contentView.snp.makeConstraints { make in
-            make.left.equalTo(CGFloat(50).scaleSizeFrom375px(size: 50))
-            make.top.equalTo(CGFloat(140).scaleSizeFrom375px(size: 140))
-            make.width.equalTo(CGFloat(294).scaleSizeFrom375px(size: 294))
-            make.height.equalTo(CGFloat(530).scaleSizeFrom375px(size: 530))
+            make.left.equalTo(50.fix)
+            make.top.equalTo(140.fix)
+            make.width.equalTo(294.fix)
+            make.height.equalTo(530.fix)
         }
         contentView.transform = rotatedTransform()
         
         docImageV.addSubview(penImageV)
         penImageV.snp.makeConstraints { make in
-            make.top.equalToSuperview().offset(CGFloat(204).scaleSizeFrom375px(size: 204))
+            make.top.equalToSuperview().offset(204.fix)
             make.right.equalToSuperview()
-            make.width.equalTo(CGFloat(67).scaleSizeFrom375px(size: 67))
-            make.height.equalTo(CGFloat(141).scaleSizeFrom375px(size: 141))
+            make.width.equalTo(67.fix)
+            make.height.equalTo(141.fix)
         }
         penImageV.layer.zPosition = 1
         
@@ -292,7 +292,7 @@ private extension YHOfficialApprovalResultVC {
         view.addSubview(lightImageV)
         lightImageV.snp.makeConstraints { make in
             make.top.right.left.equalToSuperview()
-            make.height.equalTo(CGFloat(543).scaleSizeFrom375px(size: 543))
+            make.height.equalTo(543.fix)
         }
         lightImageV.layer.zPosition = 3
         
@@ -308,7 +308,7 @@ private extension YHOfficialApprovalResultVC {
         
         bottomContentView.addSubview(tipsLabel)
         tipsLabel.snp.makeConstraints { make in
-            make.bottom.equalToSuperview().offset(CGFloat(-50).scaleSizeFrom375px(size: -50))
+            make.bottom.equalToSuperview().offset(-50.fix)
             make.centerX.equalToSuperview()
         }
         
@@ -317,17 +317,17 @@ private extension YHOfficialApprovalResultVC {
         indicatorView.snp.makeConstraints { make in
             make.left.right.equalToSuperview()
             make.height.equalTo(2)
-            make.bottom.equalTo(tipsLabel.snp.top).offset(CGFloat(-20).scaleSizeFrom375px(size: -20))
+            make.bottom.equalTo(tipsLabel.snp.top).offset(-20.fix)
         }
         
         
         bottomContentView.addSubview(bannerView)
         bannerView.snp.makeConstraints { make in
             make.left.right.equalToSuperview()
-            make.height.equalTo(CGFloat(148).scaleSizeFrom375px(size: 148))
-            make.bottom.equalTo(indicatorView.snp.top).offset(CGFloat(-16).scaleSizeFrom375px(size: -16))
+            make.height.equalTo(148.fix)
+            make.bottom.equalTo(indicatorView.snp.top).offset(-16.fix)
             
-            make.top.equalToSuperview().offset(CGFloat(20).scaleSizeFrom375px(size: 20))
+            make.top.equalToSuperview().offset(20.fix)
         }
         bannerView.layer.zPosition = 10
         

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/OfficialApproval(正式批)/V/YHOffivialApprovalSuccessCheckView.swift

@@ -171,7 +171,7 @@ private extension YHOffivialApprovalSuccessCheckView {
             let topMargin = (KScreenHeight/812.0) * 156
             closeBtn.snp.makeConstraints { make in
                 make.top.equalTo(rewardBtn.snp.bottom).offset(topMargin)
-                make.width.height.equalTo(CGFloat(24).scaleSizeFrom375px(size: 24))
+                make.width.height.equalTo(24.fix)
                 make.centerX.equalToSuperview()
             }
             closeBtn.YH_clickEdgeInsets = UIEdgeInsets(top: 10, left: 10, bottom: 10, right: 10)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/OfficialApproval(正式批)/V/YHOffivialApprovalSuccessView.swift

@@ -42,7 +42,7 @@ class YHOffivialApprovalSuccessView: UIView {
             make.left.equalTo(5)
             make.top.equalTo(0)
             make.right.equalTo(-5)
-            make.height.equalTo(CGFloat(42).scaleSizeFrom375px(size: 42))
+            make.height.equalTo(42.fix)
         }
     }
     
@@ -64,18 +64,18 @@ class YHOffivialApprovalSuccessView: UIView {
             }
             addSubview(label)
             label.snp.makeConstraints { make in
-                make.left.equalTo(CGFloat(5).scaleSizeFrom375px(size: 5))
-                make.top.equalTo(CGFloat(h).scaleSizeFrom375px(size: CGFloat(h)))
+                make.left.equalTo(5.fix)
+                make.top.equalTo(CGFloat(h).fix)
                 make.right.equalTo(-5)
-                make.height.equalTo(CGFloat(26).scaleSizeFrom375px(size: 26))
+                make.height.equalTo(26.fix)
             }
             let line = UIView()
             line.backgroundColor = UIColor(hex: 0x881000).withAlphaComponent(0.15)
             addSubview(line)
             line.snp.makeConstraints { make in
                 make.left.equalTo(5)
-                make.top.equalTo(CGFloat(h + 26 + 2).scaleSizeFrom375px(size: CGFloat(h + 26 + 2)))
-                make.width.equalTo(CGFloat(234).scaleSizeFrom375px(size: 234))
+                make.top.equalTo(CGFloat(h + 26 + 2).fix)
+                make.width.equalTo(234.fix)
                 make.height.equalTo(1)
             }
             h = h + 26 + 10

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHServiceOrderProgressTableViewCell.swift

@@ -142,6 +142,13 @@ extension YHServiceOrderProgressTableViewCell {
             if model.type == 25 {
                 titleLabel.text = "赴港行程指引"
                 messageLabel.text = "请根据指引清单提前规划赴港行程"
+                progressImageView.isHidden = true
+                progressLabel.isHidden = true
+                messageLabel.snp.remakeConstraints { make in
+                    make.top.equalTo(49)
+                    make.left.equalTo(21)
+                    make.right.equalTo(-21)
+                }
             }
             
             if model.type == 26 {
@@ -330,6 +337,13 @@ extension YHServiceOrderProgressTableViewCell {
                 messageLabel.text = "请根据指引清单提前规划赴港行程"
                 buttonLabel.text = "去查看"
                 messageLabel.textColor = UIColor.yhGreyColor50
+                progressImageView.isHidden = true
+                progressLabel.isHidden = true
+                messageLabel.snp.remakeConstraints { make in
+                    make.top.equalTo(49)
+                    make.left.equalTo(21)
+                    make.right.equalTo(-21)
+                }
             }
             
             if model.type == 26 {

galaxy/galaxy/Classes/Tools/Extention/CGFloat+Extention.swift

@@ -9,13 +9,50 @@
 import UIKit
 
 extension CGFloat {
-    public func scaleSizeFrom375px(size: CGFloat) -> CGFloat {
+    var fix: CGFloat {
         let screenWidth = UIScreen.main.bounds.width
         // 假设设计稿基于375pt宽度，iPhone 6的屏幕宽度
         let baseWidth: CGFloat = 375.0
         // 计算换算比例
         let scale = screenWidth / baseWidth
         // 应用换算比例
-        return size * scale
+        return self * scale
     }
 }
+
+extension Int {
+    var fix: CGFloat {
+        let screenWidth = UIScreen.main.bounds.width
+        // 假设设计稿基于375pt宽度，iPhone 6的屏幕宽度
+        let baseWidth: CGFloat = 375.0
+        // 计算换算比例
+        let scale = screenWidth / baseWidth
+        // 应用换算比例
+        return CGFloat(self) * scale
+    }
+}
+
+extension Float {
+    var fix: CGFloat {
+        let screenWidth = UIScreen.main.bounds.width
+        // 假设设计稿基于375pt宽度，iPhone 6的屏幕宽度
+        let baseWidth: CGFloat = 375.0
+        // 计算换算比例
+        let scale = screenWidth / baseWidth
+        // 应用换算比例
+        return CGFloat(self) * scale
+    }
+}
+
+extension Double {
+    var fix: CGFloat {
+        let screenWidth = UIScreen.main.bounds.width
+        // 假设设计稿基于375pt宽度，iPhone 6的屏幕宽度
+        let baseWidth: CGFloat = 375.0
+        // 计算换算比例
+        let scale = screenWidth / baseWidth
+        // 应用换算比例
+        return CGFloat(self) * scale
+    }
+}
+