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

* '0927' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  服务中心细节提交

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -1980,6 +1980,7 @@
 		0449EEE52C8EE99000A397FD /* Resign(续签) */ = {
 			isa = PBXGroup;
 			children = (
+				044EE2302C9290D800A2FE3A /* ResignCertificateManage(续期证件管理) */,
 				0449EEE62C8EEA2B00A397FD /* ResignMaterialManage(续期资料管理) */,
 			);
 			path = "Resign(续签)";
@@ -2117,6 +2118,45 @@
 			path = V;
 			sourceTree = "<group>";
 		};
+		044EE2302C9290D800A2FE3A /* ResignCertificateManage(续期证件管理) */ = {
+			isa = PBXGroup;
+			children = (
+				044EE2342C92910D00A2FE3A /* C */,
+				044EE2332C92910700A2FE3A /* M */,
+				044EE2322C92910100A2FE3A /* V */,
+				044EE2312C9290FB00A2FE3A /* VM */,
+			);
+			path = "ResignCertificateManage(续期证件管理)";
+			sourceTree = "<group>";
+		};
+		044EE2312C9290FB00A2FE3A /* VM */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = VM;
+			sourceTree = "<group>";
+		};
+		044EE2322C92910100A2FE3A /* V */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = V;
+			sourceTree = "<group>";
+		};
+		044EE2332C92910700A2FE3A /* M */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = M;
+			sourceTree = "<group>";
+		};
+		044EE2342C92910D00A2FE3A /* C */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = C;
+			sourceTree = "<group>";
+		};
 		045EED972B9F171A0022A143 /* ServiceProcess(我的信息流程) */ = {
 			isa = PBXGroup;
 			children = (

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

@@ -10,6 +10,8 @@ import UIKit
 import JXSegmentedView
 
 class YHServerCenterHoldViewController: UIViewController {
+    private let serviceCenterMainReqVM : YHServiceCenterViewModel = YHServiceCenterViewModel()
+
     var mobile: String = ""
     var orderId: Int = 0 {
         didSet {
@@ -73,6 +75,7 @@ class YHServerCenterHoldViewController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         setupView()
+        NotificationCenter.default.addObserver(self, selector: #selector(goToServiceTabFromFileListPage), name: YhConstant.YhNotification.didClickFileListBackToServiceTabNotifiction, object: nil)
         // Do any additional setup after loading the view.
     }
     
@@ -163,6 +166,26 @@ class YHServerCenterHoldViewController: UIViewController {
             self.segmentedView.reloadData()
         }
     }
+    
+    @objc func goToServiceTabFromFileListPage() {
+        
+        // 进行中有数据则切换到进行中，进行中无数据则切换到全部
+        YHHUD.show(.progress(message: "加载中..."))
+        self.serviceCenterMainReqVM.getServiceCenterProgressList(self.orderId, 2) {
+            [weak self] success, error in
+            YHHUD.hide()
+            guard let self = self else { return }
+            var targetTabIndex = 0 // 全部
+            if self.serviceCenterMainReqVM.arrDataForSeviceCenterProgress.count > 0 {
+                // 进行中
+                targetTabIndex = 1
+            }
+            self.segmentedView.selectItemAt(index: targetTabIndex)
+            self.segmentedView.listContainer?.didClickSelectedItem(at: targetTabIndex)
+            UIViewController.current?.navigationController?.popToRootViewController(animated: true)
+            goTabBarBy(tabType: .service)
+        }
+    }
 }
 
 extension YHServerCenterHoldViewController: JXSegmentedViewDelegate {

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

@@ -224,7 +224,6 @@ extension YHServiceCenterViewController {
             navBar.isHidden = true
         }
         
-        NotificationCenter.default.addObserver(self, selector: #selector(goToServiceTabFromFileListPage), name: YhConstant.YhNotification.didClickFileListBackToServiceTabNotifiction, object: nil)
     }
     
     @objc func pushOrderView() {
@@ -370,29 +369,6 @@ extension YHServiceCenterViewController {
     }
 }
 
-extension YHServiceCenterViewController {
-    
-    @objc func goToServiceTabFromFileListPage() {
-        
-        // 进行中有数据则切换到进行中，进行中无数据则切换到全部
-        YHHUD.show(.progress(message: "加载中..."))
-        self.serviceCenterMainReqVM.getServiceCenterProgressList(self.orderId, 2) {
-            [weak self] success, error in
-            YHHUD.hide()
-            guard let self = self else { return }
-            var targetTabIndex = 0 // 全部
-            if self.serviceCenterMainReqVM.arrDataForSeviceCenterProgress.count > 0 {
-                // 进行中
-                targetTabIndex = 1
-            }
-//            self.segmentedView.selectItemAt(index: targetTabIndex)
-//            self.segmentedView.listContainer?.didClickSelectedItem(at: targetTabIndex)
-            UIViewController.current?.navigationController?.popToRootViewController(animated: true)
-            goTabBarBy(tabType: .service)
-        }
-    }
-}
-
 extension YHServiceCenterViewController : UITableViewDelegate,UITableViewDataSource {
     
     func numberOfSections(in tableView: UITableView) -> Int {

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

@@ -151,7 +151,7 @@ extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource {
     }
 
     func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
-        if state == 3 && (type == 0 || type == 2) {
+        if state == 3 && (type == 0 || type == 2) && self.arrDataForSeviceCenterProgress.count != 0 {
             return 104
         } else {
             return kMargin
@@ -159,7 +159,7 @@ extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource {
     }
 
     func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
-        if state == 3 && (type == 0 || type == 2) {
+        if state == 3 && (type == 0 || type == 2) && self.arrDataForSeviceCenterProgress.count != 0  {
             let view = YHServiceStepThreeSectionView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: 104))
             view.block = { [weak self] tag in
                 guard let self = self else { return }