// 旅行

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

@@ -252,7 +252,12 @@ class YHTravelDocsPreparationDetailVC: YHBaseViewController {
                         if !item.cerDetailModel.isValidCer() {
                             hasError = true
                             item.cerDetailModel.isNeedCheckCer = true
-                            item.cerDetailModel.checkTips = "有效期不足，请核查文件"
+                            if item.cerDetailModel.type == 2, item.cerDetailModel.china_travel_latest_validate_date.isEmpty {
+                                // 这个情况直接弹toast
+                                
+                            } else {
+                                item.cerDetailModel.checkTips = "有效期不足，请核查文件"
+                            }
                         }
                     }
                 }
@@ -380,10 +385,14 @@ extension YHTravelDocsPreparationDetailVC: UITableViewDelegate, UITableViewDataS
             let item = sectionItems[indexPath.section]
             cell.updateModel(item.cerDetailModel)
             cell.updateBlock = {
-                [weak self] in
+                [weak self] needCheck in
                 guard let self = self else { return }
                 if !self.isDisableEdit {
-                    self.checkInfo()
+                    _ = self.checkInfo()
+                } else {
+                    if needCheck {
+                       _ = self.checkInfo()
+                    }
                 }
                 self.tableView.reloadData()
             }

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

@@ -43,7 +43,7 @@ class YHTravelCertificateUploadCell: UITableViewCell {
     var dataModel: YHTravelDocsPreparationDetailItemModel = YHTravelDocsPreparationDetailItemModel()
     let viewModel: YHBaseViewModel = YHBaseViewModel()
     
-    var updateBlock: (()->())?
+    var updateBlock: ((_ needCheck:Bool)->())?
     
     // type :Int 证件类型 1-护照 2-中国旅行证 3-港澳通行证 4-存款证明 5-其他
     var templateClick: ((_ type:Int)->())?
@@ -102,6 +102,18 @@ class YHTravelCertificateUploadCell: UITableViewCell {
         return label
     }()
     
+    lazy var warmTipsLabel: UILabel = {
+        let label = UILabel()
+        label.numberOfLines = 0
+        label.font = UIFont.PFSC_R(ofSize: 12)
+        label.textColor = UIColor.failColor
+        
+        let a: ASAttributedString = .init("温馨提示：", .font(UIFont.PFSC_R(ofSize: 12)),.foreground(UIColor.mainTextColor50))
+        let b: ASAttributedString = .init("具体根据当地出入境规定办理并提交相关证件，如有疑问，可联系银河客服经理咨询", .font(UIFont.PFSC_R(ofSize: 12)),.foreground(UIColor.brandMainColor))
+        label.attributed.text = a+b
+        return label
+    }()
+    
     lazy var certificateFrontView: YHCardUploadView = {
         let view = YHCardUploadView(frame: .zero)
         view.remakeUploadViewConstraints()
@@ -117,7 +129,7 @@ class YHTravelCertificateUploadCell: UITableViewCell {
             } else {
                 self.dataModel.img_front = url
                 self.dataModel.img_back = url
-                self.updateBlock?()
+                self.updateBlock?(false)
             }
         }
         view.deleteBlock = {
@@ -134,7 +146,7 @@ class YHTravelCertificateUploadCell: UITableViewCell {
                 self.dataModel.img_back = ""
             }
             self.dataModel.status = 0
-            self.updateBlock?()
+            self.updateBlock?(false)
         }
         return view
     }()
@@ -155,7 +167,7 @@ class YHTravelCertificateUploadCell: UITableViewCell {
             } else {
                 self.dataModel.img_front = url
                 self.dataModel.img_back = url
-                self.updateBlock?()
+                self.updateBlock?(false)
             }
         }
         view.deleteBlock = {
@@ -174,7 +186,7 @@ class YHTravelCertificateUploadCell: UITableViewCell {
                 self.dataModel.img_back = ""
             }
             self.dataModel.status = 0
-            self.updateBlock?()
+            self.updateBlock?(false)
         }
         return view
     }()
@@ -219,7 +231,7 @@ class YHTravelCertificateUploadCell: UITableViewCell {
                         } else if item.id == .deadDate {
                             self.dataModel.issue_end = time
                         }
-                        self.updateBlock?()
+                        self.updateBlock?(false)
                     }
                     
                 } else if item.id == .kind {
@@ -308,10 +320,27 @@ class YHTravelCertificateUploadCell: UITableViewCell {
         model.isNeedShowRejectReason = (model.status == 2)
         let isShowReason = (model.isNeedShowRejectReason && !model.remark.isEmpty)
         rejectReasonLabel.text = isShowReason ? "被驳回原因：" + model.remark : ""
+        
+        // 只有中国居留许可签证才显示温馨提示
+        let isShowWarmTips = (model.type == 2)
+        warmTipsLabel.isHidden = !isShowWarmTips
+        warmTipsLabel.snp.remakeConstraints { make in
+            make.left.equalTo(18)
+            make.right.equalTo(-18)
+            make.top.equalTo(lineView.snp.bottom).offset(isShowWarmTips ? 18.0 : 0)
+            if !isShowWarmTips {
+                make.height.equalTo(0)
+            }
+        }
+        
+        var rejectTop = 18.0
+        if isShowReason {
+            rejectTop = 8.0
+        }
         rejectReasonLabel.snp.remakeConstraints { make in
             make.left.equalTo(18)
             make.right.equalTo(-18)
-            make.top.equalTo(lineView.snp.bottom).offset(isShowReason ? 18 : 0)
+            make.top.equalTo(warmTipsLabel.snp.bottom).offset(isShowReason ? rejectTop : 0)
             make.bottom.equalTo(certificateFrontView.snp.top).offset(-18)
             if !isShowReason {
                 make.height.equalTo(0)
@@ -385,6 +414,7 @@ class YHTravelCertificateUploadCell: UITableViewCell {
         whiteConentView.addSubview(rejectReasonLabel)
         whiteConentView.addSubview(certificateFrontView)
         whiteConentView.addSubview(certificateBackView)
+        whiteConentView.addSubview(warmTipsLabel)
         whiteConentView.addSubview(unvalidLabel)
         whiteConentView.addSubview(selectPanelContentView)
         
@@ -408,6 +438,13 @@ class YHTravelCertificateUploadCell: UITableViewCell {
             make.height.equalTo(0.5)
         }
         
+        warmTipsLabel.snp.makeConstraints { make in
+            make.left.equalTo(18)
+            make.right.equalTo(-18)
+            make.top.equalTo(lineView.snp.bottom).offset(18)
+            make.height.equalTo(0)
+        }
+
         rejectReasonLabel.snp.makeConstraints { make in
             make.left.equalTo(18)
             make.right.equalTo(-18)
@@ -468,9 +505,9 @@ extension YHTravelCertificateUploadCell {
                     if success, let result = result {
                         self.dataModel.issue_start = result.term_begins
                         self.dataModel.issue_end = result.end_of_term
-                        self.updateBlock?()
+                        self.updateBlock?(true)
                     } else {
-                        self.updateBlock?()
+                        self.updateBlock?(true)
                     }
                 }
                 
@@ -481,9 +518,9 @@ extension YHTravelCertificateUploadCell {
                     if success, let result = result {
                         self.dataModel.issue_start = result.term_begins
                         self.dataModel.issue_end = result.end_of_term
-                        self.updateBlock?()
+                        self.updateBlock?(true)
                     } else {
-                        self.updateBlock?()
+                        self.updateBlock?(true)
                     }
                 }
             }