// 赴港

galaxy/Gemfile.lock

@@ -168,7 +168,7 @@ GEM
       xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
     fastlane-plugin-pgyer (0.2.9)
     fastlane-plugin-upload_to_bugly (0.1.2)
-    fastlane-plugin-versioning (0.5.2)
+    fastlane-plugin-versioning (0.6.0)
     ffi (1.16.3)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
@@ -294,4 +294,4 @@ DEPENDENCIES
   fastlane-plugin-versioning
 
 BUNDLED WITH
-   2.5.14
+   2.5.9

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AppointCertificate(3 赴港办证预约)/C/YHCertificateAppointViewController.swift

@@ -20,11 +20,13 @@ class YHCertificateAppointViewController: YHBaseViewController {
     var bottomStatus: YHAppointButtnStatus = .hidden
     var sections: [[YHAppointItem]] = []
     // 第一个section数据组
-    var items1: [YHAppointItem] = []
-    // 只装选人的cell
-    var items2: [YHAppointItem] = []
-    // 只装抢号中、已抢号
-    var items3: [YHAppointItem] = []
+    var normalAppointInfoArr: [YHAppointItem] = []
+    // 第二个section 只装选人的cell
+    var selectMemberGroupArr: [YHAppointItem] = []
+    // 第三个section 只装抢号中、已抢号
+    var grabbingNumInfoArr: [YHAppointItem] = []
+    // 第四个section 只装已抢号
+    var grabbedNumInfoArr:[YHAppointItem] = []
 
     // 需要继续预约人员
     var waitList: [YHAppointMemberGroupModel] = []
@@ -125,7 +127,7 @@ class YHCertificateAppointViewController: YHBaseViewController {
         }
         self.bottomView.snp.makeConstraints { make in
             make.left.right.bottom.equalToSuperview()
-            make.height.equalTo(bottomViewHeight)
+            make.height.equalTo(0)
         }
         
         requetHKPlaceList()
@@ -157,13 +159,14 @@ class YHCertificateAppointViewController: YHBaseViewController {
         YHHUD.hide()
 
         sections.removeAll()
-        items1.removeAll()
-        items2.removeAll()
-        items3.removeAll()
+        normalAppointInfoArr.removeAll()
+        selectMemberGroupArr.removeAll()
+        grabbingNumInfoArr.removeAll()
+        grabbedNumInfoArr.removeAll()
 
         // *赴港办证
         let item1 = YHAppointItem(type: .goHKMakeCertificate)
-        items1.append(item1)
+        normalAppointInfoArr.append(item1)
         
         if self.isNeedGoHK != 1 { // 是否赴港办证没有选择是
             refreshData()
@@ -172,19 +175,19 @@ class YHCertificateAppointViewController: YHBaseViewController {
         // 赴港办证选择了是
         // *温馨提示
         let item2 = YHAppointItem(type: .warmTips)
-        items1.append(item2)
+        normalAppointInfoArr.append(item2)
         
         // *无需预约办证成员（未满11岁）
         if self.noNeedAppointMembers.count > 0 {
             let item3 = YHAppointItem(type: .noNeedMakeCertificateMembers)
-            items1.append(item3)
+            normalAppointInfoArr.append(item3)
         }
         
         if self.reservationToHK == 0 { // 没有预约过人员
             
             // 赴港激活签证 申请人是否统一赴港激活签证
             let item4 = YHAppointItem(type: .activeVisa)
-            items1.append(item4)
+            normalAppointInfoArr.append(item4)
             
             if self.isAllMembersGo { // 申请人统一赴港激活签证
                 
@@ -200,7 +203,7 @@ class YHCertificateAppointViewController: YHBaseViewController {
                 item5.model = group1
                 item5.placeList = self.viewModel.placeList
                 item5.arrHkHolidays = self.viewModel.dataModelForHkHolidays?.legaldays ?? []
-                items2.append(item5)
+                selectMemberGroupArr.append(item5)
                 
             } else { // 申请人不是统一赴港激活签证
                 let item6 = YHAppointItem(type: .confirmGoHKInfo)
@@ -214,7 +217,7 @@ class YHCertificateAppointViewController: YHBaseViewController {
                 item6.model = group1
                 item6.placeList = self.viewModel.placeList
                 item6.arrHkHolidays = self.viewModel.dataModelForHkHolidays?.legaldays ?? []
-                items2.append(item6)
+                selectMemberGroupArr.append(item6)
                 
             }
             
@@ -223,19 +226,19 @@ class YHCertificateAppointViewController: YHBaseViewController {
             // 待预约的赴港成员
             if waitAppointMembers.count > 0 {
                 let item5 = YHAppointItem(type: .needReAppointMembers)
-                items1.append(item5)
+                normalAppointInfoArr.append(item5)
             }
             
             // 赴港办理抢号中批次
             if self.waitList.count > 0 {
                 let item6 = YHAppointItem(type: .grabingNumberBatch)
-                items3.append(item6)
+                grabbingNumInfoArr.append(item6)
             }
             
             // 赴港办理已抢号批次
             if self.successList.count > 0 {
                 let item7 = YHAppointItem(type: .haveGrabedNumberBatch)
-                items3.append(item7)
+                grabbedNumInfoArr.append(item7)
             }
         }
         refreshData()
@@ -245,16 +248,16 @@ class YHCertificateAppointViewController: YHBaseViewController {
         
         sections.removeAll()
         
-        if items1.count > 0 {
-            sections.append(items1)
+        if normalAppointInfoArr.count > 0 {
+            sections.append(normalAppointInfoArr)
         }
         
-        if items2.count > 0 {
-            sections.append(items2)
+        if selectMemberGroupArr.count > 0 {
+            sections.append(selectMemberGroupArr)
         }
         
-        if items3.count > 0 {
-            sections.append(items3)
+        if grabbingNumInfoArr.count > 0 {
+            sections.append(grabbingNumInfoArr)
         }
         self.tableView.reloadData()
         
@@ -618,8 +621,8 @@ extension YHCertificateAppointViewController {
         var currentMembers:[YHHKMemberModel] = []
         
         // 先改变点击当前批的选择状态
-        if 0 <= groupLevel, groupLevel < items2.count {
-            let item = items2[groupLevel]
+        if 0 <= groupLevel, groupLevel < selectMemberGroupArr.count {
+            let item = selectMemberGroupArr[groupLevel]
             if let members = item.model?.arr {
                 currentMembers = members
                 for member in members {
@@ -632,7 +635,7 @@ extension YHCertificateAppointViewController {
         
         if !select { // 如果操作是取消
             // 如果操作的当前批次是最后一批，则需要分新批次
-            if groupLevel == items2.count-1 {
+            if groupLevel == selectMemberGroupArr.count-1 {
                 // 进行分批
                 let newItem = YHAppointItem(type: .confirmGoHKInfo)
                 // 批次+1
@@ -651,15 +654,15 @@ extension YHCertificateAppointViewController {
                 newItem.model = group1
                 newItem.placeList = self.viewModel.placeList
                 newItem.arrHkHolidays = self.viewModel.dataModelForHkHolidays?.legaldays ?? []
-                items2.append(newItem)
+                selectMemberGroupArr.append(newItem)
                 
             } else { // 如果操作的当前批次不是最后一批 需要更新后面几批的选中状态
                 
                 let nextGroupIndex = groupLevel+1
                 let newMember = currentMember.copy() as! YHHKMemberModel
                 newMember.isSelected = true
-                if 0 <= groupLevel, groupLevel < items2.count {
-                    let item = items2[nextGroupIndex]
+                if 0 <= groupLevel, groupLevel < selectMemberGroupArr.count {
+                    let item = selectMemberGroupArr[nextGroupIndex]
                     if var members = item.model?.arr {
                         members.append(newMember)
                         item.model?.arr = members
@@ -670,9 +673,9 @@ extension YHCertificateAppointViewController {
             
             // 肯定会有下一层因为之前取消过
             let nextGroupIndex = groupLevel+1
-            if 0 <= nextGroupIndex, nextGroupIndex < items2.count {
-                for i in nextGroupIndex..<items2.count {
-                    let item = items2[i]
+            if 0 <= nextGroupIndex, nextGroupIndex < selectMemberGroupArr.count {
+                for i in nextGroupIndex..<selectMemberGroupArr.count {
+                    let item = selectMemberGroupArr[i]
                     if var members = item.model?.arr {
                         // 下几批的组员中都要删除该人
                         members = members.filter { $0.id != currentMember.id }
@@ -684,17 +687,17 @@ extension YHCertificateAppointViewController {
         
         //  无论是选中还是反选 检测下面所有批次有无全未选数组，有则删除该批
         let nextGroupIndex = groupLevel+1
-        if 0 <= nextGroupIndex, nextGroupIndex < items2.count {
+        if 0 <= nextGroupIndex, nextGroupIndex < selectMemberGroupArr.count {
             var i = nextGroupIndex
-            while i < items2.count {
-                let item = items2[i]
+            while i < selectMemberGroupArr.count {
+                let item = selectMemberGroupArr[i]
                 if let members = item.model?.arr {
                     let a = members.filter {
                        return $0.isSelected == true
                     }
                     // 数组中全未选
                     if a.count <= 0 {
-                        items2.remove(at: i)
+                        selectMemberGroupArr.remove(at: i)
                         
                     } else {
                         i += 1
@@ -704,7 +707,7 @@ extension YHCertificateAppointViewController {
         }
         
         // 重新进行批次排号
-        for (index, group) in items2.enumerated() {
+        for (index, group) in selectMemberGroupArr.enumerated() {
             group.itemIndex = index
         }
         refreshData()
@@ -731,7 +734,7 @@ extension YHCertificateAppointViewController {
         
         // 检测各批次是否有日期或办证地点未选择
         var isOK = true
-        for item in self.items2 {
+        for item in self.selectMemberGroupArr {
             if let groupModel = item.model {
                 if groupModel.dateTye == 0 { // 选择具体日期
                     if groupModel.detailDateStr.isEmpty {
@@ -759,7 +762,7 @@ extension YHCertificateAppointViewController {
         }
         
         var batchs:[[String: Any]] = []
-        for group in items2 {
+        for group in selectMemberGroupArr {
             if let model = group.model {
                 var start_time = ""
                 var end_time = ""