Commit 401de1d6 authored by pete谢兆麟's avatar pete谢兆麟

UI走查修改

parent 82c07a7a
...@@ -173,7 +173,7 @@ extension YHMainApplicantInformationViewController: UITableViewDelegate, UITable ...@@ -173,7 +173,7 @@ extension YHMainApplicantInformationViewController: UITableViewDelegate, UITable
func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
if stepView.currentIndex == 1 { if stepView.currentIndex == 1 {
return 217.0 return 227.0
} else { } else {
let array = dataSource?[indexPath.row].models ?? [] let array = dataSource?[indexPath.row].models ?? []
var h = 0 var h = 0
......
...@@ -28,7 +28,7 @@ class YHAddressPickView: UIView { ...@@ -28,7 +28,7 @@ class YHAddressPickView: UIView {
case .provinces: case .provinces:
/// 选择省份时,有上面的热门城市view.没有滚动选择type的titleScrollView.没有已选择label. /// 选择省份时,有上面的热门城市view.没有滚动选择type的titleScrollView.没有已选择label.
self.tableView.tableHeaderView = tableViewHeaderView self.tableView.tableHeaderView = tableViewHeaderView
self.tableView.frame = CGRect(x: 0, y: 52, width: UIScreen.main.bounds.width, height: 526) self.tableView.frame = CGRect(x: 0, y: 72, width: UIScreen.main.bounds.width, height: 516)
self.titleSV.isHidden = true self.titleSV.isHidden = true
self.leftLabel.isHidden = true self.leftLabel.isHidden = true
/// 将所有选中数据清空 /// 将所有选中数据清空
...@@ -54,7 +54,7 @@ class YHAddressPickView: UIView { ...@@ -54,7 +54,7 @@ class YHAddressPickView: UIView {
case .city: case .city:
/// 选择城市时没有热门城市view,并将titleSV显示出来 /// 选择城市时没有热门城市view,并将titleSV显示出来
self.tableView.tableHeaderView = UIView() self.tableView.tableHeaderView = UIView()
self.tableView.frame = CGRect(x: 0, y: 136, width: UIScreen.main.bounds.width, height: 427) self.tableView.frame = CGRect(x: 0, y: 146, width: UIScreen.main.bounds.width, height: 417)
self.titleSV.isHidden = false self.titleSV.isHidden = false
self.leftLabel.isHidden = false self.leftLabel.isHidden = false
/// 将省份选择保留,将城市与地区数据清空 /// 将省份选择保留,将城市与地区数据清空
...@@ -125,7 +125,7 @@ class YHAddressPickView: UIView { ...@@ -125,7 +125,7 @@ class YHAddressPickView: UIView {
return button return button
}() }()
private let leftLabel: UILabel = { private let leftLabel: UILabel = {
let label = UILabel(frame: CGRect(x: 24, y: 62, width: 100, height: 18)) let label = UILabel(frame: CGRect(x: 24, y: 72, width: 100, height: 18))
label.text = "已选择" label.text = "已选择"
label.textColor = UIColor.mainTextColor label.textColor = UIColor.mainTextColor
label.font = UIFont.PFSC_M(ofSize: 14) label.font = UIFont.PFSC_M(ofSize: 14)
...@@ -158,7 +158,7 @@ class YHAddressPickView: UIView { ...@@ -158,7 +158,7 @@ class YHAddressPickView: UIView {
private var titleSV: UIScrollView! private var titleSV: UIScrollView!
/// titleSV上button下的滚动线 /// titleSV上button下的滚动线
// private var underLine = UIView() // private var underLine = UIView()
private var tableView = UITableView(frame: CGRect(x: 0, y:62 , width: UIScreen.main.bounds.width, height: 526)) private var tableView = UITableView(frame: CGRect(x: 0, y:72 , width: UIScreen.main.bounds.width, height: 516))
init(frame: CGRect, selectColor: UIColor, selectedProvince: String? = nil, selectedCity: String? = nil) { init(frame: CGRect, selectColor: UIColor, selectedProvince: String? = nil, selectedCity: String? = nil) {
self.selectColor = selectColor self.selectColor = selectColor
...@@ -201,7 +201,7 @@ class YHAddressPickView: UIView { ...@@ -201,7 +201,7 @@ class YHAddressPickView: UIView {
// self.underLine = UIView(frame: CGRect(x: 0, y: 40, width: 30, height: 2)) // self.underLine = UIView(frame: CGRect(x: 0, y: 40, width: 30, height: 2))
// self.underLine.backgroundColor = UIColor.brandMainColor // self.underLine.backgroundColor = UIColor.brandMainColor
for i in 0..<2 { for i in 0..<2 {
let button = UIButton(frame: CGRect(x: 21 + CGFloat(i) * 86, y: 0, width: 74, height: 32)) let button = UIButton(frame: CGRect(x: 21 + CGFloat(i) * 86, y: 10, width: 74, height: 32))
button.tag = Int(i) button.tag = Int(i)
button.setTitle("请选择", for: .normal) button.setTitle("请选择", for: .normal)
button.setTitleColor(UIColor.mainTextColor, for: .normal) button.setTitleColor(UIColor.mainTextColor, for: .normal)
......
...@@ -22,9 +22,14 @@ class YHWorkItemView: UIView { ...@@ -22,9 +22,14 @@ class YHWorkItemView: UIView {
var showPrompt: Bool = false { var showPrompt: Bool = false {
didSet { didSet {
if showPrompt { if showPrompt {
explainLabel.textColor = UIColor.failColor if dataSource?.vacant_num != 0 {
subTitleLabel.text = "有" + "\(dataSource?.vacant_num ?? 0)" + "项未填写"
subTitleLabel.textColor = UIColor.failColor
} else { } else {
explainLabel.textColor = UIColor.labelTextColor2 subTitleLabel.textColor = UIColor.labelTextColor2
}
} else {
subTitleLabel.textColor = UIColor.labelTextColor2
} }
} }
} }
...@@ -62,7 +67,7 @@ class YHWorkItemView: UIView { ...@@ -62,7 +67,7 @@ class YHWorkItemView: UIView {
subTitleLabel = { subTitleLabel = {
let label = UILabel() let label = UILabel()
label.font = UIFont.PFSC_M(ofSize: 12) label.font = UIFont.PFSC_R(ofSize: 14)
label.textAlignment = .left label.textAlignment = .left
label.textColor = UIColor.labelTextColor2 label.textColor = UIColor.labelTextColor2
return label return label
...@@ -76,7 +81,7 @@ class YHWorkItemView: UIView { ...@@ -76,7 +81,7 @@ class YHWorkItemView: UIView {
explainLabel = { explainLabel = {
let label = UILabel() let label = UILabel()
label.font = UIFont.PFSC_R(ofSize: 12) label.font = UIFont.PFSC_R(ofSize: 14)
label.textAlignment = .right label.textAlignment = .right
label.textColor = UIColor.labelTextColor2 label.textColor = UIColor.labelTextColor2
return label return label
......
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