Commit ee38481a authored by pete谢兆麟's avatar pete谢兆麟

54321

parent 45315ab1
...@@ -119,7 +119,7 @@ private extension YHAdopterCardOtherGuideView { ...@@ -119,7 +119,7 @@ private extension YHAdopterCardOtherGuideView {
// 定时器触发时执行的代码 // 定时器触发时执行的代码
print("Timer fired") print("Timer fired")
self.maxCount = self.maxCount - 1 self.maxCount = self.maxCount - 1
if self.maxCount < 0 { if self.maxCount < 1 {
self.stopTimer() self.stopTimer()
self.setButtonEnable(true) self.setButtonEnable(true)
} else { } else {
......
...@@ -139,7 +139,7 @@ private extension YHOffivialApprovalGuildLineCheckView { ...@@ -139,7 +139,7 @@ private extension YHOffivialApprovalGuildLineCheckView {
// 定时器触发时执行的代码 // 定时器触发时执行的代码
print("Timer fired") print("Timer fired")
self.maxCount = self.maxCount - 1 self.maxCount = self.maxCount - 1
if self.maxCount < 0 { if self.maxCount < 1 {
self.stopTimer() self.stopTimer()
self.setButtonEnable(true) self.setButtonEnable(true)
} else { } else {
......
...@@ -25,7 +25,7 @@ class YHLookResignResultViewController: YHBaseViewController { ...@@ -25,7 +25,7 @@ class YHLookResignResultViewController: YHBaseViewController {
lazy var tableView: UITableView = { lazy var tableView: UITableView = {
let tableView = UITableView(frame:.zero, style:.grouped) let tableView = UITableView(frame:.zero, style:.grouped)
tableView.estimatedSectionHeaderHeight = 0.01 tableView.estimatedSectionHeaderHeight = 0.01
tableView.estimatedSectionFooterHeight = 0.01 tableView.estimatedSectionFooterHeight = 16
tableView.contentInsetAdjustmentBehavior = .never tableView.contentInsetAdjustmentBehavior = .never
tableView.showsVerticalScrollIndicator = false tableView.showsVerticalScrollIndicator = false
tableView.separatorStyle = .none tableView.separatorStyle = .none
...@@ -214,7 +214,7 @@ extension YHLookResignResultViewController: UITableViewDelegate, UITableViewData ...@@ -214,7 +214,7 @@ extension YHLookResignResultViewController: UITableViewDelegate, UITableViewData
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
if state == 0 { if state == 0 {
let approveCell = tableView.dequeueReusableCell(withIdentifier: YHLookResignResultStateOneTableViewCell.cellReuseIdentifier, for: indexPath) as! YHLookResignResultStateOneTableViewCell 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] approveCell.dataSource = self.viewModel.dataModel.data.data[indexPath.section]
return approveCell return approveCell
} else if state == 1 { } else if state == 1 {
...@@ -229,8 +229,13 @@ extension YHLookResignResultViewController: UITableViewDelegate, UITableViewData ...@@ -229,8 +229,13 @@ extension YHLookResignResultViewController: UITableViewDelegate, UITableViewData
} else { } else {
if indexPath.section == 0 { if indexPath.section == 0 {
let approveCell = tableView.dequeueReusableCell(withIdentifier: YHLookResignResultStateThreePeopleTableViewCell.cellReuseIdentifier, for: indexPath) as! YHLookResignResultStateThreePeopleTableViewCell 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] 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 return approveCell
} else { } else {
let approveCell = tableView.dequeueReusableCell(withIdentifier: YHLookResignResultStateThreeTableViewCell.cellReuseIdentifier, for: indexPath) as! YHLookResignResultStateThreeTableViewCell let approveCell = tableView.dequeueReusableCell(withIdentifier: YHLookResignResultStateThreeTableViewCell.cellReuseIdentifier, for: indexPath) as! YHLookResignResultStateThreeTableViewCell
...@@ -266,14 +271,11 @@ extension YHLookResignResultViewController: UITableViewDelegate, UITableViewData ...@@ -266,14 +271,11 @@ extension YHLookResignResultViewController: UITableViewDelegate, UITableViewData
} }
private func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> CGFloat { private func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> CGFloat {
if section == 0 { return 0.01
return 0.01
}
return 16.0
} }
private func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> CGFloat { private func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> CGFloat {
return 0.01 return 16
} }
func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? { func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
......
...@@ -140,7 +140,7 @@ private extension YHLookResignGuideLineView { ...@@ -140,7 +140,7 @@ private extension YHLookResignGuideLineView {
// 定时器触发时执行的代码 // 定时器触发时执行的代码
print("Timer fired") print("Timer fired")
self.maxCount = self.maxCount - 1 self.maxCount = self.maxCount - 1
if self.maxCount < 0 { if self.maxCount < 1 {
self.stopTimer() self.stopTimer()
self.setButtonEnable(true) self.setButtonEnable(true)
} else { } else {
......
...@@ -140,7 +140,7 @@ private extension YHResignAppointGuideLineView { ...@@ -140,7 +140,7 @@ private extension YHResignAppointGuideLineView {
// 定时器触发时执行的代码 // 定时器触发时执行的代码
print("Timer fired") print("Timer fired")
self.maxCount = self.maxCount - 1 self.maxCount = self.maxCount - 1
if self.maxCount < 0 { if self.maxCount < 1 {
self.stopTimer() self.stopTimer()
self.setButtonEnable(true) self.setButtonEnable(true)
} else { } else {
......
...@@ -152,7 +152,7 @@ private extension YHResignUploadTravelGuideView { ...@@ -152,7 +152,7 @@ private extension YHResignUploadTravelGuideView {
// 定时器触发时执行的代码 // 定时器触发时执行的代码
print("Timer fired") print("Timer fired")
self.maxCount = self.maxCount - 1 self.maxCount = self.maxCount - 1
if self.maxCount < 0 { if self.maxCount < 1 {
self.stopTimer() self.stopTimer()
self.setButtonEnable(true) self.setButtonEnable(true)
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment