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
cab70569
Commit
cab70569
authored
Feb 26, 2024
by
Steven杜宇
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
// 家庭成员
parent
dfffa92a
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
63 additions
and
22 deletions
+63
-22
YHSpouseInfoContainerVC.swift
...ember(家庭成员信息表)/C/Spouse(配偶)/YHSpouseInfoContainerVC.swift
+14
-16
YHSpousePrimaryInfoVC.swift
...yMember(家庭成员信息表)/C/Spouse(配偶)/YHSpousePrimaryInfoVC.swift
+0
-1
YHFamilyMemberInfoVC.swift
...ss(流程)/FamilyMember(家庭成员信息表)/C/YHFamilyMemberInfoVC.swift
+45
-1
YHUserModel.swift
galaxy/galaxy/Classes/Modules/Login(登录)/M/YHUserModel.swift
+4
-4
No files found.
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/Spouse(配偶)/YHSpouseInfoContainerVC.swift
View file @
cab70569
...
@@ -23,28 +23,26 @@ class YHSpouseInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
...
@@ -23,28 +23,26 @@ class YHSpouseInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
var
spouse
:
YHFamilyMember
?
{
var
spouse
:
YHFamilyMember
?
{
didSet
{
didSet
{
if
let
spouse
=
spouse
{
initalInfoVC
.
spouse
=
spouse
initalInfoVC
.
spouse
=
spouse
certificateVC
.
familyMember
=
spouse
certificateVC
.
familyMember
=
spouse
basicInfoVC
.
spouse
=
spouse
basicInfoVC
.
spouse
=
spouse
}
}
}
}
}
var
currentIndex
=
0
{
var
currentIndex
=
0
{
didSet
{
didSet
{
currentIndex
%=
self
.
children
.
count
stepView
.
currentIndex
=
currentIndex
stepView
.
currentIndex
=
currentIndex
for
(
i
,
vc
)
in
self
.
children
.
enumerated
()
{
for
(
i
,
vc
)
in
self
.
children
.
enumerated
()
{
vc
.
view
.
isHidden
=
(
currentIndex
!=
i
)
vc
.
view
.
isHidden
=
(
currentIndex
!=
i
)
if
currentIndex
==
i
{
}
}
}
}
}
}
}
var
stepView
:
YHStepView
=
{
var
stepView
:
YHStepView
=
{
let
step
=
YHStepView
()
let
step
V
=
YHStepView
()
return
step
return
step
V
}()
}()
var
bottomView
:
YHSaveAndSubmitView
=
{
var
bottomView
:
YHSaveAndSubmitView
=
{
...
@@ -71,8 +69,6 @@ class YHSpouseInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
...
@@ -71,8 +69,6 @@ class YHSpouseInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
updateStepView
()
updateStepView
()
currentIndex
=
0
view
.
addSubview
(
stepView
)
view
.
addSubview
(
stepView
)
view
.
addSubview
(
bottomView
)
view
.
addSubview
(
bottomView
)
...
@@ -102,7 +98,6 @@ class YHSpouseInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
...
@@ -102,7 +98,6 @@ class YHSpouseInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
}
}
func
didClickSubmitBtn
()
{
func
didClickSubmitBtn
()
{
currentIndex
+=
1
;
}
}
...
@@ -128,10 +123,6 @@ class YHSpouseInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
...
@@ -128,10 +123,6 @@ class YHSpouseInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
self
.
view
.
addSubview
(
initalInfoVC
.
view
)
self
.
view
.
addSubview
(
initalInfoVC
.
view
)
stepView
.
dataSource
=
[
"初始信息"
.
local
,
"证件上传"
.
local
,
"证件信息"
.
local
,
"基本信息"
.
local
]
stepView
.
dataSource
=
[
"初始信息"
.
local
,
"证件上传"
.
local
,
"证件信息"
.
local
,
"基本信息"
.
local
]
stepView
.
block
=
{[
weak
self
]
(
index
)
in
guard
let
self
=
self
else
{
return
}
print
(
"follow:%d"
,
self
.
orderId
)
}
}
else
{
}
else
{
self
.
addChild
(
initalInfoVC
)
self
.
addChild
(
initalInfoVC
)
...
@@ -141,12 +132,19 @@ class YHSpouseInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
...
@@ -141,12 +132,19 @@ class YHSpouseInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
self
.
view
.
addSubview
(
initalInfoVC
.
view
)
self
.
view
.
addSubview
(
initalInfoVC
.
view
)
stepView
.
dataSource
=
[
"初始信息"
.
local
,
"基本信息"
.
local
]
stepView
.
dataSource
=
[
"初始信息"
.
local
,
"基本信息"
.
local
]
stepView
.
block
=
{[
weak
self
]
(
index
)
in
guard
let
self
=
self
else
{
return
}
print
(
"follow:%d"
,
self
.
orderId
)
}
}
print
(
"step:
\(
spouse
.
step
)
"
)
currentIndex
=
spouse
.
step
stepView
.
block
=
{
[
weak
self
]
index
in
guard
let
self
=
self
else
{
return
}
print
(
"index:
\(
index
)
"
)
currentIndex
=
index
}
}
self
.
view
.
bringSubviewToFront
(
stepView
)
self
.
view
.
bringSubviewToFront
(
stepView
)
self
.
view
.
bringSubviewToFront
(
bottomView
)
self
.
view
.
bringSubviewToFront
(
bottomView
)
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/Spouse(配偶)/YHSpousePrimaryInfoVC.swift
View file @
cab70569
...
@@ -163,7 +163,6 @@ extension YHSpousePrimaryInfoVC : UITableViewDelegate, UITableViewDataSource {
...
@@ -163,7 +163,6 @@ extension YHSpousePrimaryInfoVC : UITableViewDelegate, UITableViewDataSource {
let
arr
:[
YHFormItemProtocol
]
=
items
[
indexPath
.
section
]
let
arr
:[
YHFormItemProtocol
]
=
items
[
indexPath
.
section
]
if
indexPath
.
row
>=
arr
.
count
{
return
createDefaultCell
(
indexPath
)
}
if
indexPath
.
row
>=
arr
.
count
{
return
createDefaultCell
(
indexPath
)
}
let
item
:
YHFormItemProtocol
=
arr
[
indexPath
.
row
]
let
item
:
YHFormItemProtocol
=
arr
[
indexPath
.
row
]
if
item
is
YHFormTitleItem
{
// 标题
if
item
is
YHFormTitleItem
{
// 标题
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/YHFamilyMemberInfoVC.swift
View file @
cab70569
...
@@ -21,7 +21,8 @@ class YHFamilyMemberInfoVC: YHBaseViewController {
...
@@ -21,7 +21,8 @@ class YHFamilyMemberInfoVC: YHBaseViewController {
var
familyMemberInfo
:
YHFamilyMemberGroupInfo
?
var
familyMemberInfo
:
YHFamilyMemberGroupInfo
?
var
isChildsEditMode
:
YHFormTitleItemEditType
=
.
none
var
isChildsEditMode
:
YHFormTitleItemEditType
=
.
none
var
isBrothersEditMode
:
YHFormTitleItemEditType
=
.
none
var
isBrothersEditMode
:
YHFormTitleItemEditType
=
.
none
// 是否显示未填写错误提示
var
isNeedShowError
=
false
var
items
:[[
YHFormItemProtocol
]]
=
[]
var
items
:[[
YHFormItemProtocol
]]
=
[]
lazy
var
tableView
:
UITableView
=
{
lazy
var
tableView
:
UITableView
=
{
...
@@ -114,7 +115,48 @@ class YHFamilyMemberInfoVC: YHBaseViewController {
...
@@ -114,7 +115,48 @@ class YHFamilyMemberInfoVC: YHBaseViewController {
}
}
@objc
func
didClickSubmitBtn
()
{
@objc
func
didClickSubmitBtn
()
{
let
isChecked
=
checkIntegrity
()
isNeedShowError
=
!
isChecked
self
.
tableView
.
reloadData
()
if
!
isChecked
{
YHHUD
.
flash
(
message
:
"资料还未填完"
)
return
}
}
// 检查填写信息完整性
func
checkIntegrity
()
->
Bool
{
if
let
sponse
=
familyMemberInfo
?
.
spouse
,
sponse
.
notFillNum
>
0
{
return
false
}
if
let
father
=
familyMemberInfo
?
.
father
,
father
.
notFillNum
>
0
{
return
false
}
if
let
mother
=
familyMemberInfo
?
.
mother
,
mother
.
notFillNum
>
0
{
return
false
}
if
let
childs
=
familyMemberInfo
?
.
child
,
!
childs
.
isEmpty
{
for
child
in
childs
{
if
child
.
notFillNum
>
0
{
return
false
}
}
}
if
let
brothers
=
familyMemberInfo
?
.
brother
,
!
brothers
.
isEmpty
{
for
brother
in
brothers
{
if
brother
.
notFillNum
>
0
{
return
false
}
}
}
return
true
}
}
func
loadFamilyMember
()
{
func
loadFamilyMember
()
{
...
@@ -296,6 +338,8 @@ extension YHFamilyMemberInfoVC : UITableViewDelegate, UITableViewDataSource {
...
@@ -296,6 +338,8 @@ extension YHFamilyMemberInfoVC : UITableViewDelegate, UITableViewDataSource {
let
cell
=
tableView
.
dequeueReusableCell
(
withIdentifier
:
YHFormItemEnterDetailCell
.
cellReuseIdentifier
,
for
:
indexPath
)
as!
YHFormItemEnterDetailCell
let
cell
=
tableView
.
dequeueReusableCell
(
withIdentifier
:
YHFormItemEnterDetailCell
.
cellReuseIdentifier
,
for
:
indexPath
)
as!
YHFormItemEnterDetailCell
cell
.
title
=
detailItem
.
getTitle
()
cell
.
title
=
detailItem
.
getTitle
()
cell
.
isShowBottomLine
=
indexPath
.
row
!=
arr
.
count
-
1
cell
.
isShowBottomLine
=
indexPath
.
row
!=
arr
.
count
-
1
cell
.
detailLabel
.
textColor
=
(
isNeedShowError
&&
detailItem
.
notFillNum
>
0
?
.
failColor
:
.
labelTextColor2
)
if
detailItem
.
notFillNum
>
0
{
if
detailItem
.
notFillNum
>
0
{
cell
.
detailLabel
.
text
=
String
(
format
:
"有%d项未填写"
.
local
,
detailItem
.
notFillNum
)
cell
.
detailLabel
.
text
=
String
(
format
:
"有%d项未填写"
.
local
,
detailItem
.
notFillNum
)
}
else
{
}
else
{
...
...
galaxy/galaxy/Classes/Modules/Login(登录)/M/YHUserModel.swift
View file @
cab70569
...
@@ -17,9 +17,9 @@ struct YHUserModel: SmartCodable {
...
@@ -17,9 +17,9 @@ struct YHUserModel: SmartCodable {
var
ip
:
String
?
var
ip
:
String
?
var
imei
:
String
?
var
imei
:
String
?
var
channel
:
String
?
var
channel
:
String
?
var
token
:
String
?
// 暂无token
//
var token: String? // 暂无token
//
var token: String? {
var
token
:
String
?
{
//
return "eyJpdiI6Ik5aeEVDclZTK0FISEFBZUgxN2VkdGc9PSIsInZhbHVlIjoiRFRJOHlObzVrZlp4T2tVYW1MSE1ZK0Z3dXlyK3p4QlczNmxsTXdkdW5GQVY4Q2VqZlNNUDdrdVpsb0JcLytpYmJheUp2MWZTUE5pOWgrVWRLdEtIUkx4R1wvS3F6SmRSQ0dWeFVXanFINGkyRWNMTXB4TVlcLzhjXC9NSzVoMFwvZ1ZOaVIwb0VqWlo1VERPSHY2RWJhME1RdWtkXC8yanBQdm9lMWM4WXJVK1BnMDd6SncwVVlWMDNnbSswSnM3eVwveFRRck03M3pOaDFSc3g0UmlYMTJQdmZpSkhUWHVMa21RV2xRbXBkalVTTUFicmFaN2NVNXl1ZTJOeEJoKzhrMnZtdzdvM1U5Qmh4WXNiSEFERUpiZHNWNkxoM2ZkVVRUdFlMMU1MQnIyaWNxNSt4S1NocDVEbnNqeHphUCtVVk1qTlVnMk1ydVNPamJ0c2tDQ1wvWFk1SkxtSWtDMU9oT3ZqaFpuNU5aVUVicHpYVU56VnlqK01Cb20welJMbkQrcTFWOHFUbzlPK0RGdDRcLzJ1T094MjNjYTVZZmJcL2txRE93cEFUYzlKWWdVWE9cLzFnYnVwTFZ4VUtqMFQ5QlgzZitDQjhyNURpU3p0bktqblBicUxPekNBcWRWM0g0WklSOEc0T0RPVkNBMGZQdEtWV3ZqN3IrcHZDYm9UNjREdnA3U1RZY1Z1dFE3K1RRM2F2eGY0QXc2dGlha0RBUDVpVHdFWE53dzl2eVczVk9VNTJSa1Fzb1J4ZGd0c0RCdktPQ1FWOUQ5Y0krckQ3bFc4NkNJMHliSXlnNGtYU1ZCUHRZWTdCKzA5d1wvdldzWTlpeUdYaEg4eGhITHpRSUthMWpSVlZvZVhwZ3BvamxCTHFSUXJmQ1hQNThYbUNNanZnVGs0b3RDTUFmYkdsYTEzeEtnTXJpZVU0QnJHWDJoUk9sUklzaFFhUkJiNWk0Z2E0cUUwejU4RmF2RnE4Z2U0eEo3VmZ2SmFMTlVacFBvSFlZUmM2N3liVTdhTk5NWU9YS0xtalk3QUN3NWV2UTlPeE5hMmk0aHU4MSt0YjNJQytFczRMa2l6XC9jV0Jxc01QYU0yYXdTXC92RXBxTFNVOVd6SlwvRm9KM21jUHlcL2diRlMyU3REeEl0K1RxSjRuck8xaXlOaWY4NXVzMVBibXpVSEZJWkVZQnFUd2k5TUVJcDUwUEFjTmljTzYyaWFYaFkzZUtkR294d29LUzBUTFF1Y0xxbWtMNFF4ZlZkN2k4YktEUnRGekU3OEdaN2J3TUR4T2FpVHRKaGlqRWNcL2c5dlwvOUVEVmdLNUhBSk1wSGV5UXVoOFJydlczc09HU1EyeXI4SFZZQmJJQWx1cGFIaXhmK1VJNmdoNmwrOElMZXFxSHZtazQreW84RFBlOXFnVDI2bm1tZWl0K01OcU1DSGJEQXdnWW9Hc0ptWFVJbXVXdEpyT2FKUHprTzJ1MkxFSEViZGV4cFpuOWRXK3dUdVR4bmJHZ1VRRGJycFRBME5lWUtaT0JCYjViSWVvcVJ3RXllb2tQZ1VkUWFqVWo0UHQzMUQwWVMwZ05rTTU0Nk1QQUdxTm9rZFNISVYrTG5DWlArNkt5RkZxajdZN1luakRKQVdUaVpnOUhCUExYMEVKRXRRT3QyZTI4cU9TdlBrbWxVZkFLSWZFbXNha3lCZUhFRVpyTmxQOERjbVwvMytCc0JpNnZcL1Nvek9yR2pUWGF2XC9VMzN4OEY5T3VsdUNGRFNWbHZZMnBzNHhMeEdIR21majBOOUJNbEhlK1J4S3dFTnlJamdTeFQyTWlTTlhCUWxnSDF6VmNhWHIzVGpoREY5clB2XC9uZHZjSm1iTHZ1bjFIUUFRait6dUJlUk1WQ1FhdXFoN002YlQ5MVwvQVMzYzJJQ0RFR1czdEtqMFBTQT09IiwibWFjIjoiOGVlZjBmNTVmMzEwNjhkZjVmYTlkYzAwYzllMjJmNjUyZmRmN2U1ODFiZTIzNzRjMDVjMTNiOTNhOWRhMmVkYSJ9"
return
"eyJpdiI6Ik5aeEVDclZTK0FISEFBZUgxN2VkdGc9PSIsInZhbHVlIjoiRFRJOHlObzVrZlp4T2tVYW1MSE1ZK0Z3dXlyK3p4QlczNmxsTXdkdW5GQVY4Q2VqZlNNUDdrdVpsb0JcLytpYmJheUp2MWZTUE5pOWgrVWRLdEtIUkx4R1wvS3F6SmRSQ0dWeFVXanFINGkyRWNMTXB4TVlcLzhjXC9NSzVoMFwvZ1ZOaVIwb0VqWlo1VERPSHY2RWJhME1RdWtkXC8yanBQdm9lMWM4WXJVK1BnMDd6SncwVVlWMDNnbSswSnM3eVwveFRRck03M3pOaDFSc3g0UmlYMTJQdmZpSkhUWHVMa21RV2xRbXBkalVTTUFicmFaN2NVNXl1ZTJOeEJoKzhrMnZtdzdvM1U5Qmh4WXNiSEFERUpiZHNWNkxoM2ZkVVRUdFlMMU1MQnIyaWNxNSt4S1NocDVEbnNqeHphUCtVVk1qTlVnMk1ydVNPamJ0c2tDQ1wvWFk1SkxtSWtDMU9oT3ZqaFpuNU5aVUVicHpYVU56VnlqK01Cb20welJMbkQrcTFWOHFUbzlPK0RGdDRcLzJ1T094MjNjYTVZZmJcL2txRE93cEFUYzlKWWdVWE9cLzFnYnVwTFZ4VUtqMFQ5QlgzZitDQjhyNURpU3p0bktqblBicUxPekNBcWRWM0g0WklSOEc0T0RPVkNBMGZQdEtWV3ZqN3IrcHZDYm9UNjREdnA3U1RZY1Z1dFE3K1RRM2F2eGY0QXc2dGlha0RBUDVpVHdFWE53dzl2eVczVk9VNTJSa1Fzb1J4ZGd0c0RCdktPQ1FWOUQ5Y0krckQ3bFc4NkNJMHliSXlnNGtYU1ZCUHRZWTdCKzA5d1wvdldzWTlpeUdYaEg4eGhITHpRSUthMWpSVlZvZVhwZ3BvamxCTHFSUXJmQ1hQNThYbUNNanZnVGs0b3RDTUFmYkdsYTEzeEtnTXJpZVU0QnJHWDJoUk9sUklzaFFhUkJiNWk0Z2E0cUUwejU4RmF2RnE4Z2U0eEo3VmZ2SmFMTlVacFBvSFlZUmM2N3liVTdhTk5NWU9YS0xtalk3QUN3NWV2UTlPeE5hMmk0aHU4MSt0YjNJQytFczRMa2l6XC9jV0Jxc01QYU0yYXdTXC92RXBxTFNVOVd6SlwvRm9KM21jUHlcL2diRlMyU3REeEl0K1RxSjRuck8xaXlOaWY4NXVzMVBibXpVSEZJWkVZQnFUd2k5TUVJcDUwUEFjTmljTzYyaWFYaFkzZUtkR294d29LUzBUTFF1Y0xxbWtMNFF4ZlZkN2k4YktEUnRGekU3OEdaN2J3TUR4T2FpVHRKaGlqRWNcL2c5dlwvOUVEVmdLNUhBSk1wSGV5UXVoOFJydlczc09HU1EyeXI4SFZZQmJJQWx1cGFIaXhmK1VJNmdoNmwrOElMZXFxSHZtazQreW84RFBlOXFnVDI2bm1tZWl0K01OcU1DSGJEQXdnWW9Hc0ptWFVJbXVXdEpyT2FKUHprTzJ1MkxFSEViZGV4cFpuOWRXK3dUdVR4bmJHZ1VRRGJycFRBME5lWUtaT0JCYjViSWVvcVJ3RXllb2tQZ1VkUWFqVWo0UHQzMUQwWVMwZ05rTTU0Nk1QQUdxTm9rZFNISVYrTG5DWlArNkt5RkZxajdZN1luakRKQVdUaVpnOUhCUExYMEVKRXRRT3QyZTI4cU9TdlBrbWxVZkFLSWZFbXNha3lCZUhFRVpyTmxQOERjbVwvMytCc0JpNnZcL1Nvek9yR2pUWGF2XC9VMzN4OEY5T3VsdUNGRFNWbHZZMnBzNHhMeEdIR21majBOOUJNbEhlK1J4S3dFTnlJamdTeFQyTWlTTlhCUWxnSDF6VmNhWHIzVGpoREY5clB2XC9uZHZjSm1iTHZ1bjFIUUFRait6dUJlUk1WQ1FhdXFoN002YlQ5MVwvQVMzYzJJQ0RFR1czdEtqMFBTQT09IiwibWFjIjoiOGVlZjBmNTVmMzEwNjhkZjVmYTlkYzAwYzllMjJmNjUyZmRmN2U1ODFiZTIzNzRjMDVjMTNiOTNhOWRhMmVkYSJ9"
//
}
}
}
}
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