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
938011eb
Commit
938011eb
authored
Mar 17, 2025
by
Steven杜宇
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
// lint
parent
313466e4
Changes
24
Hide whitespace changes
Inline
Side-by-side
Showing
24 changed files
with
141 additions
and
110 deletions
+141
-110
YHInvatationShareViewController.swift
...onWithGifts(邀请有礼)/C/YHInvatationShareViewController.swift
+4
-1
YHHomePageViewModel.swift
...axy/Classes/Modules/Home(首页)/VM/YHHomePageViewModel.swift
+3
-1
YHAdopterAddNewTableViewCell.swift
.../AddAdopters(2新增受养人)/V/YHAdopterAddNewTableViewCell.swift
+3
-2
YHCertificateAppointViewController.swift
...cate(3 赴港办证预约)/C/YHCertificateAppointViewController.swift
+4
-2
YHFamilyInfoConfirmViewController.swift
...nfirm(1 家庭信息确认)/C/YHFamilyInfoConfirmViewController.swift
+1
-1
YHPrincipleApprovedMailViewController.swift
...eBatch(原则批)/C/YHPrincipleApprovedMailViewController.swift
+8
-7
YHPrincipleUploadListVC.swift
...(客服段)/PrincipleBatch(原则批)/C/YHPrincipleUploadListVC.swift
+62
-57
YHPrincipleWaitResultViewController.swift
...pleBatch(原则批)/C/YHPrincipleWaitResultViewController.swift
+3
-1
YHHKPlanItemView.swift
...服务中心)/QMAS(优才)/MyDocuments(我的文书)/V/YHHKPlanItemView.swift
+1
-1
YHSignatureUploadTableViewCell.swift
.../MySignature(我的签字)/V/YHSignatureUploadTableViewCell.swift
+1
-1
YHLookResignResultViewController.swift
...gnResult(查看续签结果)/C/YHLookResignResultViewController.swift
+3
-1
YHResignCertificateDetailHkViewController.swift
...续期证件管理)/C/YHResignCertificateDetailHkViewController.swift
+1
-1
YHResignAppointScheduleListViewController.swift
...在港递交预约)/C/YHResignAppointScheduleListViewController.swift
+6
-2
YHResignMaterialViewModel.swift
...MaterialManage(续期资料管理)/VM/YHResignMaterialViewModel.swift
+2
-2
YHResignUploadDocDetailViewController.swift
...adDoc(续签补件)/C/YHResignUploadDocDetailViewController.swift
+1
-1
YHResignUploadDocListViewController.swift
...loadDoc(续签补件)/C/YHResignUploadDocListViewController.swift
+4
-4
YHResignUploadTravelPassportViewController.swift
...传旅行证件)/C/YHResignUploadTravelPassportViewController.swift
+1
-1
YHResignUploadTravelCardListfootView.swift
...Crad(上传旅行证件)/V/YHResignUploadTravelCardListfootView.swift
+1
-1
YHBasicInfoCellModel.swift
...的信息流程)/BaseInformation(基本资料)/M/YHBasicInfoCellModel.swift
+1
-1
YHBasicInfoFillModel.swift
...的信息流程)/BaseInformation(基本资料)/M/YHBasicInfoFillModel.swift
+13
-13
YHChoiceButtonHoldView.swift
...息流程)/BaseInformation(基本资料)/V/YHChoiceButtonHoldView.swift
+1
-1
YHEducationDetailVC.swift
...ation&Qualification(学历专业资格填写)/C/YHEducationDetailVC.swift
+13
-6
YHMajorSearchViewController.swift
...alification(学历专业资格填写)/C/YHMajorSearchViewController.swift
+3
-1
YHGCFamilyMemberInfoListVC.swift
...流程)/FamilyMember(家庭成员)/C/YHGCFamilyMemberInfoListVC.swift
+1
-1
No files found.
galaxy/galaxy/Classes/Modules/Home(首页)/InvitationWithGifts(邀请有礼)/C/YHInvatationShareViewController.swift
View file @
938011eb
...
@@ -226,7 +226,10 @@ extension YHInvatationShareViewController: UICollectionViewDelegate, UICollectio
...
@@ -226,7 +226,10 @@ extension YHInvatationShareViewController: UICollectionViewDelegate, UICollectio
}
}
return
cell
return
cell
}
else
{
}
else
{
let
cell
=
collectionView
.
dequeueReusableCell
(
withReuseIdentifier
:
YHShareTwoCollectionViewCell
.
cellReuseIdentifier
,
for
:
indexPath
)
as!
YHShareTwoCollectionViewCell
guard
let
cell
=
collectionView
.
dequeueReusableCell
(
withReuseIdentifier
:
YHShareTwoCollectionViewCell
.
cellReuseIdentifier
,
for
:
indexPath
)
as?
YHShareTwoCollectionViewCell
else
{
return
UICollectionViewCell
()
}
return
cell
return
cell
}
}
...
...
galaxy/galaxy/Classes/Modules/Home(首页)/VM/YHHomePageViewModel.swift
View file @
938011eb
...
@@ -407,7 +407,9 @@ extension YHHomePageViewModel {
...
@@ -407,7 +407,9 @@ extension YHHomePageViewModel {
callBackBlock
(
false
,
nil
)
callBackBlock
(
false
,
nil
)
return
return
}
}
self
.
hkList
=
(
result
as!
[
YHHKEventModel
])
if
let
result
=
result
as?
[
YHHKEventModel
]
{
self
.
hkList
=
result
}
callBackBlock
(
true
,
nil
)
callBackBlock
(
true
,
nil
)
}
else
{
}
else
{
let
error
:
YHErrorModel
=
YHErrorModel
(
errorCode
:
Int32
(
json
.
code
),
errorMsg
:
json
.
msg
)
let
error
:
YHErrorModel
=
YHErrorModel
(
errorCode
:
Int32
(
json
.
code
),
errorMsg
:
json
.
msg
)
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/CustomerService(客服段)/Certificate(办证段)/AddAdopters(2新增受养人)/V/YHAdopterAddNewTableViewCell.swift
View file @
938011eb
...
@@ -220,8 +220,9 @@ class YHAdopterAddNewTableViewCell: UITableViewCell {
...
@@ -220,8 +220,9 @@ class YHAdopterAddNewTableViewCell: UITableViewCell {
cannalButton
.
isHidden
=
true
cannalButton
.
isHidden
=
true
}
}
for
i
in
0
..<
(
dataSource
?
.
count
??
0
)
{
for
i
in
0
..<
(
dataSource
?
.
count
??
0
)
{
let
view
=
mainItemView
.
viewWithTag
(
4000
+
i
)
as!
YHAdopterItemView
if
let
view
=
mainItemView
.
viewWithTag
(
4000
+
i
)
as?
YHAdopterItemView
{
view
.
isShowDelete
(
i
,
isShow
:
true
)
view
.
isShowDelete
(
i
,
isShow
:
true
)
}
}
}
if
let
block
=
isMoreBlock
{
if
let
block
=
isMoreBlock
{
block
(
true
)
block
(
true
)
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/CustomerService(客服段)/Certificate(办证段)/AppointCertificate(3 赴港办证预约)/C/YHCertificateAppointViewController.swift
View file @
938011eb
...
@@ -397,7 +397,7 @@ extension YHCertificateAppointViewController: UITableViewDelegate, UITableViewDa
...
@@ -397,7 +397,7 @@ extension YHCertificateAppointViewController: UITableViewDelegate, UITableViewDa
if
item
.
type
==
.
activeVisa
{
if
item
.
type
==
.
activeVisa
{
// 赴港激活签证
// 赴港激活签证
let
cell
=
tableView
.
dequeueReusableCell
(
withIdentifier
:
YHActivateHKVisaCell
.
cellReuseIdentifier
,
for
:
indexPath
)
as!
YHActivateHKVisaCell
guard
let
cell
=
tableView
.
dequeueReusableCell
(
withIdentifier
:
YHActivateHKVisaCell
.
cellReuseIdentifier
,
for
:
indexPath
)
as?
YHActivateHKVisaCell
else
{
return
UITableViewCell
()
}
cell
.
isAllGo
=
self
.
isAllMembersGo
cell
.
isAllGo
=
self
.
isAllMembersGo
cell
.
selectBlock
=
{
cell
.
selectBlock
=
{
[
weak
self
]
isAllGo
in
[
weak
self
]
isAllGo
in
...
@@ -410,7 +410,9 @@ extension YHCertificateAppointViewController: UITableViewDelegate, UITableViewDa
...
@@ -410,7 +410,9 @@ extension YHCertificateAppointViewController: UITableViewDelegate, UITableViewDa
if
item
.
type
==
.
needReAppointMembers
{
if
item
.
type
==
.
needReAppointMembers
{
// 待预约赴港成员
// 待预约赴港成员
let
cell
=
tableView
.
dequeueReusableCell
(
withIdentifier
:
YHWaitAppointMembersCell
.
cellReuseIdentifier
,
for
:
indexPath
)
as!
YHWaitAppointMembersCell
guard
let
cell
=
tableView
.
dequeueReusableCell
(
withIdentifier
:
YHWaitAppointMembersCell
.
cellReuseIdentifier
,
for
:
indexPath
)
as?
YHWaitAppointMembersCell
else
{
return
UITableViewCell
()
}
cell
.
members
=
waitAppointMembers
cell
.
members
=
waitAppointMembers
cell
.
clickBlock
=
{
cell
.
clickBlock
=
{
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/CustomerService(客服段)/Certificate(办证段)/FamilyInfoConfirm(1 家庭信息确认)/C/YHFamilyInfoConfirmViewController.swift
View file @
938011eb
...
@@ -162,7 +162,7 @@ extension YHFamilyInfoConfirmViewController: UITableViewDelegate, UITableViewDat
...
@@ -162,7 +162,7 @@ extension YHFamilyInfoConfirmViewController: UITableViewDelegate, UITableViewDat
}
}
}
}
guard
let
warmTipsCell
=
tableView
.
dequeueReusableCell
(
withIdentifier
:
YHFamilyWarmTipsCell
.
cellReuseIdentifier
,
for
:
indexPath
)
as?
YHFamilyWarmTipsCell
else
{
return
UITableViewCell
}
guard
let
warmTipsCell
=
tableView
.
dequeueReusableCell
(
withIdentifier
:
YHFamilyWarmTipsCell
.
cellReuseIdentifier
,
for
:
indexPath
)
as?
YHFamilyWarmTipsCell
else
{
return
UITableViewCell
()
}
return
warmTipsCell
return
warmTipsCell
}
}
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/CustomerService(客服段)/PrincipleBatch(原则批)/C/YHPrincipleApprovedMailViewController.swift
View file @
938011eb
...
@@ -149,13 +149,14 @@ extension YHPrincipleApprovedMailViewController: UITableViewDelegate, UITableVie
...
@@ -149,13 +149,14 @@ extension YHPrincipleApprovedMailViewController: UITableViewDelegate, UITableVie
if
0
<=
indexPath
.
row
&&
indexPath
.
row
<
items
.
count
{
if
0
<=
indexPath
.
row
&&
indexPath
.
row
<
items
.
count
{
let
m
=
items
[
indexPath
.
row
]
let
m
=
items
[
indexPath
.
row
]
if
m
is
YHPrincipleEnvelopeModel
{
if
m
is
YHPrincipleEnvelopeModel
{
let
model
=
m
as!
YHPrincipleEnvelopeModel
if
let
model
=
m
as?
YHPrincipleEnvelopeModel
{
cell
.
updateModel
(
model
)
cell
.
updateModel
(
model
)
cell
.
expandClick
=
{
cell
.
expandClick
=
{
[
weak
self
]
isUnfold
in
[
weak
self
]
isUnfold
in
guard
let
self
=
self
else
{
return
}
guard
let
self
=
self
else
{
return
}
model
.
isUnfold
=
isUnfold
model
.
isUnfold
=
isUnfold
self
.
tableView
.
reloadData
()
self
.
tableView
.
reloadData
()
}
}
}
}
}
}
}
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/CustomerService(客服段)/PrincipleBatch(原则批)/C/YHPrincipleUploadListVC.swift
View file @
938011eb
...
@@ -374,73 +374,78 @@ extension YHPrincipleUploadListVC: UITableViewDelegate, UITableViewDataSource {
...
@@ -374,73 +374,78 @@ extension YHPrincipleUploadListVC: UITableViewDelegate, UITableViewDataSource {
if
m
is
YHPrincipleEnvelopeModel
{
if
m
is
YHPrincipleEnvelopeModel
{
// 已获得港府甄选名额 信封cell
// 已获得港府甄选名额 信封cell
let
cell
=
tableView
.
dequeueReusableCell
(
withIdentifier
:
YHPrincipleEnvelopeCell
.
cellReuseIdentifier
,
for
:
indexPath
)
as!
YHPrincipleEnvelopeCell
guard
let
cell
=
tableView
.
dequeueReusableCell
(
withIdentifier
:
YHPrincipleEnvelopeCell
.
cellReuseIdentifier
,
for
:
indexPath
)
as?
YHPrincipleEnvelopeCell
else
{
let
model
=
m
as!
YHPrincipleEnvelopeModel
return
UITableViewCell
()
cell
.
updateModel
(
model
)
}
// 点击展开
if
let
model
=
m
as?
YHPrincipleEnvelopeModel
{
cell
.
expandClick
=
{
cell
.
updateModel
(
model
)
[
weak
self
]
isUnfold
in
// 点击展开
guard
let
self
=
self
else
{
return
}
cell
.
expandClick
=
{
model
.
isUnfold
=
isUnfold
[
weak
self
]
isUnfold
in
self
.
tableView
.
reloadData
()
guard
let
self
=
self
else
{
return
}
model
.
isUnfold
=
isUnfold
self
.
tableView
.
reloadData
()
}
}
}
return
cell
return
cell
}
}
if
m
is
YHPrincipleAgreementModel
{
if
m
is
YHPrincipleAgreementModel
{
// 上传文件 cell
// 上传文件 cell
let
cell
=
tableView
.
dequeueReusableCell
(
withIdentifier
:
YHPrincipleUploadStatusCell
.
cellReuseIdentifier
,
for
:
indexPath
)
as!
YHPrincipleUploadStatusCell
guard
let
cell
=
tableView
.
dequeueReusableCell
(
withIdentifier
:
YHPrincipleUploadStatusCell
.
cellReuseIdentifier
,
for
:
indexPath
)
as?
YHPrincipleUploadStatusCell
else
{
let
model
=
m
as!
YHPrincipleAgreementModel
return
UITableViewCell
()
if
isNeedShowSubmitCheckError
,
model
.
isMust
==
true
,
model
.
content_url
.
count
<=
0
{
model
.
isShowRedTips
=
true
}
else
{
model
.
isShowRedTips
=
false
}
cell
.
updateModel
(
model
)
// 点击展开
cell
.
expandClick
=
{
[
weak
self
]
isUnfold
in
guard
let
self
=
self
else
{
return
}
model
.
isUnfold
=
isUnfold
self
.
tableView
.
reloadData
()
}
// 文件操作
cell
.
fileEditBlock
=
{
[
weak
self
]
_
,
index
in
guard
let
self
=
self
else
{
return
}
self
.
showFileOperationAlertView
(
index
,
itemModel
:
model
)
}
}
// 点击文件直接预览
if
let
model
=
m
as?
YHPrincipleAgreementModel
{
cell
.
fileClickBlock
=
{
if
isNeedShowSubmitCheckError
,
model
.
isMust
==
true
,
model
.
content_url
.
count
<=
0
{
[
weak
self
]
fileModel
,
_
in
model
.
isShowRedTips
=
true
guard
let
self
=
self
else
{
return
}
}
else
{
// 直接点击文件所在行进行预览
model
.
isShowRedTips
=
false
let
fileUrl
=
!
fileModel
.
url
.
isEmpty
?
fileModel
.
url
:
fileModel
.
fileUrl
}
YHHUD
.
show
(
.
progress
(
message
:
"加载中..."
)
)
cell
.
updateModel
(
model
)
self
.
viewModel
.
getRealUsefulUrl
(
fileUrl
)
{
// 点击展开
[
weak
self
]
resultUrl
in
cell
.
expandClick
=
{
YHHUD
.
hide
()
[
weak
self
]
isUnfold
in
guard
let
self
=
self
else
{
return
}
guard
let
self
=
self
else
{
return
}
self
.
previewFileTool
.
openXLSXRemoteFile
(
urlString
:
resultUrl
,
fileName
:
model
.
name
)
model
.
isUnfold
=
isUnfold
self
.
tableView
.
reloadData
()
}
}
}
// 文件操作
// 上传文件点击
cell
.
fileEditBlock
=
{
cell
.
uploadBtnClick
=
{
[
weak
self
]
_
,
index
in
[
weak
self
]
_
in
guard
let
self
=
self
else
{
return
}
guard
let
self
=
self
else
{
return
}
self
.
showFileOperationAlertView
(
index
,
itemModel
:
model
)
if
model
.
content_url
.
count
>=
10
{
}
YHHUD
.
flash
(
message
:
"最多上传10张照片或文件"
)
// 点击文件直接预览
return
cell
.
fileClickBlock
=
{
[
weak
self
]
fileModel
,
_
in
guard
let
self
=
self
else
{
return
}
// 直接点击文件所在行进行预览
let
fileUrl
=
!
fileModel
.
url
.
isEmpty
?
fileModel
.
url
:
fileModel
.
fileUrl
YHHUD
.
show
(
.
progress
(
message
:
"加载中..."
))
self
.
viewModel
.
getRealUsefulUrl
(
fileUrl
)
{
[
weak
self
]
resultUrl
in
YHHUD
.
hide
()
guard
let
self
=
self
else
{
return
}
self
.
previewFileTool
.
openXLSXRemoteFile
(
urlString
:
resultUrl
,
fileName
:
model
.
name
)
}
}
// 上传文件点击
cell
.
uploadBtnClick
=
{
[
weak
self
]
_
in
guard
let
self
=
self
else
{
return
}
if
model
.
content_url
.
count
>=
10
{
YHHUD
.
flash
(
message
:
"最多上传10张照片或文件"
)
return
}
self
.
showSelectImageAndFileView
(
model
)
}
// 点击模板
cell
.
templateBtnClick
=
{
[
weak
self
]
_
in
guard
let
self
=
self
else
{
return
}
self
.
showPreviewAndMailList
(
model
)
}
}
self
.
showSelectImageAndFileView
(
model
)
}
// 点击模板
cell
.
templateBtnClick
=
{
[
weak
self
]
_
in
guard
let
self
=
self
else
{
return
}
self
.
showPreviewAndMailList
(
model
)
}
}
return
cell
return
cell
}
}
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/CustomerService(客服段)/PrincipleBatch(原则批)/C/YHPrincipleWaitResultViewController.swift
View file @
938011eb
...
@@ -188,7 +188,9 @@ extension YHPrincipleWaitResultViewController: UITableViewDelegate, UITableViewD
...
@@ -188,7 +188,9 @@ extension YHPrincipleWaitResultViewController: UITableViewDelegate, UITableViewD
}
}
}
}
let
cell
=
tableView
.
dequeueReusableCell
(
withIdentifier
:
YHPrincipleProfileListCell
.
cellReuseIdentifier
,
for
:
indexPath
)
as!
YHPrincipleProfileListCell
guard
let
cell
=
tableView
.
dequeueReusableCell
(
withIdentifier
:
YHPrincipleProfileListCell
.
cellReuseIdentifier
,
for
:
indexPath
)
as?
YHPrincipleProfileListCell
else
{
return
UITableViewCell
()
}
if
0
<=
indexPath
.
row
&&
indexPath
.
row
<
items
.
count
{
if
0
<=
indexPath
.
row
&&
indexPath
.
row
<
items
.
count
{
let
model
=
items
[
indexPath
.
row
]
let
model
=
items
[
indexPath
.
row
]
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyDocuments(我的文书)/V/YHHKPlanItemView.swift
View file @
938011eb
...
@@ -446,7 +446,7 @@ private extension YHHKPlanItemView {
...
@@ -446,7 +446,7 @@ private extension YHHKPlanItemView {
}
}
}
else
{
}
else
{
isPreDone
=
true
isPreDone
=
true
returStrn
=
returStrn
+
String
(
scalar
)
returStrn
+=
String
(
scalar
)
}
}
}
}
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MySignature(我的签字)/V/YHSignatureUploadTableViewCell.swift
View file @
938011eb
...
@@ -171,7 +171,7 @@ class YHSignatureUploadTableViewCell: UITableViewCell {
...
@@ -171,7 +171,7 @@ class YHSignatureUploadTableViewCell: UITableViewCell {
make
.
height
.
equalTo
(
h
)
make
.
height
.
equalTo
(
h
)
make
.
right
.
equalTo
(
-
18
)
make
.
right
.
equalTo
(
-
18
)
}
}
y
=
y
+
h
y
+=
h
}
}
}
}
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/Resign(续签)/LookResignResult(查看续签结果)/C/YHLookResignResultViewController.swift
View file @
938011eb
...
@@ -219,7 +219,9 @@ extension YHLookResignResultViewController: UITableViewDelegate, UITableViewData
...
@@ -219,7 +219,9 @@ extension YHLookResignResultViewController: UITableViewDelegate, UITableViewData
approveCell
.
dataSource
=
self
.
viewModel
.
dataModel
.
data
.
data
[
indexPath
.
section
]
approveCell
.
dataSource
=
self
.
viewModel
.
dataModel
.
data
.
data
[
indexPath
.
section
]
return
approveCell
return
approveCell
}
else
if
state
==
1
{
}
else
if
state
==
1
{
let
approveCell
=
tableView
.
dequeueReusableCell
(
withIdentifier
:
YHLookResignResultStateTwoTableViewCell
.
cellReuseIdentifier
,
for
:
indexPath
)
as!
YHLookResignResultStateTwoTableViewCell
guard
let
approveCell
=
tableView
.
dequeueReusableCell
(
withIdentifier
:
YHLookResignResultStateTwoTableViewCell
.
cellReuseIdentifier
,
for
:
indexPath
)
as?
YHLookResignResultStateTwoTableViewCell
else
{
return
UITableViewCell
()
}
approveCell
.
state
=
state
approveCell
.
state
=
state
let
model
=
YHLookResignResultDataLettersModel
()
let
model
=
YHLookResignResultDataLettersModel
()
model
.
result_file
=
self
.
viewModel
.
dataModel
.
data
.
result_file
model
.
result_file
=
self
.
viewModel
.
dataModel
.
data
.
result_file
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/Resign(续签)/ResignCertificateManage(续期证件管理)/C/YHResignCertificateDetailHkViewController.swift
View file @
938011eb
...
@@ -373,7 +373,7 @@ extension YHResignCertificateDetailHkViewController: UITableViewDelegate, UITabl
...
@@ -373,7 +373,7 @@ extension YHResignCertificateDetailHkViewController: UITableViewDelegate, UITabl
let
message
=
item
.
message
??
""
let
message
=
item
.
message
??
""
let
isNeed
=
item
.
isNeed
??
false
let
isNeed
=
item
.
isNeed
??
false
if
isShow
&&
message
.
count
==
0
&&
isNeed
{
if
isShow
&&
message
.
count
==
0
&&
isNeed
{
tatol
=
tatol
+
20
tatol
+=
20
}
}
}
}
return
CGFloat
(
649
+
tatol
)
return
CGFloat
(
649
+
tatol
)
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/Resign(续签)/ResignHKAppoint(在港递交预约)/C/YHResignAppointScheduleListViewController.swift
View file @
938011eb
...
@@ -427,7 +427,9 @@ extension YHResignAppointScheduleListViewController: UITableViewDelegate, UITabl
...
@@ -427,7 +427,9 @@ extension YHResignAppointScheduleListViewController: UITableViewDelegate, UITabl
if
0
<=
indexPath
.
row
&&
indexPath
.
row
<
scheduleArr
.
count
{
if
0
<=
indexPath
.
row
&&
indexPath
.
row
<
scheduleArr
.
count
{
let
model
=
scheduleArr
[
indexPath
.
row
]
let
model
=
scheduleArr
[
indexPath
.
row
]
if
scheduleArr
.
count
<=
1
{
if
scheduleArr
.
count
<=
1
{
let
cell
=
tableView
.
dequeueReusableCell
(
withIdentifier
:
YHResignScheduleSingleInfoCell
.
cellReuseIdentifier
,
for
:
indexPath
)
as!
YHResignScheduleSingleInfoCell
guard
let
cell
=
tableView
.
dequeueReusableCell
(
withIdentifier
:
YHResignScheduleSingleInfoCell
.
cellReuseIdentifier
,
for
:
indexPath
)
as?
YHResignScheduleSingleInfoCell
else
{
return
UITableViewCell
()
}
cell
.
updateModel
(
model
)
cell
.
updateModel
(
model
)
// 点击确认在港或未确认在港按钮
// 点击确认在港或未确认在港按钮
cell
.
clickConfirmBtnBlock
=
{
cell
.
clickConfirmBtnBlock
=
{
...
@@ -452,7 +454,9 @@ extension YHResignAppointScheduleListViewController: UITableViewDelegate, UITabl
...
@@ -452,7 +454,9 @@ extension YHResignAppointScheduleListViewController: UITableViewDelegate, UITabl
}
}
// 分组
// 分组
let
cell2
=
tableView
.
dequeueReusableCell
(
withIdentifier
:
YHResignScheduleMultipleInfoCell
.
cellReuseIdentifier
,
for
:
indexPath
)
as!
YHResignScheduleMultipleInfoCell
guard
let
cell2
=
tableView
.
dequeueReusableCell
(
withIdentifier
:
YHResignScheduleMultipleInfoCell
.
cellReuseIdentifier
,
for
:
indexPath
)
as?
YHResignScheduleMultipleInfoCell
else
{
return
UITableViewCell
()
}
model
.
batchIndex
=
indexPath
.
row
+
1
model
.
batchIndex
=
indexPath
.
row
+
1
cell2
.
updateModel
(
model
)
cell2
.
updateModel
(
model
)
cell2
.
clickConfirmBtnBlock
=
{
cell2
.
clickConfirmBtnBlock
=
{
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/Resign(续签)/ResignMaterialManage(续期资料管理)/VM/YHResignMaterialViewModel.swift
View file @
938011eb
...
@@ -209,12 +209,12 @@ class YHResignMaterialViewModel: YHBaseViewModel {
...
@@ -209,12 +209,12 @@ class YHResignMaterialViewModel: YHBaseViewModel {
func
updateMaterials
(
material
:
YHMaterialModel
,
addInfoArr
:
[
YHMaterialModelItemModel
],
callback
:
((
_
success
:
Bool
,
_
error
:
YHErrorModel
?)
->
Void
)?)
{
func
updateMaterials
(
material
:
YHMaterialModel
,
addInfoArr
:
[
YHMaterialModelItemModel
],
callback
:
((
_
success
:
Bool
,
_
error
:
YHErrorModel
?)
->
Void
)?)
{
let
strUrl
=
YHBaseUrlManager
.
shared
.
curURL
()
+
YHAllApiName
.
ResignMaterial
.
uploadMaterials
let
strUrl
=
YHBaseUrlManager
.
shared
.
curURL
()
+
YHAllApiName
.
ResignMaterial
.
uploadMaterials
guard
var
params
=
[
var
params
:
[
String
:
Any
]
=
[
"material_id"
:
"
\(
material
.
id
)
"
,
"material_id"
:
"
\(
material
.
id
)
"
,
"template_id"
:
"
\(
material
.
template_id
)
"
,
"template_id"
:
"
\(
material
.
template_id
)
"
,
"status"
:
material
.
status
,
"status"
:
material
.
status
,
"audit_remark"
:
material
.
audit_remark
"audit_remark"
:
material
.
audit_remark
]
as?
[
String
:
Any
]
else
{
return
}
]
var
info
:
[[
String
:
Any
]]
=
[]
var
info
:
[[
String
:
Any
]]
=
[]
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/Resign(续签)/ResignUploadDoc(续签补件)/C/YHResignUploadDocDetailViewController.swift
View file @
938011eb
...
@@ -588,7 +588,7 @@ extension YHResignUploadDocDetailViewController: UITableViewDelegate, UITableVie
...
@@ -588,7 +588,7 @@ extension YHResignUploadDocDetailViewController: UITableViewDelegate, UITableVie
var
cerName
:
ASAttributedString
=
.
init
(
string
:
self
.
materialModel
.
name
,
.
font
(
UIFont
.
PFSC_M
(
ofSize
:
17
)),
.
foreground
(
UIColor
.
mainTextColor
))
var
cerName
:
ASAttributedString
=
.
init
(
string
:
self
.
materialModel
.
name
,
.
font
(
UIFont
.
PFSC_M
(
ofSize
:
17
)),
.
foreground
(
UIColor
.
mainTextColor
))
let
template
:
ASAttributedString
=
"
\(
.
view
(
statusLabel
,
.
original
(
.
center
))
)
"
let
template
:
ASAttributedString
=
"
\(
.
view
(
statusLabel
,
.
original
(
.
center
))
)
"
cerName
=
cerName
+
template
cerName
+=
template
titlelabel
.
attributed
.
text
=
cerName
titlelabel
.
attributed
.
text
=
cerName
view
.
addSubview
(
noLabel
)
view
.
addSubview
(
noLabel
)
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/Resign(续签)/ResignUploadDoc(续签补件)/C/YHResignUploadDocListViewController.swift
View file @
938011eb
...
@@ -257,17 +257,17 @@ extension YHResignUploadDocListViewController: UITableViewDelegate, UITableViewD
...
@@ -257,17 +257,17 @@ extension YHResignUploadDocListViewController: UITableViewDelegate, UITableViewD
if
indexPath
.
section
==
0
{
if
indexPath
.
section
==
0
{
var
height
:
CGFloat
=
0
var
height
:
CGFloat
=
0
for
item
in
self
.
viewModel
.
mainModel
.
upload_list
{
for
item
in
self
.
viewModel
.
mainModel
.
upload_list
{
height
=
height
+
32
height
+=
32
let
value
=
getHeight
(
item
.
name
)
let
value
=
getHeight
(
item
.
name
)
height
=
height
+
value
height
+=
value
}
}
return
CGFloat
(
52
+
height
)
return
CGFloat
(
52
+
height
)
}
else
{
}
else
{
var
height
:
CGFloat
=
0
var
height
:
CGFloat
=
0
for
item
in
self
.
viewModel
.
mainModel
.
doc_list
{
for
item
in
self
.
viewModel
.
mainModel
.
doc_list
{
height
=
height
+
32
height
+=
32
let
value
=
getHeight
(
item
.
name
)
let
value
=
getHeight
(
item
.
name
)
height
=
height
+
value
height
+=
value
}
}
return
CGFloat
(
52
+
height
)
return
CGFloat
(
52
+
height
)
}
}
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/Resign(续签)/UploadTravelCrad(上传旅行证件)/C/YHResignUploadTravelPassportViewController.swift
View file @
938011eb
...
@@ -264,7 +264,7 @@ extension YHResignUploadTravelPassportViewController: UITableViewDelegate, UITab
...
@@ -264,7 +264,7 @@ extension YHResignUploadTravelPassportViewController: UITableViewDelegate, UITab
let
message
=
item
.
message
??
""
let
message
=
item
.
message
??
""
let
isNeed
=
item
.
isNeed
??
false
let
isNeed
=
item
.
isNeed
??
false
if
isShow
&&
message
.
count
==
0
&&
isNeed
{
if
isShow
&&
message
.
count
==
0
&&
isNeed
{
tatol
=
tatol
+
20
tatol
+=
20
}
}
}
}
return
CGFloat
(
333
+
tatol
)
return
CGFloat
(
333
+
tatol
)
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/Resign(续签)/UploadTravelCrad(上传旅行证件)/V/YHResignUploadTravelCardListfootView.swift
View file @
938011eb
...
@@ -188,7 +188,7 @@ extension YHResignUploadTravelCardListfootView: JXSegmentedListContainerViewData
...
@@ -188,7 +188,7 @@ extension YHResignUploadTravelCardListfootView: JXSegmentedListContainerViewData
}
}
func
listContainerView
(
_
listContainerView
:
JXSegmentedListContainerView
,
initListAt
index
:
Int
)
->
JXSegmentedListContainerViewListDelegate
{
func
listContainerView
(
_
listContainerView
:
JXSegmentedListContainerView
,
initListAt
index
:
Int
)
->
JXSegmentedListContainerViewListDelegate
{
if
let
vc
=
arrItemVCs
[
index
]
as?
JXSegmentedListContainerViewListDelegate
else
{
guard
let
vc
=
arrItemVCs
[
index
]
as?
JXSegmentedListContainerViewListDelegate
else
{
return
YHResignUploadTravelCardFootViewController
()
return
YHResignUploadTravelCardFootViewController
()
}
}
return
vc
return
vc
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/BaseInformation(基本资料)/M/YHBasicInfoCellModel.swift
View file @
938011eb
...
@@ -15,7 +15,7 @@ class YHBasicInfoCellModel {
...
@@ -15,7 +15,7 @@ class YHBasicInfoCellModel {
var
needCheckFlag
:
Bool
=
false
var
needCheckFlag
:
Bool
=
false
var
model
:
b
ackgroundModel
?
var
model
:
B
ackgroundModel
?
var
type
:
Int
=
0
// 0- 输入型 1-选择型
var
type
:
Int
=
0
// 0- 输入型 1-选择型
init
(
question
:
String
,
answer
:
String
,
info
:
String
,
type
:
Int
=
0
,
needCheckFlag
:
Bool
=
false
)
{
init
(
question
:
String
,
answer
:
String
,
info
:
String
,
type
:
Int
=
0
,
needCheckFlag
:
Bool
=
false
)
{
self
.
question
=
question
self
.
question
=
question
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/BaseInformation(基本资料)/M/YHBasicInfoFillModel.swift
View file @
938011eb
...
@@ -15,7 +15,7 @@ class YHBasicInfoFillModel: SmartCodable {
...
@@ -15,7 +15,7 @@ class YHBasicInfoFillModel: SmartCodable {
var
spouse
:
SpouseModel
?
var
spouse
:
SpouseModel
?
var
child
:
[
SpouseModel
]?
var
child
:
[
SpouseModel
]?
var
brother
:
[
SpouseModel
]?
var
brother
:
[
SpouseModel
]?
var
background
:
b
ackgroundModel
?
var
background
:
B
ackgroundModel
?
var
order_id
:
String
=
""
var
order_id
:
String
=
""
required
init
()
{
required
init
()
{
...
@@ -23,16 +23,16 @@ class YHBasicInfoFillModel: SmartCodable {
...
@@ -23,16 +23,16 @@ class YHBasicInfoFillModel: SmartCodable {
}
}
}
}
class
b
ackgroundModel
:
SmartCodable
{
class
B
ackgroundModel
:
SmartCodable
{
var
subset
:
[
s
ubsetModel
]
=
[]
var
subset
:
[
S
ubsetModel
]
=
[]
var
background_member
:
b
ackground_memberModel
?
var
background_member
:
B
ackground_memberModel
?
required
init
()
{
required
init
()
{
}
}
}
}
class
s
ubsetModel
:
SmartCodable
{
class
S
ubsetModel
:
SmartCodable
{
var
id
:
Int
=
0
var
id
:
Int
=
0
var
subset_name
:
String
=
""
var
subset_name
:
String
=
""
...
@@ -41,7 +41,7 @@ class subsetModel: SmartCodable {
...
@@ -41,7 +41,7 @@ class subsetModel: SmartCodable {
}
}
}
}
class
b
ackground_memberModel
:
SmartCodable
{
class
B
ackground_memberModel
:
SmartCodable
{
var
has
:
String
=
""
var
has
:
String
=
""
var
info
:
String
=
""
var
info
:
String
=
""
...
@@ -53,8 +53,8 @@ class background_memberModel: SmartCodable {
...
@@ -53,8 +53,8 @@ class background_memberModel: SmartCodable {
class
SpouseModel
:
SmartCodable
{
class
SpouseModel
:
SmartCodable
{
var
id
:
Int
=
0
var
id
:
Int
=
0
var
subset_name
:
String
=
""
var
subset_name
:
String
=
""
var
child_departure
:
b
ackground_memberModel
?
var
child_departure
:
B
ackground_memberModel
?
var
child_deny
:
b
ackground_memberModel
?
var
child_deny
:
B
ackground_memberModel
?
required
init
()
{
required
init
()
{
}
}
...
@@ -62,11 +62,11 @@ class SpouseModel: SmartCodable {
...
@@ -62,11 +62,11 @@ class SpouseModel: SmartCodable {
class
ApplicantModel
:
SmartCodable
{
class
ApplicantModel
:
SmartCodable
{
var
id
:
Int
=
0
var
id
:
Int
=
0
var
has_conviction
:
b
ackground_memberModel
?
var
has_conviction
:
B
ackground_memberModel
?
var
has_departure
:
b
ackground_memberModel
?
var
has_departure
:
B
ackground_memberModel
?
var
has_deny
:
b
ackground_memberModel
?
var
has_deny
:
B
ackground_memberModel
?
var
has_breaking_law
:
b
ackground_memberModel
?
var
has_breaking_law
:
B
ackground_memberModel
?
var
has_other_id
:
b
ackground_memberModel
?
var
has_other_id
:
B
ackground_memberModel
?
required
init
()
{
required
init
()
{
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/BaseInformation(基本资料)/V/YHChoiceButtonHoldView.swift
View file @
938011eb
...
@@ -22,7 +22,7 @@ class YHChoiceButtonHoldView: UIView {
...
@@ -22,7 +22,7 @@ class YHChoiceButtonHoldView: UIView {
private
var
arrCheckBtns
:
[
UIButton
]
=
[]
private
var
arrCheckBtns
:
[
UIButton
]
=
[]
var
targetId
:
Int
=
-
1
var
targetId
:
Int
=
-
1
var
dataModel
:
[
s
ubsetModel
]
=
[]
{
var
dataModel
:
[
S
ubsetModel
]
=
[]
{
didSet
{
didSet
{
updateView
()
updateView
()
}
}
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/Education&Qualification(学历专业资格填写)/C/YHEducationDetailVC.swift
View file @
938011eb
...
@@ -189,9 +189,12 @@ extension YHEducationDetailVC: UITableViewDelegate, UITableViewDataSource {
...
@@ -189,9 +189,12 @@ extension YHEducationDetailVC: UITableViewDelegate, UITableViewDataSource {
if
item
is
YHFormTitleItem
{
// 是标题
if
item
is
YHFormTitleItem
{
// 是标题
let
formItem
=
item
as!
YHFormTitleItem
guard
let
cell
=
tableView
.
dequeueReusableCell
(
withIdentifier
:
YHFormItemTitleCell
.
cellReuseIdentifier
,
for
:
indexPath
)
as?
YHFormItemTitleCell
else
{
let
cell
=
tableView
.
dequeueReusableCell
(
withIdentifier
:
YHFormItemTitleCell
.
cellReuseIdentifier
,
for
:
indexPath
)
as!
YHFormItemTitleCell
return
UITableViewCell
()
cell
.
setTitleAndSubTitle
(
title
:
formItem
.
getTitle
())
}
if
let
formItem
=
item
as?
YHFormTitleItem
{
cell
.
setTitleAndSubTitle
(
title
:
formItem
.
getTitle
())
}
return
cell
return
cell
}
}
...
@@ -200,7 +203,9 @@ extension YHEducationDetailVC: UITableViewDelegate, UITableViewDataSource {
...
@@ -200,7 +203,9 @@ extension YHEducationDetailVC: UITableViewDelegate, UITableViewDataSource {
let
detailItem
=
item
as!
YHFormDetailItem
let
detailItem
=
item
as!
YHFormDetailItem
let
cellType
=
getCellType
(
detailItem
)
let
cellType
=
getCellType
(
detailItem
)
if
cellType
==
.
inputText
{
if
cellType
==
.
inputText
{
let
cell
=
tableView
.
dequeueReusableCell
(
withIdentifier
:
YHFormItemInputTextCell
.
cellReuseIdentifier
,
for
:
indexPath
)
as!
YHFormItemInputTextCell
guard
let
cell
=
tableView
.
dequeueReusableCell
(
withIdentifier
:
YHFormItemInputTextCell
.
cellReuseIdentifier
,
for
:
indexPath
)
as?
YHFormItemInputTextCell
else
{
return
UITableViewCell
()
}
var
isValueValid
=
false
var
isValueValid
=
false
if
let
value
=
detailItem
.
value
,
!
value
.
isEmpty
{
if
let
value
=
detailItem
.
value
,
!
value
.
isEmpty
{
isValueValid
=
true
isValueValid
=
true
...
@@ -261,7 +266,9 @@ extension YHEducationDetailVC: UITableViewDelegate, UITableViewDataSource {
...
@@ -261,7 +266,9 @@ extension YHEducationDetailVC: UITableViewDelegate, UITableViewDataSource {
return
cell
return
cell
}
else
if
cellType
==
.
selectSheet
{
}
else
if
cellType
==
.
selectSheet
{
let
cell
=
tableView
.
dequeueReusableCell
(
withIdentifier
:
YHFormItemSelectSheetCell
.
cellReuseIdentifier
,
for
:
indexPath
)
as!
YHFormItemSelectSheetCell
guard
let
cell
=
tableView
.
dequeueReusableCell
(
withIdentifier
:
YHFormItemSelectSheetCell
.
cellReuseIdentifier
,
for
:
indexPath
)
as?
YHFormItemSelectSheetCell
else
{
return
UITableViewCell
()
}
cell
.
isShowTipsButton
=
(
detailItem
.
type
==
.
degreeType
)
cell
.
isShowTipsButton
=
(
detailItem
.
type
==
.
degreeType
)
cell
.
tipsBtnClickBlock
=
{
cell
.
tipsBtnClickBlock
=
{
YHWholeScreenTipsView
.
show
(
type
:
.
degreeType
,
targetView
:
cell
.
tipsButton
)
YHWholeScreenTipsView
.
show
(
type
:
.
degreeType
,
targetView
:
cell
.
tipsButton
)
...
@@ -279,7 +286,7 @@ extension YHEducationDetailVC: UITableViewDelegate, UITableViewDataSource {
...
@@ -279,7 +286,7 @@ extension YHEducationDetailVC: UITableViewDelegate, UITableViewDataSource {
}
else
if
cellType
==
.
cerConfirm
{
}
else
if
cellType
==
.
cerConfirm
{
let
cell
=
tableView
.
dequeueReusableCell
(
withIdentifier
:
YHEducationCertificateConfirmCell
.
cellReuseIdentifier
,
for
:
indexPath
)
as!
YHEducationCertificateConfirmCell
guard
let
cell
=
tableView
.
dequeueReusableCell
(
withIdentifier
:
YHEducationCertificateConfirmCell
.
cellReuseIdentifier
,
for
:
indexPath
)
as?
YHEducationCertificateConfirmCell
else
{
return
UITableViewCell
()
}
cell
.
isCheck
=
isNeedShowError
cell
.
isCheck
=
isNeedShowError
var
isSelectTrue
=
false
var
isSelectTrue
=
false
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/Education&Qualification(学历专业资格填写)/C/YHMajorSearchViewController.swift
View file @
938011eb
...
@@ -129,7 +129,9 @@ extension YHMajorSearchViewController: UITableViewDelegate, UITableViewDataSourc
...
@@ -129,7 +129,9 @@ extension YHMajorSearchViewController: UITableViewDelegate, UITableViewDataSourc
}
}
func
tableView
(
_
tableView
:
UITableView
,
cellForRowAt
indexPath
:
IndexPath
)
->
UITableViewCell
{
func
tableView
(
_
tableView
:
UITableView
,
cellForRowAt
indexPath
:
IndexPath
)
->
UITableViewCell
{
let
cell
=
tableView
.
dequeueReusableCell
(
withIdentifier
:
YHMajorNameCell
.
cellReuseIdentifier
,
for
:
indexPath
)
as!
YHMajorNameCell
guard
let
cell
=
tableView
.
dequeueReusableCell
(
withIdentifier
:
YHMajorNameCell
.
cellReuseIdentifier
,
for
:
indexPath
)
as?
YHMajorNameCell
else
{
return
UITableViewCell
()
}
if
indexPath
.
row
<
majors
.
count
{
if
indexPath
.
row
<
majors
.
count
{
let
college
:
YHMajorInfo
=
majors
[
indexPath
.
row
]
let
college
:
YHMajorInfo
=
majors
[
indexPath
.
row
]
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员)/C/YHGCFamilyMemberInfoListVC.swift
View file @
938011eb
...
@@ -587,7 +587,7 @@ extension YHGCFamilyMemberInfoListVC: UITableViewDelegate, UITableViewDataSource
...
@@ -587,7 +587,7 @@ extension YHGCFamilyMemberInfoListVC: UITableViewDelegate, UITableViewDataSource
}
}
if
item
is
YHFamilyMember
{
if
item
is
YHFamilyMember
{
guard
let
detailItem
=
item
as
!
YHFamilyMember
else
{
return
}
guard
let
detailItem
=
item
as
?
YHFamilyMember
else
{
return
}
// 配偶
// 配偶
if
detailItem
.
relationType
==
.
spouse
{
if
detailItem
.
relationType
==
.
spouse
{
...
...
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