// 预约

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

@@ -27,7 +27,6 @@ class YHResignAppointContainerViewController: YHBaseViewController {
     
     override func viewDidLoad() {
         super.viewDidLoad()
-        gk_navigationBar.isHidden = true
         
         self.addChild(appointVC)
         self.addChild(scheduleVC)
@@ -36,7 +35,8 @@ class YHResignAppointContainerViewController: YHBaseViewController {
         self.view.addSubview(scheduleVC.view)
         
         YHHUD.show(.progress(message: "加载中..."))
-        viewModel.getAppointInfoList(renewalId: renewalId) { success, error in
+        viewModel.getAppointInfoList(renewalId: renewalId) {
+            [weak self] success, error in
             YHHUD.hide()
             guard let self = self else { return }
             if self.viewModel.appointInfoListModel.renewal_List.count <= 0 { // 没有预约过

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

@@ -106,36 +106,16 @@ extension YHResignAppointSubmitScheduleViewController: UITableViewDelegate, UITa
     
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         
-        let cell2 = tableView.dequeueReusableCell(withIdentifier: YHResignAppointTimeSingleCell.cellReuseIdentifier, for: indexPath) as! YHResignAppointTimeSingleCell
+        let cell = tableView.dequeueReusableCell(withIdentifier: YHResignHaveAppointedSingleInfoCell.cellReuseIdentifier, for: indexPath) as! YHResignHaveAppointedSingleInfoCell
         
         if 0 <= indexPath.row && indexPath.row < familyArr.count {
             
-            if indexPath.row == 0 {
-                let cell1 = tableView.dequeueReusableCell(withIdentifier: YHResignAppointOptionResultCell.cellReuseIdentifier, for: indexPath) as! YHResignAppointOptionResultCell
-                return cell1
-            }
-            
-            if indexPath.row == 1 {
-                let cell1 = tableView.dequeueReusableCell(withIdentifier: YHResignAppointOptionCell.cellReuseIdentifier, for: indexPath) as! YHResignAppointOptionCell
-                return cell1
-            }
-            
-            if indexPath.row == 2 {
-                let cell1 = tableView.dequeueReusableCell(withIdentifier: YHResignAppointApplicantInfoCell.cellReuseIdentifier, for: indexPath) as! YHResignAppointApplicantInfoCell
-                return cell1
-            }
-            
-            if indexPath.row == 3 {
-                let cell1 = tableView.dequeueReusableCell(withIdentifier: YHResignHaveAppointedSingleInfoCell.cellReuseIdentifier, for: indexPath) as! YHResignHaveAppointedSingleInfoCell
-                return cell1
-            }
-            
             if indexPath.row == 4 {
-                let cell1 = tableView.dequeueReusableCell(withIdentifier: YHResignAppointTimeMultipleCell.cellReuseIdentifier, for: indexPath) as! YHResignAppointTimeMultipleCell
+                let cell1 = tableView.dequeueReusableCell(withIdentifier: YHResignHaveAppointedMultipleInfoCell.cellReuseIdentifier, for: indexPath) as! YHResignHaveAppointedMultipleInfoCell
                 return cell1
             }
         }
-        return cell2
+        return cell
     }
     
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {