Skip to content

G
galaxy-iOS
Commit 326a46d7 authored by David黄金龙's avatar David黄金龙
Browse files
Options

删除 至今 功能

parent 14299037
Hide whitespace changes
Inline Side-by-side
Showing with 65 additions and 64 deletions
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ 326a46d7
...@@ -3252,7 +3252,7 @@ ...@@ -3252,7 +3252,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxyTestEnv.entitlements; CODE_SIGN_ENTITLEMENTS = galaxy/galaxyTestEnv.entitlements;
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 6; CURRENT_PROJECT_VERSION = 7;
DEVELOPMENT_TEAM = RXHYW88XR7; DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO; ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
...@@ -3456,7 +3456,7 @@ ...@@ -3456,7 +3456,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxyDebug.entitlements; CODE_SIGN_ENTITLEMENTS = galaxy/galaxyDebug.entitlements;
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 6; CURRENT_PROJECT_VERSION = 7;
DEVELOPMENT_TEAM = RXHYW88XR7; DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO; ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
...@@ -3502,7 +3502,7 @@ ...@@ -3502,7 +3502,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements; CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 6; CURRENT_PROJECT_VERSION = 7;
DEVELOPMENT_TEAM = RXHYW88XR7; DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO; ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/C/YHWorkIntroductionViewController.swift
View file @ 326a46d7
...@@ -14,7 +14,7 @@ class YHWorkIntroductionViewController: YHBaseViewController { ...@@ -14,7 +14,7 @@ class YHWorkIntroductionViewController: YHBaseViewController {
var nameTextField: UITextField! var nameTextField: UITextField!
var startTextField: UITextField! var startTextField: UITextField!
var endTextField: UITextField! var endTextField: UITextField!
var longTimeButton: UIButton! // var longTimeButton: UIButton!
var messageTextField: UITextView! var messageTextField: UITextView!
var startButton: UIButton! var startButton: UIButton!
var endButton: UIButton! var endButton: UIButton!
...@@ -153,43 +153,44 @@ class YHWorkIntroductionViewController: YHBaseViewController { ...@@ -153,43 +153,44 @@ class YHWorkIntroductionViewController: YHBaseViewController {
make.right.equalTo(-18) make.right.equalTo(-18)
} }
longTimeButton = { // longTimeButton = {
let button = UIButton(type: .custom) // let button = UIButton(type: .custom)
button.setImage(UIImage(named: "main_time_normal"), for: .normal) // button.setImage(UIImage(named: "main_time_normal"), for: .normal)
button.setImage(UIImage(named: "login_privacy_agree"), for: .selected) // button.setImage(UIImage(named: "login_privacy_agree"), for: .selected)
button.setTitleColor(UIColor.mainTextColor, for: .normal) // button.setTitleColor(UIColor.mainTextColor, for: .normal)
button.setTitle("至今", for: .normal) // button.setTitle("至今", for: .normal)
button.titleLabel?.font = UIFont.PFSC_M(ofSize: 14) // button.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
button.contentHorizontalAlignment = .right // button.contentHorizontalAlignment = .right
button.addTarget(self, action: #selector(longTimeButtonClick), for: .touchUpInside) // button.addTarget(self, action: #selector(longTimeButtonClick), for: .touchUpInside)
if dataSource.project_end_time == "至今" { // if dataSource.project_end_time == "至今" {
button.isSelected = true // button.isSelected = true
} else { // } else {
button.isSelected = false // button.isSelected = false
} // }
return button // return button
}() // }()
view.addSubview(longTimeButton) // view.addSubview(longTimeButton)
if dataSource.project_end_time != "至今" { // if dataSource.project_end_time != "至今" {
longTimeButton.snp.makeConstraints { make in // longTimeButton.snp.makeConstraints { make in
make.right.equalTo(-18) // make.right.equalTo(-18)
make.centerY.equalTo(endTextField.snp.centerY) // make.centerY.equalTo(endTextField.snp.centerY)
make.height.equalTo(32) // make.height.equalTo(32)
make.width.equalTo(43) // make.width.equalTo(43)
} // }
endTextField.isHidden = false endTextField.isHidden = false
endButton.isHidden = false endButton.isHidden = false
} else { // }
longTimeButton.snp.makeConstraints { make in // else {
make.left.equalTo(117) // longTimeButton.snp.makeConstraints { make in
make.centerY.equalTo(endTextField.snp.centerY) // make.left.equalTo(117)
make.height.equalTo(32) // make.centerY.equalTo(endTextField.snp.centerY)
make.width.equalTo(43) // make.height.equalTo(32)
} // make.width.equalTo(43)
endTextField.isHidden = true // }
endButton.isHidden = true // endTextField.isHidden = true
} // endButton.isHidden = true
longTimeButton.iconInLeft(spacing: 3) // }
// longTimeButton.iconInLeft(spacing: 3)
messageTextField = { messageTextField = {
...@@ -295,33 +296,33 @@ class YHWorkIntroductionViewController: YHBaseViewController { ...@@ -295,33 +296,33 @@ class YHWorkIntroductionViewController: YHBaseViewController {
} }
} }
@objc func longTimeButtonClick() { // @objc func longTimeButtonClick() {
longTimeButton.isSelected = !longTimeButton.isSelected // longTimeButton.isSelected = !longTimeButton.isSelected
if longTimeButton.isSelected { // if longTimeButton.isSelected {
longTimeButton.snp.remakeConstraints { make in // longTimeButton.snp.remakeConstraints { make in
make.left.equalTo(117) // make.left.equalTo(117)
make.centerY.equalTo(endTextField.snp.centerY) // make.centerY.equalTo(endTextField.snp.centerY)
make.height.equalTo(32) // make.height.equalTo(32)
make.width.equalTo(43) // make.width.equalTo(43)
} // }
endTextField.isHidden = true // endTextField.isHidden = true
endButton.isHidden = true // endButton.isHidden = true
} else { // } else {
longTimeButton.snp.remakeConstraints { make in // longTimeButton.snp.remakeConstraints { make in
make.right.equalTo(-18) // make.right.equalTo(-18)
make.centerY.equalTo(endTextField.snp.centerY) // make.centerY.equalTo(endTextField.snp.centerY)
make.height.equalTo(32) // make.height.equalTo(32)
make.width.equalTo(43) // make.width.equalTo(43)
} // }
endTextField.isHidden = false // endTextField.isHidden = false
endButton.isHidden = false // endButton.isHidden = false
} // }
} // }
@objc func submit() { @objc func submit() {
if longTimeButton.isSelected { // if longTimeButton.isSelected {
dataSource.project_end_time = "至今" // dataSource.project_end_time = "至今"
} // }
guard let _ = dataSource.project_name else { guard let _ = dataSource.project_name else {
YHHUD.flash(message: "您还有信息未填写") YHHUD.flash(message: "您还有信息未填写")
return return
......
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