Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
galaxy-iOS
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
mobile-group
galaxy-iOS
Commits
54ab7e63
Commit
54ab7e63
authored
Jan 25, 2024
by
Steven杜宇
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
// 家庭成员信息填写表单
parent
73c08c3a
Changes
13
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
845 additions
and
85 deletions
+845
-85
project.pbxproj
galaxy/galaxy.xcodeproj/project.pbxproj
+8
-4
AppDelegate.swift
galaxy/galaxy/AppDelegate.swift
+1
-1
YHFamilyMemberFormVC.swift
...viceProcess(流程)/FamilyMember/C/YHFamilyMemberFormVC.swift
+491
-59
YHSpouseFormVC.swift
...心)/ServiceProcess(流程)/FamilyMember/C/YHSpouseFormVC.swift
+2
-2
YHFamilyInitialInfo.swift
...rviceProcess(流程)/FamilyMember/M/YHFamilyInitialInfo.swift
+199
-9
YHTest.swift
...vice(服务中心)/ServiceProcess(流程)/FamilyMember/M/YHTest.swift
+13
-0
YHFormAddInfoCell.swift
...viceProcess(流程)/FamilyMember/View/YHFormAddInfoCell.swift
+6
-2
YHFormTitleCell.swift
...erviceProcess(流程)/FamilyMember/View/YHFormTitleCell.swift
+72
-6
YHSingleLineSelectCell.swift
...rocess(流程)/FamilyMember/View/YHSingleLineSelectCell.swift
+30
-1
YHNetRequest.swift
galaxy/galaxy/Classes/Tools/NetWork/YHNetRequest.swift
+1
-1
Contents.json
...Res/Assets.xcassets/Form/form_edit.imageset/Contents.json
+22
-0
Group 2894@2x.png
...Assets.xcassets/Form/form_edit.imageset/Group 2894@2x.png
+0
-0
Group 2894@3x.png
...Assets.xcassets/Form/form_edit.imageset/Group 2894@3x.png
+0
-0
No files found.
galaxy/galaxy.xcodeproj/project.pbxproj
View file @
54ab7e63
...
...
@@ -15,9 +15,10 @@
041B52932B5E6CBA007EBCEB
/* YHFormTitleCell.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
041B52922B5E6CBA007EBCEB
/* YHFormTitleCell.swift */
;
};
041B52952B5E7037007EBCEB
/* YHFormAddInfoCell.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
041B52942B5E7037007EBCEB
/* YHFormAddInfoCell.swift */
;
};
041B52982B5E8EA0007EBCEB
/* YHFamilyMemberFormVC.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
041B52972B5E8EA0007EBCEB
/* YHFamilyMemberFormVC.swift */
;
};
041B52D62B5F899E007EBCEB
/* YH
ConsortFormVC.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
041B52D52B5F899E007EBCEB
/* YHConsort
FormVC.swift */
;
};
041B52D62B5F899E007EBCEB
/* YH
SpouseFormVC.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
041B52D52B5F899E007EBCEB
/* YHSpouse
FormVC.swift */
;
};
041B52D92B5F8B07007EBCEB
/* YHConsortInfo.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
041B52D82B5F8B07007EBCEB
/* YHConsortInfo.swift */
;
};
041B52DB2B5FDF8E007EBCEB
/* YHFamilyInitialInfo.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
041B52DA2B5FDF8E007EBCEB
/* YHFamilyInitialInfo.swift */
;
};
041B52DD2B60A889007EBCEB
/* YHTest.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
041B52DC2B60A889007EBCEB
/* YHTest.swift */
;
};
0468D4202B49320900CFB916
/* YHVerificationCodeLoginController.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
0468D41F2B49320900CFB916
/* YHVerificationCodeLoginController.swift */
;
};
0468D4222B493A5E00CFB916
/* YHPhoneMessageView.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
0468D4212B493A5E00CFB916
/* YHPhoneMessageView.swift */
;
};
0468D4242B494BEA00CFB916
/* YHCodeResultViewController.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
0468D4232B494BEA00CFB916
/* YHCodeResultViewController.swift */
;
};
...
...
@@ -158,9 +159,10 @@
041B52922B5E6CBA007EBCEB
/* YHFormTitleCell.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
YHFormTitleCell.swift
;
sourceTree
=
"<group>"
;
};
041B52942B5E7037007EBCEB
/* YHFormAddInfoCell.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
YHFormAddInfoCell.swift
;
sourceTree
=
"<group>"
;
};
041B52972B5E8EA0007EBCEB
/* YHFamilyMemberFormVC.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
YHFamilyMemberFormVC.swift
;
sourceTree
=
"<group>"
;
};
041B52D52B5F899E007EBCEB
/* YH
ConsortFormVC.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
YHConsort
FormVC.swift
;
sourceTree
=
"<group>"
;
};
041B52D52B5F899E007EBCEB
/* YH
SpouseFormVC.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
YHSpouse
FormVC.swift
;
sourceTree
=
"<group>"
;
};
041B52D82B5F8B07007EBCEB
/* YHConsortInfo.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
YHConsortInfo.swift
;
sourceTree
=
"<group>"
;
};
041B52DA2B5FDF8E007EBCEB
/* YHFamilyInitialInfo.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
YHFamilyInitialInfo.swift
;
sourceTree
=
"<group>"
;
};
041B52DC2B60A889007EBCEB
/* YHTest.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
YHTest.swift
;
sourceTree
=
"<group>"
;
};
0468D41F2B49320900CFB916
/* YHVerificationCodeLoginController.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
YHVerificationCodeLoginController.swift
;
sourceTree
=
"<group>"
;
};
0468D4212B493A5E00CFB916
/* YHPhoneMessageView.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
YHPhoneMessageView.swift
;
sourceTree
=
"<group>"
;
};
0468D4232B494BEA00CFB916
/* YHCodeResultViewController.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
YHCodeResultViewController.swift
;
sourceTree
=
"<group>"
;
};
...
...
@@ -332,7 +334,7 @@
isa
=
PBXGroup
;
children
=
(
041B52972B5E8EA0007EBCEB
/* YHFamilyMemberFormVC.swift */
,
041B52D52B5F899E007EBCEB
/* YH
Consort
FormVC.swift */
,
041B52D52B5F899E007EBCEB
/* YH
Spouse
FormVC.swift */
,
);
path
=
C
;
sourceTree
=
"<group>"
;
...
...
@@ -342,6 +344,7 @@
children
=
(
041B52D82B5F8B07007EBCEB
/* YHConsortInfo.swift */
,
041B52DA2B5FDF8E007EBCEB
/* YHFamilyInitialInfo.swift */
,
041B52DC2B60A889007EBCEB
/* YHTest.swift */
,
);
path
=
M
;
sourceTree
=
"<group>"
;
...
...
@@ -1015,6 +1018,7 @@
A5C5B2FB2B5535DF00A7C5D1
/* YHHomeBannerView.swift in Sources */
,
041B528B2B5E15F1007EBCEB
/* YHDoubleChoiceQuestionCell.swift in Sources */
,
A5ACE94B2B4564F7002C94D2
/* BsHUDRotatingImageView.swift in Sources */
,
041B52DD2B60A889007EBCEB
/* YHTest.swift in Sources */
,
A5ACE94F2B4564F7002C94D2
/* YhOverlayView.swift in Sources */
,
A53026902B4E6F2700F35102
/* YHHomeCustomCell.swift in Sources */
,
A5ACE92E2B4564F7002C94D2
/* YHValidateCodeInputView.swift in Sources */
,
...
...
@@ -1038,7 +1042,7 @@
A510441A2B495DD0006B60BB
/* UIView+Extension.swift in Sources */
,
A5ACE93E2B4564F7002C94D2
/* UIImage+Extension.swift in Sources */
,
A5ACE94C2B4564F7002C94D2
/* BsHUDErrorView.swift in Sources */
,
041B52D62B5F899E007EBCEB
/* YH
Consort
FormVC.swift in Sources */
,
041B52D62B5F899E007EBCEB
/* YH
Spouse
FormVC.swift in Sources */
,
A5D6AB1B2B46A1CC001C10A5
/* YHHomeModel.swift in Sources */
,
A5D6AB1D2B46AAFB001C10A5
/* YHHomePageViewModel.swift in Sources */
,
A5ACE9552B4564F7002C94D2
/* YHTabBarViewController.swift in Sources */
,
...
...
galaxy/galaxy/AppDelegate.swift
View file @
54ab7e63
...
...
@@ -67,7 +67,7 @@ extension AppDelegate {
//1.数据解析
#if DEBUG
SmartConfig
.
debugMode
=
.
verbose
//
SmartConfig.debugMode = .verbose
SmartConfig
.
debugMode
=
.
none
//for test hjl
#else
SmartConfig
.
debugMode
=
.
none
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/C/YHFamilyMemberFormVC.swift
View file @
54ab7e63
...
...
@@ -8,8 +8,20 @@
import
UIKit
enum
YHFamilyMemberEditType
:
Int
{
case
none
=
1
case
canEdit
=
2
case
canCancel
=
3
}
class
YHFamilyMemberFormVC
:
YHBaseViewController
{
var
familyMemberInfo
:
YHFamilyMemberInfo
?
var
isChildsEditMode
:
YHFamilyMemberEditType
=
.
none
var
isBrothersEditMode
:
YHFamilyMemberEditType
=
.
none
var
items
:[[
YHFamilyMemberProtocol
]]
=
[]
lazy
var
tableView
:
UITableView
=
{
let
tableView
=
UITableView
(
frame
:
.
zero
,
style
:
.
plain
)
...
...
@@ -47,10 +59,10 @@ class YHFamilyMemberFormVC: YHBaseViewController {
override
func
viewDidLoad
()
{
super
.
viewDidLoad
()
self
.
t
itle
=
"家庭成员信息填写"
self
.
gk_navT
itle
=
"家庭成员信息填写"
view
.
backgroundColor
=
UIColor
(
hexString
:
"#F8F8F8"
)
createUI
()
loadData
()
}
...
...
@@ -84,90 +96,510 @@ class YHFamilyMemberFormVC: YHBaseViewController {
@objc
func
didClickSubmitBtn
()
{
}
func
loadData
()
{
let
dic
=
[
"father"
:
[
"id"
:
0
,
"deceased"
:
0
,
"custody"
:
100
,
"nationality"
:
""
,
"order_id"
:
0
,
"relation"
:
0
,
"has_degree"
:
0
,
"has_degree_json"
:
[],
"follow"
:
0
,
"statement"
:
0
,
"subset_name"
:
""
,
"subset_name_pinyin"
:
""
,
"used_name"
:
""
,
"birthday"
:
""
,
"birth_place_aboard"
:
0
,
"birth_place"
:
[],
"occupation"
:
""
,
"occupation_name"
:
""
,
"operator_ame"
:
""
,
"child_has_hk_id"
:
[],
"hk_identity_card"
:
""
,
"sex"
:
0
,
"married"
:
0
,
"nows"
:
0
,
"address"
:
[],
"child_stepchild"
:
[],
"child_in_hk"
:
[],
"country_identity"
:
[],
"hk_identity"
:
""
,
"hk_identity_other"
:
""
,
"live_country"
:
""
,
"is_handled"
:
0
,
"finish_follow"
:
0
,
"step"
:
0
,
"not_fill_num"
:
-
1
,
"certificates"
:
[],
"is_live_oversea_year"
:
0
],
"mother"
:
[
"id"
:
0
,
"deceased"
:
0
,
"custody"
:
100
,
"nationality"
:
""
,
"order_id"
:
0
,
"relation"
:
0
,
"has_degree"
:
0
,
"has_degree_json"
:
[],
"follow"
:
0
,
"statement"
:
0
,
"subset_name"
:
""
,
"subset_name_pinyin"
:
""
,
"used_name"
:
""
,
"birthday"
:
""
,
"birth_place_aboard"
:
0
,
"birth_place"
:
[],
"occupation"
:
""
,
"occupation_name"
:
""
,
"operator_ame"
:
""
,
"child_has_hk_id"
:
[],
"hk_identity_card"
:
""
,
"sex"
:
0
,
"married"
:
0
,
"nows"
:
0
,
"address"
:
[],
"child_stepchild"
:
[],
"child_in_hk"
:
[],
"country_identity"
:
[],
"hk_identity"
:
""
,
"hk_identity_other"
:
""
,
"live_country"
:
""
,
"is_handled"
:
0
,
"finish_follow"
:
0
,
"step"
:
0
,
"not_fill_num"
:
-
1
,
"certificates"
:
[],
"is_live_oversea_year"
:
0
],
"spouse"
:
[
"id"
:
68416
,
"deceased"
:
0
,
"custody"
:
100
,
"nationality"
:
"中国-China"
,
"order_id"
:
133971
,
"relation"
:
"3"
,
"has_degree"
:
"1"
,
"has_degree_json"
:
[[
"degree"
:
"1"
,
"address"
:
"1"
]],
"follow"
:
1
,
"statement"
:
0
,
"subset_name"
:
"林源芳"
,
"subset_name_pinyin"
:
[
"family_name"
:
"LIN"
,
"given_name"
:
"YUANFANG"
],
"used_name"
:
""
,
"birthday"
:
"2012-01-01"
,
"birth_place_aboard"
:
0
,
"birth_place"
:
[
"area"
:
[
"广东省"
,
"深圳市"
],
"country"
:
""
,
"details"
:
""
,
"foreign"
:
""
],
"occupation"
:
"在职"
,
"occupation_name"
:
"工程师"
,
"operator_ame"
:
""
,
"child_has_hk_id"
:
[
"has"
:
"N"
],
"hk_identity_card"
:
""
,
"sex"
:
2
,
"married"
:
"未婚"
,
"nows"
:
0
,
"address"
:
[
"area"
:
[
"广东省"
,
"深圳市"
],
"country"
:
"中国-China"
,
"details"
:
"大新地铁站"
,
"foreign"
:
""
],
"child_stepchild"
:
[
"has"
:
""
,
"info"
:
""
],
"child_in_hk"
:
[
"has"
:
"N"
],
"country_identity"
:
[],
"hk_identity"
:
""
,
"hk_identity_other"
:
""
,
"live_country"
:
""
,
"is_handled"
:
0
,
"finish_follow"
:
0
,
"step"
:
3
,
"not_fill_num"
:
0
,
"is_live_oversea_year"
:
0
,
"surname"
:
""
,
"certificates"
:
[
"cnIdentityCard"
:
[
"id"
:
116871
,
"number"
:
"421087199005010811"
,
"issue_at"
:
"深圳"
,
"issue_date_start_at"
:
"2017-01-01"
,
"issue_date_end_at"
:
"2029-01-01"
,
"img_front"
:
""
,
"img_back"
:
""
],
"passport"
:
[
"id"
:
116872
,
"number"
:
""
,
"issue_at"
:
""
,
"issue_date_start_at"
:
""
,
"issue_date_end_at"
:
""
,
"img_front"
:
""
,
"img_back"
:
""
,
"passport_type"
:
11
]
]
]
]
as
[
String
:
Any
]
familyMemberInfo
=
YHFamilyMemberInfo
.
deserialize
(
dict
:
dic
)
loadFamilyMember
()
}
func
loadFamilyMember
()
{
items
.
removeAll
()
// 配偶section
if
let
sponse
=
familyMemberInfo
?
.
spouse
{
let
sponseArray
:[
YHFamilyMemberProtocol
]
=
[
YHFamilyMemberFormItem
(
type
:
.
sponse
),
sponse
]
items
.
append
(
sponseArray
)
}
// 父母section
var
parents
=
[
YHFamilyMemberProtocol
]()
if
let
father
=
familyMemberInfo
?
.
father
{
parents
.
append
(
father
)
}
if
let
mother
=
familyMemberInfo
?
.
mother
{
parents
.
append
(
mother
)
}
if
!
parents
.
isEmpty
{
let
item0
=
YHFamilyMemberFormItem
(
type
:
.
parent
)
parents
.
insert
(
item0
,
at
:
0
)
items
.
append
(
parents
)
}
// 子女section
var
childArr
:[
YHFamilyMemberProtocol
]
=
[
YHFamilyMemberFormItem
(
type
:
.
child
),
YHFamilyMemberFormItem
(
type
:
.
addChild
)]
if
let
childs
=
familyMemberInfo
?
.
child
,
!
childs
.
isEmpty
{
childArr
.
insert
(
contentsOf
:
childs
,
at
:
1
)
}
items
.
append
(
childArr
)
// 兄妹section
var
brotherArr
:[
YHFamilyMemberProtocol
]
=
[
YHFamilyMemberFormItem
(
type
:
.
brother
),
YHFamilyMemberFormItem
(
type
:
.
addBrother
)]
if
let
brothers
=
familyMemberInfo
?
.
brother
,
!
brothers
.
isEmpty
{
brotherArr
.
insert
(
contentsOf
:
brothers
,
at
:
1
)
}
items
.
append
(
brotherArr
)
let
childCount
=
familyMemberInfo
?
.
child
?
.
count
??
0
if
isChildsEditMode
==
.
none
&&
childCount
>
0
{
isChildsEditMode
=
.
canEdit
}
let
brotherCount
=
familyMemberInfo
?
.
brother
?
.
count
??
0
if
isBrothersEditMode
==
.
none
&&
brotherCount
>
0
{
isBrothersEditMode
=
.
canEdit
}
tableView
.
reloadData
()
}
}
extension
YHFamilyMemberFormVC
{
func
addBrother
()
{
let
dict
=
[
"id"
:
68470
,
"deceased"
:
0
,
"custody"
:
100
,
"nationality"
:
""
,
"order_id"
:
133971
,
"relation"
:
"5"
,
"has_degree"
:
"100"
,
"has_degree_json"
:
[],
"follow"
:
0
,
"statement"
:
0
,
"subset_name"
:
""
,
"subset_name_pinyin"
:
[
"family_name"
:
""
,
"given_name"
:
""
],
"used_name"
:
""
,
"birthday"
:
""
,
"birth_place_aboard"
:
100
,
"birth_place"
:
[
"area"
:
[],
"country"
:
""
,
"details"
:
""
,
"foreign"
:
""
],
"occupation"
:
""
,
"occupation_name"
:
""
,
"operator_ame"
:
""
,
"child_has_hk_id"
:
[
"has"
:
""
,
"info"
:
""
],
"hk_identity_card"
:
""
,
"sex"
:
0
,
"married"
:
"未婚"
,
"nows"
:
100
,
"address"
:
[
"area"
:
[],
"country"
:
""
,
"details"
:
""
,
"foreign"
:
""
],
"child_stepchild"
:
[
"has"
:
""
,
"info"
:
""
],
"child_in_hk"
:
[
"has"
:
""
,
"info"
:
""
],
"country_identity"
:
[],
"hk_identity"
:
""
,
"hk_identity_other"
:
""
,
"live_country"
:
""
,
"is_handled"
:
100
,
"finish_follow"
:
0
,
"step"
:
0
,
"not_fill_num"
:
9
,
"is_live_oversea_year"
:
0
,
"surname"
:
""
,
"certificates"
:
[]
]
as
[
String
:
Any
]
let
brother
:
YHBrother
=
YHBrother
.
deserialize
(
dict
:
dict
)
!
if
var
brothers
=
familyMemberInfo
?
.
brother
{
brothers
.
append
(
brother
)
familyMemberInfo
!.
brother
=
brothers
}
else
{
familyMemberInfo
?
.
brother
=
[
brother
]
}
loadFamilyMember
()
}
func
addChild
()
{
let
dict
=
[
"id"
:
68493
,
"deceased"
:
0
,
"custody"
:
100
,
"nationality"
:
""
,
"order_id"
:
133971
,
"relation"
:
"4"
,
"has_degree"
:
"100"
,
"has_degree_json"
:
[],
"follow"
:
0
,
"statement"
:
0
,
"subset_name"
:
""
,
"subset_name_pinyin"
:
[
"family_name"
:
""
,
"given_name"
:
""
],
"used_name"
:
""
,
"birthday"
:
""
,
"birth_place_aboard"
:
100
,
"birth_place"
:
[
"area"
:
[],
"country"
:
""
,
"details"
:
""
,
"foreign"
:
""
],
"occupation"
:
""
,
"occupation_name"
:
""
,
"operator_ame"
:
""
,
"child_has_hk_id"
:
[
"has"
:
""
,
"info"
:
""
],
"hk_identity_card"
:
""
,
"sex"
:
0
,
"married"
:
"未婚"
,
"nows"
:
100
,
"address"
:
[
"area"
:
[],
"country"
:
""
,
"details"
:
""
,
"foreign"
:
""
],
"child_stepchild"
:
[
"has"
:
""
,
"info"
:
""
],
"child_in_hk"
:
[
"has"
:
""
,
"info"
:
""
],
"country_identity"
:
[],
"hk_identity"
:
""
,
"hk_identity_other"
:
""
,
"live_country"
:
""
,
"is_handled"
:
100
,
"finish_follow"
:
0
,
"step"
:
0
,
"not_fill_num"
:
10
,
"is_live_oversea_year"
:
0
,
"surname"
:
""
,
"certificates"
:[]
]
as
[
String
:
Any
]
let
child
=
YHChild
.
deserialize
(
dict
:
dict
)
!
if
var
childs
=
familyMemberInfo
?
.
child
{
childs
.
append
(
child
)
familyMemberInfo
!.
child
=
childs
}
else
{
familyMemberInfo
?
.
child
=
[
child
]
}
loadFamilyMember
()
}
}
extension
YHFamilyMemberFormVC
:
UITableViewDelegate
,
UITableViewDataSource
{
func
numberOfSections
(
in
tableView
:
UITableView
)
->
Int
{
return
4
return
items
.
count
}
func
tableView
(
_
tableView
:
UITableView
,
numberOfRowsInSection
section
:
Int
)
->
Int
{
if
section
==
1
{
return
2
}
else
if
section
==
2
{
return
3
}
else
if
section
==
3
{
return
2
}
return
1
if
section
>=
items
.
count
{
return
0
}
let
arr
=
items
[
section
]
return
arr
.
count
}
func
tableView
(
_
tableView
:
UITableView
,
cellForRowAt
indexPath
:
IndexPath
)
->
UITableViewCell
{
if
indexPath
.
section
==
0
{
let
cell
=
tableView
.
dequeueReusableCell
(
withIdentifier
:
YHSingleLineSelectCell
.
cellReuseIdentifier
,
for
:
indexPath
)
as!
YHSingleLineSelectCell
createCorner
(
cell
:
cell
,
indexPath
:
indexPath
)
cell
.
title
=
"配偶"
.
local
cell
.
detailLabel
.
text
=
"(如未婚、离婚、丧偶可不填)"
.
local
return
cell
}
else
if
indexPath
.
section
==
1
{
let
arr
=
items
[
indexPath
.
section
]
let
item
:
YHFamilyMemberProtocol
=
arr
[
indexPath
.
row
]
if
item
is
YHFamilyMemberFormItem
{
// 是标题或添加项目
if
indexPath
.
row
==
0
{
let
cell
=
tableView
.
dequeueReusableCell
(
withIdentifier
:
YHFormTitleCell
.
cellReuseIdentifier
,
for
:
indexPath
)
as!
YHFormTitleCell
createCorner
(
cell
:
cell
,
indexPath
:
indexPath
)
cell
.
titleLabel
.
text
=
"子女"
.
local
cell
.
subTitleLabel
.
text
=
"(如无可不填)"
.
local
return
cell
}
else
if
indexPath
.
row
==
1
{
let
formItem
=
item
as!
YHFamilyMemberFormItem
if
formItem
.
type
==
.
addChild
||
formItem
.
type
==
.
addBrother
{
// 新增子女/兄弟姐妹
let
cell
=
tableView
.
dequeueReusableCell
(
withIdentifier
:
YHFormAddInfoCell
.
cellReuseIdentifier
,
for
:
indexPath
)
as!
YHFormAddInfoCell
createCorner
(
cell
:
cell
,
indexPath
:
indexPath
)
createCorner
(
cell
:
cell
,
arr
:
arr
,
indexPath
:
indexPath
)
cell
.
clickBlock
=
{
[
weak
self
]
in
if
formItem
.
type
==
.
addBrother
{
self
?
.
addBrother
()
}
else
if
formItem
.
type
==
.
addChild
{
self
?
.
addChild
()
}
}
return
cell
}
// 配偶父母子女兄妹title
let
cell
=
tableView
.
dequeueReusableCell
(
withIdentifier
:
YHFormTitleCell
.
cellReuseIdentifier
,
for
:
indexPath
)
as!
YHFormTitleCell
createCorner
(
cell
:
cell
,
arr
:
arr
,
indexPath
:
indexPath
)
cell
.
titleLabel
.
text
=
formItem
.
getTitle
()
cell
.
subTitleLabel
.
text
=
formItem
.
getSubTitle
()
}
else
if
indexPath
.
section
==
2
{
if
indexPath
.
row
==
0
{
let
cell
=
tableView
.
dequeueReusableCell
(
withIdentifier
:
YHFormTitleCell
.
cellReuseIdentifier
,
for
:
indexPath
)
as!
YHFormTitleCell
createCorner
(
cell
:
cell
,
indexPath
:
indexPath
)
cell
.
titleLabel
.
text
=
"父母"
.
local
cell
.
subTitleLabel
.
text
=
"(包含已故)"
.
local
return
cell
// 决定右边按钮显示样式
cell
.
showEditType
(
type
:
.
none
)
if
formItem
.
type
==
.
child
{
cell
.
showEditType
(
type
:
isChildsEditMode
)
}
else
{
let
cell
=
tableView
.
dequeueReusableCell
(
withIdentifier
:
YHSingleLineSelectCell
.
cellReuseIdentifier
,
for
:
indexPath
)
as!
YHSingleLineSelectCell
createCorner
(
cell
:
cell
,
indexPath
:
indexPath
)
return
cell
}
else
if
formItem
.
type
==
.
brother
{
cell
.
showEditType
(
type
:
isBrothersEditMode
)
}
}
else
if
indexPath
.
section
==
3
{
// 右边按钮点击事件处理
cell
.
rightClickBlock
=
{
[
weak
self
]
type
in
if
formItem
.
type
==
.
child
{
if
self
?
.
isChildsEditMode
==
.
canCancel
{
self
?
.
isChildsEditMode
=
.
canEdit
}
else
if
self
?
.
isChildsEditMode
==
.
canEdit
{
self
?
.
isChildsEditMode
=
.
canCancel
}
}
if
formItem
.
type
==
.
brother
{
if
self
?
.
isBrothersEditMode
==
.
canCancel
{
self
?
.
isBrothersEditMode
=
.
canEdit
}
else
if
self
?
.
isBrothersEditMode
==
.
canEdit
{
self
?
.
isBrothersEditMode
=
.
canCancel
}
}
self
?
.
loadFamilyMember
()
}
return
cell
}
// 配偶父母子女兄妹具体条目
if
item
is
YHParent
||
item
is
YHChild
||
item
is
YHSpouse
||
item
is
YHBrother
{
if
indexPath
.
row
==
0
{
let
cell
=
tableView
.
dequeueReusableCell
(
withIdentifier
:
YHFormTitleCell
.
cellReuseIdentifier
,
for
:
indexPath
)
as!
YHFormTitleCell
createCorner
(
cell
:
cell
,
indexPath
:
indexPath
)
cell
.
titleLabel
.
text
=
"兄弟姐妹"
.
local
cell
.
subTitleLabel
.
text
=
"(如无可不填)"
.
local
return
cell
let
cell
=
tableView
.
dequeueReusableCell
(
withIdentifier
:
YHSingleLineSelectCell
.
cellReuseIdentifier
,
for
:
indexPath
)
as!
YHSingleLineSelectCell
createCorner
(
cell
:
cell
,
arr
:
arr
,
indexPath
:
indexPath
)
cell
.
isShowDeleteBtn
=
false
cell
.
deleteBlock
=
nil
if
item
is
YHChild
||
item
is
YHBrother
{
}
else
{
let
cell
=
tableView
.
dequeueReusableCell
(
withIdentifier
:
YHFormAddInfoCell
.
cellReuseIdentifier
,
for
:
indexPath
)
as!
YHFormAddInfoCell
createCorner
(
cell
:
cell
,
indexPath
:
indexPath
)
return
cell
if
item
is
YHChild
{
cell
.
isShowDeleteBtn
=
(
isChildsEditMode
==
.
canCancel
)
}
else
if
item
is
YHBrother
{
cell
.
isShowDeleteBtn
=
(
isBrothersEditMode
==
.
canCancel
)
}
// 删除子女兄妹处理
cell
.
deleteBlock
=
{
[
weak
self
]
in
if
item
is
YHChild
{
let
childCount
=
self
?
.
familyMemberInfo
?
.
child
?
.
count
??
0
if
(
indexPath
.
row
<
childCount
)
{
// 因为子女兄妹section第一行都是标题所以row-1
self
?
.
familyMemberInfo
?
.
child
?
.
remove
(
at
:
indexPath
.
row
-
1
)
self
?
.
isChildsEditMode
=
.
none
self
?
.
isBrothersEditMode
=
.
none
}
}
else
if
item
is
YHBrother
{
let
brotherCount
=
self
?
.
familyMemberInfo
?
.
brother
?
.
count
??
0
if
(
indexPath
.
row
<
brotherCount
)
{
// 因为子女兄妹section第一行都是标题所以row-1
self
?
.
familyMemberInfo
?
.
brother
?
.
remove
(
at
:
indexPath
.
row
-
1
)
self
?
.
isChildsEditMode
=
.
none
self
?
.
isBrothersEditMode
=
.
none
}
}
self
?
.
loadFamilyMember
()
}
}
return
cell
}
let
cell
=
tableView
.
dequeueReusableCell
(
withIdentifier
:
"UITableViewCell"
,
for
:
indexPath
)
as!
UITableViewCell
createCorner
(
cell
:
cell
,
indexPath
:
indexPath
)
let
cell
=
tableView
.
dequeueReusableCell
(
withIdentifier
:
"UITableViewCell"
,
for
:
indexPath
)
createCorner
(
cell
:
cell
,
arr
:
arr
,
indexPath
:
indexPath
)
return
cell
}
func
tableView
(
_
tableView
:
UITableView
,
heightForRowAt
indexPath
:
IndexPath
)
->
CGFloat
{
return
80.0
let
arr
=
items
[
indexPath
.
section
]
let
item
:
YHFamilyMemberProtocol
=
arr
[
indexPath
.
row
]
if
item
is
YHFamilyMemberFormItem
{
// 是标题或添加项目
let
titleItem
=
item
as!
YHFamilyMemberFormItem
if
titleItem
.
type
==
.
addChild
||
titleItem
.
type
==
.
addBrother
{
return
77.0
}
return
52.0
}
return
64.0
}
func
tableView
(
_
tableView
:
UITableView
,
viewForFooterInSection
section
:
Int
)
->
UIView
?
{
...
...
@@ -180,17 +612,17 @@ extension YHFamilyMemberFormVC : UITableViewDelegate, UITableViewDataSource {
}
func
tableView
(
_
tableView
:
UITableView
,
didSelectRowAt
indexPath
:
IndexPath
)
{
let
vc
=
YH
Consort
FormVC
()
let
vc
=
YH
Spouse
FormVC
()
self
.
navigationController
?
.
pushViewController
(
vc
)
}
func
createCorner
(
cell
:
UITableViewCell
,
indexPath
:
IndexPath
)
{
func
createCorner
(
cell
:
UITableViewCell
,
arr
:
Array
<
Any
>
,
indexPath
:
IndexPath
)
{
// 设置每块section圆角
if
(
indexPath
.
row
==
0
)
{
let
corner
=
UIRectCorner
(
rawValue
:
UIRectCorner
.
topLeft
.
rawValue
|
UIRectCorner
.
topRight
.
rawValue
)
cell
.
createCorner
(
CGSizeMake
(
12.0
,
12.0
),
corner
)
}
else
if
(
indexPath
.
row
==
2
)
{
}
else
if
(
indexPath
.
row
==
arr
.
count
-
1
)
{
let
corner
=
UIRectCorner
(
rawValue
:
UIRectCorner
.
bottomLeft
.
rawValue
|
UIRectCorner
.
bottomRight
.
rawValue
)
cell
.
createCorner
(
CGSizeMake
(
12.0
,
12.0
),
corner
)
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/C/YH
Consort
FormVC.swift
→
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/C/YH
Spouse
FormVC.swift
View file @
54ab7e63
...
...
@@ -8,7 +8,7 @@
import
UIKit
class
YH
Consort
FormVC
:
YHBaseViewController
{
class
YH
Spouse
FormVC
:
YHBaseViewController
{
lazy
var
items
:[
YHTableItemInfo
]
=
[
YHTableItemInfo
]()
...
...
@@ -118,7 +118,7 @@ class YHConsortFormVC: YHBaseViewController {
}
extension
YH
Consort
FormVC
:
UITableViewDelegate
,
UITableViewDataSource
{
extension
YH
Spouse
FormVC
:
UITableViewDelegate
,
UITableViewDataSource
{
func
numberOfSections
(
in
tableView
:
UITableView
)
->
Int
{
return
items
.
count
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/M/YHFamilyInitialInfo.swift
View file @
54ab7e63
...
...
@@ -9,6 +9,68 @@
import
UIKit
import
SmartCodable
enum
YHFamilyMemberItemType
:
Int
{
case
sponse
=
1
case
parent
=
2
case
child
=
3
case
brother
=
4
case
addChild
=
5
case
addBrother
=
6
}
protocol
YHFamilyMemberProtocol
{
func
getTitle
()
->
String
func
getSubTitle
()
->
String
}
class
YHFamilyMemberFormItem
:
YHFamilyMemberProtocol
{
var
type
:
YHFamilyMemberItemType
init
(
type
:
YHFamilyMemberItemType
)
{
self
.
type
=
type
}
func
getTitle
()
->
String
{
switch
self
.
type
{
case
.
sponse
:
return
"配偶"
.
local
case
.
parent
:
return
"父母"
.
local
case
.
brother
:
return
"兄弟姐妹"
.
local
case
.
child
:
return
"子女"
.
local
case
.
addChild
:
return
"新增子女"
.
local
case
.
addBrother
:
return
"新增兄弟姐妹"
.
local
}
}
func
getSubTitle
()
->
String
{
switch
self
.
type
{
case
.
sponse
:
return
String
(
format
:
"(%@)"
,
"如未婚、离婚、丧偶可不填"
.
local
)
case
.
parent
:
return
String
(
format
:
"(%@)"
,
"包含已故"
.
local
)
case
.
brother
:
return
String
(
format
:
"(%@)"
,
"如无可不填"
.
local
)
case
.
child
:
return
String
(
format
:
"(%@)"
,
"如无可不填"
.
local
)
case
.
addChild
:
return
""
case
.
addBrother
:
return
""
}
}
}
/* ***** ***** ***** ***** ***** ***** ***** ***** */
// MARK: - YHWelcome
class
YHWelcome
:
SmartCodable
{
...
...
@@ -34,13 +96,15 @@ class YHFamilyMemberInfo: SmartCodable {
var
mother
:
YHParent
?
var
spouse
:
YHSpouse
?
var
child
:
[
YHChild
]?
var
brother
:
[
YHBrother
]?
enum
CodingKeys
:
String
,
CodingKey
{
case
father
=
"father"
case
mother
=
"mother"
case
spouse
=
"spouse"
case
child
=
"child"
}
enum
CodingKeys
:
String
,
CodingKey
{
case
father
=
"father"
case
mother
=
"mother"
case
spouse
=
"spouse"
case
brother
=
"brother"
case
child
=
"child"
}
required
init
()
{
...
...
@@ -48,7 +112,7 @@ class YHFamilyMemberInfo: SmartCodable {
}
// MARK: - 子女初始信息 YHChild
class
YHChild
:
SmartCodable
{
class
YHChild
:
SmartCodable
,
YHFamilyMemberProtocol
{
var
id
:
Int
=
-
1
var
deceased
:
Int
=
-
1
...
...
@@ -133,6 +197,111 @@ class YHChild: SmartCodable {
required
init
()
{
}
// YHFamilyMemberProtocol
func
getTitle
()
->
String
{
return
"配偶"
.
local
}
func
getSubTitle
()
->
String
{
return
""
}
}
// MARK: - YHBrother
class
YHBrother
:
SmartCodable
,
YHFamilyMemberProtocol
{
var
id
:
Int
?
=
-
1
var
deceased
:
Int
?
=
-
1
var
custody
:
Int
?
=
-
1
var
nationality
:
String
?
var
orderId
:
Int
?
=
-
1
var
relation
:
String
?
var
hasDegree
:
String
?
var
hasDegreeJson
:
[
SmartAny
]?
var
follow
:
Int
?
=
-
1
var
statement
:
Int
?
=
-
1
var
subsetName
:
String
?
var
subsetNamePinyin
:
YHSubsetNamePinyin
?
var
usedName
:
String
?
var
birthday
:
String
?
var
birthPlaceAboard
:
Int
?
=
-
1
var
birthPlace
:
YHAddress
?
var
occupation
:
String
?
var
occupationName
:
String
?
var
operatorAme
:
SmartAny
?
var
childHasHkId
:
YHChildStepchildClass
?
var
hkIdentityCard
:
String
?
var
sex
:
Int
?
=
-
1
var
married
:
String
?
var
nows
:
Int
?
=
-
1
var
address
:
YHAddress
?
var
childStepchild
:
YHChildStepchildClass
?
var
childInHk
:
YHChildStepchildClass
?
var
countryIdentity
:
[
SmartAny
]?
var
hkIdentity
:
String
?
var
hkIdentityOther
:
String
?
var
liveCountry
:
String
?
var
isHandled
:
Int
?
=
-
1
var
finishFollow
:
Int
?
=
-
1
var
step
:
Int
?
=
-
1
var
notFillNum
:
Int
?
=
-
1
var
isLiveOverseaYear
:
Int
?
=
-
1
var
surname
:
String
?
var
certificates
:
[
SmartAny
]?
enum
CodingKeys
:
String
,
CodingKey
{
case
id
=
"id"
case
deceased
=
"deceased"
case
custody
=
"custody"
case
nationality
=
"nationality"
case
orderId
=
"order_id"
case
relation
=
"relation"
case
hasDegree
=
"has_degree"
case
hasDegreeJson
=
"has_degree_json"
case
follow
=
"follow"
case
statement
=
"statement"
case
subsetName
=
"subset_name"
case
subsetNamePinyin
=
"subset_name_pinyin"
case
usedName
=
"used_name"
case
birthday
=
"birthday"
case
birthPlaceAboard
=
"birth_place_aboard"
case
birthPlace
=
"birth_place"
case
occupation
=
"occupation"
case
occupationName
=
"occupation_name"
case
operatorAme
=
"operator_ame"
case
childHasHkId
=
"child_has_hk_id"
case
hkIdentityCard
=
"hk_identity_card"
case
sex
=
"sex"
case
married
=
"married"
case
nows
=
"nows"
case
address
=
"address"
case
childStepchild
=
"child_stepchild"
case
childInHk
=
"child_in_hk"
case
countryIdentity
=
"country_identity"
case
hkIdentity
=
"hk_identity"
case
hkIdentityOther
=
"hk_identity_other"
case
liveCountry
=
"live_country"
case
isHandled
=
"is_handled"
case
finishFollow
=
"finish_follow"
case
step
=
"step"
case
notFillNum
=
"not_fill_num"
case
isLiveOverseaYear
=
"is_live_oversea_year"
case
surname
=
"surname"
case
certificates
=
"certificates"
}
required
init
()
{
}
// YHFamilyMemberProtocol
func
getTitle
()
->
String
{
return
"兄弟姐妹"
.
local
}
func
getSubTitle
()
->
String
{
return
""
}
}
// MARK: - 居住地址信息 YHAddress
...
...
@@ -185,7 +354,7 @@ class YHSubsetNamePinyin: SmartCodable {
}
// MARK: - 父母信息 YHParent
class
YHParent
:
SmartCodable
{
class
YHParent
:
SmartCodable
,
YHFamilyMemberProtocol
{
var
id
:
Int
=
-
1
var
deceased
:
Int
=
-
1
var
custody
:
Int
=
-
1
...
...
@@ -267,10 +436,22 @@ class YHParent: SmartCodable {
required
init
()
{
}
// YHFamilyMemberProtocol
func
getTitle
()
->
String
{
if
sex
==
0
{
return
"父亲"
.
local
}
return
"母亲"
.
local
}
func
getSubTitle
()
->
String
{
return
""
}
}
// MARK: - 配偶 YHSpouse
class
YHSpouse
:
SmartCodable
{
class
YHSpouse
:
SmartCodable
,
YHFamilyMemberProtocol
{
var
id
:
Int
=
-
1
var
deceased
:
Int
=
-
1
var
custody
:
Int
=
-
1
...
...
@@ -354,6 +535,15 @@ class YHSpouse: SmartCodable {
required
init
()
{
}
// YHFamilyMemberProtocol
func
getTitle
()
->
String
{
return
"配偶"
.
local
}
func
getSubTitle
()
->
String
{
return
""
}
}
// MARK: - YHCertificates
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/M/YHTest.swift
0 → 100644
View file @
54ab7e63
//
// YHTest.swift
// galaxy
//
// Created by edy on 2024/1/24.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import
UIKit
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/View/YHFormAddInfoCell.swift
View file @
54ab7e63
...
...
@@ -16,6 +16,8 @@ class YHFormAddInfoCell: UITableViewCell {
let
btnHeight
=
44.0
let
cornerRadius
=
4.0
var
clickBlock
:(()
->
Void
)?
lazy
var
addBtn
:
UIButton
=
{
let
btn
=
UIButton
.
bs_button
(
title
:
"新增信息"
,
font
:
UIFont
.
PFSCR
(
ofSize
:
14
),
normalColor
:
btnTitleColor
)
btn
.
iconInLeft
(
spacing
:
10
)
...
...
@@ -72,7 +74,9 @@ class YHFormAddInfoCell: UITableViewCell {
}
@objc
func
didClickAddBtn
()
{
if
let
clickBlock
=
clickBlock
{
clickBlock
()
}
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/View/YHFormTitleCell.swift
View file @
54ab7e63
...
...
@@ -11,13 +11,18 @@ import UIKit
class
YHFormTitleCell
:
UITableViewCell
{
static
let
cellReuseIdentifier
=
"YHFormTitleCell"
let
editTag
=
9527
let
cancelTag
=
9528
var
rightClickBlock
:((
YHFamilyMemberEditType
)
->
Void
)?
lazy
var
titleLabel
:
UILabel
=
{
let
label
=
UILabel
()
label
.
textColor
=
UIColor
(
hexString
:
"#333333"
)
label
.
textAlignment
=
.
left
label
.
numberOfLines
=
0
label
.
font
=
UIFont
.
PFSCR
(
ofSize
:
20
)
label
.
font
=
UIFont
.
PFSCR
(
ofSize
:
16
)
return
label
}()
...
...
@@ -26,10 +31,27 @@ class YHFormTitleCell: UITableViewCell {
label
.
textColor
=
UIColor
(
hexString
:
"#888F98"
)
label
.
textAlignment
=
.
left
label
.
numberOfLines
=
0
label
.
font
=
UIFont
.
PFSCR
(
ofSize
:
1
5
)
label
.
font
=
UIFont
.
PFSCR
(
ofSize
:
1
4
)
return
label
}()
lazy
var
cancelButton
:
UIButton
=
{
let
btn
=
UIButton
.
bs_button
(
title
:
"取消操作"
.
local
,
font
:
UIFont
.
PFSCR
(
ofSize
:
14
),
normalColor
:
UIColor
(
hex
:
0x4487F9
))
btn
.
tag
=
cancelTag
btn
.
addTarget
(
self
,
action
:
#selector(
didClickOperatorBtn(btn:)
)
,
for
:
.
touchUpInside
)
btn
.
isHidden
=
true
return
btn
}()
lazy
var
editButton
:
UIButton
=
{
let
btn
=
UIButton
()
btn
.
setImage
(
UIImage
(
named
:
"form_edit"
),
for
:
.
normal
)
btn
.
tag
=
editTag
btn
.
addTarget
(
self
,
action
:
#selector(
didClickOperatorBtn(btn:)
)
,
for
:
.
touchUpInside
)
btn
.
isHidden
=
true
return
btn
}()
lazy
var
bottomLineView
:
UIView
=
{
let
view
=
UIView
()
view
.
backgroundColor
=
UIColor
(
hex
:
0xF0F0F0
)
...
...
@@ -51,10 +73,9 @@ class YHFormTitleCell: UITableViewCell {
contentView
.
addSubview
(
titleLabel
)
contentView
.
addSubview
(
subTitleLabel
)
contentView
.
addSubview
(
bottomLineView
)
titleLabel
.
text
=
"配偶"
subTitleLabel
.
text
=
" (如未婚、离婚、丧偶可不填)"
contentView
.
addSubview
(
editButton
)
contentView
.
addSubview
(
cancelButton
)
titleLabel
.
snp
.
makeConstraints
{
make
in
make
.
left
.
equalToSuperview
()
.
offset
(
16
)
make
.
right
.
equalTo
(
subTitleLabel
.
snp
.
left
)
.
offset
(
-
3
)
...
...
@@ -66,9 +87,54 @@ class YHFormTitleCell: UITableViewCell {
make
.
centerY
.
equalToSuperview
()
}
editButton
.
snp
.
makeConstraints
{
make
in
make
.
size
.
equalTo
(
CGSizeMake
(
24
,
24
))
make
.
centerY
.
equalToSuperview
()
make
.
right
.
equalToSuperview
()
.
offset
(
-
18
)
}
editButton
.
snp
.
makeConstraints
{
make
in
make
.
size
.
equalTo
(
CGSizeMake
(
24
,
24
))
make
.
centerY
.
equalToSuperview
()
make
.
right
.
equalToSuperview
()
.
offset
(
-
18
)
}
cancelButton
.
snp
.
makeConstraints
{
make
in
make
.
size
.
equalTo
(
CGSizeMake
(
92
,
40
))
make
.
centerY
.
equalToSuperview
()
make
.
right
.
equalToSuperview
()
}
bottomLineView
.
snp
.
makeConstraints
{
make
in
make
.
left
.
right
.
bottom
.
equalToSuperview
()
make
.
height
.
equalTo
(
1.0
)
}
}
func
showEditType
(
type
:
YHFamilyMemberEditType
)
{
switch
type
{
case
.
none
:
cancelButton
.
isHidden
=
true
editButton
.
isHidden
=
true
case
.
canEdit
:
cancelButton
.
isHidden
=
true
editButton
.
isHidden
=
false
case
.
canCancel
:
cancelButton
.
isHidden
=
false
editButton
.
isHidden
=
true
}
}
@objc
func
didClickOperatorBtn
(
btn
:
UIButton
)
{
if
let
clickBlock
=
rightClickBlock
{
if
btn
.
tag
==
editTag
{
clickBlock
(
.
canEdit
)
}
else
if
btn
.
tag
==
cancelTag
{
clickBlock
(
.
canCancel
)
}
}
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/View/YHSingleLineSelectCell.swift
View file @
54ab7e63
...
...
@@ -14,6 +14,15 @@ class YHSingleLineSelectCell: UITableViewCell {
// 是否必填 如必填title会展示红色*
var
isMust
=
false
var
deleteBlock
:(()
->
Void
)?
var
isShowDeleteBtn
:
Bool
=
false
{
didSet
{
deleteButton
.
isHidden
=
!
isShowDeleteBtn
detailLabel
.
isHidden
=
isShowDeleteBtn
arrowImgView
.
isHidden
=
isShowDeleteBtn
}
}
var
title
:
String
?
{
didSet
{
...
...
@@ -56,6 +65,12 @@ class YHSingleLineSelectCell: UITableViewCell {
return
imgView
}()
lazy
var
deleteButton
:
UIButton
=
{
let
btn
=
UIButton
.
bs_button
(
title
:
"删除"
.
local
,
font
:
UIFont
.
PFSCR
(
ofSize
:
14
),
normalColor
:
UIColor
(
hex
:
0xF81D22
))
btn
.
addTarget
(
self
,
action
:
#selector(
didClickDeleteBtn(btn:)
)
,
for
:
.
touchUpInside
)
btn
.
isHidden
=
true
return
btn
}()
required
init
?(
coder
:
NSCoder
)
{
super
.
init
(
coder
:
coder
)
...
...
@@ -72,7 +87,8 @@ class YHSingleLineSelectCell: UITableViewCell {
contentView
.
addSubview
(
titleLabel
)
contentView
.
addSubview
(
detailLabel
)
contentView
.
addSubview
(
arrowImgView
)
contentView
.
addSubview
(
deleteButton
)
title
=
"婚姻状况"
detailLabel
.
text
=
"沙发上发顺丰"
titleLabel
.
snp
.
makeConstraints
{
make
in
...
...
@@ -91,5 +107,18 @@ class YHSingleLineSelectCell: UITableViewCell {
make
.
right
.
equalToSuperview
()
.
offset
(
-
16
)
make
.
centerY
.
equalToSuperview
()
}
deleteButton
.
snp
.
makeConstraints
{
make
in
make
.
size
.
equalTo
(
CGSizeMake
(
64
,
40
))
make
.
centerY
.
equalToSuperview
()
make
.
right
.
equalToSuperview
()
}
}
@objc
func
didClickDeleteBtn
(
btn
:
UIButton
)
{
if
let
deleteBlock
=
deleteBlock
{
deleteBlock
()
}
}
}
galaxy/galaxy/Classes/Tools/NetWork/YHNetRequest.swift
View file @
54ab7e63
...
...
@@ -93,7 +93,7 @@ class YHNetRequest: NSObject {
print
(
"sign =
\(
sign
)
"
)
requestHeader
.
add
(
name
:
"sign"
,
value
:
sign
)
requestHeader
.
add
(
name
:
"token"
,
value
:
"eyJpdiI6I
mFheHNOa3dmYzZ0NUFSQzZUeDh2MVE9PSIsInZhbHVlIjoiblpTOVFWUFwvMHh4am5GUUxmaHkzTWUrZ1Roenk2QXp2V3FtbzJ2cHJSMXo2N2RnMGdpOG9JS3d3RlZtS1cweWhCcUpweVN6dGw5d2s2WldTRDdWODBhTGpFRWZmOFBiWDJib2lkSDNxSjJ2RXdRT2NhcXVLNGQ2ZjlFK1VIOTFRVjhld0F3eUk4amtcL0o1SDM5dm95TTB3RnZwcmVWaGZDU1FQckhCaGd6Y1cxMWNVUm5jRzZNOEhudWRrN1R1UzVreXR3YUhDeEdKNnhMbFlDNkIzendjVGJXRnFZbGpZUm1VRjltNHkxV0VXaUpHWTIwUVU3MjJCd3Z0YmgzTHNEOHRPTW5URks0T0lEdTFOYU5cL1lFZnJVdkpxRmpFSU9Dcms3R3NoQmlnbFRjY1ZpUFFtT0pDeE1SanpPemdoNFhSUUN0TkJ1V1VvXC9XWjdNSGVXMVNsVERHcThiM1dxVmZ1MlZrb3dDSUZLeFQ1SDBlcTl5NU1IUDJRQUtMeXZ4SnJOSjczWDhRWXZoZE1DVVIzclUzdEtNQkRRSHVRejNkSWpJNGZyUXVQOFlTbEd2Ujk1bjRKT3ZValltNXkwKzdTMCtJdDlRc015VDErMmdqQU52ejVcL0FLQ3BwdjJPQUZHeFozRjJKRzlINmxDTWdEcnQyaXZNaEVaZm1laXFMXC80TmJsblh0Q2JGWFVWRzhuWWF1SHc5SkFmMUdENExwR3FtRW1GTGpsZUcwNlFhbkdEU0dIZFQ5aU9FQlJWa2EzajRHOEt6NFwvXC9qNzhnWkpQOEFiOEIwbFdZWUVCcFd2YWZ4NHhcL1ZSOGZvaElnc3R2cVpFRG1GUTlwUEZwdFcxYnJEMjQ0Yk50bVd2ZU52cDlFZTBueEtmam55MUhLbDVlRjJGS0V3djlhQ1huZFU1QU1lYWZ6TEdQQ1wvK2V6VnFwSzJJeTVsZ2RCNE5qZkRRXC9GSzdvVkNcL1wvWUR2a2Q2NE5kVXBHYVloZDhtMlo1SHJFZnBITXlqWUQyZEVjQStGNGZiaXRPMVpJXC9ibDFXbG9HS21GSHhGVmNleG94UW9mQWhwY09qeDRJekpEQk9mMzZpdDNUSFwvUWpCa2xiYjlUcmRSdnZMTVpmajNkMU4zMk9mNWN3Mng2RlBWbEtYMGtwUDVZNjRsRlpTSmMyUWVMelo2K1J6R1VyYU9aYlVCMUFjZ2todm1kOWdcL3JUaXBCMjFleWliRTZhNDJ6d3dxb3llaHlSVmE4TjlkNCszMzJBbEdOY2N6ZE9zRW50K3VMUnV2d0xYMWtxM1RObkRiQTZDUGtpUHYzT01iQ2c1M1hxeEQ2RStTa3JRWUVpOGZ4d3lsOXpISTJzaGpLTHc0Z1NNZ0srRkdjbExET3drbFViVVdmRFhPVUZ2aU5VUkFqUTlkTUNDOHd4aUltUHNTSmtpWXlYMm9hY09JUCtGRlJ2amdYV2pIdEtBd2Frd1hEczA3Wk44T3FDY2t3dEk4RzhMMFJIK0x5WFB5cG9wTUR6dk9xdFZXVDk5eThFNmYzZ2IyTksyTGhDeHc4RlphTHBnc2ZJS2JRcWhtM1FYYm5TdFZLdnluYlZcL2N2TEYwYUNNOVNzMlpId0JKOXZSSEZ6d2tiQUdsdDErdkJYYXdvZnFsTTVnWFRNR1hcL2E2dXkrZ0h5bmRORFwvWW4yOVl1SHdZdjdra042bjBpUGIwWkJwZFZpMkY4RWtqTXpWT243Z0xBVGhLYzNiTStQSWhTQTNUV3BNSENTYXdYVGo0U0Y0WWlXTkRLdjBwend2Q3oySzJiUktKa1d2UlRrXC81emNwb0VEM3MzbFwvc3dLS0ZBcmxuaFladmtnXC9qb0JpOHFpYzlxeWNqVE5pYXNHbVcwajdnQUVPRngwK2xRdnZZOFdSXC9vb056UT09IiwibWFjIjoiN2MxYzYwYzFmMWY4ZmQyNjBjMjhjNTQ2ZGY2ZmY5NDE4MmRmN2IwNDg3ZWNmMWE1ZTk3YzhhMzFkNTBjYjhiMyJ9
"
)
requestHeader
.
add
(
name
:
"token"
,
value
:
"eyJpdiI6I
khLdkJSZlFKeSswZkJMSEM3c3BieVE9PSIsInZhbHVlIjoiQ0h3eXZPeUZUVnZ5VUtDcmRSRDNFbU1IRURRMnowVTFRSmFOWTZlTTlVYUM1eWZRYXJpOE1HXC9xMlM1NytmVHV2dVQzdzRqdEwwU29VTTJSYlNYcWl3UDRjXC9GVHNLSEM5WU1Eb3Y4ZERNd0Z6QmF1RzdUT01EakZoXC80bjJHUXgycUN6U08xZFdnQ3pRT3IyQUxobDZFZTJzMDFOTXZvdmFtOEJBaHV2Z1NTN0Vldk9Yd1d5TE52U2ZUTzJaSEhGRkJBOEpaMnd0REdycHJOU3p2M1NncEtnY2ZMeG5WT01OekdPV0FNb0hvdjErWXNldHlYYjFaelRyRSthTUhyQWtCSlNTdVNBV1lwbVpnM3FpSUxKeWg0QTgrOTZxWEVNcWk5bVpjYVVHMTZPS05nNnI3WXhQSUh4Nkp5NHVtZGNcL0RIcnBVaUNxOGpwUGhmeWxINTN6bllqMUw4WVJwd0t4VmpqN2pNWGFqajhBQVV0Slp2VmhodTBSMzlEZEdFZlBEWFpOZHlUejRwdlUyRWpvYUdtTmlqdG05TXpqV0VXRXNuTlpzclwvdnpDMlZzWWZBVE5YMExBU29rNmRtXC9oeUZnNHNoU0RoU1pxa0VvRlNHT1ozdVZCRzZTRXVCNXE4RkkxUnlPakpBaTgrXC9McjZ5OWR2ZE8zaWg4R0lkamdVYUNaZFMrMGFvQkdSMnVzeVJZeTQyZmFvYkR2U3FJVW1XZTVcL3hXMGJZNisyK3FrenRFTmlxZ2pCdENEajBtS1RuOGVobHVyU25uMGZXZ1R4ZUdHeHNNMXlFVjNycmZVZ1BKam03KzlwMGFCR2U2aTN3NmNKeXY4Y1lLNWcyQXBFaytwSm1EZ05EZDFNQVZUdzJNTUE5VXRndnhPS3VXbGh2OXBcL1pUTE96V1lnYld6Q1JcL21qOE8yREtJQ1AyMmg4T1RSQ0FweUN0M0tJeDNHd29SK204RmRTbTlrS2NaK2YwTGR4QldxVmZ1cks4UUN5MVBGdzZtWHBGMnB1bzBKY09uYTFQVks2d3VRYzgrRGpiM0lqSnBRR1kxRFdla1BpMEk1dlBzdENqRTlZaGI5RDFVbWdJakhWUVhidWxEZG16cDJBcVB3T3ZIZTlmM0NGQVRIMXdadXR3XC8zbVlrSjVYWk5SVjlDbkhvS0pqNU1MVmFxcmVuWEtLN0w5WGpidFlhZWFUdXhBSnVoT0I1OFhFUGgzdHk1TVRJXC9vYVlyYlwvXC9jcVVVUVVLNndMNW1iU09Xd2JlQ2lMOWo0NHBBXC9DTjFmXC91cjZJZGpEVzJQN3FiN3pzVjMrY1lGQkJxanNnMWdJU3pJZUV4N2FzemhVVnpxb2tpR0NvMCtSMEJRczJUcE5ROUVIRlwvUmtlNEVXT1g0RkZaQUorWnVuTUR4aWNuaFByMHc4UkowMU5JNzdsYlwvK3pya2pucHMyM0ZNVERxQko3Zm41dFgyMDBicFNUTXd6Q0hGNlM0WlI5c3JuR0IzN0d3eVp4WGNVTEJCU2lNQnR4bmE4MXpVbnE0RmUxMjlyK2NNM0JLYjJRZjJYQWRNb0ZhZTFEeDFndnQ0T2p4TTJaUFZtXC9oM1Q4T2FMNnpENkJNXC9zRUxSZjEwSm5POHpHRXYwcmZ5SUxIWUkxbE1UejFINEluWW13V1dpWXdGTzVqN0FXcjEzR0RrUXBqcTIwUUllTjV5Z052UXlCUHdHNE5mMEpNcW5LY1pDQmdQUm9sTzhVVzg3TE94ZnFlK0c0S3VhWnpVNzVXOUZvVkdHenlKK1V3ODArUDQ5MjQ3OExBNjlDcnlnOHNZOVVKV2xRaSthMFNRaVVycFpoXC9ZY1lLa0VPV2xtQ21sQzdyRExTTkNkdzJoa1ZqS0U1QjhQT2RoSUFNdTBBNFdWRGZydWsxUEE9PSIsIm1hYyI6IjNjOGU0ODg2NzA1YTI2NWEyNmU4NGZiNWY3NjVjMTVkZWQ5ZWM2ZTkzNzAwZjI2MmFhYmIzMGE4MWI4MzAyZDkifQ==
"
)
headers
=
requestHeader
}
...
...
galaxy/galaxy/Res/Assets.xcassets/Form/form_edit.imageset/Contents.json
0 → 100644
View file @
54ab7e63
{
"images"
:
[
{
"idiom"
:
"universal"
,
"scale"
:
"1x"
},
{
"filename"
:
"Group 2894@2x.png"
,
"idiom"
:
"universal"
,
"scale"
:
"2x"
},
{
"filename"
:
"Group 2894@3x.png"
,
"idiom"
:
"universal"
,
"scale"
:
"3x"
}
],
"info"
:
{
"author"
:
"xcode"
,
"version"
:
1
}
}
galaxy/galaxy/Res/Assets.xcassets/Form/form_edit.imageset/Group 2894@2x.png
0 → 100644
View file @
54ab7e63
1.73 KB
galaxy/galaxy/Res/Assets.xcassets/Form/form_edit.imageset/Group 2894@3x.png
0 → 100644
View file @
54ab7e63
2.6 KB
David黄金龙
@david.hjl
mentioned in commit
2ca5fb75
·
Jan 25, 2024
mentioned in commit
2ca5fb75
mentioned in commit 2ca5fb75e8799a009d467a00317af8262d4e67b4
Toggle commit list
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment