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

* 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  // 格式
  // 预约

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

@@ -114,10 +114,12 @@ class YHResignAppointTimeMultipleCell: UITableViewCell {
                     if self.model.leave_hk_at.isEmpty {
                         self.model.ready_to_submit_at = selectTimeStr
                     } else {
-                        if self.compareDates(selectTimeStr, self.model.leave_hk_at) != .small {
-                            // selectTimeStr >= leave_hk_at
-                            YHHUD.flash(message: "预约在港递交时间必须早于预计离港时间")
-                            return
+                        if !self.model.notleaveHK { // 离港才比较日期
+                            if self.compareDates(selectTimeStr, self.model.leave_hk_at) != .small {
+                                // selectTimeStr >= leave_hk_at
+                                YHHUD.flash(message: "预约在港递交时间必须早于预计离港时间")
+                                return
+                            }
                         }
                         self.model.ready_to_submit_at = selectTimeStr
                     }
@@ -342,7 +344,7 @@ class YHResignAppointTimeMultipleCell: UITableViewCell {
         // 若结束时间为空则取当前时间+28天的时间
         
         let formatter = DateFormatter()
-        formatter.dateFormat = "yyyy-MM-dd HH:mm"
+        formatter.dateFormat = "yyyy-MM-dd"
         var startTimeStr = formatter.string(from: Date())
         var endTimeStr = ""
         if let date = formatter.date(from: startTimeStr) {

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

@@ -50,6 +50,7 @@ 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 }
                 let view = YHRangeDatePickerSheetView2.sheetView()
@@ -65,10 +66,12 @@ class YHResignAppointTimeSingleCell: UITableViewCell {
                     if self.model.leave_hk_at.isEmpty {
                         self.model.ready_to_submit_at = selectTimeStr
                     } else {
-                        if self.compareDates(selectTimeStr, self.model.leave_hk_at) != .small {
-                            // selectTimeStr >= leave_hk_at
-                            YHHUD.flash(message: "预约在港递交时间必须早于预计离港时间")
-                            return
+                        if !self.model.notleaveHK { // 离港才比较日期
+                            if self.compareDates(selectTimeStr, self.model.leave_hk_at) != .small {
+                                // selectTimeStr >= leave_hk_at
+                                YHHUD.flash(message: "预约在港递交时间必须早于预计离港时间")
+                                return
+                            }
                         }
                         self.model.ready_to_submit_at = selectTimeStr
                     }