Skip to content

G
galaxy-iOS
Commit 9fe07aab authored by pete谢兆麟's avatar pete谢兆麟
Browse files
Options

优高专留UI修改

parent 161fe2d8
Hide whitespace changes
Inline Side-by-side
Showing with 67 additions and 15 deletions
galaxy/fastlane/Fastfile
View file @ 9fe07aab
......@@ -34,7 +34,7 @@ platform :ios do
main_fix = "main-fix"
jiaofei = "jiaofei"
plan = "4.25-1"
push = "push"
push = "HIGH"
#打包正使用的分支
myPack_branch = push
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/OrderList(服务订单)/C/YHServiceOrderListViewController.swift
View file @ 9fe07aab
......@@ -120,6 +120,7 @@ class YHServiceOrderListViewController: YHBaseViewController {
let vc = YHPrincipleWaitResultViewController()
vc.status = type
vc.orderId = orderId
vc.orderType = 1
UIViewController.current?.navigationController?.pushViewController(vc)
} else if type == 13 {
......@@ -131,6 +132,7 @@ class YHServiceOrderListViewController: YHBaseViewController {
} else if type == 15 {
// 正式批已获批~
let vc = YHOfficialApprovalResultVC()
vc.orderType = 1
UIViewController.current?.navigationController?.pushViewController(vc)
} else if type == 21 {
// 新增受养人
......@@ -213,8 +215,9 @@ class YHServiceOrderListViewController: YHBaseViewController {
// 14 原则批未获批准
let vc = YHPrincipleWaitResultViewController()
vc.status = type
vc.status = type % 100
vc.orderId = orderId
vc.orderType = 2
UIViewController.current?.navigationController?.pushViewController(vc)
} else if type == 213 {
......@@ -226,6 +229,7 @@ class YHServiceOrderListViewController: YHBaseViewController {
} else if type == 215 {
// 正式批已获批~
let vc = YHOfficialApprovalResultVC()
vc.orderType = 2
UIViewController.current?.navigationController?.pushViewController(vc)
} else if type == 221 {
// 新增受养人
......@@ -308,8 +312,9 @@ class YHServiceOrderListViewController: YHBaseViewController {
// 14 原则批未获批准
let vc = YHPrincipleWaitResultViewController()
vc.status = type
vc.status = type % 100
vc.orderId = orderId
vc.orderType = 3
UIViewController.current?.navigationController?.pushViewController(vc)
} else if type == 313 {
......@@ -321,6 +326,7 @@ class YHServiceOrderListViewController: YHBaseViewController {
} else if type == 315 {
// 正式批已获批~
let vc = YHOfficialApprovalResultVC()
vc.orderType = 3
UIViewController.current?.navigationController?.pushViewController(vc)
} else if type == 321 {
// 新增受养人
......@@ -403,8 +409,9 @@ class YHServiceOrderListViewController: YHBaseViewController {
// 14 原则批未获批准
let vc = YHPrincipleWaitResultViewController()
vc.status = type
vc.status = type % 100
vc.orderId = orderId
vc.orderType = 4
UIViewController.current?.navigationController?.pushViewController(vc)
} else if type == 413 {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/CustomerService(客服段)/Certificate(办证段)/TravelDocumentsPreparation(6 旅行证件准备)/C/YHTravelDocsPreparationDetailVC.swift
View file @ 9fe07aab
......@@ -344,10 +344,14 @@ private extension YHTravelDocsPreparationDetailVC {
var cerArr: [[String: Any]] = []
for item in sectionItems {
if item.type == .certificate {
var imageback = item.cerDetailModel.img_back
if self.type == .chinesePassPort || self.type == .forignPassPort {
imageback = ""
}
let dic: [String: Any] = [
"type": item.cerDetailModel.type,
"img_front": item.cerDetailModel.img_front,
"img_back": item.cerDetailModel.img_back,
"img_back": imageback,
"issue_start": item.cerDetailModel.issue_start,
"issue_end": item.cerDetailModel.issue_end
]
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/CustomerService(客服段)/OfficialApproval(正式批)/C/YHOfficialApprovalResultVC.swift
View file @ 9fe07aab
......@@ -46,6 +46,7 @@ class YHOfficialApprovalResultVC: YHBaseViewController {
// 文档内容
lazy var contentView: YHOffivialApprovalSuccessView = {
let view = YHOffivialApprovalSuccessView()
view.orderTypeString = orderTypeString
// view.isHidden = true
return view
}()
......@@ -138,6 +139,18 @@ class YHOfficialApprovalResultVC: YHBaseViewController {
// 是否来着首页的弹窗
var isFromHomeAlertViewFlag: Bool = false
var orderTypeString = ""
var orderType: Int = 1 {
didSet {
if orderType == 1 {
orderTypeString = "优秀人才入境计划"
} else if orderType == 2 {
orderTypeString = "高才通人才计划"
} else if orderType == 3 {
orderTypeString = "输入内地人才入境计划"
}
}
}
lazy var previewFileTool: YHFilePreviewTool = {
let tool = YHFilePreviewTool(targetVC: UIViewController.current)
......@@ -205,6 +218,7 @@ private extension YHOfficialApprovalResultVC {
let view = YHOffivialApprovalSuccessCheckView.sheetView()
view.days = self.princleVM.lettersModel?.days ?? 0
view.orderType = self.orderType
view.show()
view.block = { tag in
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/CustomerService(客服段)/OfficialApproval(正式批)/V/YHOffivialApprovalSuccessCheckView.swift
View file @ 9fe07aab
......@@ -97,6 +97,18 @@ class YHOffivialApprovalSuccessCheckView: UIView {
lastText = "从递交资料伊始，经历了" + String(days) + "天，感谢您这一路以来对银河的信赖与包容！"
}
}
var orderType: Int = 1 {
didSet {
if orderType == 1 {
fullText = "恭喜您申请的【优秀人才入境计划】"
} else if orderType == 2 {
fullText = "恭喜您申请的【高才通人才计划】"
} else if orderType == 3 {
fullText = "恭喜您申请的【输入内地人才入境计划】"
}
}
}
}
extension YHOffivialApprovalSuccessCheckView {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/CustomerService(客服段)/OfficialApproval(正式批)/V/YHOffivialApprovalSuccessView.swift
View file @ 9fe07aab
......@@ -19,7 +19,7 @@ class YHOffivialApprovalSuccessView: UIView {
private var titleLabel: UILabel!
private var arrViews: [UIView] = []
var orderTypeString: String = "优秀人才入境计划"
required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
......@@ -100,13 +100,13 @@ private extension YHOffivialApprovalSuccessView {
let arr = tmp.split(separator: "-")
if arr.count == 3 {
tmp = arr[0] + "年" + arr[1] + "月" + arr[2] + "日" + "正式获批"
let fourItems = ["祝贺您和您的家人申请的", "【优秀人才入境计划】", tmp, "这意味着，您领取香港居民身份证", "仅有一步之遥！！"]
let fourItems = ["祝贺您和您的家人申请的", "【\(orderTypeString)】", tmp, "这意味着，您领取香港居民身份证", "仅有一步之遥！！"]
updataView(data: fourItems)
}
} else {
titleLabel.text = "恭喜 客户！"
let tmp = "正式获批"
let fourItems = ["祝贺您和您的家人申请的", "【优秀人才入境计划】", tmp, "这意味着，您领取香港居民身份证", "仅有一步之遥！！"]
let fourItems = ["祝贺您和您的家人申请的", "【\(orderTypeString)】", tmp, "这意味着，您领取香港居民身份证", "仅有一步之遥！！"]
updataView(data: fourItems)
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/CustomerService(客服段)/PrincipleBatch(原则批)/C/YHPrincipleWaitResultViewController.swift
View file @ 9fe07aab
......@@ -27,7 +27,22 @@ class YHPrincipleWaitResultViewController: YHBaseViewController {
var status: Int = -1
var items: [YHPrincipleWaitResultModel] = []
var isQuerying: Bool = false
var orderTypeString = ""
var orderTypeTime = ""
var orderType: Int = 1 {
didSet {
if orderType == 1 {
orderTypeString = "优秀人才入境计划"
orderTypeTime = "12个月"
} else if orderType == 2 {
orderTypeString = "高才通人才计划"
orderTypeTime = "2-3个月"
} else if orderType == 3 {
orderTypeString = "输入内地人才入境计划"
orderTypeTime = "3-6个月"
}
}
}
let viewModel = YHPrincleViewModel()
lazy var tableView: UITableView = {
let tableView = UITableView(frame: .zero, style: .grouped)
......@@ -287,7 +302,7 @@ extension YHPrincipleWaitResultViewController: UITableViewDelegate, UITableViewD
// 14 未获批准~
if status == YHCustomerServiceStatus.principleWaitResult.rawValue { // 等待原则批结果
let str1: ASAttributedString = .init("您的【优秀人才入境计划】赴港居留申请资料已经递交港府，且入境事务处已经认收受理！港府审核周期预计在12个月内，", .font(UIFont.PFSC_R(ofSize: 14)), .foreground(UIColor.mainTextColor(alpha: 0.7)))
let str1: ASAttributedString = .init("您的【\(orderTypeString)】赴港居留申请资料已经递交港府，且入境事务处已经认收受理！港府审核周期预计在\(orderTypeTime)内，", .font(UIFont.PFSC_R(ofSize: 14)), .foreground(UIColor.mainTextColor(alpha: 0.7)))
let str2: ASAttributedString = .init("我们将实时为您查询身份申请进度", .font(UIFont.PFSC_B(ofSize: 14)), .foreground(UIColor.brandMainColor))
var str3: ASAttributedString = .init("，请您耐心等待！", .font(UIFont.PFSC_R(ofSize: 14)), .foreground(UIColor.mainTextColor(alpha: 0.7)))
if self.viewModel.waitResultModel.resultImageList.count > 0 {
......@@ -302,7 +317,7 @@ extension YHPrincipleWaitResultViewController: UITableViewDelegate, UITableViewD
} else if status == YHCustomerServiceStatus.principleRejected.rawValue { // 未获批准~
let str1: ASAttributedString = .init("您【与家人】申请的【优秀人才入境计划】", .font(UIFont.PFSC_R(ofSize: 14)), .foreground(UIColor.mainTextColor(alpha: 0.7)))
let str1: ASAttributedString = .init("您【与家人】申请的【\(orderTypeString)】", .font(UIFont.PFSC_R(ofSize: 14)), .foreground(UIColor.mainTextColor(alpha: 0.7)))
let str2: ASAttributedString = .init("未获批准", .font(UIFont.PFSC_B(ofSize: 14)), .foreground(UIColor.brandMainColor))
let str3: ASAttributedString = .init("。具体详情以及后续处理方式，请您联系专属服务您的生活管家进行详细沟通", .font(UIFont.PFSC_R(ofSize: 14)), .foreground(UIColor.mainTextColor(alpha: 0.7)))
return str1 + str2 + str3
......
galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/客服段/办证段/3赴港办证预约/appoint_warm_tips.imageset/Contents.json
View file @ 9fe07aab
......@@ -5,12 +5,12 @@
"scale" : "1x"
},
{
"filename" : "Group 2033194705@2x.png",
"filename" : "Group 2033195498@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "Group 2033194705@3x.png",
"filename" : "Group 2033195498@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/客服段/正式批/official_approval_guideline.imageset/Contents.json
View file @ 9fe07aab
......@@ -5,12 +5,12 @@
"scale" : "1x"
},
{
"filename" : "2@2x.png",
"filename" : "图片替换@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "3@3x.png",
"filename" : "图片替换@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment