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

// 续签

parent 5175d0ca
...@@ -151,7 +151,7 @@ class YHResignInfoConfirmModifyViewController: YHBaseViewController { ...@@ -151,7 +151,7 @@ class YHResignInfoConfirmModifyViewController: YHBaseViewController {
} }
@objc func didConfirmBtnClicked() { @objc func didConfirmBtnClicked() {
self.detailMember.isCheck = true self.detailMember.isNeedCheck = true
self.updateData() self.updateData()
if !checkInfo() { if !checkInfo() {
...@@ -211,7 +211,7 @@ extension YHResignInfoConfirmModifyViewController: UITableViewDelegate, UITableV ...@@ -211,7 +211,7 @@ extension YHResignInfoConfirmModifyViewController: UITableViewDelegate, UITableV
if !checkInfo() { if !checkInfo() {
// 检查信息错误 // 检查信息错误
self.isInfoEditing = true self.isInfoEditing = true
self.detailMember.isCheck = true self.detailMember.isNeedCheck = true
self.updateData() self.updateData()
return return
} }
......
...@@ -140,7 +140,7 @@ class YHResignInfoConfirmFamilyModel: SmartCodable { ...@@ -140,7 +140,7 @@ class YHResignInfoConfirmFamilyModel: SmartCodable {
// 自定义属性 // 自定义属性
var relation:Int = YHFamilyMemberRelationType.none.rawValue var relation:Int = YHFamilyMemberRelationType.none.rawValue
// 是否检测编辑字段 // 是否检测编辑字段
var isCheck: Bool = false var isNeedCheck: Bool = false
required init() { required init() {
......
...@@ -282,7 +282,7 @@ class YHResignInfoItemView: UIView { ...@@ -282,7 +282,7 @@ class YHResignInfoItemView: UIView {
} }
} }
let isShowTips = (familyInfo.isCheck && !item.tips.isEmpty) let isShowTips = (familyInfo.isNeedCheck && !item.tips.isEmpty)
errorTipsLabel.text = item.tips errorTipsLabel.text = item.tips
errorTipsLabel.isHidden = !isShowTips errorTipsLabel.isHidden = !isShowTips
errorTipsLabel.snp.remakeConstraints { make in errorTipsLabel.snp.remakeConstraints { make in
...@@ -307,6 +307,7 @@ extension YHResignInfoItemView: UITextFieldDelegate { ...@@ -307,6 +307,7 @@ extension YHResignInfoItemView: UITextFieldDelegate {
var newText = (textField.text! as NSString).replacingCharacters(in: range, with: string) var newText = (textField.text! as NSString).replacingCharacters(in: range, with: string)
printLog("\(newText)") printLog("\(newText)")
if self.item.id == .mainApplicantName || self.item.id == .spouseName || self.item.id == .childName { if self.item.id == .mainApplicantName || self.item.id == .spouseName || self.item.id == .childName {
if newText.count > 30 { // 上限30个字符 if newText.count > 30 { // 上限30个字符
newText = String(newText.prefix(30)) newText = String(newText.prefix(30))
...@@ -319,6 +320,12 @@ extension YHResignInfoItemView: UITextFieldDelegate { ...@@ -319,6 +320,12 @@ extension YHResignInfoItemView: UITextFieldDelegate {
debounceTimer = Timer.scheduledTimer(withTimeInterval: 1.0, repeats: false) { [weak self] _ in debounceTimer = Timer.scheduledTimer(withTimeInterval: 1.0, repeats: false) { [weak self] _ in
self?.updateNamePinYin() self?.updateNamePinYin()
} }
} else {
// 刷新文字输入后的布局
debounceTimer?.invalidate()
debounceTimer = Timer.scheduledTimer(withTimeInterval: 1.25, repeats: false) { [weak self] _ in
self?.updateList?()
}
} }
if self.item.id == .occupation { // 职业 if self.item.id == .occupation { // 职业
...@@ -343,12 +350,12 @@ extension YHResignInfoItemView: UITextFieldDelegate { ...@@ -343,12 +350,12 @@ extension YHResignInfoItemView: UITextFieldDelegate {
@objc func textFieldChanged(textField:UITextField) { @objc func textFieldChanged(textField:UITextField) {
if let text = textField.text { if let text = textField.text {
self.faimilyInfo.isCheck = false
self.updateText(text) self.updateText(text)
} else { } else {
self.updateText("") self.updateText("")
} }
self.updateItem(self.item, familyInfo: self.faimilyInfo)
} }
func textFieldDidEndEditing(_ textField: UITextField) { func textFieldDidEndEditing(_ textField: UITextField) {
...@@ -389,7 +396,6 @@ extension YHResignInfoItemView: UITextFieldDelegate { ...@@ -389,7 +396,6 @@ extension YHResignInfoItemView: UITextFieldDelegate {
if newText.isEmpty { if newText.isEmpty {
self.faimilyInfo.familyName = "" self.faimilyInfo.familyName = ""
self.faimilyInfo.givenName = "" self.faimilyInfo.givenName = ""
self.faimilyInfo.isCheck = false
self.updateList?() self.updateList?()
} }
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