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
cc46b08a
Commit
cc46b08a
authored
Sep 06, 2024
by
Steven杜宇
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
// 家庭信息确认
parent
d6fe612b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
13 deletions
+11
-13
YHFamilyGroupModel.swift
...段)/FamilyInfoConfirm(1 家庭信息确认)/M/YHFamilyGroupModel.swift
+2
-5
YHIFamilyInfoListCell.swift
...FamilyInfoConfirm(1 家庭信息确认)/V/YHIFamilyInfoListCell.swift
+1
-1
YHFamilyInfoConfirmViewModel.swift
...foConfirm(1 家庭信息确认)/VM/YHFamilyInfoConfirmViewModel.swift
+8
-7
No files found.
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/FamilyInfoConfirm(1 家庭信息确认)/M/YHFamilyGroupModel.swift
View file @
cc46b08a
...
@@ -118,13 +118,10 @@ class YHFamilyMemberInfoModel: SmartCodable {
...
@@ -118,13 +118,10 @@ class YHFamilyMemberInfoModel: SmartCodable {
}
}
func
getBirthNation
()
->
String
{
func
getBirthNation
()
->
String
{
if
self
.
birthPlaceAboard
==
"0"
{
if
self
.
birthPlaceAboard
==
"1"
{
return
"国内"
}
else
if
self
.
birthPlaceAboard
==
"1"
{
return
"国外"
return
"国外"
}
}
return
""
return
"
国内
"
}
}
func
getHistoryBirthNation
()
->
String
{
func
getHistoryBirthNation
()
->
String
{
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/FamilyInfoConfirm(1 家庭信息确认)/V/YHIFamilyInfoListCell.swift
View file @
cc46b08a
...
@@ -264,7 +264,7 @@ class YHIFamilyInfoListCell: UITableViewCell {
...
@@ -264,7 +264,7 @@ class YHIFamilyInfoListCell: UITableViewCell {
guard
let
self
=
self
else
{
return
}
guard
let
self
=
self
else
{
return
}
if
item
.
id
==
.
birthNation
{
if
item
.
id
==
.
birthNation
{
familyInfo
.
birthPlaceAboard
=
"
\(
selectItem
.
index
)
"
familyInfo
.
birthPlaceAboard
=
"
\(
selectItem
.
index
)
"
self
.
selectBirthNation
?(
familyInfo
.
birthPlaceAboard
==
"0
"
)
self
.
selectBirthNation
?(
familyInfo
.
birthPlaceAboard
!=
"1
"
)
}
}
}
}
itemsContentView
.
addSubview
(
itemView
)
itemsContentView
.
addSubview
(
itemView
)
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/FamilyInfoConfirm(1 家庭信息确认)/VM/YHFamilyInfoConfirmViewModel.swift
View file @
cc46b08a
...
@@ -238,8 +238,8 @@ extension YHFamilyInfoConfirmViewModel {
...
@@ -238,8 +238,8 @@ extension YHFamilyInfoConfirmViewModel {
// 出生国家/地区
// 出生国家/地区
let
birthNation
=
model
.
info
.
getBirthNation
()
let
birthNation
=
model
.
info
.
getBirthNation
()
let
historyBirthNation
=
model
.
info
.
getHistoryBirthNation
()
let
historyBirthNation
=
model
.
info
.
getHistoryBirthNation
()
let
options
=
[
YHFamilyInfoOption
(
index
:
0
,
value
:
"国内"
,
isSelect
:
model
.
info
.
birthPlaceAboard
==
"0
"
),
let
options
=
[
YHFamilyInfoOption
(
index
:
0
,
value
:
"国内"
,
isSelect
:
model
.
info
.
birthPlaceAboard
!=
"1
"
),
YHFamilyInfoOption
(
index
:
1
,
value
:
"国外"
,
isSelect
:
model
.
info
.
birthPlaceAboard
!=
"0
"
)]
YHFamilyInfoOption
(
index
:
1
,
value
:
"国外"
,
isSelect
:
model
.
info
.
birthPlaceAboard
==
"1
"
)]
let
birthNationInfo
=
YHFamilyInfoItem
(
id
:
.
birthNation
,
let
birthNationInfo
=
YHFamilyInfoItem
(
id
:
.
birthNation
,
action
:
.
choice
,
action
:
.
choice
,
...
@@ -257,14 +257,15 @@ extension YHFamilyInfoConfirmViewModel {
...
@@ -257,14 +257,15 @@ extension YHFamilyInfoConfirmViewModel {
var
birthPlaceActionType
=
YHFamilyInfoActionType
.
select
var
birthPlaceActionType
=
YHFamilyInfoActionType
.
select
// 出生地
// 出生地
var
birthPlace
=
""
var
birthPlace
=
""
if
model
.
info
.
birthPlaceAboard
==
"0"
{
// 当前出生国家是国内
if
model
.
info
.
birthPlaceAboard
==
"1"
{
// 当前出生国家是国外
birthPlaceId
=
.
birthPlaceInChina
birthPlaceActionType
=
.
select
birthPlace
=
model
.
info
.
birthPlace
.
area
.
joined
(
separator
:
""
)
}
else
{
birthPlaceId
=
.
birthPlaceAboard
birthPlaceId
=
.
birthPlaceAboard
birthPlaceActionType
=
.
edit
birthPlaceActionType
=
.
edit
birthPlace
=
model
.
info
.
birthPlace
.
foreign
birthPlace
=
model
.
info
.
birthPlace
.
foreign
}
else
{
birthPlaceId
=
.
birthPlaceInChina
birthPlaceActionType
=
.
select
birthPlace
=
model
.
info
.
birthPlace
.
area
.
joined
(
separator
:
""
)
}
}
//
//
...
...
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