Commit e73b0a71 authored by Steven杜宇's avatar Steven杜宇

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

parents 9456bd42 8d9369c4
...@@ -48,8 +48,9 @@ class YHWorkExperienceViewController: YHBaseViewController { ...@@ -48,8 +48,9 @@ class YHWorkExperienceViewController: YHBaseViewController {
gk_navBackgroundColor = .white gk_navBackgroundColor = .white
gk_navBarAlpha = 1.0 gk_navBarAlpha = 1.0
setView() setView()
getData()
NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillShow(_:)), name: UIResponder.keyboardDidShowNotification, object: nil) NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillShow(_:)), name: UIResponder.keyboardDidShowNotification, object: nil)
NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillHide(_:)), name: UIResponder.keyboardDidHideNotification, object: nil) NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillHide(_:)), name: UIResponder.keyboardDidHideNotification, object: nil)
NotificationCenter.default.addObserver(self, selector: #selector(handleKeyboardNotification(_:)), name: UIResponder.keyboardWillShowNotification, object: nil) NotificationCenter.default.addObserver(self, selector: #selector(handleKeyboardNotification(_:)), name: UIResponder.keyboardWillShowNotification, object: nil)
...@@ -77,7 +78,10 @@ class YHWorkExperienceViewController: YHBaseViewController { ...@@ -77,7 +78,10 @@ class YHWorkExperienceViewController: YHBaseViewController {
override func viewWillAppear(_ animated: Bool) { override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated) super.viewWillAppear(animated)
getData() viewModel.requestWorkPositionList("\(orderID)", workExperienceID ?? "") {[weak self] success, error in
guard let self = self else { return }
self.updateDataSource()
}
} }
@objc func handleKeyboardNotification(_ notification: Notification) { @objc func handleKeyboardNotification(_ notification: Notification) {
......
...@@ -127,9 +127,9 @@ class YHWorkExperienceViewModel: YHBaseViewModel { ...@@ -127,9 +127,9 @@ class YHWorkExperienceViewModel: YHBaseViewModel {
func saveWorkDetail(workId: Int, callBackBlock:@escaping (_ success: Bool?, _ error:YHErrorModel?)->()) { func saveWorkDetail(workId: Int, callBackBlock:@escaping (_ success: Bool?, _ error:YHErrorModel?)->()) {
var file: [[String : Any]] = [] var file: [[String : Any]] = []
for item in mainModel.file { for item in mainModel.file {
let fileDic = ["fileName": item.fileName, let fileDic = ["file_name": item.fileName,
"fileUrl": item.fileUrl, "file_url": item.fileUrl,
"uploadedAt": item.uploadedAt] "uploaded_at": item.uploadedAt]
file.append(fileDic) file.append(fileDic)
} }
let params: [String : Any] = ["next_step": 0, let params: [String : Any] = ["next_step": 0,
......
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