Skip to content

G
galaxy-iOS
Commit ea572067 authored by Steven杜宇's avatar Steven杜宇
Browse files
Options

// 家庭

parent faaae409
Hide whitespace changes
Inline Side-by-side
Showing with 46 additions and 45 deletions
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/FamilyInfoConfirm(家庭信息确认)/C/YHFamilyInfoUpdateViewController.swift
View file @ ea572067
......@@ -122,9 +122,9 @@ class YHFamilyInfoUpdateViewController: YHBaseViewController {
action: .edit,
isMust: true,
title: "主申请人姓名",
detail: name,
value: name,
previousTitle: "原主申人姓名",
previousDetail: name,
previousValue: name,
isEditMode: isEditMode,
isShowPreviousInfo: isShowPreviousInfo)
arr1.append(mainApplicantNameInfo)
......@@ -135,9 +135,9 @@ class YHFamilyInfoUpdateViewController: YHBaseViewController {
action: .edit,
isMust: true,
title: "配偶姓名",
detail: name,
value: name,
previousTitle: "原配偶姓名",
previousDetail: name,
previousValue: name,
isEditMode: isEditMode,
isShowPreviousInfo: isShowPreviousInfo)
arr1.append(spouseNameInfo)
......@@ -148,9 +148,9 @@ class YHFamilyInfoUpdateViewController: YHBaseViewController {
action: .edit,
isMust: true,
title: "子女姓名",
detail: name,
value: name,
previousTitle: "原子女姓名",
previousDetail: name,
previousValue: name,
isEditMode: isEditMode,
isShowPreviousInfo: isShowPreviousInfo)
arr1.append(childNameInfo)
......@@ -161,9 +161,9 @@ class YHFamilyInfoUpdateViewController: YHBaseViewController {
action: .edit,
isMust: true,
title: "姓(拼音)",
detail: firsName,
value: firsName,
previousTitle: "原姓(拼音)",
previousDetail: firsName,
previousValue: firsName,
isEditMode: isEditMode,
isShowPreviousInfo: isShowPreviousInfo)
arr1.append(firstNameInfo)
......@@ -173,9 +173,9 @@ class YHFamilyInfoUpdateViewController: YHBaseViewController {
action: .edit,
isMust: true,
title: "名(拼音)",
detail: lastName,
value: lastName,
previousTitle: "原名(拼音)",
previousDetail: lastName,
previousValue: lastName,
isEditMode: isEditMode,
isShowPreviousInfo: isShowPreviousInfo)
arr1.append(lastNameInfo)
......@@ -187,9 +187,9 @@ class YHFamilyInfoUpdateViewController: YHBaseViewController {
action: .select,
isMust: true,
title: "婚姻状况",
detail: marriage,
value: marriage,
previousTitle: "原婚姻状况",
previousDetail: marriage,
previousValue: marriage,
isEditMode: isEditMode,
isShowPreviousInfo: isShowPreviousInfo)
arr1.append(marriageInfo)
......@@ -202,9 +202,9 @@ class YHFamilyInfoUpdateViewController: YHBaseViewController {
action: .choice,
isMust: true,
title: "出生国家/地区",
detail: birthNation,
value: birthNation,
previousTitle: "原出生国家/地区",
previousDetail: birthNation,
previousValue: birthNation,
options: options,
isEditMode: isEditMode,
isShowPreviousInfo: isShowPreviousInfo)
......@@ -215,9 +215,9 @@ class YHFamilyInfoUpdateViewController: YHBaseViewController {
action: .select,
isMust: true,
title: "出生地",
detail: birthPlace,
value: birthPlace,
previousTitle: "原出生地",
previousDetail: birthPlace,
previousValue: birthPlace,
isEditMode: isEditMode,
isShowPreviousInfo: isShowPreviousInfo)
arr1.append(birthPlaceInfo)
......@@ -227,9 +227,9 @@ class YHFamilyInfoUpdateViewController: YHBaseViewController {
action: .select,
isMust: true,
title: "申报国籍",
detail: declareNation,
value: declareNation,
previousTitle: "原申报国籍",
previousDetail: declareNation,
previousValue: declareNation,
isEditMode: isEditMode,
isShowPreviousInfo: isShowPreviousInfo)
arr1.append(declareNationInfo)
......@@ -239,9 +239,9 @@ class YHFamilyInfoUpdateViewController: YHBaseViewController {
action: .edit,
isMust: true,
title: "职业",
detail: occupation,
value: occupation,
previousTitle: "原职业",
previousDetail: occupation,
previousValue: occupation,
isEditMode: isEditMode,
isShowPreviousInfo: isShowPreviousInfo)
arr1.append(occupationInfo)
......@@ -251,9 +251,9 @@ class YHFamilyInfoUpdateViewController: YHBaseViewController {
action: .edit,
isMust: true,
title: "香港身份证号",
detail: hongkongId,
value: hongkongId,
previousTitle: "原香港身份证号",
previousDetail: hongkongId,
previousValue: hongkongId,
isEditMode: isEditMode,
isShowPreviousInfo: isShowPreviousInfo)
arr1.append(hongkongIdInfo)
......@@ -267,9 +267,9 @@ class YHFamilyInfoUpdateViewController: YHBaseViewController {
action: .select,
isMust: true,
title: "申报旅行证件",
detail: travelCerType,
value: travelCerType,
previousTitle: "原申报旅行证件",
previousDetail: travelCerType,
previousValue: travelCerType,
isEditMode: false,
isShowPreviousInfo: false)
arr2.append(travelCerInfo)
......@@ -279,9 +279,9 @@ class YHFamilyInfoUpdateViewController: YHBaseViewController {
action: .edit,
isMust: true,
title: "证件号",
detail: cerId,
value: cerId,
previousTitle: "原证件号",
previousDetail: cerId,
previousValue: cerId,
isEditMode: false,
isShowPreviousInfo: false)
arr2.append(cerIdInfo)
......@@ -301,7 +301,7 @@ class YHFamilyInfoUpdateViewController: YHBaseViewController {
if let arr1 = items.first {
for item in arr1 {
item.isEditMode = isEditMode
if !isEditMode, !item.previousDetail.isEmpty, item.previousDetail != item.detail {
if !isEditMode, !item.previousValue.isEmpty, item.previousValue != item.value {
item.isShowPreviousInfo = true
} else {
item.isShowPreviousInfo = false
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/FamilyInfoConfirm(家庭信息确认)/V/YHIFamilyInfoListCell.swift
View file @ ea572067
......@@ -48,28 +48,28 @@ class YHFamilyInfoItem {
var action:YHFamilyInfoActionType = .none
var isMust: Bool = false
var title: String = ""
var detail: String = ""
var value: String = ""
var previousTitle: String = ""
var previousDetail: String = ""
var previousValue: String = ""
var options:[YHFamilyInfoOption] = []
var isEditMode: Bool = false
var isShowPreviousInfo: Bool = false
var options:[YHFamilyInfoOption] = []
required init() {
}
init(id: YHFamilyInfoType, action: YHFamilyInfoActionType, isMust: Bool, title: String, detail: String, previousTitle: String, previousDetail: String, options:[YHFamilyInfoOption] = [], isEditMode: Bool, isShowPreviousInfo: Bool) {
init(id: YHFamilyInfoType, action: YHFamilyInfoActionType, isMust: Bool, title: String, value: String, previousTitle: String, previousValue: String, options: [YHFamilyInfoOption] = [], isEditMode: Bool, isShowPreviousInfo: Bool) {
self.id = id
self.action = action
self.isMust = isMust
self.title = title
self.detail = detail
self.value = value
self.previousTitle = previousTitle
self.previousDetail = previousDetail
self.options = options
self.previousValue = previousValue
self.isEditMode = isEditMode
self.isShowPreviousInfo = isShowPreviousInfo
self.options = options
}
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/FamilyInfoConfirm(家庭信息确认)/V/YHInfoItemView.swift
View file @ ea572067
......@@ -175,10 +175,10 @@ class YHInfoItemView: UIView {
if item.action == .select {
if item.id == .marriage {
YHSheetPickerView.show(type:.marriage, selectTitle: item.detail) {
YHSheetPickerView.show(type:.marriage, selectTitle: item.value) {
[weak self] item in
guard let self = self else { return }
self.item.detail = item.title
self.item.value = item.title
self.detailLabel.text = item.title
}
......@@ -195,7 +195,7 @@ class YHInfoItemView: UIView {
if !isEmptyString(string3) {
address += string3
}
self.item.detail = address
self.item.value = address
self.detailLabel.text = address
}
UIViewController.current?.present(vc, animated: true)
......@@ -203,7 +203,7 @@ class YHInfoItemView: UIView {
} else if item.id == .declareNation {
let vc = YHSelectCountryViewController()
vc.backLocationStringController = { (country) in
self.item.detail = country
self.item.value = country
self.detailLabel.text = country
}
UIViewController.current?.navigationController?.pushViewController(vc)
......@@ -225,14 +225,14 @@ class YHInfoItemView: UIView {
titleLabel.attributed.text = title
let isTextEdit = item.isEditMode && item.action == .edit
detailLabel.text = item.detail
detailLabel.text = item.value
detailLabel.isHidden = isTextEdit
textField.isHidden = !isTextEdit
let isSelectSheet = item.isEditMode && item.action == .select
clickRowBtn.isHidden = !isSelectSheet
textField.text = item.detail
textField.text = item.value
rightBtn.isHidden = !item.isEditMode
if item.action == .edit {
rightBtn.setImage(UIImage(named: "family_info_del"), for: .normal)
......@@ -240,7 +240,7 @@ class YHInfoItemView: UIView {
rightBtn.setImage(UIImage(named: "family_info_arrow"), for: .normal)
}
previousTitleLabel.text = item.previousTitle
previousDetailLabel.text = item.previousDetail
previousDetailLabel.text = item.previousValue
previousContentView.isHidden = !item.isShowPreviousInfo
detailLabel.snp.remakeConstraints { make in
......@@ -277,7 +277,8 @@ extension YHInfoItemView: UITextFieldDelegate {
// YHHUD.flash(message: "限制最多\(Self.maxWordsCount)个字符")
// return false
// }
self.item.detail = newText
self.item.value = newText
self.updateItem(item)
return true
}
}
......@@ -413,7 +414,7 @@ class YHInfoOptionView: UIView {
title = mustTag + title
}
titleLabel.attributed.text = title
detailLabel.text = item.detail
detailLabel.text = item.value
detailLabel.isHidden = item.isEditMode
optionsView.isHidden = !item.isEditMode
......@@ -441,7 +442,7 @@ class YHInfoOptionView: UIView {
}
previousTitleLabel.text = item.previousTitle
previousDetailLabel.text = item.previousDetail
previousDetailLabel.text = item.previousValue
previousContentView.isHidden = !item.isShowPreviousInfo
previousContentView.snp.remakeConstraints { make in
make.left.right.equalToSuperview()
......@@ -461,7 +462,7 @@ class YHInfoOptionView: UIView {
let isSelect = (selectIndex == index)
option.isSelect = isSelect
if isSelect {
item.detail = option.value
item.value = option.value
}
}
self.updateItem(item)
......
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