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(服务中心)/CustomerService/Certificate(办证段)/AppointCertificate(3 赴港办证预约)/C/YHCertificateAppointViewController.swift

@@ -523,7 +523,7 @@ extension YHCertificateAppointViewController {
             let nextGroupIndex = groupLevel+1
             if 0 <= nextGroupIndex, nextGroupIndex < items2.count {
                 for i in nextGroupIndex..<items2.count {
-                    let item = items2[nextGroupIndex]
+                    let item = items2[i]
                     if var members = item.model?.arr {
                         // 下几批的组员中都要删除该人
                         members = members.filter { $0.id != currentMember.id }
@@ -531,20 +531,29 @@ extension YHCertificateAppointViewController {
                     }
                 }
             }
-            
-            // 检测下几层有无空数组，有则删除该批
-            if 0 <= nextGroupIndex, nextGroupIndex < items2.count {
-                for i in nextGroupIndex..<items2.count {
-                    let item = items2[nextGroupIndex]
-                    if var members = item.model?.arr, members.count == 0 {
+        }
+        
+        //  无论是选中还是反选 检测下面所有批次有无全未选数组，有则删除该批
+        let nextGroupIndex = groupLevel+1
+        if 0 <= nextGroupIndex, nextGroupIndex < items2.count {
+            var i = nextGroupIndex
+            while i < items2.count {
+                let item = items2[i]
+                if let members = item.model?.arr {
+                    let a = members.filter {
+                       return $0.isSelected == true
+                    }
+                    // 数组中全未选
+                    if a.count <= 0 {
+                        items2.remove(at: i)
                         
+                    } else {
+                        i += 1
                     }
                 }
             }
         }
-        
         refreshData()
-        
     }
 }
 

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

@@ -290,7 +290,11 @@ extension YHSelectApplicantGroupCell: UICollectionViewDelegate, UICollectionView
         if let dataModel = self.dataModel, let model = dataModel.model {
             if 0 <= indexPath.item && indexPath.item < model.arr.count {
                 let member = model.arr[indexPath.item]
-                if model.arr.count == 1, member.isSelected { // 分组中有且仅有一个且原状态是选中
+                let selectArr = model.arr.filter {
+                    return $0.isSelected == true
+                }
+                if selectArr.count == 1, member.isSelected == true, member.id == selectArr[0].id {
+                    // 分组中仅有一个选中用户 且点击的是该用户
                     return
                 }
                 selectBlock?(member, !member.isSelected, dataModel.itemIndex)

galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMyViewController.swift

@@ -346,10 +346,13 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
             return
         }
         
-        let vc = YHCertificateAppointViewController()
-        vc.orderId = 151085
-        self.navigationController?.pushViewController(vc)
-        return
+        if true {
+            let vc = YHCertificateAppointViewController()
+            vc.orderId = 151085
+            self.navigationController?.pushViewController(vc)
+            return
+        }
+        
         
         let item: PersonalModuleItem = items[indexPath.row]
         switch item.type {