54321

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService(客服段)/Certificate(办证段)/AddAdopters(2新增受养人)/V/YHAdopterCardOtherGuideView.swift

@@ -119,7 +119,7 @@ private extension YHAdopterCardOtherGuideView {
             // 定时器触发时执行的代码
             print("Timer fired")
         self.maxCount = self.maxCount - 1
-        if self.maxCount < 0 {
+        if self.maxCount < 1 {
             self.stopTimer()
             self.setButtonEnable(true)
         } else {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService(客服段)/OfficialApproval(正式批)/V/YHOffivialApprovalGuildLineCheckView.swift

@@ -139,7 +139,7 @@ private extension YHOffivialApprovalGuildLineCheckView {
             // 定时器触发时执行的代码
             print("Timer fired")
         self.maxCount = self.maxCount - 1
-        if self.maxCount < 0 {
+        if self.maxCount < 1 {
             self.stopTimer()
             self.setButtonEnable(true)
         } else {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/LookResignResult(查看续签结果)/C/YHLookResignResultViewController.swift

@@ -25,7 +25,7 @@ class YHLookResignResultViewController: YHBaseViewController {
     lazy var tableView: UITableView = {
         let tableView = UITableView(frame:.zero, style:.grouped)
         tableView.estimatedSectionHeaderHeight = 0.01
-        tableView.estimatedSectionFooterHeight = 0.01
+        tableView.estimatedSectionFooterHeight = 16
         tableView.contentInsetAdjustmentBehavior = .never
         tableView.showsVerticalScrollIndicator = false
         tableView.separatorStyle = .none
@@ -214,7 +214,7 @@ extension YHLookResignResultViewController: UITableViewDelegate, UITableViewData
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         if state == 0 {
             let approveCell = tableView.dequeueReusableCell(withIdentifier: YHLookResignResultStateOneTableViewCell.cellReuseIdentifier, for: indexPath) as! YHLookResignResultStateOneTableViewCell
-            approveCell.title = "第" + convertNumberToChineseText(indexPath.section + 1) + "批"
+            approveCell.title = "第" + convertNumberToChineseText(self.viewModel.dataModel.data.data[indexPath.section].number) + "批"
             approveCell.dataSource = self.viewModel.dataModel.data.data[indexPath.section]
             return approveCell
         } else if state == 1 {
@@ -229,8 +229,13 @@ extension YHLookResignResultViewController: UITableViewDelegate, UITableViewData
         } else {
             if indexPath.section == 0 {
                 let approveCell = tableView.dequeueReusableCell(withIdentifier: YHLookResignResultStateThreePeopleTableViewCell.cellReuseIdentifier, for: indexPath) as! YHLookResignResultStateThreePeopleTableViewCell
-                approveCell.title = "第" + convertNumberToChineseText(indexPath.row + 1) + "批"
+                approveCell.title = "第" + convertNumberToChineseText(self.viewModel.dataModel.data.data[indexPath.row].number) + "批"
                 approveCell.dataSource = self.viewModel.dataModel.data.data[indexPath.row]
+                if indexPath.row == self.viewModel.dataModel.data.data.count - 1 {
+                    approveCell.lineView.isHidden = true
+                } else {
+                    approveCell.lineView.isHidden = false
+                }
                 return approveCell
             } else {
                 let approveCell = tableView.dequeueReusableCell(withIdentifier: YHLookResignResultStateThreeTableViewCell.cellReuseIdentifier, for: indexPath) as! YHLookResignResultStateThreeTableViewCell
@@ -266,14 +271,11 @@ extension YHLookResignResultViewController: UITableViewDelegate, UITableViewData
     }
     
     private func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> CGFloat {
-        if section == 0 {
-            return 0.01
-        }
-        return 16.0
+        return 0.01
     }
     
     private func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> CGFloat {
-        return 0.01
+        return 16
     }
     
     func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/LookResignResult(查看续签结果)/V/YHLookResignGuideLineView.swift

@@ -140,7 +140,7 @@ private extension YHLookResignGuideLineView {
             // 定时器触发时执行的代码
             print("Timer fired")
         self.maxCount = self.maxCount - 1
-        if self.maxCount < 0 {
+        if self.maxCount < 1 {
             self.stopTimer()
             self.setButtonEnable(true)
         } else {

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

@@ -140,7 +140,7 @@ private extension YHResignAppointGuideLineView {
             // 定时器触发时执行的代码
             print("Timer fired")
         self.maxCount = self.maxCount - 1
-        if self.maxCount < 0 {
+        if self.maxCount < 1 {
             self.stopTimer()
             self.setButtonEnable(true)
         } else {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/UploadTravelCrad(上传旅行证件)/V/YHResignUploadTravelGuideView.swift

@@ -152,7 +152,7 @@ private extension YHResignUploadTravelGuideView {
             // 定时器触发时执行的代码
             print("Timer fired")
         self.maxCount = self.maxCount - 1
-        if self.maxCount < 0 {
+        if self.maxCount < 1 {
             self.stopTimer()
             self.setButtonEnable(true)
         } else {