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
3b1f8911
Commit
3b1f8911
authored
Sep 05, 2024
by
pete谢兆麟
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' of
http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS
into develop
parents
795bea64
e1838259
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
20 additions
and
14 deletions
+20
-14
YHTravelDocsPreparationDetailVC.swift
...aration(6 旅行证件准备)/C/YHTravelDocsPreparationDetailVC.swift
+16
-10
YHTravelDocsPreparationDetailModel.swift
...tion(6 旅行证件准备)/M/YHTravelDocsPreparationDetailModel.swift
+3
-3
YHTravelDocsPreparationViewModel.swift
...ation(6 旅行证件准备)/VM/YHTravelDocsPreparationViewModel.swift
+1
-1
Group 2033195466@2x.png
.../family_certificate_info.imageset/Group 2033195466@2x.png
+0
-0
Group 2033195466@3x.png
.../family_certificate_info.imageset/Group 2033195466@3x.png
+0
-0
No files found.
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/TravelDocumentsPreparation(6 旅行证件准备)/C/YHTravelDocsPreparationDetailVC.swift
View file @
3b1f8911
...
...
@@ -172,7 +172,7 @@ class YHTravelDocsPreparationDetailVC: YHBaseViewController {
let
cerModel1
=
YHTravelDocsPreparationDetailItemModel
(
type
:
type
,
order_id
:
self
.
orderId
,
order_sn
:
""
,
img_back
:
""
,
img_front
:
""
,
status
:
0
,
issue_start
:
""
,
issue_end
:
""
,
user_id
:
userId
,
user_type
:
dataModel
.
type
,
remark
:
""
,
nationality
:
"
\(
dataModel
.
nationality
)
"
,
age
:
age
)
cerModel1
.
latest_validaty_date
=
self
.
viewModel
.
travelDetailModel
?
.
latest_validaty_date
??
""
cerModel1
.
china_travel_latest_validat
e
_date
=
self
.
viewModel
.
travelDetailModel
?
.
china_travel_latest_validaty_date
??
""
cerModel1
.
china_travel_latest_validat
y
_date
=
self
.
viewModel
.
travelDetailModel
?
.
china_travel_latest_validaty_date
??
""
cerModel1
.
isCanEdit
=
true
item
.
cerDetailModel
=
cerModel1
sectionItems
.
append
(
item
)
...
...
@@ -183,7 +183,7 @@ class YHTravelDocsPreparationDetailVC: YHBaseViewController {
let
item1
=
YHTravelCerSectionItem
(
type
:
.
certificate
,
tipsArr
:
[])
let
cerModel1
=
YHTravelDocsPreparationDetailItemModel
(
type
:
1
,
order_id
:
self
.
orderId
,
order_sn
:
""
,
img_back
:
""
,
img_front
:
""
,
status
:
0
,
issue_start
:
""
,
issue_end
:
""
,
user_id
:
userId
,
user_type
:
dataModel
.
type
,
remark
:
""
,
nationality
:
"
\(
dataModel
.
nationality
)
"
,
age
:
age
)
cerModel1
.
latest_validaty_date
=
self
.
viewModel
.
travelDetailModel
?
.
latest_validaty_date
??
""
cerModel1
.
china_travel_latest_validat
e
_date
=
self
.
viewModel
.
travelDetailModel
?
.
china_travel_latest_validaty_date
??
""
cerModel1
.
china_travel_latest_validat
y
_date
=
self
.
viewModel
.
travelDetailModel
?
.
china_travel_latest_validaty_date
??
""
cerModel1
.
isCanEdit
=
true
item1
.
cerDetailModel
=
cerModel1
sectionItems
.
append
(
item1
)
...
...
@@ -191,6 +191,8 @@ class YHTravelDocsPreparationDetailVC: YHBaseViewController {
// 中国居留许可签证
let
item2
=
YHTravelCerSectionItem
(
type
:
.
certificate
,
tipsArr
:
[])
let
cerModel2
=
YHTravelDocsPreparationDetailItemModel
(
type
:
2
,
order_id
:
self
.
orderId
,
order_sn
:
""
,
img_back
:
""
,
img_front
:
""
,
status
:
0
,
issue_start
:
""
,
issue_end
:
""
,
user_id
:
userId
,
user_type
:
dataModel
.
type
,
remark
:
""
,
nationality
:
"
\(
dataModel
.
nationality
)
"
,
age
:
age
)
cerModel2
.
latest_validaty_date
=
self
.
viewModel
.
travelDetailModel
?
.
latest_validaty_date
??
""
cerModel2
.
china_travel_latest_validaty_date
=
self
.
viewModel
.
travelDetailModel
?
.
china_travel_latest_validaty_date
??
""
cerModel2
.
isCanEdit
=
true
item2
.
cerDetailModel
=
cerModel2
sectionItems
.
append
(
item2
)
...
...
@@ -219,7 +221,8 @@ class YHTravelDocsPreparationDetailVC: YHBaseViewController {
var
errorItemCount
=
0
for
item
in
sectionItems
{
if
item
.
type
==
.
certificate
{
var
hasError
=
false
var
hasSubmitError
=
false
var
isDateValidate
=
true
item
.
cerDetailModel
.
isNeedCheckCer
=
false
item
.
cerDetailModel
.
isNeedCheckDate
=
false
...
...
@@ -237,7 +240,7 @@ class YHTravelDocsPreparationDetailVC: YHBaseViewController {
}
if
noCerInfo
{
hasError
=
true
has
Submit
Error
=
true
item
.
cerDetailModel
.
isNeedCheckCer
=
true
if
item
.
cerDetailModel
.
type
==
3
{
// 港澳通行证
item
.
cerDetailModel
.
checkTips
=
item
.
cerDetailModel
.
img_front
.
isEmpty
?
"请上传港澳通行证正面"
:
"请上传港澳通行证反面"
...
...
@@ -252,28 +255,31 @@ class YHTravelDocsPreparationDetailVC: YHBaseViewController {
}
else
{
item
.
cerDetailModel
.
isNeedCheckDate
=
false
if
item
.
cerDetailModel
.
issue_start
.
isEmpty
||
item
.
cerDetailModel
.
issue_end
.
isEmpty
{
hasError
=
true
has
Submit
Error
=
true
item
.
cerDetailModel
.
isNeedCheckDate
=
true
}
else
{
let
isValidCertificate
=
item
.
cerDetailModel
.
isValidCer
()
if
!
isValidCertificate
{
hasError
=
true
if
item
.
cerDetailModel
.
type
==
2
,
item
.
cerDetailModel
.
china_travel_latest_validate_date
.
isEmpty
{
if
item
.
cerDetailModel
.
type
==
2
,
item
.
cerDetailModel
.
china_travel_latest_validaty_date
.
isEmpty
{
// 这个情况直接弹toast
hasSubmitError
=
true
YHHUD
.
flash
(
message
:
"赴港行程尚未成功预约,请前往检查"
)
}
else
{
// 有效期不足也能提交
isDateValidate
=
false
item
.
cerDetailModel
.
isNeedCheckCer
=
true
let
deadDate
:
String
=
(
item
.
cerDetailModel
.
type
==
2
?
item
.
cerDetailModel
.
china_travel_latest_validat
e
_date
:
item
.
cerDetailModel
.
latest_validaty_date
)
let
deadDate
:
String
=
(
item
.
cerDetailModel
.
type
==
2
?
item
.
cerDetailModel
.
china_travel_latest_validat
y
_date
:
item
.
cerDetailModel
.
latest_validaty_date
)
item
.
cerDetailModel
.
checkTips
=
"有效期不足,需要为
\(
deadDate
)
或以后"
}
}
}
}
}
if
!
hasError
{
if
!
item
.
cerDetailModel
.
isOCR_failed
{
// 无法识别也要可以提交
if
!
hasSubmitError
{
// 无法识别或有效期不足也要可以提交
if
!
item
.
cerDetailModel
.
isOCR_failed
&&
isDateValidate
{
item
.
cerDetailModel
.
isNeedCheckCer
=
false
item
.
cerDetailModel
.
isNeedCheckDate
=
false
}
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/TravelDocumentsPreparation(6 旅行证件准备)/M/YHTravelDocsPreparationDetailModel.swift
View file @
3b1f8911
...
...
@@ -46,7 +46,7 @@ class YHTravelDocsPreparationDetailItemModel: SmartCodable {
var
latest_validaty_date
:
String
=
""
//有效期最晚时间
var
china_travel_latest_validat
e
_date
:
String
=
""
// 中国居留许可签证有效期最晚时间
var
china_travel_latest_validat
y
_date
:
String
=
""
// 中国居留许可签证有效期最晚时间
var
age
:
Int
=
0
// 是否检测时间
...
...
@@ -87,10 +87,10 @@ class YHTravelDocsPreparationDetailItemModel: SmartCodable {
if
self
.
age
<
11
{
// 小于11岁的不检测
return
true
}
if
self
.
china_travel_latest_validat
e
_date
.
isEmpty
{
// 截止日期为空
if
self
.
china_travel_latest_validat
y
_date
.
isEmpty
{
// 截止日期为空
return
false
}
let
isValid
=
self
.
compareDates
(
dateString1
:
self
.
issue_end
,
dateString2
:
self
.
china_travel_latest_validat
e
_date
)
let
isValid
=
self
.
compareDates
(
dateString1
:
self
.
issue_end
,
dateString2
:
self
.
china_travel_latest_validat
y
_date
)
return
isValid
}
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/TravelDocumentsPreparation(6 旅行证件准备)/VM/YHTravelDocsPreparationViewModel.swift
View file @
3b1f8911
...
...
@@ -69,7 +69,7 @@ extension YHTravelDocsPreparationViewModel {
for
item
in
resultModel
.
list
{
if
let
item
=
item
{
item
.
latest_validaty_date
=
self
.
travelDetailModel
?
.
latest_validaty_date
??
""
item
.
china_travel_latest_validat
e
_date
=
self
.
travelDetailModel
?
.
china_travel_latest_validaty_date
??
""
item
.
china_travel_latest_validat
y
_date
=
self
.
travelDetailModel
?
.
china_travel_latest_validaty_date
??
""
item
.
age
=
resultModel
.
age
}
}
...
...
galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/客服段/办证段/1 家庭信息确认/family_certificate_info.imageset/Group 2033195466@2x.png
View replaced file @
795bea64
View file @
3b1f8911
This diff is collapsed.
Click to expand it.
galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/客服段/办证段/1 家庭信息确认/family_certificate_info.imageset/Group 2033195466@3x.png
View replaced file @
795bea64
View file @
3b1f8911
This diff is collapsed.
Click to expand it.
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