Skip to content

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

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

# Conflicts:
#	galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMyViewController.swift
parents 5e89d82e 4d0b6a49
Hide whitespace changes
Inline Side-by-side
Showing with 123 additions and 66 deletions
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ fa62cdd6
......@@ -272,7 +272,7 @@
0468D4362B57752F00CFB916 /* YHUserModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0468D4352B57752F00CFB916 /* YHUserModel.swift */; };
0468D43A2B579EAC00CFB916 /* YHLoginViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0468D4392B579EAC00CFB916 /* YHLoginViewModel.swift */; };
0472CBA72C5A11640096F48F /* YHPrincipleCongratulationVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0472CB9B2C5A11640096F48F /* YHPrincipleCongratulationVC.swift */; };
0472CBA82C5A11640096F48F /* YHPrincipleReviewListVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0472CB9C2C5A11640096F48F /* YHPrincipleReviewListVC.swift */; };
0472CBA82C5A11640096F48F /* YHPrincipleUploadListVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0472CB9C2C5A11640096F48F /* YHPrincipleUploadListVC.swift */; };
0472CBA92C5A11640096F48F /* YHPrincleGroupModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0472CB9E2C5A11640096F48F /* YHPrincleGroupModel.swift */; };
0472CBAC2C5A11640096F48F /* YHPrincleViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0472CBA32C5A11640096F48F /* YHPrincleViewModel.swift */; };
0472E25C2C521E64008EAB6E /* YHHomeIdentityListVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0472E25B2C521E64008EAB6E /* YHHomeIdentityListVC.swift */; };
......@@ -300,7 +300,7 @@
047AA3F82C5CC7B0009C4554 /* YHShareStepView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047AA3F72C5CC7B0009C4554 /* YHShareStepView.swift */; };
047AA3FA2C60739E009C4554 /* YHInvitationWithGiftsSelectItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047AA3F92C60739E009C4554 /* YHInvitationWithGiftsSelectItemView.swift */; };
047AA3FC2C61EE7F009C4554 /* YHSignAppendStepView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047AA3FB2C61EE7F009C4554 /* YHSignAppendStepView.swift */; };
047AA4092C65C1AC009C4554 /* YHOfficialApprovalResultVC2.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047AA4042C65C1AC009C4554 /* YHOfficialApprovalResultVC2.swift */; };
047AA4092C65C1AC009C4554 /* YHOfficialApprovalResultVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047AA4042C65C1AC009C4554 /* YHOfficialApprovalResultVC.swift */; };
047AA40A2C65C1AC009C4554 /* YHOffivialApprovalSuccessView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047AA4062C65C1AC009C4554 /* YHOffivialApprovalSuccessView.swift */; };
047AA40B2C65C1AC009C4554 /* YHOffivialApprovalGuildLineCheckView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047AA4072C65C1AC009C4554 /* YHOffivialApprovalGuildLineCheckView.swift */; };
047AA40C2C65C1AC009C4554 /* YHOffivialApprovalSuccessCheckView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047AA4082C65C1AC009C4554 /* YHOffivialApprovalSuccessCheckView.swift */; };
......@@ -922,7 +922,7 @@
046AB7772BD674170086C6F1 /* galaxyDebug.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = galaxyDebug.entitlements; sourceTree = "<group>"; };
046AB7782BD674170086C6F1 /* galaxyTestEnv.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = galaxyTestEnv.entitlements; sourceTree = "<group>"; };
0472CB9B2C5A11640096F48F /* YHPrincipleCongratulationVC.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHPrincipleCongratulationVC.swift; sourceTree = "<group>"; };
0472CB9C2C5A11640096F48F /* YHPrincipleReviewListVC.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHPrincipleReviewListVC.swift; sourceTree = "<group>"; };
0472CB9C2C5A11640096F48F /* YHPrincipleUploadListVC.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHPrincipleUploadListVC.swift; sourceTree = "<group>"; };
0472CB9E2C5A11640096F48F /* YHPrincleGroupModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHPrincleGroupModel.swift; sourceTree = "<group>"; };
0472CBA32C5A11640096F48F /* YHPrincleViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHPrincleViewModel.swift; sourceTree = "<group>"; };
0472E25B2C521E64008EAB6E /* YHHomeIdentityListVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHomeIdentityListVC.swift; sourceTree = "<group>"; };
......@@ -950,7 +950,7 @@
047AA3F72C5CC7B0009C4554 /* YHShareStepView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHShareStepView.swift; sourceTree = "<group>"; };
047AA3F92C60739E009C4554 /* YHInvitationWithGiftsSelectItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHInvitationWithGiftsSelectItemView.swift; sourceTree = "<group>"; };
047AA3FB2C61EE7F009C4554 /* YHSignAppendStepView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHSignAppendStepView.swift; sourceTree = "<group>"; };
047AA4042C65C1AC009C4554 /* YHOfficialApprovalResultVC2.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHOfficialApprovalResultVC2.swift; sourceTree = "<group>"; };
047AA4042C65C1AC009C4554 /* YHOfficialApprovalResultVC.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHOfficialApprovalResultVC.swift; sourceTree = "<group>"; };
047AA4062C65C1AC009C4554 /* YHOffivialApprovalSuccessView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHOffivialApprovalSuccessView.swift; sourceTree = "<group>"; };
047AA4072C65C1AC009C4554 /* YHOffivialApprovalGuildLineCheckView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHOffivialApprovalGuildLineCheckView.swift; sourceTree = "<group>"; };
047AA4082C65C1AC009C4554 /* YHOffivialApprovalSuccessCheckView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHOffivialApprovalSuccessCheckView.swift; sourceTree = "<group>"; };
......@@ -2206,7 +2206,7 @@
isa = PBXGroup;
children = (
0472CB9B2C5A11640096F48F /* YHPrincipleCongratulationVC.swift */,
0472CB9C2C5A11640096F48F /* YHPrincipleReviewListVC.swift */,
0472CB9C2C5A11640096F48F /* YHPrincipleUploadListVC.swift */,
04B360F22C636525001EB053 /* YHPrincipleWaitResultViewController.swift */,
04B360F42C646844001EB053 /* YHPrincipleApprovedMailViewController.swift */,
0485DFD52C64E70200B50293 /* YHPrincipleApprovedWaitSubmitVC.swift */,
......@@ -2368,7 +2368,7 @@
047AA4032C65C1AC009C4554 /* C */ = {
isa = PBXGroup;
children = (
047AA4042C65C1AC009C4554 /* YHOfficialApprovalResultVC2.swift */,
047AA4042C65C1AC009C4554 /* YHOfficialApprovalResultVC.swift */,
);
path = C;
sourceTree = "<group>";
......@@ -3703,7 +3703,7 @@
A5F886B42C61CEA700B63CF5 /* YHPictureReviewManager.swift in Sources */,
04E86E662B86EB6F00A35F4B /* YHLoginManager.swift in Sources */,
04A7BD112BA4218B00BD35A2 /* YHMyDocumentsListViewModel.swift in Sources */,
0472CBA82C5A11640096F48F /* YHPrincipleReviewListVC.swift in Sources */,
0472CBA82C5A11640096F48F /* YHPrincipleUploadListVC.swift in Sources */,
A5EF21352BA6E05E005027E6 /* YHQuestionAndAnswerViewController.swift in Sources */,
A5EF213B2BA6EC98005027E6 /* YHQuestionAndAnswerCell.swift in Sources */,
045EEEA82B9F171A0022A143 /* YHWorkIntroductionViewController.swift in Sources */,
......@@ -3997,7 +3997,7 @@
04C8F4832B7216D800ADF59B /* YHUserInfoHeaderView.swift in Sources */,
045EEEAF2B9F171A0022A143 /* YHWorkExperienceTextItemView.swift in Sources */,
A5ACE9492B4564F7002C94D2 /* YHHUDSuccessView.swift in Sources */,
047AA4092C65C1AC009C4554 /* YHOfficialApprovalResultVC2.swift in Sources */,
047AA4092C65C1AC009C4554 /* YHOfficialApprovalResultVC.swift in Sources */,
04B360EF2C620975001EB053 /* YHPrincipleUploadStatusCell.swift in Sources */,
045EEE9C2B9F171A0022A143 /* YHCompanyViewModel.swift in Sources */,
A58556BA2B6BCF1A003746B2 /* YHPersonInfoFillStepModel.swift in Sources */,
......@@ -4274,7 +4274,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxyTestEnv.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 4;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = (
......@@ -4299,7 +4299,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 0.9.4;
MARKETING_VERSION = 0.9.5;
PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
......@@ -4415,7 +4415,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 4;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = (
......@@ -4440,7 +4440,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 0.9.4;
MARKETING_VERSION = 0.9.5;
PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
......@@ -4619,7 +4619,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxyDebug.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 4;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = (
......@@ -4644,7 +4644,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 0.9.4;
MARKETING_VERSION = 0.9.5;
PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
......@@ -4665,7 +4665,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 4;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = (
......@@ -4690,7 +4690,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 0.9.4;
MARKETING_VERSION = 0.9.5;
PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/OfficialApprovalBatch/C/YHOfficialApprovalResultVC2.swift → galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/OfficialApprovalBatch/C/YHOfficialApprovalResultVC.swift
View file @ fa62cdd6
......@@ -12,7 +12,7 @@ import UIKit
正式批 结果页
*/
class YHOfficialApprovalResultVC2: YHBaseViewController {
class YHOfficialApprovalResultVC: YHBaseViewController {
var contentView: YHOffivialApprovalSuccessView!
......@@ -25,7 +25,7 @@ class YHOfficialApprovalResultVC2: YHBaseViewController {
lazy var bkgImageV: UIImageView = {
let imageV = UIImageView()
imageV.image = UIImage(named: "official_approval_result_bkg")
imageV.contentMode = .scaleAspectFit
imageV.contentMode = .scaleAspectFill
imageV.clipsToBounds = true
return imageV
}()
......@@ -34,7 +34,7 @@ class YHOfficialApprovalResultVC2: YHBaseViewController {
lazy var paperImageV: UIImageView = {
let imageV = UIImageView()
imageV.image = UIImage(named: "official_approval_result_paper")
imageV.contentMode = .scaleAspectFit
imageV.contentMode = .scaleAspectFill
imageV.clipsToBounds = true
return imageV
}()
......@@ -43,14 +43,44 @@ class YHOfficialApprovalResultVC2: YHBaseViewController {
lazy var docImageV: UIImageView = {
let imageV = UIImageView()
imageV.image = UIImage(named: "official_approval_result_doc")
imageV.contentMode = .scaleAspectFit
imageV.contentMode = .scaleAspectFill
imageV.clipsToBounds = true
return imageV
}()
//pen
lazy var penImageV: UIImageView = {
let imageV = UIImageView()
imageV.image = UIImage(named: "official_approval_result_pen")
imageV.contentMode = .scaleAspectFill
imageV.clipsToBounds = true
return imageV
}()
//bottom
lazy var bottomImageV: UIImageView = {
let imageV = UIImageView()
imageV.image = UIImage(named: "official_approval_result_bottom_shadow")
imageV.contentMode = .scaleAspectFill
imageV.clipsToBounds = true
return imageV
}()
//光线
lazy var lightImageV: UIImageView = {
let imageV = UIImageView()
imageV.image = UIImage(named: "official_approval_result_top_shadow")
imageV.contentMode = .scaleAspectFill
imageV.clipsToBounds = true
return imageV
}()
}
private extension YHOfficialApprovalResultVC2 {
private extension YHOfficialApprovalResultVC {
func setupUI() {
gk_navBarAlpha = 0.0
......@@ -79,6 +109,7 @@ private extension YHOfficialApprovalResultVC2 {
make.width.equalTo(294)
make.height.equalTo(530)
}
docImageV.layer.zPosition = 1
contentView = {
let view = YHOffivialApprovalSuccessView()
......@@ -92,8 +123,34 @@ private extension YHOfficialApprovalResultVC2 {
make.width.equalTo(294)
make.height.equalTo(530)
}
// contentView.backgroundColor = .red
contentView.transform = rotatedTransform()
docImageV.addSubview(penImageV)
penImageV.snp.makeConstraints { make in
make.top.equalToSuperview().offset(170)
make.right.equalToSuperview()
make.width.equalTo(67)
make.height.equalTo(141)
}
penImageV.layer.zPosition = 1
view.addSubview(bottomImageV)
bottomImageV.snp.makeConstraints { make in
make.left.right.bottom.equalToSuperview()
make.height.equalTo(200)
}
bottomImageV.layer.zPosition = 2
view.addSubview(lightImageV)
lightImageV.snp.makeConstraints { make in
make.top.right.bottom.equalToSuperview()
make.height.equalTo(543)
}
lightImageV.layer.zPosition = 3
}
private func rotatedTransform() -> CGAffineTransform {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/OfficialApprovalBatch/V/YHOffivialApprovalGuildLineCheckView.swift
View file @ fa62cdd6
......@@ -125,8 +125,6 @@ private extension YHOffivialApprovalGuildLineCheckView {
} else {
rewardBtn.setTitle("请上滑看完指引后操作（\(maxCount)s）", for: .normal)
}
}
func startTimer() {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/OfficialApprovalBatch/V/YHOffivialApprovalSuccessCheckView.swift
View file @ fa62cdd6
......@@ -195,9 +195,7 @@ private extension YHOffivialApprovalSuccessCheckView {
Timer.scheduledTimer(withTimeInterval: 4, repeats: false) { timer in
self.scrollBgImgV.stopAnimating()
timer.invalidate()
self.closeBtn.isHidden = false
self.scrollBgImgV.isHidden = true
self.rewardBtn.isEnabled = true
}
}
}
......@@ -282,6 +280,9 @@ private extension YHOffivialApprovalSuccessCheckView {
currentIndex += 1
} else {
displayLink.invalidate()
self.closeBtn.isHidden = false
self.rewardBtn.isEnabled = true
}
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/OfficialApprovalBatch/V/YHOffivialApprovalSuccessView.swift
View file @ fa62cdd6
......@@ -46,7 +46,7 @@ class YHOffivialApprovalSuccessView: UIView {
item.removeFromSuperview()
}
var h = 80
var h = 60
var index = 0
for item in data {
let label = UILabel()
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/PrincipleBatch(原则批)/C/YHPrincipleApprovedWaitSubmitVC.swift
View file @ fa62cdd6
......@@ -89,8 +89,8 @@ class YHPrincipleApprovedWaitSubmitVC: YHBaseViewController {
}
@objc func didUploadBtnClicked() {
let vc = YHPrincipleReviewListVC()
vc.orderId = 12345
let vc = YHPrincipleUploadListVC()
vc.orderId = 150702
navigationController?.pushViewController(vc)
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/PrincipleBatch(原则批)/C/YHPrincipleReviewListVC.swift → galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/PrincipleBatch(原则批)/C/YHPrincipleUploadListVC.swift
View file @ fa62cdd6
//
// YHPrincipleReviewListVC.swift
// YHPrincipleUploadListVC.swift
// galaxy
//
// Created by edy on 2024/4/29.
......@@ -10,7 +10,7 @@ import UIKit
import SmartCodable
import AttributedString
class YHPrincipleReviewListVC: YHBaseViewController {
class YHPrincipleUploadListVC: YHBaseViewController {
var orderId: Int = 0
var items: [SmartCodable] = []
......@@ -165,14 +165,14 @@ class YHPrincipleReviewListVC: YHBaseViewController {
}
}
extension YHPrincipleReviewListVC {
extension YHPrincipleUploadListVC {
@objc func didUploadBtnClicked() {
}
}
extension YHPrincipleReviewListVC: UITableViewDelegate, UITableViewDataSource {
extension YHPrincipleUploadListVC: UITableViewDelegate, UITableViewDataSource {
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
return items.count
......@@ -237,14 +237,7 @@ extension YHPrincipleReviewListVC: UITableViewDelegate, UITableViewDataSource {
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
if 0 <= indexPath.section && indexPath.section < items.count {
#if DEBUG
if true {
let vc = YHPrincipleCongratulationVC()
self.navigationController?.pushViewController(vc)
return
}
#endif
}
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/PrincipleBatch(原则批)/C/YHPrincipleWaitResultViewController.swift
View file @ fa62cdd6
......@@ -155,14 +155,7 @@ extension YHPrincipleWaitResultViewController: UITableViewDelegate, UITableViewD
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
if 0 <= indexPath.section && indexPath.section < items.count {
#if DEBUG
if true {
let vc = YHPrincipleCongratulationVC()
self.navigationController?.pushViewController(vc)
return
}
#endif
}
}
......@@ -177,13 +170,13 @@ extension YHPrincipleWaitResultViewController: UITableViewDelegate, UITableViewD
func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
let view = UIView()
var titleLabel = UILabel()
let titleLabel = UILabel()
titleLabel.numberOfLines = 0
var name = self.viewModel.waitResultModel.applicant.userName
if name.count > 5 {
name = String(name.prefix(5)) + "..."
}
var callName = self.viewModel.waitResultModel.applicant.sex == 2 ? "女士" : "先生"
let callName = self.viewModel.waitResultModel.applicant.sex == 2 ? "女士" : "先生"
let title: ASAttributedString = .init("您好，\(name)\(callName)！", .font(UIFont.PFSC_M(ofSize: 24)),.foreground(UIColor.mainTextColor))
titleLabel.attributed.text = title
view.addSubview(titleLabel)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/PrincipleBatch(原则批)/M/YHPrincipleUploadModel.swift
View file @ fa62cdd6
......@@ -175,8 +175,6 @@ class YHPrincipleAgreementModel: SmartCodable {
var redTips: String = ""
// 是否展开
var isUnfold: Bool = false
//
var fileList:[String] = []
required init() {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/PrincipleBatch(原则批)/V/YHPrincipleUploadFileCell.swift
View file @ fa62cdd6
......@@ -16,6 +16,7 @@ class YHPrincipleUploadFileCell: UITableViewCell {
var iconImgV: UIImageView!
var titleLabel: UILabel!
var timeLabel: UILabel!
var editBtn: UIButton!
override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
super.init(style: style, reuseIdentifier: reuseIdentifier)
......@@ -26,9 +27,9 @@ class YHPrincipleUploadFileCell: UITableViewCell {
super.init(coder: coder)
}
func updateModel(_ str: String) {
titleLabel.text = str
timeLabel.text = "上传于2023.02.06"
func updateModel(_ model: YHPrincipleContentUrlModel) {
titleLabel.text = model.name
timeLabel.text = model.updated_at
}
func setupUI() {
......@@ -40,15 +41,19 @@ class YHPrincipleUploadFileCell: UITableViewCell {
titleLabel = UILabel()
titleLabel.font = UIFont.PFSC_M(ofSize: 14)
titleLabel.textColor = UIColor.mainTextColor
titleLabel.text = "新公司在职证明.pdf"
titleLabel.text = "文件名称"
self.addSubview(titleLabel)
timeLabel = UILabel()
timeLabel.font = UIFont.PFSC_R(ofSize: 11)
timeLabel.textColor = UIColor.labelTextColor2
timeLabel.text = "上传于2024.12.12"
timeLabel.text = "上传于0000.00.00"
self.addSubview(timeLabel)
editBtn = UIButton()
editBtn.setImage(UIImage(named: "my_cer_btn_edit"), for: .normal)
self.addSubview(editBtn)
iconImgV.snp.makeConstraints { make in
make.left.equalTo(16)
make.centerY.equalToSuperview()
......@@ -68,5 +73,11 @@ class YHPrincipleUploadFileCell: UITableViewCell {
make.height.equalTo(20)
make.right.equalTo(-16)
}
editBtn.snp.makeConstraints { make in
make.width.height.equalTo(16)
make.centerY.equalToSuperview()
make.right.equalTo(-20)
}
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/PrincipleBatch(原则批)/V/YHPrincipleUploadStatusCell.swift
View file @ fa62cdd6
......@@ -27,7 +27,7 @@ class YHPrincipleUploadStatusCell: UITableViewCell {
static let cellReuseIdentifier = "YHPrincipleUploadStatusCell"
var itemModel:YHPrincipleAgreementModel?
var items: [String] = []
var items: [YHPrincipleContentUrlModel] = []
var expandClick:((Bool)->())?
var status: YHPrincipleUploadStatus = .preUpload
......@@ -169,7 +169,7 @@ class YHPrincipleUploadStatusCell: UITableViewCell {
itemModel = model
items.removeAll()
// items.append(contentsOf: model.fileList)
items.append(contentsOf: model.content_url)
contentView.removeSubviews()
self.dotLineLayer.removeFromSuperlayer()
......@@ -269,15 +269,16 @@ class YHPrincipleUploadStatusCell: UITableViewCell {
}
tableView.snp.remakeConstraints { make in
make.top.equalTo(detailLabel.snp.bottom).offset(model.fileList.count <= 0 ? 0 : 16)
make.top.equalTo(detailLabel.snp.bottom).offset(model.content_url.count <= 0 ? 0 : 16)
make.left.equalTo(0)
make.right.equalTo(0)
var listHeight = 0.0
if model.fileList.count > 0 {
listHeight = Double(model.fileList.count) * 55.0 + Double(model.fileList.count-1) * 8.0
if model.content_url.count > 0 {
listHeight = Double(model.content_url.count) * 55.0 + Double(model.content_url.count-1) * 8.0
}
make.height.equalTo(listHeight)
}
tableView.reloadData()
uploadBtn.snp.remakeConstraints { make in
make.left.equalTo(16)
......@@ -425,6 +426,10 @@ extension YHPrincipleUploadStatusCell: UITableViewDataSource, UITableViewDelegat
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let cell = tableView.dequeueReusableCell(withIdentifier: YHPrincipleUploadFileCell.cellReuseIdentifier, for: indexPath) as! YHPrincipleUploadFileCell
if 0 <= indexPath.row, indexPath.row < items.count {
let model: YHPrincipleContentUrlModel = items[indexPath.row]
cell.updateModel(model)
}
return cell
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/PrincipleBatch(原则批)/VM/YHPrincleViewModel.swift
View file @ fa62cdd6
......@@ -62,17 +62,17 @@ class YHPrincleViewModel: YHBaseViewModel {
return
}
self.envelopModel = resultModel
self.envelopModel = self.getEnvelopModel()
// self.envelopModel = self.getEnvelopModel()
callback?(true, nil)
} else {
let err = YHErrorModel(errorCode: Int32(json.code), errorMsg: json.msg.isEmpty ? "" : json.msg)
self.envelopModel = self.getEnvelopModel()
// self.envelopModel = self.getEnvelopModel()
callback?(false, err)
}
} failBlock: { err in
self.envelopModel = self.getEnvelopModel()
// self.envelopModel = self.getEnvelopModel()
callback?(false, err)
}
}
......
galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMyViewController.swift
View file @ fa62cdd6
......@@ -103,6 +103,7 @@ class YHMyViewController: YHBaseViewController, ConstraintRelatableTarget {
// let vc = YHOfficialApprovalResultVC2()
// self?.navigationController?.pushViewController(vc) //for test hjl
}
view.evaluateBlock = {
[weak self] in
......
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