// 预约

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignHKAppoint(在港递交预约)/V/YHResignAppointTimeMultipleCell.swift

@@ -141,8 +141,23 @@ class YHResignAppointTimeMultipleCell: UITableViewCell {
         view.clickBlock = {
             [weak self] in
             guard let self = self else { return }
-            self.getDateInfo { [weak self] startDate, endDate in
-                guard let self = self else { return }
+//            self.getDateInfo {
+//                [weak self] startDate, endDate in
+//                guard let self = self else { return }
+            
+                //  离港时间选择区间从预约在港递交时间到2029-12-31 若在港递交时间为空则离港时间选择最早为今天
+                var startDate: String = self.model.getSubmitHKTime()
+                let format = "yyyy-MM-dd"
+                if startDate.count >= format.count {
+                    startDate = String(startDate.prefix(format.count))
+                }
+                if startDate.isEmpty {
+                    let dateFormatter = DateFormatter()
+                    dateFormatter.dateFormat = format
+                    startDate = dateFormatter.string(from: Date())
+                }
+                var endDate = "2029-12-31"
+            
                 let view = YHRangeDatePickerSheetView2.sheetView()
                 view.viewTitle = "选择预计离港时间"
                 view.minDateStr = startDate
@@ -168,7 +183,7 @@ class YHResignAppointTimeMultipleCell: UITableViewCell {
 
                 }
                 view.show()
-            }
+//            }
         }
         return view
     }()

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignHKAppoint(在港递交预约)/V/YHResignAppointTimeSingleCell.swift

@@ -93,8 +93,22 @@ class YHResignAppointTimeSingleCell: UITableViewCell {
         view.clickBlock = {
             [weak self] in
             guard let self = self else { return }
-            self.getDateInfo { [weak self] startDate, endDate in
-                guard let self = self else { return }
+//            self.getDateInfo { [weak self] startDate, endDate in
+//                guard let self = self else { return }
+            
+                //  离港时间选择区间从预约在港递交时间到2029-12-31 若在港递交时间为空则离港时间选择最早为今天
+                var startDate: String = self.model.getSubmitHKTime()
+                let format = "yyyy-MM-dd"
+                if startDate.count >= format.count {
+                    startDate = String(startDate.prefix(format.count))
+                }
+                if startDate.isEmpty {
+                    let dateFormatter = DateFormatter()
+                    dateFormatter.dateFormat = format
+                    startDate = dateFormatter.string(from: Date())
+                }
+                var endDate = "2029-12-31"
+            
                 let view = YHRangeDatePickerSheetView2.sheetView()
                 view.viewTitle = "选择预计离港时间"
                 view.minDateStr = startDate
@@ -120,7 +134,7 @@ class YHResignAppointTimeSingleCell: UITableViewCell {
 
                 }
                 view.show()
-            }
+//            }
         }
         return view
     }()