// 旅行

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServiceOrderListViewController.swift

@@ -165,9 +165,13 @@ extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource {
 
 
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
-        let model = self.viewModel.arrDataForSeviceCenterProgress[indexPath.section]
-        if model.type == 27 {
-            return 146
+        let arr = self.viewModel.arrDataForSeviceCenterProgress
+        if  0 <= indexPath.section, indexPath.section < arr.count {
+            let model = arr[indexPath.section]
+            if model.type == 27 {
+                return 146
+            }
+            return 128
         }
         return 128
     }

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

@@ -148,7 +148,6 @@ class YHTravelDocsPreparationDetailVC: YHBaseViewController {
             for model in list {
                 let item2 = YHTravelCerSectionItem(type: .certificate, tipsArr: [])
                 if let model = model {
-                    model.latest_validaty_date = self.viewModel.travelDetailModel?.latest_validaty_date ?? ""
                     item2.cerDetailModel = model
                     model.isCanEdit = !self.isDisableEdit
                     sectionItems.append(item2)
@@ -173,7 +172,9 @@ class YHTravelDocsPreparationDetailVC: YHBaseViewController {
                     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)")
+                
                 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
                 item.cerDetailModel = cerModel1
                 sectionItems.append(item)
@@ -183,6 +184,8 @@ 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)")
+                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
                 item1.cerDetailModel = cerModel1
                 sectionItems.append(item1)
@@ -340,6 +343,7 @@ private extension YHTravelDocsPreparationDetailVC {
                 YHHUD.hide()
                 if success {
                     YHHUD.flash(message: "保存成功")
+                    self.navigationController?.popViewController()
                     return
                 }
                 YHHUD.flash(message: error?.errorMsg ?? "保存失败")

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

@@ -53,7 +53,9 @@ class YHTravelDocsPreparationListViewController: YHBaseViewController {
 private extension YHTravelDocsPreparationListViewController {
     func loadData() {
         let params: [String : Any] = ["order_id": orderId]
+        YHHUD.show(.progress(message: "加载中..."))
         viewModel.getTravelDocsList(param: params){ success, error in
+            YHHUD.hide()
             if success {
                 
             } else {

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

@@ -12,11 +12,12 @@ import SmartCodable
 class YHTravelDocsPreparationDetailModel: SmartCodable {
     var ttl : Int = -1 //电子签证有效期
     var latest_validaty_date : String = "" //有效期最晚时间
+    var china_travel_latest_validate_date: String = "" // 中国居留许可签证有效期最晚时间
     var list : [YHTravelDocsPreparationDetailItemModel?] = [] //电子签证有效期
     
     required init() {
+        
     }
-
 }
 
 
@@ -40,10 +41,10 @@ class YHTravelDocsPreparationDetailItemModel: SmartCodable {
     // 证件错误信息
     var checkTips: String = ""
     // 是否显示被拒理由
-    var isNeedShowRejectReason: Bool = false
-    // 被拒理由
-    var rejectReason: String = ""
-    var latest_validaty_date : String = ""
+    var isNeedShowRejectReason: Bool = false    
+    var latest_validaty_date : String = "" //有效期最晚时间
+    var china_travel_latest_validate_date: String = "" // 中国居留许可签证有效期最晚时间
+
     // 是否检测时间
     var isNeedCheckDate: Bool = false
     // 是否可编辑
@@ -70,7 +71,18 @@ class YHTravelDocsPreparationDetailItemModel: SmartCodable {
     }
     
     func isValidCer() -> Bool {
-        let latestDate = self.latest_validaty_date
+        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: "赴港行程尚未预约，请前往预约")
+                return false
+            }
+            return true
+        }
         let isValid = self.compareDates(dateString1: latestDate, dateString2: self.issue_end)
         return isValid
     }

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

@@ -133,6 +133,7 @@ class YHTravelCertificateUploadCell: UITableViewCell {
                 self.dataModel.img_front = ""
                 self.dataModel.img_back = ""
             }
+            self.dataModel.status = 0
             self.updateBlock?()
         }
         return view
@@ -172,6 +173,7 @@ class YHTravelCertificateUploadCell: UITableViewCell {
                 self.dataModel.img_front = ""
                 self.dataModel.img_back = ""
             }
+            self.dataModel.status = 0
             self.updateBlock?()
         }
         return view
@@ -303,8 +305,9 @@ class YHTravelCertificateUploadCell: UITableViewCell {
         // 是否有证件
         let hasNoCertiInfo = model.img_front.isEmpty && model.img_back.isEmpty
         // 需要显示被拒原因
-        let isShowReason = (model.isNeedShowRejectReason && !model.rejectReason.isEmpty)
-        
+        model.isNeedShowRejectReason = (model.status == 2)
+        let isShowReason = (model.isNeedShowRejectReason && !model.remark.isEmpty)
+        rejectReasonLabel.text = isShowReason ? "被驳回原因：" + model.remark : ""
         rejectReasonLabel.snp.remakeConstraints { make in
             make.left.equalTo(18)
             make.right.equalTo(-18)

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

@@ -66,6 +66,12 @@ extension YHTravelDocsPreparationViewModel {
                     return
                 }
                 self.travelDetailModel = resultModel
+                for item in resultModel.list {
+                    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 ?? ""
+                    }
+                }
                 callBackBlock(true, nil)
                 
             } else {