Commit df00f10b authored by pete谢兆麟's avatar pete谢兆麟

正式环境 UI走查

parent 8cb67c62
...@@ -412,7 +412,7 @@ class YHItemView: UIView { ...@@ -412,7 +412,7 @@ class YHItemView: UIView {
case .normal: case .normal:
printLog("不需要跳转") printLog("不需要跳转")
case .address: case .address:
let addressPicker = YHAddressViewController() let addressPicker = YHAddressViewController(selectProvince: "台湾省")
addressPicker.backLocationStringController = { (address,province,city,area) in addressPicker.backLocationStringController = { (address,province,city,area) in
self.dataSource?.message = address self.dataSource?.message = address
self.dataSource?.value = [province, city] self.dataSource?.value = [province, city]
......
...@@ -56,6 +56,7 @@ class YHCountryHotView: UIView { ...@@ -56,6 +56,7 @@ class YHCountryHotView: UIView {
button.setTitle(dataSource[i], for: .normal) button.setTitle(dataSource[i], for: .normal)
button.setTitleColor(UIColor.mainTextColor, for: .normal) button.setTitleColor(UIColor.mainTextColor, for: .normal)
button.setBackgroundColor(color: UIColor.contentBkgColor, forState: .normal) button.setBackgroundColor(color: UIColor.contentBkgColor, forState: .normal)
button.setBackgroundColor(color: UIColor.tipsColor.withAlphaComponent(0.08), forState: .highlighted)
button.titleLabel?.font = UIFont.PFSC_R(ofSize: 13) button.titleLabel?.font = UIFont.PFSC_R(ofSize: 13)
button.layer.cornerRadius = 16 button.layer.cornerRadius = 16
button.tag = 3000 + i button.tag = 3000 + i
......
...@@ -72,6 +72,7 @@ class YHWorkExampleTypeView: UIView { ...@@ -72,6 +72,7 @@ class YHWorkExampleTypeView: UIView {
button.setTitle(dataSource[i], for: .normal) button.setTitle(dataSource[i], for: .normal)
button.setTitleColor(UIColor.mainTextColor, for: .normal) button.setTitleColor(UIColor.mainTextColor, for: .normal)
button.setBackgroundColor(color: UIColor.contentBkgColor, forState: .normal) button.setBackgroundColor(color: UIColor.contentBkgColor, forState: .normal)
button.setBackgroundColor(color: UIColor.tipsColor.withAlphaComponent(0.08), forState: .highlighted)
button.titleLabel?.font = UIFont.PFSC_R(ofSize: 13) button.titleLabel?.font = UIFont.PFSC_R(ofSize: 13)
button.layer.cornerRadius = 16 button.layer.cornerRadius = 16
button.tag = 3000 + i button.tag = 3000 + i
......
...@@ -399,6 +399,12 @@ class YHWorkExperienceItemView: UIView { ...@@ -399,6 +399,12 @@ class YHWorkExperienceItemView: UIView {
if dataSource?.id == .id10 { if dataSource?.id == .id10 {
title = "请选择离职日期" title = "请选择离职日期"
} }
if dataSource?.id == .id21 {
title = "请选择高管在职开始时间"
}
if dataSource?.id == .id22 {
title = "请选择高管在职结束时间"
}
YHDatePickView.show(type: .yyyymm, title: title) { date in YHDatePickView.show(type: .yyyymm, title: title) { date in
self.dataSource?.message = date self.dataSource?.message = date
self.updateAllViews() self.updateAllViews()
......
...@@ -14,14 +14,10 @@ class YHCompanyViewModel: YHBaseViewModel { ...@@ -14,14 +14,10 @@ class YHCompanyViewModel: YHBaseViewModel {
} }
func requestCompany(_ key: String, callBackBlock:@escaping (_ success: [YHCompanyModelListModel]?, _ error:YHErrorModel?)->()) { func requestCompany(_ key: String, callBackBlock:@escaping (_ success: [YHCompanyModelListModel]?, _ error:YHErrorModel?)->()) {
// let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.WorkExperience.company + "?company_name=\(key)&page_size=20&current_page=1"
let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.WorkExperience.company let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.WorkExperience.company
let params = ["company_name":key,"page_size":20,"current_page":1] as [String : Any] let params = ["company_name":key,"page_size":20,"current_page":1] as [String : Any]
let _ = YHNetRequest.getRequest(url: strUrl,params: params) { [weak self] json, code in let _ = YHNetRequest.getRequest(url: strUrl,params: params) { [weak self] json, code in
// let _ = YHNetRequest.getRequest(url: strUrl) { [weak self] json, code in
//1. json字符串 转 对象 //1. json字符串 转 对象
guard self != nil else { return } guard self != nil else { return }
if json.code == 200 { if json.code == 200 {
......
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