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
d6fe612b
Commit
d6fe612b
authored
Sep 06, 2024
by
Steven杜宇
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
// 跟安卓显示逻辑保持一致
parent
93fc8107
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
8 deletions
+6
-8
YHFamilyGroupModel.swift
...段)/FamilyInfoConfirm(1 家庭信息确认)/M/YHFamilyGroupModel.swift
+2
-5
YHFamilyInfoConfirmViewModel.swift
...foConfirm(1 家庭信息确认)/VM/YHFamilyInfoConfirmViewModel.swift
+4
-3
No files found.
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/FamilyInfoConfirm(1 家庭信息确认)/M/YHFamilyGroupModel.swift
View file @
d6fe612b
...
...
@@ -128,13 +128,10 @@ class YHFamilyMemberInfoModel: SmartCodable {
}
func
getHistoryBirthNation
()
->
String
{
if
self
.
birthPlaceAboardHistory
==
"0"
{
return
"国内"
}
else
if
self
.
birthPlaceAboardHistory
==
"1"
{
if
self
.
birthPlaceAboardHistory
==
"1"
{
return
"国外"
}
return
""
return
"
国内
"
}
private
func
getMarriageStatus
(
_
marrage
:
String
)
->
String
{
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/FamilyInfoConfirm(1 家庭信息确认)/VM/YHFamilyInfoConfirmViewModel.swift
View file @
d6fe612b
...
...
@@ -269,10 +269,11 @@ extension YHFamilyInfoConfirmViewModel {
//
var
birthPlaceHistory
=
""
if
model
.
info
.
birthPlaceAboardHistory
==
"0"
{
// 原出生国家是国内
birthPlaceHistory
=
model
.
info
.
birthPlaceHistory
.
area
.
joined
(
separator
:
""
)
}
else
{
if
model
.
info
.
birthPlaceAboardHistory
==
"1"
{
// 原出生国家是国外
birthPlaceHistory
=
model
.
info
.
birthPlaceHistory
.
foreign
}
else
{
birthPlaceHistory
=
model
.
info
.
birthPlaceHistory
.
area
.
joined
(
separator
:
""
)
}
let
birthPlaceInfo
=
YHFamilyInfoItem
(
id
:
birthPlaceId
,
...
...
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