Commit 51516ddd authored by Steven杜宇's avatar Steven杜宇

// 学历资格

parent e995715f
......@@ -505,13 +505,20 @@ extension YHEducationDetailVC : UITableViewDelegate, UITableViewDataSource {
vc.orderId = self.orderId
vc.searchMajorName = detailInfo.major
vc.selectBlock = {
[weak self] text in
[weak self] fullName, enName in
guard let self = self else { return }
if let text = text, !text.isEmpty {
if let text = fullName, !text.isEmpty {
detailInfo.major = text
} else {
detailInfo.major = ""
}
if let enname = enName, !enname.isEmpty {
detailInfo.tempMajor = enname
} else {
detailInfo.tempMajor = ""
}
loadInfo()
saveInfoSilent()
}
......
......@@ -12,7 +12,7 @@ class YHMajorSearchViewController: YHBaseViewController {
var orderId:Int = 0
var searchMajorName:String?
var selectBlock:((String?)->Void)?
var selectBlock:((String?, String?)->Void)?
var majors:[YHMajorInfo] = []
let educationRequest:YHEducationRequestViewModel = YHEducationRequestViewModel()
......@@ -76,7 +76,7 @@ class YHMajorSearchViewController: YHBaseViewController {
[weak self] in
guard let self = self else { return }
if let selectBlock = selectBlock {
selectBlock(searchBar.textField.text)
selectBlock(searchBar.textField.text, "")
self.navigationController?.popViewController(animated: true)
}
}
......@@ -151,7 +151,7 @@ extension YHMajorSearchViewController: UITableViewDelegate, UITableViewDataSourc
if let selectBlock = selectBlock {
if indexPath.row < majors.count {
let major:YHMajorInfo = majors[indexPath.row]
selectBlock(major.getMajorName())
selectBlock(major.getMajorName(), major.en_name)
self.navigationController?.popViewController(animated: true)
}
}
......
......@@ -110,6 +110,7 @@ class YHEducationDetailInfo: SmartCodable {
var graduateTime: String = ""
var degree: String = ""
var major: String = ""
var tempMajor : String = "" //保存专业中文名称
var degreeType: String = ""
var schoolAddress: YHCollegeAddress = YHCollegeAddress()
var isAboardSchool: Bool = false
......@@ -142,6 +143,7 @@ class YHEducationDetailInfo: SmartCodable {
case graduateTime = "graduate_time"
case degree = "degree"
case major = "major"
case tempMajor = "temp_major"
case degreeType = "degree_type"
case schoolAddress = "school_address"
case isAboardSchool = "is_aboard_school"
......
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