Commit d4137e05 authored by David黄金龙's avatar David黄金龙

Merge branch 'qmas-1130' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into qmas-1130

* 'qmas-1130' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  工作经验bug修复
parents 1d84c925 ca1e30ab
......@@ -206,7 +206,7 @@ extension YHWorkExperienceListViewController: UITableViewDelegate, UITableViewDa
if indexPath.row == 2 {
return UITableView.automaticDimension
}
let number = dataSource?.count ?? 0
_ = dataSource?.count ?? 0
var height = 23 + 154
if let data = dataSource {
for item in data {
......@@ -229,6 +229,9 @@ extension YHWorkExperienceListViewController: UITableViewDelegate, UITableViewDa
height = height + 76
}
}
if showPrompt && item.vacant_num != 0 {
height = height + 20
}
}
}
return CGFloat(height)
......
......@@ -114,7 +114,7 @@ class YHWorkExperienceViewController: YHBaseViewController {
viewModel.requestWorkExample { success, error in
}
if workExperienceID == "" {
if workExperienceID == "0" {
self.stepView.currentIndex = 0
self.stepView.maxIndex = 0
self.updateDataSource()
......@@ -877,7 +877,7 @@ extension YHWorkExperienceViewController: UITableViewDelegate, UITableViewDataSo
var height = 23 + 154
for item in viewModel.positionList {
if item.position_name == "" {
height = height + 52
height = height + 76
} else {
let text = item.position_name // 要显示的文本内容
let font = UIFont.PFSC_B(ofSize: 14) // 字体大小
......
......@@ -18,7 +18,7 @@ class YHWorkExperiencePositionModel: SmartCodable {
var entry_time: String = ""
var departure_time: String = ""
var experience_scope: String = ""
var experience_sub_scope: String = " "
var experience_sub_scope: String = ""
var is_international_work_experience: Int = 0
var provide_certificate_type: Int = 0
var work_country: String = ""
......
......@@ -247,6 +247,9 @@ class YHWorkExperienceItemView: UIView {
messageTextField.text = item["title"]
}
}
if messageTextField.text == "0" {
messageTextField.text = ""
}
case .prove:
break
case .company:
......
......@@ -216,7 +216,7 @@ class YHWorkExperienceListTableViewCell: UITableViewCell {
itemView.showPrompt = showPrompt
var h = 0
if model.company_name == "" {
h = 51
h = 75
} else {
let text = model.company_name // 要显示的文本内容
let font = UIFont.PFSC_B(ofSize: 14) // 字体大小
......
......@@ -150,6 +150,9 @@ class YHWorkItemView: UIView {
if dataSource.company_name?.count == 0 {
titleLabel.text = "工作经验\(tag - 4000 + 1)"
}
if dataSource.position?.count == 0 {
subTitleLabel.text = "职位\(tag - 4000 + 1)"
}
}
......
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