Commit 5fe5c198 authored by Steven杜宇's avatar Steven杜宇

// 时间选择逻辑

parent ea1a6931
...@@ -36,7 +36,7 @@ class YHCertificateAppointViewController: YHBaseViewController { ...@@ -36,7 +36,7 @@ class YHCertificateAppointViewController: 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 = 16.0 tableView.estimatedSectionHeaderHeight = 0.01
tableView.estimatedSectionFooterHeight = 0.01 tableView.estimatedSectionFooterHeight = 0.01
tableView.contentInsetAdjustmentBehavior = .never tableView.contentInsetAdjustmentBehavior = .never
tableView.showsVerticalScrollIndicator = false tableView.showsVerticalScrollIndicator = false
......
...@@ -46,7 +46,10 @@ class YHSelectGroupMemberModel { ...@@ -46,7 +46,10 @@ class YHSelectGroupMemberModel {
//赴港办证时间类型 //赴港办证时间类型
var dateTye : Int = 0 //0 - 具体日期 1-具体时段 var dateTye : Int = 0 //0 - 具体日期 1-具体时段
//开始时间 或具体日期某一天 // 具体日期
var detailDateStr : String = ""
//开始时间
var startDateStr : String = "" var startDateStr : String = ""
//结束时间 //结束时间
......
...@@ -20,9 +20,20 @@ class YHInfoItemSelectSheetView: UIView { ...@@ -20,9 +20,20 @@ class YHInfoItemSelectSheetView: UIView {
} }
} }
var placeHolder: String = ""
var detail: String = "" { var detail: String = "" {
didSet { didSet {
if detail.isEmpty {
// 显示placeHolder
detailLabel.text = self.placeHolder
detailLabel.textColor = .placeHolderColor
return
}
detailLabel.text = detail detailLabel.text = detail
detailLabel.textColor = .mainTextColor
detailLabel.textAlignment = .left
} }
} }
...@@ -55,13 +66,15 @@ class YHInfoItemSelectSheetView: UIView { ...@@ -55,13 +66,15 @@ class YHInfoItemSelectSheetView: UIView {
let label = UILabel() let label = UILabel()
label.numberOfLines = 0 label.numberOfLines = 0
label.font = UIFont.PFSC_R(ofSize: 14) label.font = UIFont.PFSC_R(ofSize: 14)
label.textColor = .mainTextColor
return label return label
}() }()
lazy var detailLabel: UILabel = { private lazy var detailLabel: UILabel = {
let label = UILabel() let label = UILabel()
label.numberOfLines = 0 label.numberOfLines = 0
label.font = UIFont.PFSC_M(ofSize: 14) label.font = UIFont.PFSC_M(ofSize: 14)
label.textColor = .mainTextColor
return label return label
}() }()
......
...@@ -292,11 +292,18 @@ private extension YHSelectApplicantGroupCell { ...@@ -292,11 +292,18 @@ private extension YHSelectApplicantGroupCell {
if let model = dataModel?.model { if let model = dataModel?.model {
if model.dateTye == 0 { // 具体时间 if model.dateTye == 0 { // 具体时间
optionsView.selectIndex = 0 optionsView.selectIndex = 0
timeSelectView.detailLabel.text = model.startDateStr timeSelectView.placeHolder = "请选择具体日期"
timeSelectView.detail = model.detailDateStr
} else { // 具体时段 } else { // 具体时段
optionsView.selectIndex = 1 optionsView.selectIndex = 1
self.timeSelectView.detailLabel.text = "\(model.startDateStr) ~ \(model.endDateStr)"
timeSelectView.placeHolder = "请选择具体时段"
if !model.startDateStr.isEmpty, !model.endDateStr.isEmpty {
self.timeSelectView.detail = "\(model.startDateStr) ~ \(model.endDateStr)"
} else {
self.timeSelectView.detail = ""
}
} }
} }
} }
...@@ -327,9 +334,9 @@ private extension YHSelectApplicantGroupCell { ...@@ -327,9 +334,9 @@ private extension YHSelectApplicantGroupCell {
[weak self] dateStr in [weak self] dateStr in
guard let self = self else { return } guard let self = self else { return }
timeSelectView.detailLabel.text = dateStr timeSelectView.detail = dateStr
if let model = dataModel?.model { if let model = dataModel?.model {
model.startDateStr = dateStr model.detailDateStr = dateStr
} }
} }
} }
...@@ -346,7 +353,13 @@ private extension YHSelectApplicantGroupCell { ...@@ -346,7 +353,13 @@ private extension YHSelectApplicantGroupCell {
format.dateFormat = "yyyy-MM-dd" format.dateFormat = "yyyy-MM-dd"
let startDateStr = format.string(from: startDate) let startDateStr = format.string(from: startDate)
let endDateStr = format.string(from: endDate) let endDateStr = format.string(from: endDate)
self.timeSelectView.detailLabel.text = "\(startDateStr) ~ \(startDateStr)" printLog("\(startDateStr) ~ \(endDateStr)")
if !startDateStr.isEmpty, !endDateStr.isEmpty {
self.timeSelectView.detail = "\(startDateStr) ~ \(endDateStr)"
} else {
self.timeSelectView.detail = ""
}
if let model = dataModel?.model { if let model = dataModel?.model {
model.startDateStr = startDateStr model.startDateStr = startDateStr
......
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