Merge branch 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into develop

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignCertificateManage(续期证件管理)/V/YHResignCertificatePassportTableViewCell.swift

@@ -74,7 +74,7 @@ class YHResignCertificatePassportTableViewCell: UITableViewCell {
                 let isShow = item.isShowPrompts ?? false
                 let message = item.message ?? ""
                 let isNeed = item.isNeed ?? false
-                if item.id == .id1 {
+                if item.id == .id5 {
                     cardBeginView.dataSource = item
                     if isShow && message.count == 0 && isNeed {
                         cardBeginView.snp.updateConstraints { make in
@@ -86,7 +86,7 @@ class YHResignCertificatePassportTableViewCell: UITableViewCell {
                         }
                     }
                 }
-                if item.id == .id2 {
+                if item.id == .id6 {
                     cardEndView.dataSource = item
                     if isShow && message.count == 0 && isNeed {
                         cardEndView.snp.updateConstraints { make in

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/UploadTravelCrad(上传旅行证件)/C/YHResignUploadTravelCardListViewController.swift

@@ -157,12 +157,14 @@ extension YHResignUploadTravelCardListViewController: UITableViewDelegate, UITab
                 //跳转护照
                 let vc = YHResignUploadTravelPassportViewController()
                 vc.fatherData = model
+                vc.batchId = batchId
                 vc.orderId = orderId
                 self.navigationController?.pushViewController(vc)
             } else {
                 //跳转港澳通行证
                 let vc = YHResignUploadTravelHKViewController()
                 vc.fatherData = model
+                vc.batchId = batchId
                 vc.orderId = orderId
                 self.navigationController?.pushViewController(vc)
             }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/UploadTravelCrad(上传旅行证件)/C/YHResignUploadTravelPassportViewController.swift

@@ -98,7 +98,7 @@ class YHResignUploadTravelPassportViewController: YHBaseViewController {
     func getTextWithType(type: Int, date:String) -> ASAttributedString  {
         
         if type ==  0 {
-           return .init("上传《护照》(需有效期≥签证时长+3个月)", .font(UIFont.PFSC_R(ofSize:14)),.foreground(UIColor.mainTextColor(alpha: 0.5)))
+           return .init("上传《护照》(需有效期≥最新签证逗留截止日)", .font(UIFont.PFSC_R(ofSize:14)),.foreground(UIColor.mainTextColor(alpha: 0.5)))
         }
         
         return .init("", .font(UIFont.PFSC_R(ofSize:14)),.foreground(UIColor.mainTextColor(alpha: 0.5)))

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/UploadTravelCrad(上传旅行证件)/V/YHResignUploadTravelHKTableViewCell.swift

@@ -131,11 +131,6 @@ class YHResignUploadTravelHKTableViewCell: UITableViewCell {
                             make.height.equalTo(52)
                         }
                     }
-                    if self.compareDates(dateString1: item.message ?? "", dateString2: self.dataModel.latest_validaty_date) {
-                        failString = ""
-                    } else {
-                        failString = "卡片有效期不足，需要为\(self.dataModel.latest_validaty_date)或以后"
-                    }
                 }
                 if item.id == .id3 {
                     signBeginView.dataSource = item
@@ -160,17 +155,11 @@ class YHResignUploadTravelHKTableViewCell: UITableViewCell {
                             make.height.equalTo(52)
                         }
                     }
-                    if self.compareDates(dateString1: item.message ?? "", dateString2: self.dataModel.latest_validaty_date) {
-                        if failString == "签注有效期不足，需要为\(self.dataModel.latest_validaty_date)或以后" {
-                            failString = ""
-                        }
-                    } else {
-                        if failString == "卡片有效期不足，需要为\(self.dataModel.latest_validaty_date)或以后" {
-                            
-                        } else {
-                            failString = "签注有效期不足，需要为\(self.dataModel.latest_validaty_date)或以后"
-                        }
-                    }
+//                    if self.compareDates(dateString1: item.message ?? "", dateString2: self.dataModel.latest_validaty_date) {
+//                
+//                    } else {
+//                        failString = "签注有效期不足，需要为\(self.dataModel.latest_validaty_date)或以后"
+//                    }
                 }
             }
         }
@@ -446,13 +435,6 @@ class YHResignUploadTravelHKTableViewCell: UITableViewCell {
             guard let self = self else { return }
             if let block = self.block {
                 block(model)
-                if self.compareDates(dateString1: model.message ?? "", dateString2: self.dataModel.latest_validaty_date) {
-                    if failString == "卡片有效期不足，需要为\(self.dataModel.latest_validaty_date)或以后" {
-                        failString = ""
-                    }
-                } else {
-                    failString = "卡片有效期不足，需要为\(self.dataModel.latest_validaty_date)或以后"
-                }
             }
         }
         centerView.addSubview(cardEndView)
@@ -512,9 +494,7 @@ class YHResignUploadTravelHKTableViewCell: UITableViewCell {
             if let block = self.block {
                 block(model)
                 if self.compareDates(dateString1: model.message ?? "", dateString2: self.dataModel.latest_validaty_date) {
-                    if failString == "签注有效期不足，需要为\(self.dataModel.latest_validaty_date)或以后" {
-                        failString = ""
-                    }
+    
                 } else {
                     failString = "签注有效期不足，需要为\(self.dataModel.latest_validaty_date)或以后"
                 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/UploadTravelCrad(上传旅行证件)/V/YHResignUploadTravelPassportTableViewCell.swift

@@ -74,7 +74,7 @@ class YHResignUploadTravelPassportTableViewCell: UITableViewCell {
                 let isShow = item.isShowPrompts ?? false
                 let message = item.message ?? ""
                 let isNeed = item.isNeed ?? false
-                if item.id == .id1 {
+                if item.id == .id5 {
                     cardBeginView.dataSource = item
                     if isShow && message.count == 0 && isNeed {
                         cardBeginView.snp.updateConstraints { make in
@@ -86,7 +86,7 @@ class YHResignUploadTravelPassportTableViewCell: UITableViewCell {
                         }
                     }
                 }
-                if item.id == .id2 {
+                if item.id == .id6 {
                     cardEndView.dataSource = item
                     if isShow && message.count == 0 && isNeed {
                         cardEndView.snp.updateConstraints { make in
@@ -97,11 +97,11 @@ class YHResignUploadTravelPassportTableViewCell: UITableViewCell {
                             make.height.equalTo(52)
                         }
                     }
-                    if self.compareDates(dateString1: item.message ?? "", dateString2: self.dataModel.latest_validaty_date) {
-                        failString = ""
-                    } else {
-                        failString = "有效期不足，需要为\(self.dataModel.latest_validaty_date)或以后"
-                    }
+//                    if self.compareDates(dateString1: item.message ?? "", dateString2: self.dataModel.latest_validaty_date) {
+//                        failString = ""
+//                    } else {
+//                        failString = "有效期不足，需要为\(self.dataModel.latest_validaty_date)或以后"
+//                    }
                 }
             }
         }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/UploadTravelCrad(上传旅行证件)/VM/YHResignUploadTravelCardDetailViewModel.swift

@@ -38,8 +38,8 @@ class YHResignUploadTravelCardDetailViewModel: YHBaseViewModel {
     }
     
     func getPassPortDataSource(_ isShowPrompt: Bool) -> [YHItemModel] {
-        let item1 = YHItemModel(id: .id5, isNeed: true, title: "签发日期", isUserKeyBoard: false, prompts: "请选择", message: getResultString(dataModel.visa_start), type: .time, isShowPrompts: isShowPrompt, alertMessage:"请选择开始时间")
-        let item2 = YHItemModel(id: .id6, isNeed: true, title: "届满日期", isUserKeyBoard: false, prompts: "请选择", message: getResultString(dataModel.visa_end), type: .time, isShowPrompts: isShowPrompt, alertMessage:"请选择到期时间")
+        let item1 = YHItemModel(id: .id5, isNeed: true, title: "签发日期", isUserKeyBoard: false, prompts: "请选择", message: getResultString(dataModel.issue_start), type: .time, isShowPrompts: isShowPrompt, alertMessage:"请选择开始时间")
+        let item2 = YHItemModel(id: .id6, isNeed: true, title: "届满日期", isUserKeyBoard: false, prompts: "请选择", message: getResultString(dataModel.issue_end), type: .time, isShowPrompts: isShowPrompt, alertMessage:"请选择到期时间")
         return [item1, item2]
     }
     
@@ -55,9 +55,9 @@ class YHResignUploadTravelCardDetailViewModel: YHBaseViewModel {
         case .id4:
             dataModel.visa_end = item.message ?? ""
         case .id5:
-            dataModel.visa_start = item.message ?? ""
+            dataModel.issue_start = item.message ?? ""
         case .id6:
-            dataModel.visa_end = item.message ?? ""
+            dataModel.issue_end = item.message ?? ""
         default:
             break
         }