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

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/OrderList(服务订单)/C/YHInformationPerfectListVC.swift

@@ -619,11 +619,7 @@ extension YHInformationPerfectListVC : UITableViewDelegate,UITableViewDataSource
                     self.showTipsAlert()
                     return
                 }
-                if serviceCenterMainReqVM.myInfoFillStep > 0 {
-                    gotoApplyTypeVC(.typeA)
-                } else {
-                    gotoApplyTypeVC(nil)
-                }
+                gotoApplyTypeVC()
                 //高A- 申请类别
             } else if tapIndex == 1 {
                 //高A- 主申请人信息
@@ -661,17 +657,7 @@ extension YHInformationPerfectListVC : UITableViewDelegate,UITableViewDataSource
                     self.showTipsAlert()
                     return
                 }
-                if serviceCenterMainReqVM.myInfoFillStep > 0 {
-                    var type: YHGCApplicationType = .typeB
-                    if productType == 2 {
-                        type = .typeB
-                    } else if productType == 3 {
-                        type = .typeC
-                    }
-                    gotoApplyTypeVC(type)
-                } else {
-                    gotoApplyTypeVC(nil)
-                }
+                gotoApplyTypeVC()
                 //高才BC- 申请类别
             } else if tapIndex == 1 {
                 //高才BC- 主申请人信息
@@ -710,13 +696,29 @@ extension YHInformationPerfectListVC : UITableViewDelegate,UITableViewDataSource
         }
     }
     
-    private func gotoApplyTypeVC(_ type: YHGCApplicationType?) {
-        if let type = type {
-            let ctl = YHGCApplicationTypeResultController(type: type)
-            navigationController?.pushViewController(ctl)
-        } else {
-            let ctl = YHGCApplicationTypeController(orderId: orderId ?? 0)
-            navigationController?.pushViewController(ctl)
+    private func gotoApplyTypeVC() {
+        let orderId = orderId ?? 0
+        YHHUD.show(.progress(message: "加载中..."))
+        YHGCApplicationTypeViewModel().getApplyType(orderId: orderId) { [weak self] model, error in
+            YHHUD.hide()
+            guard let self = self else {
+                return
+            }
+            guard let model = model else {
+                if let errorMsg = error?.errorMsg, errorMsg.count > 0 {
+                    YHHUD.flash(message: errorMsg)
+                }
+                return
+            }
+            let type = YHGCApplicationType(rawValue: model.apply_type)
+            if let type = type {
+                let ctl = YHGCApplicationTypeResultController(type: type)
+                self.navigationController?.pushViewController(ctl)
+            } else {
+                let ctl = YHGCApplicationTypeController(orderId: orderId)
+                self.navigationController?.pushViewController(ctl)
+            }
         }
+        
     }
 }