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
10e77180
Commit
10e77180
authored
Aug 22, 2024
by
pete谢兆麟
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
服务中心卡片逻辑添加
parent
657d872e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
184 additions
and
67 deletions
+184
-67
YHServiceOrderListViewController.swift
...entService(服务中心)/C/YHServiceOrderListViewController.swift
+88
-66
YHServiceOrderProgressTableViewCell.swift
...Service(服务中心)/V/YHServiceOrderProgressTableViewCell.swift
+96
-1
No files found.
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServiceOrderListViewController.swift
View file @
10e77180
...
...
@@ -40,7 +40,13 @@ extension YHServiceOrderListView {
if
YHLoginManager
.
shared
.
isLogin
()
{
viewModel
.
getStageInformation
(
params
:
[
"orderId"
:
orderID
])
{[
weak
self
]
success
,
error
in
guard
let
self
=
self
else
{
return
}
viewModel
.
getNewServiceCenterProgressList
(
orderID
,
type
,
orderType
:
self
.
viewModel
.
personInfoModel
.
type
)
{[
weak
self
]
success
,
error
in
var
state
=
1
if
self
.
viewModel
.
personInfoModel
.
type
==
1
{
state
=
1
}
else
{
state
=
2
}
viewModel
.
getNewServiceCenterProgressList
(
orderID
,
type
,
orderType
:
state
)
{[
weak
self
]
success
,
error
in
guard
let
self
=
self
else
{
return
}
if
(
self
.
homeTableView
!=
nil
)
{
if
self
.
viewModel
.
arrDataForSeviceCenterProgress
.
count
==
0
{
...
...
@@ -158,6 +164,10 @@ extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource {
func
tableView
(
_
tableView
:
UITableView
,
heightForRowAt
indexPath
:
IndexPath
)
->
CGFloat
{
let
model
=
self
.
viewModel
.
arrDataForSeviceCenterProgress
[
indexPath
.
section
]
if
model
.
type
==
27
{
return
146
}
return
128
}
...
...
@@ -173,71 +183,83 @@ extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource {
func
tableView
(
_
tableView
:
UITableView
,
didSelectRowAt
indexPath
:
IndexPath
)
{
let
model
=
self
.
viewModel
.
arrDataForSeviceCenterProgress
[
indexPath
.
section
]
let
vc
=
YHAddAdoptersViewController
()
vc
.
orderId
=
orderID
navigationController
?
.
pushViewController
(
vc
)
// if model.status == 1 || model.status == 4 {
// return
// } else {
// //1 证件 2 信息完善 3 我的评分 4 我的方案 5 我的签字 6我的文书
// if model.type == 1 {
// let vc = YHMineCertificateEntryViewController()
// vc.orderId = orderID
// navigationController?.pushViewController(vc)
//
// } else if model.type == 2 {
// let vc = YHInformationPerfectListVC()
// vc.orderId = orderID
// navigationController?.pushViewController(vc)
//
// } else if model.type == 3 { // 评分
//
// handleRedPointFor(key: kMyScoreRedPointInfoKey, model: model)
// let vc = YHScoreDetailViewController()
// vc.orderId = orderID
//// vc.model = serviceCenterMainReqVM.allInfoScoreModel
// navigationController?.pushViewController(vc)
//
// } else if model.type == 4 { // 方案
// handleRedPointFor(key: kMyPlanRedPointInfoKey, model: model)
// let vc = YHMineSchemeViewController()
// navigationController?.pushViewController(vc)
//
// } else if model.type == 5 {
// let vc = YHMySignatureListViewController()
// vc.orderId = orderID
// navigationController?.pushViewController(vc)
//
// } else if model.type == 6 {
// let vc = YHMyDocumentsListViewController()
// vc.orderId = orderID
// vc.mobile = mobile
// navigationController?.pushViewController(vc)
//
// } else if model.type == 11 || model.type == 12 || model.type == 14 {
//
// // 11 原则批等待结果
// // 12 原则批待补件
// // 14 原则批未获批准
//
// let vc = YHPrincipleWaitResultViewController()
// vc.status = model.type
// vc.orderId = orderID
// navigationController?.pushViewController(vc)
//
// } else if model.type == 13 { //原则批已获批~
// let vc = YHPrincipleApprovedResultVC()
// vc.orderId = orderID
// navigationController?.pushViewController(vc)
//
// } else if model.type == 15 {
// //正式批已获批~
// let vc = YHOfficialApprovalResultVC()
// self.navigationController?.pushViewController(vc)
// }
// }
if
model
.
status
==
1
||
model
.
status
==
4
{
return
}
else
{
//1 证件 2 信息完善 3 我的评分 4 我的方案 5 我的签字 6我的文书
if
model
.
type
==
1
{
let
vc
=
YHMineCertificateEntryViewController
()
vc
.
orderId
=
orderID
navigationController
?
.
pushViewController
(
vc
)
}
else
if
model
.
type
==
2
{
let
vc
=
YHInformationPerfectListVC
()
vc
.
orderId
=
orderID
navigationController
?
.
pushViewController
(
vc
)
}
else
if
model
.
type
==
3
{
// 评分
handleRedPointFor
(
key
:
kMyScoreRedPointInfoKey
,
model
:
model
)
let
vc
=
YHScoreDetailViewController
()
vc
.
orderId
=
orderID
// vc.model = serviceCenterMainReqVM.allInfoScoreModel
navigationController
?
.
pushViewController
(
vc
)
}
else
if
model
.
type
==
4
{
// 方案
handleRedPointFor
(
key
:
kMyPlanRedPointInfoKey
,
model
:
model
)
let
vc
=
YHMineSchemeViewController
()
navigationController
?
.
pushViewController
(
vc
)
}
else
if
model
.
type
==
5
{
let
vc
=
YHMySignatureListViewController
()
vc
.
orderId
=
orderID
navigationController
?
.
pushViewController
(
vc
)
}
else
if
model
.
type
==
6
{
let
vc
=
YHMyDocumentsListViewController
()
vc
.
orderId
=
orderID
vc
.
mobile
=
mobile
navigationController
?
.
pushViewController
(
vc
)
}
else
if
model
.
type
==
11
||
model
.
type
==
12
||
model
.
type
==
14
{
// 11 原则批等待结果
// 12 原则批待补件
// 14 原则批未获批准
let
vc
=
YHPrincipleWaitResultViewController
()
vc
.
status
=
model
.
type
vc
.
orderId
=
orderID
navigationController
?
.
pushViewController
(
vc
)
}
else
if
model
.
type
==
13
{
//原则批已获批~
let
vc
=
YHPrincipleApprovedResultVC
()
vc
.
orderId
=
orderID
navigationController
?
.
pushViewController
(
vc
)
}
else
if
model
.
type
==
15
{
//正式批已获批~
let
vc
=
YHOfficialApprovalResultVC
()
self
.
navigationController
?
.
pushViewController
(
vc
)
}
else
if
model
.
type
==
21
{
//家庭信息确认
}
else
if
model
.
type
==
22
{
//新增受养人
let
vc
=
YHAddAdoptersViewController
()
vc
.
orderId
=
orderID
navigationController
?
.
pushViewController
(
vc
)
}
else
if
model
.
type
==
23
{
//赴港时间预约
}
else
if
model
.
type
==
24
{
//电子签字缴费
}
else
if
model
.
type
==
25
{
//赴港行程指引
}
else
if
model
.
type
==
26
{
//旅行证件准备
}
else
if
model
.
type
==
27
{
//上传过关证件
}
}
}
func
handleRedPointFor
(
key
:
String
,
model
:
YHServiceCenterProgressModel
)
{
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHServiceOrderProgressTableViewCell.swift
View file @
10e77180
...
...
@@ -68,6 +68,14 @@ extension YHServiceOrderProgressTableViewCell {
func
updateUI
()
{
guard
let
model
=
dataModel
else
{
return
}
progress
.
isHidden
=
false
progressImageView
.
isHidden
=
false
progressLabel
.
isHidden
=
false
messageLabel
.
snp
.
remakeConstraints
{
make
in
make
.
top
.
equalTo
(
49
)
make
.
left
.
equalTo
(
21
)
make
.
right
.
equalTo
(
-
122
)
}
messageLabel
.
text
=
"您还有"
+
"
\(
model
.
num
)
"
+
"份信息待填写哦~"
// 0未知 1待开始 2进行中 3 已完成
if
model
.
status
==
1
{
...
...
@@ -239,6 +247,62 @@ extension YHServiceOrderProgressTableViewCell {
progressLabel
.
attributed
.
text
=
b
+
bb
}
if
model
.
type
==
21
{
titleLabel
.
text
=
"家庭信息确认"
messageLabel
.
text
=
"请确认现阶段信息是否存在变更~"
buttonLabel
.
text
=
"待确认"
messageLabel
.
textColor
=
UIColor
.
yhGreyColor50
}
if
model
.
type
==
22
{
titleLabel
.
text
=
"新增受养人"
messageLabel
.
text
=
"如需,建议现阶段新增,激活后新增需香港住址证明"
buttonLabel
.
text
=
"待完善"
progress
.
isHidden
=
true
progressImageView
.
isHidden
=
true
progressLabel
.
isHidden
=
true
messageLabel
.
textColor
=
UIColor
.
yhGreyColor50
messageLabel
.
snp
.
remakeConstraints
{
make
in
make
.
top
.
equalTo
(
49
)
make
.
left
.
equalTo
(
21
)
make
.
right
.
equalTo
(
-
21
)
}
}
if
model
.
type
==
23
{
titleLabel
.
text
=
"赴港办证预约"
messageLabel
.
text
=
"抢号中~"
buttonLabel
.
text
=
"去查看"
messageLabel
.
textColor
=
UIColor
.
yhGreyColor50
}
if
model
.
type
==
24
{
titleLabel
.
text
=
"电子签证缴费"
messageLabel
.
text
=
"请根据指引缴费领取电子签证~"
buttonLabel
.
text
=
"待缴费"
messageLabel
.
textColor
=
UIColor
.
yhGreyColor50
}
if
model
.
type
==
25
{
titleLabel
.
text
=
"赴港行程指引"
messageLabel
.
text
=
"请根据指引清单提前规划赴港行程"
buttonLabel
.
text
=
"去查看"
messageLabel
.
textColor
=
UIColor
.
yhGreyColor50
}
if
model
.
type
==
26
{
titleLabel
.
text
=
"旅行证件准备"
messageLabel
.
text
=
"请更新所有赴港人员的旅行证件"
buttonLabel
.
text
=
"去上传"
messageLabel
.
textColor
=
UIColor
.
yhGreyColor50
}
if
model
.
type
==
27
{
titleLabel
.
text
=
"上传过关证件"
messageLabel
.
text
=
"点击保存入境小白条及香港身份证(后续身份续期、永居均涉及)"
buttonLabel
.
text
=
"去上传"
messageLabel
.
textColor
=
UIColor
.
yhGreyColor50
}
}
if
model
.
status
==
3
{
titleLabel
.
textColor
=
UIColor
.
mainTextColor
...
...
@@ -272,6 +336,36 @@ extension YHServiceOrderProgressTableViewCell {
titleLabel
.
text
=
"我的文书"
messageLabel
.
text
=
"恭喜您,文书已全部定稿~"
}
if
model
.
type
==
21
{
titleLabel
.
text
=
"家庭信息确认"
messageLabel
.
text
=
"请确认现阶段信息是否存在变更~"
buttonLabel
.
text
=
"已完成"
}
if
model
.
type
==
23
{
titleLabel
.
text
=
"赴港办证预约"
messageLabel
.
text
=
"请填写意向办证时间,银河代预约~"
buttonLabel
.
text
=
"已完成"
}
if
model
.
type
==
24
{
titleLabel
.
text
=
"电子签证缴费"
messageLabel
.
text
=
"请根据指引缴费领取电子签证~"
buttonLabel
.
text
=
"已完成"
}
if
model
.
type
==
26
{
titleLabel
.
text
=
"旅行证件准备"
messageLabel
.
text
=
"请更新所有赴港人员的旅行证件"
buttonLabel
.
text
=
"已完成"
}
if
model
.
type
==
27
{
titleLabel
.
text
=
"上传过关证件"
messageLabel
.
text
=
"点击保存入境小白条及香港身份证(后续身份续期、永居均涉及)"
buttonLabel
.
text
=
"已完成"
}
let
b
:
ASAttributedString
=
.
init
(
NSAttributedString
(
string
:
"
\(
model
.
percentage
)
"
),
.
font
(
UIFont
(
name
:
"DINAlternate-Bold"
,
size
:
24
)
!
),
.
foreground
(
UIColor
.
mainTextColor
))
let
bb
:
ASAttributedString
=
.
init
(
"%"
,
.
font
(
UIFont
.
PFSC_M
(
ofSize
:
10
)),
.
foreground
(
UIColor
.
mainTextColor
.
withAlphaComponent
(
0.3
)))
progressLabel
.
attributed
.
text
=
b
+
bb
...
...
@@ -397,13 +491,14 @@ extension YHServiceOrderProgressTableViewCell {
let
label
=
UILabel
()
label
.
font
=
UIFont
.
PFSC_M
(
ofSize
:
13
)
label
.
textColor
=
UIColor
.
mainTextColor
label
.
numberOfLines
=
0
return
label
}()
holdView
.
addSubview
(
messageLabel
)
messageLabel
.
snp
.
makeConstraints
{
make
in
make
.
top
.
equalTo
(
49
)
make
.
left
.
equalTo
(
21
)
make
.
height
.
equalTo
(
18
)
make
.
right
.
equalTo
(
-
122
)
}
buttonLabel
=
{
...
...
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