Skip to content

G
galaxy-iOS
Commit b2484d4f authored by Steven杜宇's avatar Steven杜宇
Browse files
Options

// 原则批弹窗

parent c9a6d172
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 25 deletions
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ b2484d4f
......@@ -8,7 +8,7 @@
/* Begin PBXBuildFile section */
0408C3632BEC7C6900DB1E25 /* YHVideoPlayerControlView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0408C3622BEC7C6900DB1E25 /* YHVideoPlayerControlView.swift */; };
0409BEEB2C5B41D4003FCFD7 /* YHPrincipleUnapprovedCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0409BEEA2C5B41D4003FCFD7 /* YHPrincipleUnapprovedCell.swift */; };
0409BEEB2C5B41D4003FCFD7 /* YHPrincipleProfileListCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0409BEEA2C5B41D4003FCFD7 /* YHPrincipleProfileListCell.swift */; };
041390692C1081FA0098CB8A /* YHFileListEmptyView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 041390682C1081FA0098CB8A /* YHFileListEmptyView.swift */; };
0414BDA92BC7E81500225367 /* YHMyPermissionSettingVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0414BDA82BC7E81500225367 /* YHMyPermissionSettingVC.swift */; };
0414BDAB2BC7E9C200225367 /* YHMyPermissionCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0414BDAA2BC7E9C200225367 /* YHMyPermissionCell.swift */; };
......@@ -362,7 +362,7 @@
04B360E32C60A346001EB053 /* YHPrinciplePhotoListCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04B360E22C60A346001EB053 /* YHPrinciplePhotoListCell.swift */; };
04B360E52C60B5D3001EB053 /* YHPrinciplePhotoCollectCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04B360E42C60B5D3001EB053 /* YHPrinciplePhotoCollectCell.swift */; };
04B360E72C60CD37001EB053 /* YHPrincipleUploadFileCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04B360E62C60CD37001EB053 /* YHPrincipleUploadFileCell.swift */; };
04B360EB2C60E88C001EB053 /* YHPrincipleCongratulationAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04B360EA2C60E88C001EB053 /* YHPrincipleCongratulationAlertView.swift */; };
04B360EB2C60E88C001EB053 /* YHPrincipleApprovedAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04B360EA2C60E88C001EB053 /* YHPrincipleApprovedAlertView.swift */; };
04B360ED2C61F157001EB053 /* YHPrincipleEnvelopeCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04B360EC2C61F157001EB053 /* YHPrincipleEnvelopeCell.swift */; };
04B360EF2C620975001EB053 /* YHPrincipleUploadStatusCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04B360EE2C620975001EB053 /* YHPrincipleUploadStatusCell.swift */; };
04B360F12C635A33001EB053 /* YHPrincipleWaitResultModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04B360F02C635A33001EB053 /* YHPrincipleWaitResultModel.swift */; };
......@@ -658,7 +658,7 @@
/* Begin PBXFileReference section */
0408C3622BEC7C6900DB1E25 /* YHVideoPlayerControlView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHVideoPlayerControlView.swift; sourceTree = "<group>"; };
0409BEEA2C5B41D4003FCFD7 /* YHPrincipleUnapprovedCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPrincipleUnapprovedCell.swift; sourceTree = "<group>"; };
0409BEEA2C5B41D4003FCFD7 /* YHPrincipleProfileListCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPrincipleProfileListCell.swift; sourceTree = "<group>"; };
041390682C1081FA0098CB8A /* YHFileListEmptyView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFileListEmptyView.swift; sourceTree = "<group>"; };
0414BDA82BC7E81500225367 /* YHMyPermissionSettingVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMyPermissionSettingVC.swift; sourceTree = "<group>"; };
0414BDAA2BC7E9C200225367 /* YHMyPermissionCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMyPermissionCell.swift; sourceTree = "<group>"; };
......@@ -1014,7 +1014,7 @@
04B360E22C60A346001EB053 /* YHPrinciplePhotoListCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPrinciplePhotoListCell.swift; sourceTree = "<group>"; };
04B360E42C60B5D3001EB053 /* YHPrinciplePhotoCollectCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPrinciplePhotoCollectCell.swift; sourceTree = "<group>"; };
04B360E62C60CD37001EB053 /* YHPrincipleUploadFileCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPrincipleUploadFileCell.swift; sourceTree = "<group>"; };
04B360EA2C60E88C001EB053 /* YHPrincipleCongratulationAlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPrincipleCongratulationAlertView.swift; sourceTree = "<group>"; };
04B360EA2C60E88C001EB053 /* YHPrincipleApprovedAlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPrincipleApprovedAlertView.swift; sourceTree = "<group>"; };
04B360EC2C61F157001EB053 /* YHPrincipleEnvelopeCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPrincipleEnvelopeCell.swift; sourceTree = "<group>"; };
04B360EE2C620975001EB053 /* YHPrincipleUploadStatusCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPrincipleUploadStatusCell.swift; sourceTree = "<group>"; };
04B360F02C635A33001EB053 /* YHPrincipleWaitResultModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPrincipleWaitResultModel.swift; sourceTree = "<group>"; };
......@@ -2232,13 +2232,13 @@
0472CBA22C5A11640096F48F /* V */ = {
isa = PBXGroup;
children = (
0409BEEA2C5B41D4003FCFD7 /* YHPrincipleUnapprovedCell.swift */,
0409BEEA2C5B41D4003FCFD7 /* YHPrincipleProfileListCell.swift */,
04B360E22C60A346001EB053 /* YHPrinciplePhotoListCell.swift */,
04B360E42C60B5D3001EB053 /* YHPrinciplePhotoCollectCell.swift */,
04B360E62C60CD37001EB053 /* YHPrincipleUploadFileCell.swift */,
04B360EE2C620975001EB053 /* YHPrincipleUploadStatusCell.swift */,
04B360EC2C61F157001EB053 /* YHPrincipleEnvelopeCell.swift */,
04B360EA2C60E88C001EB053 /* YHPrincipleCongratulationAlertView.swift */,
04B360EA2C60E88C001EB053 /* YHPrincipleApprovedAlertView.swift */,
0485DFD72C66036600B50293 /* YHPrincipleFileRenameView.swift */,
0485DFDB2C670C7200B50293 /* YHPrincipleSendMailView.swift */,
);
......@@ -3653,7 +3653,7 @@
047AA40B2C65C1AC009C4554 /* YHOffivialApprovalGuildLineCheckView.swift in Sources */,
045EEE7C2B9F171A0022A143 /* YHPreviewInfoSessionModel.swift in Sources */,
049A48AA2B49536000D0C641 /* YHAboutUsAdvantageCell.swift in Sources */,
04B360EB2C60E88C001EB053 /* YHPrincipleCongratulationAlertView.swift in Sources */,
04B360EB2C60E88C001EB053 /* YHPrincipleApprovedAlertView.swift in Sources */,
04CE1AD42C2AD91F001CB80A /* YHActivityDetailModel.swift in Sources */,
045EEF112B9F171A0022A143 /* YHMainInformationModel.swift in Sources */,
A58AC09D2BABD59600A30FA9 /* YHFileListModel.swift in Sources */,
......@@ -3703,7 +3703,7 @@
045EEED72B9F171A0022A143 /* YHEducationInfo.swift in Sources */,
047AA3D92C4A4A91009C4554 /* YHInvatationShareViewController.swift in Sources */,
045EEEDE2B9F171A0022A143 /* YHEducationInfoCell.swift in Sources */,
0409BEEB2C5B41D4003FCFD7 /* YHPrincipleUnapprovedCell.swift in Sources */,
0409BEEB2C5B41D4003FCFD7 /* YHPrincipleProfileListCell.swift in Sources */,
A5ACE93A2B4564F7002C94D2 /* NSAttributedString+Extension.swift in Sources */,
A5F886B42C61CEA700B63CF5 /* YHPictureReviewManager.swift in Sources */,
04E86E662B86EB6F00A35F4B /* YHLoginManager.swift in Sources */,
......
galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHomeHoldViewPageViewController.swift
View file @ b2484d4f
......@@ -148,7 +148,7 @@ extension YHHomeHoldViewPageViewController {
return
}
model.type = 1 //for test hjl
model.type = 2 //for test hjl
if model.type == 1 {
//正式弹窗
......@@ -187,6 +187,23 @@ extension YHHomeHoldViewPageViewController {
}
} else if model.type == 2 {
//原则批弹窗
let view = YHPrincipleApprovedAlertView.alertView()
view.lookBlock = {
if let orderID = UserDefaults.standard.value(forKey: "orderIdForPreview") as? Int {
self.princleVM.postAlertStatus(14) { success, error in
}
let vc = YHPrincipleApprovedWaitSubmitVC()
vc.orderId = orderID
self.navigationController?.pushViewController(vc)
} else {
YHHUD.flash(message: "订单号为空")
}
}
view.show()
}
}
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/PrincipleBatch(原则批)/C/YHPrincipleApprovedMailViewController.swift
View file @ b2484d4f
......@@ -28,7 +28,7 @@ class YHPrincipleApprovedMailViewController: YHBaseViewController {
tableView.dataSource = self
tableView.backgroundColor = .clear
tableView.register(UITableViewCell.self, forCellReuseIdentifier: "UITableViewCell")
tableView.register(YHPrincipleUnapprovedCell.self, forCellReuseIdentifier: YHPrincipleUnapprovedCell.cellReuseIdentifier)
tableView.register(YHPrincipleProfileListCell.self, forCellReuseIdentifier: YHPrincipleProfileListCell.cellReuseIdentifier)
tableView.register(YHPrincipleEnvelopeCell.self, forCellReuseIdentifier: YHPrincipleEnvelopeCell.cellReuseIdentifier)
return tableView
}()
......@@ -125,7 +125,7 @@ extension YHPrincipleApprovedMailViewController: UITableViewDelegate, UITableVie
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
if 0 <= indexPath.row && indexPath.row < items.count {
let cell = tableView.dequeueReusableCell(withIdentifier: YHPrincipleUnapprovedCell.cellReuseIdentifier, for: indexPath) as! YHPrincipleUnapprovedCell
let cell = tableView.dequeueReusableCell(withIdentifier: YHPrincipleProfileListCell.cellReuseIdentifier, for: indexPath) as! YHPrincipleProfileListCell
let m = items[indexPath.row]
if m is YHPrincipleWaitResultModel {
let model = m as! YHPrincipleWaitResultModel
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/PrincipleBatch(原则批)/C/YHPrincipleApprovedWaitSubmitVC.swift
View file @ b2484d4f
......@@ -27,7 +27,7 @@ class YHPrincipleApprovedWaitSubmitVC: YHBaseViewController {
tableView.dataSource = self
tableView.backgroundColor = .clear
tableView.register(UITableViewCell.self, forCellReuseIdentifier: "UITableViewCell")
tableView.register(YHPrincipleUnapprovedCell.self, forCellReuseIdentifier: YHPrincipleUnapprovedCell.cellReuseIdentifier)
tableView.register(YHPrincipleProfileListCell.self, forCellReuseIdentifier: YHPrincipleProfileListCell.cellReuseIdentifier)
tableView.register(YHPrincipleEnvelopeCell.self, forCellReuseIdentifier: YHPrincipleEnvelopeCell.cellReuseIdentifier)
return tableView
}()
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/PrincipleBatch(原则批)/C/YHPrincipleUploadListVC.swift
View file @ b2484d4f
......@@ -31,7 +31,7 @@ class YHPrincipleUploadListVC: YHBaseViewController {
tableView.backgroundColor = .clear
tableView.register(UITableViewCell.self, forCellReuseIdentifier: "UITableViewCell")
tableView.register(YHPrincipleUploadStatusCell.self, forCellReuseIdentifier: YHPrincipleUploadStatusCell.cellReuseIdentifier)
tableView.register(YHPrincipleUnapprovedCell.self, forCellReuseIdentifier: YHPrincipleUnapprovedCell.cellReuseIdentifier)
tableView.register(YHPrincipleProfileListCell.self, forCellReuseIdentifier: YHPrincipleProfileListCell.cellReuseIdentifier)
tableView.register(YHPrincipleEnvelopeCell.self, forCellReuseIdentifier: YHPrincipleEnvelopeCell.cellReuseIdentifier)
return tableView
}()
......@@ -327,7 +327,7 @@ extension YHPrincipleUploadListVC: UITableViewDelegate, UITableViewDataSource {
if m is YHPrincipleWaitResultModel {
// 入境处已认收受理 和 申请资料已递交港府留档 cell
let cell = tableView.dequeueReusableCell(withIdentifier: YHPrincipleUnapprovedCell.cellReuseIdentifier, for: indexPath) as! YHPrincipleUnapprovedCell
let cell = tableView.dequeueReusableCell(withIdentifier: YHPrincipleProfileListCell.cellReuseIdentifier, for: indexPath) as! YHPrincipleProfileListCell
let model = m as! YHPrincipleWaitResultModel
cell.updateModel(model)
cell.expandClick = {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/PrincipleBatch(原则批)/C/YHPrincipleWaitResultViewController.swift
View file @ b2484d4f
......@@ -38,7 +38,7 @@ class YHPrincipleWaitResultViewController: YHBaseViewController {
tableView.dataSource = self
tableView.backgroundColor = .clear
tableView.register(UITableViewCell.self, forCellReuseIdentifier: "UITableViewCell")
tableView.register(YHPrincipleUnapprovedCell.self, forCellReuseIdentifier: YHPrincipleUnapprovedCell.cellReuseIdentifier)
tableView.register(YHPrincipleProfileListCell.self, forCellReuseIdentifier: YHPrincipleProfileListCell.cellReuseIdentifier)
tableView.register(YHPrinciplePhotoListCell.self, forCellReuseIdentifier: YHPrinciplePhotoListCell.cellReuseIdentifier)
return tableView
}()
......@@ -166,7 +166,7 @@ extension YHPrincipleWaitResultViewController: UITableViewDelegate, UITableViewD
}
}
let cell = tableView.dequeueReusableCell(withIdentifier: YHPrincipleUnapprovedCell.cellReuseIdentifier, for: indexPath) as! YHPrincipleUnapprovedCell
let cell = tableView.dequeueReusableCell(withIdentifier: YHPrincipleProfileListCell.cellReuseIdentifier, for: indexPath) as! YHPrincipleProfileListCell
if 0 <= indexPath.row && indexPath.row < items.count {
let model = items[indexPath.row]
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/PrincipleBatch(原则批)/V/YHPrincipleCongratulationAlertView.swift → galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/PrincipleBatch(原则批)/V/YHPrincipleApprovedAlertView.swift
View file @ b2484d4f
......@@ -9,8 +9,10 @@
import UIKit
import AttributedString
class YHPrincipleCongratulationAlertView: UIView {
class YHPrincipleApprovedAlertView: UIView {
var lookBlock: (()->())?
lazy var blackMaskView: UIView = {
let view = UIView()
view.backgroundColor = .alertMaskColor
......@@ -71,8 +73,8 @@ class YHPrincipleCongratulationAlertView: UIView {
return button
}()
static func alertView() -> YHPrincipleCongratulationAlertView {
let view = YHPrincipleCongratulationAlertView(frame: UIScreen.main.bounds)
static func alertView() -> YHPrincipleApprovedAlertView {
let view = YHPrincipleApprovedAlertView(frame: UIScreen.main.bounds)
return view
}
......@@ -81,7 +83,8 @@ class YHPrincipleCongratulationAlertView: UIView {
}
@objc func didLookBtnClicked() {
self.lookBlock?()
self.dismiss()
}
@objc func show() {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/PrincipleBatch(原则批)/V/YHPrincipleUnapprovedCell.swift → galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/PrincipleBatch(原则批)/V/YHPrincipleProfileListCell.swift
View file @ b2484d4f
......@@ -20,7 +20,7 @@ class YHPrincipleFileModel {
}
}
class YHPrincipleUnapprovedItemView: UIView {
class YHPrincipleProfileItemView: UIView {
static let viewH: CGFloat = 20.0
var btnClick: (()->())?
......@@ -94,9 +94,9 @@ class YHPrincipleUnapprovedItemView: UIView {
}
}
class YHPrincipleUnapprovedCell: UITableViewCell {
class YHPrincipleProfileListCell: UITableViewCell {
static let cellReuseIdentifier = "YHPrincipleUnapprovedCell"
static let cellReuseIdentifier = "YHPrincipleProfileListCell"
var itemModel:YHPrincipleWaitResultModel?
var items: [YHPrincipleFileModel] = []
var expandClick:((Bool)->())?
......@@ -201,7 +201,7 @@ class YHPrincipleUnapprovedCell: UITableViewCell {
var lastItemView: UIView = listTitleLabel
for (index, item) in items.enumerated() {
let itemView = YHPrincipleUnapprovedItemView(frame: .zero)
let itemView = YHPrincipleProfileItemView(frame: .zero)
itemView.updateModel(item)
if model.type == .entry {
itemView.btnClick = {
......@@ -224,7 +224,7 @@ class YHPrincipleUnapprovedCell: UITableViewCell {
whiteView.addSubview(itemView)
itemView.snp.makeConstraints { make in
make.left.right.equalTo(0)
make.height.equalTo(YHPrincipleUnapprovedItemView.viewH)
make.height.equalTo(YHPrincipleProfileItemView.viewH)
make.top.equalTo(lastItemView.snp.bottom).offset(16.0)
if index == items.count-1 {
make.bottom.equalTo(-16.0)
......
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