Skip to content

G
galaxy-iOS
Commit db8476bf authored by David黄金龙's avatar David黄金龙
Browse files
Options

Merge branch 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into develop 

* 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  白名单搜索返回按钮布局
  续签文书管理tips调整
  服务中心模块 证件续签 UI走查bug修复
parents 05ad7d55 7f44514e
Expand all Show whitespace changes
Inline Side-by-side
Showing with 115 additions and 36 deletions
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ db8476bf
......@@ -760,7 +760,6 @@
A5ACE94F2B4564F7002C94D2 /* YhOverlayView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5ACE9112B4564F7002C94D2 /* YhOverlayView.swift */; };
A5ACE9502B4564F7002C94D2 /* YhCacheTool.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5ACE9122B4564F7002C94D2 /* YhCacheTool.swift */; };
A5ACE9512B4564F7002C94D2 /* YhConstant.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5ACE9132B4564F7002C94D2 /* YhConstant.swift */; };
A5ACE9522B4564F7002C94D2 /* YHServiceCenterMainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5ACE9192B4564F7002C94D2 /* YHServiceCenterMainViewController.swift */; };
A5ACE9532B4564F7002C94D2 /* YHBaseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5ACE9202B4564F7002C94D2 /* YHBaseViewController.swift */; };
A5ACE9542B4564F7002C94D2 /* YHNavigationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5ACE9212B4564F7002C94D2 /* YHNavigationController.swift */; };
A5ACE9552B4564F7002C94D2 /* YHTabBarViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5ACE9222B4564F7002C94D2 /* YHTabBarViewController.swift */; };
......@@ -1621,7 +1620,6 @@
A5ACE9122B4564F7002C94D2 /* YhCacheTool.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YhCacheTool.swift; sourceTree = "<group>"; };
A5ACE9132B4564F7002C94D2 /* YhConstant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YhConstant.swift; sourceTree = "<group>"; };
A5ACE9152B4564F7002C94D2 /* galaxy-Bridge-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "galaxy-Bridge-Header.h"; sourceTree = "<group>"; };
A5ACE9192B4564F7002C94D2 /* YHServiceCenterMainViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHServiceCenterMainViewController.swift; sourceTree = "<group>"; };
A5ACE9202B4564F7002C94D2 /* YHBaseViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHBaseViewController.swift; sourceTree = "<group>"; };
A5ACE9212B4564F7002C94D2 /* YHNavigationController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHNavigationController.swift; sourceTree = "<group>"; };
A5ACE9222B4564F7002C94D2 /* YHTabBarViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHTabBarViewController.swift; sourceTree = "<group>"; };
......@@ -4242,7 +4240,6 @@
A5ACE9182B4564F7002C94D2 /* C */ = {
isa = PBXGroup;
children = (
A5ACE9192B4564F7002C94D2 /* YHServiceCenterMainViewController.swift */,
044EE2222C8FE1D000A2FE3A /* YHServiceCenterViewController.swift */,
044EE2242C90138000A2FE3A /* YHServerCenterHoldViewController.swift */,
04E41DE72BD240570077EAE3 /* YHOrderDetailViewController.swift */,
......@@ -4989,7 +4986,6 @@
049D62C22C6F258700E811A1 /* YHFamilyInfoConfirmViewController.swift in Sources */,
0430E64C2C732821000511E2 /* YHNoAdopterAlertView.swift in Sources */,
04CE1ADE2C2AD91F001CB80A /* YHActivityTravelCell.swift in Sources */,
A5ACE9522B4564F7002C94D2 /* YHServiceCenterMainViewController.swift in Sources */,
045EEF072B9F171A0022A143 /* YHBasicInfoFillViewModel.swift in Sources */,
045EEF212B9F171A0022A143 /* YHMainInformationTableViewCell.swift in Sources */,
A5ACE9462B4564F7002C94D2 /* YHHUDSquareBaseView.swift in Sources */,
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServerCenterHoldViewController.swift
View file @ db8476bf
......@@ -154,6 +154,7 @@ class YHServerCenterHoldViewController: UIViewController {
let indicator = JXSegmentedIndicatorLineView()
indicator.indicatorWidth = 16
indicator.indicatorColor = UIColor.brandMainColor
indicator.indicatorHeight = 2
indicator.indicatorCornerRadius = 0
indicator.verticalOffset = 4
segmentedView.indicators = [indicator]
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServiceCenterViewController.swift
View file @ db8476bf
......@@ -225,6 +225,12 @@ extension YHServiceCenterViewController {
if self.navigationController?.viewControllers.count != 2 && self.navigationController?.viewControllers.count != 1 {
titleLabel.setTitle("订单详情", for: .normal)
orderButton.isHidden = true
titleLabel.snp.remakeConstraints { make in
make.top.equalTo(53)
make.left.equalTo(47)
make.height.equalTo(29)
make.width.equalTo(102)
}
} else {
navBar.isHidden = true
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServiceOrderListViewController.swift
View file @ db8476bf
......@@ -243,6 +243,7 @@ extension YHServiceOrderListView {
func setupUI() {
gk_navBarAlpha = 0
gk_navigationBar.isHidden = true
view.backgroundColor = UIColor(hex: 0xf4f6fa)
homeTableView = {
let tableView = YHGestureTableView(frame: .zero, style: .grouped)
tableView.backgroundColor = .clear
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MySignature(我的签字)/V/YHCommonAlertView.swift
View file @ db8476bf
......@@ -103,7 +103,6 @@ class YHCommonAlertView: UIView {
agreeButton.snp.remakeConstraints { make in
make.top.equalTo(messageLabel.snp.bottom).offset(36)
make.height.equalTo(45)
make.right.equalToSuperview().offset(-kMargin)
make.left.equalToSuperview().offset(kMargin)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignCertificateManage(续期证件管理)/C/YHResignCertificateDetailViewController.swift
View file @ db8476bf
......@@ -477,7 +477,7 @@ private extension YHResignCertificateDetailViewController {
lineView.snp.makeConstraints { make in
make.left.equalToSuperview().offset(18)
make.right.equalToSuperview().offset(-18)
make.top.equalTo(titleTextView.snp.bottom).offset(12)
make.top.equalTo(titleTextView.snp.bottom).offset(4)
make.height.equalTo(1)
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignCertificateManage(续期证件管理)/V/YHResignCertificateHKTableViewCell.swift
View file @ db8476bf
......@@ -346,7 +346,7 @@ class YHResignCertificateHKTableViewCell: UITableViewCell {
}()
centerView.addSubview(backSurfaceImageButton)
backSurfaceImageButton.snp.makeConstraints { make in
make.right.equalTo(-8)
make.right.equalTo(-18)
make.top.equalTo(96)
make.height.equalTo(102)
make.width.equalTo(CGFloat(147).fix)
......@@ -410,6 +410,13 @@ class YHResignCertificateHKTableViewCell: UITableViewCell {
}
cardBeginView = {
let view = YHItemView()
let line = UIView()
line.backgroundColor = UIColor.separatorColor
view.addSubview(line)
line.snp.makeConstraints { make in
make.left.right.bottom.equalToSuperview()
make.height.equalTo(0.5)
}
return view
}()
cardBeginView.block = {[weak self] model in
......@@ -428,6 +435,13 @@ class YHResignCertificateHKTableViewCell: UITableViewCell {
cardEndView = {
let view = YHItemView()
let line = UIView()
line.backgroundColor = UIColor.separatorColor
view.addSubview(line)
line.snp.makeConstraints { make in
make.left.right.bottom.equalToSuperview()
make.height.equalTo(0.5)
}
return view
}()
cardEndView.block = {[weak self] model in
......@@ -468,6 +482,13 @@ class YHResignCertificateHKTableViewCell: UITableViewCell {
signBeginView = {
let view = YHItemView()
let line = UIView()
line.backgroundColor = UIColor.separatorColor
view.addSubview(line)
line.snp.makeConstraints { make in
make.left.right.bottom.equalToSuperview()
make.height.equalTo(0.5)
}
return view
}()
signBeginView.block = {[weak self] model in
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignCertificateManage(续期证件管理)/V/YHResignCertificateListTableViewCell.swift
View file @ db8476bf
......@@ -168,7 +168,7 @@ class YHResignCertificateView: UIView {
subTitleLabel = {
let label = UILabel()
label.font = UIFont.PFSC_B(ofSize: 12)
label.font = UIFont.PFSC_R(ofSize: 12)
label.textAlignment = .left
label.numberOfLines = 2
label.textColor = UIColor.mainTextColor50
......@@ -189,7 +189,7 @@ class YHResignCertificateView: UIView {
}()
addSubview(explainLabel)
explainLabel.snp.makeConstraints { make in
make.right.equalTo(-24)
make.right.equalTo(-20)
make.left.equalToSuperview()
make.height.equalTo(20)
make.centerY.equalToSuperview()
......@@ -255,7 +255,7 @@ class YHResignCertificateView: UIView {
} else {
nextStepImageView.isHidden = false
explainLabel.snp.remakeConstraints { make in
make.right.equalTo(-24)
make.right.equalTo(-20)
make.left.equalToSuperview()
make.height.equalTo(20)
make.centerY.equalToSuperview()
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignCertificateManage(续期证件管理)/V/YHResignCertificatePassportTableViewCell.swift
View file @ db8476bf
......@@ -275,6 +275,13 @@ class YHResignCertificatePassportTableViewCell: UITableViewCell {
cardBeginView = {
let view = YHItemView()
let line = UIView()
line.backgroundColor = UIColor.separatorColor
view.addSubview(line)
line.snp.makeConstraints { make in
make.left.right.bottom.equalToSuperview()
make.height.equalTo(0.5)
}
return view
}()
cardBeginView.block = {[weak self] model in
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignCertificateManage(续期证件管理)/VM/YHResignCertificateDetailViewModel.swift
View file @ db8476bf
......@@ -38,8 +38,8 @@ class YHResignCertificateDetailViewModel: YHBaseViewModel {
}
func getPassPortDataSource(_ isShowPrompt: Bool) -> [YHItemModel] {
let item1 = YHItemModel(id: .id1, isNeed: true, title: "签发日期", isUserKeyBoard: false, prompts: "请选择", message: getResultString(dataModel.cert_info.issue_start), type: .time, isShowPrompts: isShowPrompt, alertMessage:"请选择开始时间")
let item2 = YHItemModel(id: .id2, isNeed: true, title: "届满日期", isUserKeyBoard: false, prompts: "请选择", message: getResultString(dataModel.cert_info.issue_end), type: .time, isShowPrompts: isShowPrompt, alertMessage:"请选择到期时间")
let item1 = YHItemModel(id: .id5, isNeed: true, title: "签发日期", isUserKeyBoard: false, prompts: "请选择", message: getResultString(dataModel.cert_info.issue_start), type: .time, isShowPrompts: isShowPrompt, alertMessage:"请选择开始时间")
let item2 = YHItemModel(id: .id6, isNeed: true, title: "届满日期", isUserKeyBoard: false, prompts: "请选择", message: getResultString(dataModel.cert_info.issue_end), type: .time, isShowPrompts: isShowPrompt, alertMessage:"请选择到期时间")
return [item1, item2]
}
......@@ -54,6 +54,10 @@ class YHResignCertificateDetailViewModel: YHBaseViewModel {
dataModel.cert_info.validate_start = item.message ?? ""
case .id4:
dataModel.cert_info.validate_end = item.message ?? ""
case .id5:
dataModel.cert_info.issue_start = item.message ?? ""
case .id6:
dataModel.cert_info.issue_end = item.message ?? ""
default:
break
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignDocumentManagement(续签文书管理)/M/YHResignDocumentType.swift
View file @ db8476bf
......@@ -19,7 +19,7 @@ enum YHResignDocumentType: Int {
case .powerOfAttorney:
return "代理委托书"
case .settlementPlan:
return "定居计划书"
return "定居计划"
case .explanatoryStatement:
return "解释说明"
case .qmasDoc:
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignDocumentManagement(续签文书管理)/V/YHResignDocumentTipsCell.swift
View file @ db8476bf
......@@ -7,6 +7,7 @@
//
import UIKit
import AttributedString
class YHResignDocumentTipsCell: YHResignDocumentCell {
static let cellReuseIdentifier = "YHResignDocumentTipsCell"
......@@ -54,6 +55,12 @@ class YHResignDocumentTipsCell: YHResignDocumentCell {
infoDetailLabel.textColor = detailColor
infoDetailLabel.attributedText = detail
}
func setupCellASAttributedInfo(title: String?, detail: ASAttributedString?, detailColor: UIColor = .mainTextColor50) {
infoTitleLabel.text = title
infoDetailLabel.textColor = detailColor
infoDetailLabel.attributed.text = detail
}
}
extension YHResignDocumentTipsCell {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/MainApplicantInformation(主申请人信息)/V/YHItemView.swift
View file @ db8476bf
......@@ -462,14 +462,22 @@ class YHItemView: UIView {
case .time:
var title = ""
var isLastDay = false
if dataSource?.id == .id10 || dataSource?.id == .id14 || dataSource?.id == .id19 {
if dataSource?.id == .id5 || dataSource?.id == .id10 || dataSource?.id == .id14 || dataSource?.id == .id19 {
title = "请选择签发日期"
isLastDay = true
}
if dataSource?.id == .id11 || dataSource?.id == .id15 || dataSource?.id == .id20 {
if dataSource?.id == .id6 || dataSource?.id == .id11 || dataSource?.id == .id15 || dataSource?.id == .id20 {
title = "请选择届满日期"
isLastDay = false
}
if dataSource?.id == .id1 || dataSource?.id == .id3 {
title = "请选择开始时间"
isLastDay = false
}
if dataSource?.id == .id2 || dataSource?.id == .id4 {
title = "请选择到期时间"
isLastDay = false
}
if dataSource?.id == .id24 {
title = "请选择出生日期"
isLastDay = true
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHServiceCenterStepThreeTableHeadView.swift
View file @ db8476bf
......@@ -72,7 +72,7 @@ class YHServiceCenterStepThreeTableHeadView: UIView {
bgView = {
let view = UIView()
view.backgroundColor = UIColor.pageBkgColor
view.backgroundColor = UIColor.contentBkgColor
return view
}()
addSubview(bgView)
......@@ -87,7 +87,7 @@ class YHServiceCenterStepThreeTableHeadView: UIView {
let label = UILabel()
label.textColor = UIColor.mainTextColor70
label.text = ""
label.font = UIFont.PFSC_M(ofSize: 13)
label.font = UIFont.PFSC_R(ofSize: 13)
return label
}()
bgView.addSubview(explainLabel)
......@@ -170,11 +170,13 @@ class YHServiceSectionStepThreeCollectionViewCell: UICollectionViewCell {
func setSelectedStyle() {
descripeLable.textColor = UIColor.mainTextColor
descripeLable.layer.borderColor = UIColor.mainTextColor.cgColor
descripeLable.font = UIFont.PFSC_M(ofSize: 13)
}
func setDeSelectedStyle() {
descripeLable.textColor = UIColor.mainTextColor50
descripeLable.layer.borderColor = UIColor.mainTextColor18.cgColor
descripeLable.font = UIFont.PFSC_R(ofSize: 13)
}
var dataSource: Int = 0 {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHServiceMoreAlertView.swift
View file @ db8476bf
......@@ -62,7 +62,7 @@ class YHServiceMoreAlertView: UIView {
centerView = {
let view = UIView()
view.backgroundColor = .white
view.layer.cornerRadius = kCornerRadius8
view.layer.cornerRadius = kCornerRadius3
return view
}()
addSubview(centerView)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHServiceOrderProgressTableViewCell.swift
View file @ db8476bf
......@@ -80,7 +80,7 @@ extension YHServiceOrderProgressTableViewCell {
// 0未知 1待开始 2进行中 3 已完成
if model.status == 1 {
titleLabel.textColor = UIColor.mainTextColor50
messageLabel.textColor = UIColor.yhGreyColor50
messageLabel.textColor = UIColor.mainTextColor50
buttonLabel.text = "待开始"
buttonLabel.backgroundColor = UIColor(hex: 0xb8babe,transparency: 0.5)
progressImageView.image = UIImage(named: "service_progress_normal")
......@@ -228,7 +228,7 @@ extension YHServiceOrderProgressTableViewCell {
let aaa: ASAttributedString = .init("哦~", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.yhGreyColor))
messageLabel.attributed.text = a + aa + aaa
buttonLabel.text = "请稍候"
buttonLabel.backgroundColor = UIColor.yhGreyColor50
buttonLabel.backgroundColor = UIColor.mainTextColor50
} else {
let a: ASAttributedString = .init("您还有", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.yhGreyColor))
let aa: ASAttributedString = .init(NSAttributedString(string: "\(model.num)份"), .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.brandMainColor))
......@@ -246,7 +246,7 @@ extension YHServiceOrderProgressTableViewCell {
messageLabel.text = "正在等待原则批结果~"
buttonLabel.text = "去查看"
buttonLabel.backgroundColor = UIColor.brandMainColor
messageLabel.textColor = UIColor.yhGreyColor50
messageLabel.textColor = UIColor.mainTextColor50
progress.changeColor(UIColor.brandMainColor)
progressImageView.image = UIImage(named: "service_progress_normal")
let b: ASAttributedString = .init(NSAttributedString(string: "\(model.percentage)"), .font(UIFont(name: "DINAlternate-Bold", size: 24)!),.foreground(UIColor.mainTextColor.withAlphaComponent(0.3)))
......@@ -259,7 +259,7 @@ extension YHServiceOrderProgressTableViewCell {
messageLabel.text = "正在进行原则批补件~"
buttonLabel.text = "去查看"
buttonLabel.backgroundColor = UIColor.brandMainColor
messageLabel.textColor = UIColor.yhGreyColor50
messageLabel.textColor = UIColor.mainTextColor50
progress.changeColor(UIColor.brandMainColor)
progressImageView.image = UIImage(named: "service_progress_normal")
let b: ASAttributedString = .init(NSAttributedString(string: "\(model.percentage)"), .font(UIFont(name: "DINAlternate-Bold", size: 24)!),.foreground(UIColor.mainTextColor.withAlphaComponent(0.3)))
......@@ -272,7 +272,7 @@ extension YHServiceOrderProgressTableViewCell {
messageLabel.text = "恭喜您，原则批已获批~"
buttonLabel.text = "去查看"
buttonLabel.backgroundColor = UIColor.brandMainColor
messageLabel.textColor = UIColor.yhGreyColor50
messageLabel.textColor = UIColor.mainTextColor50
progress.changeColor(UIColor.brandMainColor)
progressImageView.image = UIImage(named: "service_progress_start")
let b: ASAttributedString = .init(NSAttributedString(string: "\(model.percentage)"), .font(UIFont(name: "DINAlternate-Bold", size: 24)!),.foreground(UIColor.mainTextColor))
......@@ -285,7 +285,7 @@ extension YHServiceOrderProgressTableViewCell {
messageLabel.text = "很遗憾，您未获批准~"
buttonLabel.text = "去查看"
buttonLabel.backgroundColor = UIColor(hex: 0x55cba0)
messageLabel.textColor = UIColor.yhGreyColor50
messageLabel.textColor = UIColor.mainTextColor50
progress.changeColor(UIColor(hex: 0x55cba0))
progressImageView.image = UIImage(named: "service_progress_end")
let b: ASAttributedString = .init(NSAttributedString(string: "\(model.percentage)"), .font(UIFont(name: "DINAlternate-Bold", size: 24)!),.foreground(UIColor.mainTextColor))
......@@ -298,7 +298,7 @@ extension YHServiceOrderProgressTableViewCell {
messageLabel.text = "恭喜您，正式批已获批~"
buttonLabel.text = "去查看"
buttonLabel.backgroundColor = UIColor(hex: 0x55cba0)
messageLabel.textColor = UIColor.yhGreyColor50
messageLabel.textColor = UIColor.mainTextColor50
progress.changeColor(UIColor(hex: 0x55cba0))
progressImageView.image = UIImage(named: "service_progress_end")
let b: ASAttributedString = .init(NSAttributedString(string: "\(model.percentage)"), .font(UIFont(name: "DINAlternate-Bold", size: 24)!),.foreground(UIColor.mainTextColor))
......@@ -310,7 +310,7 @@ extension YHServiceOrderProgressTableViewCell {
titleLabel.text = "家庭信息确认"
messageLabel.text = "请确认现阶段信息是否存在变更～"
buttonLabel.text = "待确认"
messageLabel.textColor = UIColor.yhGreyColor50
messageLabel.textColor = UIColor.mainTextColor50
}
if model.type == 21 {
......@@ -320,7 +320,7 @@ extension YHServiceOrderProgressTableViewCell {
progress.isHidden = true
progressImageView.isHidden = true
progressLabel.isHidden = true
messageLabel.textColor = UIColor.yhGreyColor50
messageLabel.textColor = UIColor.mainTextColor50
messageLabel.snp.remakeConstraints { make in
make.top.equalTo(49)
make.left.equalTo(21)
......@@ -336,21 +336,21 @@ extension YHServiceOrderProgressTableViewCell {
messageLabel.text = "请填写意向办证时间，银河代预约～"
}
buttonLabel.text = "去查看"
messageLabel.textColor = UIColor.yhGreyColor50
messageLabel.textColor = UIColor.mainTextColor50
}
if model.type == 23 {
titleLabel.text = "电子签证缴费"
messageLabel.text = "请根据指引缴费领取电子签证～"
buttonLabel.text = "待缴费"
messageLabel.textColor = UIColor.yhGreyColor50
messageLabel.textColor = UIColor.mainTextColor50
}
if model.type == 25 {
titleLabel.text = "赴港行程指引"
messageLabel.text = "请根据指引清单提前规划赴港行程"
buttonLabel.text = "去查看"
messageLabel.textColor = UIColor.yhGreyColor50
messageLabel.textColor = UIColor.mainTextColor50
progressImageView.isHidden = true
progressLabel.isHidden = true
messageLabel.snp.remakeConstraints { make in
......@@ -364,27 +364,27 @@ extension YHServiceOrderProgressTableViewCell {
titleLabel.text = "旅行证件准备"
messageLabel.text = "请更新所有赴港人员的旅行证件"
buttonLabel.text = "去上传"
messageLabel.textColor = UIColor.yhGreyColor50
messageLabel.textColor = UIColor.mainTextColor50
}
if model.type == 27 {
titleLabel.text = "上传过关证件"
messageLabel.text = "点击保存入境小白条及香港身份证（后续身份续期、永居均涉及）"
buttonLabel.text = "去上传"
messageLabel.textColor = UIColor.yhGreyColor50
messageLabel.textColor = UIColor.mainTextColor50
}
if model.type == 31 {
titleLabel.text = "续签资料管理"
messageLabel.text = "请根据资料清单上传您的续签证明文件~"
buttonLabel.text = "去上传"
messageLabel.textColor = UIColor.yhGreyColor50
messageLabel.textColor = UIColor.mainTextColor50
}
if model.type == 32 {
titleLabel.text = "续签文书管理"
messageLabel.text = "请确认您的续签文书内容并完成签字~"
buttonLabel.text = "去确认"
messageLabel.textColor = UIColor.yhGreyColor50
messageLabel.textColor = UIColor.mainTextColor50
}
}
if model.status == 3 {
......@@ -475,7 +475,7 @@ extension YHServiceOrderProgressTableViewCell {
if model.status == 4 {
titleLabel.textColor = UIColor.mainTextColor
buttonLabel.text = "请稍候"
buttonLabel.backgroundColor = UIColor.yhGreyColor50
buttonLabel.backgroundColor = UIColor.mainTextColor50
progressImageView.image = UIImage(named: "service_progress_start")
progress.changeColor(UIColor.brandMainColor)
// 1 证件 2 信息完善 3 我的评分 4 我的方案 5 我的签字 6我的文书
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHServiceStepAlertView.swift
View file @ db8476bf
......@@ -19,9 +19,14 @@ class YHServiceStepAlertView: UIView {
if isStepOne {
orderButton.isSelected = false
guideButton.isSelected = true
orderButton.titleLabel?.font = UIFont.PFSC_R(ofSize: 14)
guideButton.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
} else {
orderButton.isSelected = true
guideButton.isSelected = false
orderButton.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
guideButton.titleLabel?.font = UIFont.PFSC_R(ofSize: 14)
}
}
}
......@@ -52,7 +57,7 @@ class YHServiceStepAlertView: UIView {
centerView = {
let view = UIView()
view.backgroundColor = .white
view.layer.cornerRadius = kCornerRadius8
view.layer.cornerRadius = kCornerRadius3
return view
}()
addSubview(centerView)
......
galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/续签/续签文书管理/tip_list_index_dot.imageset/Contents.json 0 → 100644
View file @ db8476bf
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "tip_list_index_dot@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "tip_list_index_dot@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
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