Commit ca8c0fa2 authored by Steven杜宇's avatar Steven杜宇

// 方案

parent 32a6b825
...@@ -504,6 +504,7 @@ ...@@ -504,6 +504,7 @@
047F3DF02CE88380001B2A6D /* YHMaterialListCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047F3DEF2CE88380001B2A6D /* YHMaterialListCell.swift */; }; 047F3DF02CE88380001B2A6D /* YHMaterialListCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047F3DEF2CE88380001B2A6D /* YHMaterialListCell.swift */; };
047F3DF22CE888EF001B2A6D /* YHDocumentListCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047F3DF12CE888EF001B2A6D /* YHDocumentListCell.swift */; }; 047F3DF22CE888EF001B2A6D /* YHDocumentListCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047F3DF12CE888EF001B2A6D /* YHDocumentListCell.swift */; };
047F3DF42CE88ACD001B2A6D /* YHImproveSchemeCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047F3DF32CE88ACD001B2A6D /* YHImproveSchemeCell.swift */; }; 047F3DF42CE88ACD001B2A6D /* YHImproveSchemeCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047F3DF32CE88ACD001B2A6D /* YHImproveSchemeCell.swift */; };
047F3DF62CE8A1C4001B2A6D /* YHModifySchemeInfoCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047F3DF52CE8A1C4001B2A6D /* YHModifySchemeInfoCell.swift */; };
0480582F2C7CA77900502CAA /* YHDisappointHKAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0480582E2C7CA77900502CAA /* YHDisappointHKAlertView.swift */; }; 0480582F2C7CA77900502CAA /* YHDisappointHKAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0480582E2C7CA77900502CAA /* YHDisappointHKAlertView.swift */; };
048058312C7DBDC900502CAA /* YHTravelCertificateTipsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 048058302C7DBDC900502CAA /* YHTravelCertificateTipsView.swift */; }; 048058312C7DBDC900502CAA /* YHTravelCertificateTipsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 048058302C7DBDC900502CAA /* YHTravelCertificateTipsView.swift */; };
048058332C7DC0CF00502CAA /* YHTravelCertificateTipsCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 048058322C7DC0CF00502CAA /* YHTravelCertificateTipsCell.swift */; }; 048058332C7DC0CF00502CAA /* YHTravelCertificateTipsCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 048058322C7DC0CF00502CAA /* YHTravelCertificateTipsCell.swift */; };
...@@ -1513,6 +1514,7 @@ ...@@ -1513,6 +1514,7 @@
047F3DEF2CE88380001B2A6D /* YHMaterialListCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMaterialListCell.swift; sourceTree = "<group>"; }; 047F3DEF2CE88380001B2A6D /* YHMaterialListCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMaterialListCell.swift; sourceTree = "<group>"; };
047F3DF12CE888EF001B2A6D /* YHDocumentListCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHDocumentListCell.swift; sourceTree = "<group>"; }; 047F3DF12CE888EF001B2A6D /* YHDocumentListCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHDocumentListCell.swift; sourceTree = "<group>"; };
047F3DF32CE88ACD001B2A6D /* YHImproveSchemeCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHImproveSchemeCell.swift; sourceTree = "<group>"; }; 047F3DF32CE88ACD001B2A6D /* YHImproveSchemeCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHImproveSchemeCell.swift; sourceTree = "<group>"; };
047F3DF52CE8A1C4001B2A6D /* YHModifySchemeInfoCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHModifySchemeInfoCell.swift; sourceTree = "<group>"; };
0480582E2C7CA77900502CAA /* YHDisappointHKAlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHDisappointHKAlertView.swift; sourceTree = "<group>"; }; 0480582E2C7CA77900502CAA /* YHDisappointHKAlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHDisappointHKAlertView.swift; sourceTree = "<group>"; };
048058302C7DBDC900502CAA /* YHTravelCertificateTipsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHTravelCertificateTipsView.swift; sourceTree = "<group>"; }; 048058302C7DBDC900502CAA /* YHTravelCertificateTipsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHTravelCertificateTipsView.swift; sourceTree = "<group>"; };
048058322C7DC0CF00502CAA /* YHTravelCertificateTipsCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHTravelCertificateTipsCell.swift; sourceTree = "<group>"; }; 048058322C7DC0CF00502CAA /* YHTravelCertificateTipsCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHTravelCertificateTipsCell.swift; sourceTree = "<group>"; };
...@@ -3642,6 +3644,7 @@ ...@@ -3642,6 +3644,7 @@
047F3DEF2CE88380001B2A6D /* YHMaterialListCell.swift */, 047F3DEF2CE88380001B2A6D /* YHMaterialListCell.swift */,
047F3DF12CE888EF001B2A6D /* YHDocumentListCell.swift */, 047F3DF12CE888EF001B2A6D /* YHDocumentListCell.swift */,
047F3DF32CE88ACD001B2A6D /* YHImproveSchemeCell.swift */, 047F3DF32CE88ACD001B2A6D /* YHImproveSchemeCell.swift */,
047F3DF52CE8A1C4001B2A6D /* YHModifySchemeInfoCell.swift */,
047F3DE52CE83A0F001B2A6D /* YHHKRequiredItemView.swift */, 047F3DE52CE83A0F001B2A6D /* YHHKRequiredItemView.swift */,
047F3DEB2CE84BD5001B2A6D /* YHImproveRequireItemView.swift */, 047F3DEB2CE84BD5001B2A6D /* YHImproveRequireItemView.swift */,
); );
...@@ -5710,6 +5713,7 @@ ...@@ -5710,6 +5713,7 @@
04E86E662B86EB6F00A35F4B /* YHLoginManager.swift in Sources */, 04E86E662B86EB6F00A35F4B /* YHLoginManager.swift in Sources */,
04A7BD112BA4218B00BD35A2 /* YHMyDocumentsListViewModel.swift in Sources */, 04A7BD112BA4218B00BD35A2 /* YHMyDocumentsListViewModel.swift in Sources */,
0472CBA82C5A11640096F48F /* YHPrincipleUploadListVC.swift in Sources */, 0472CBA82C5A11640096F48F /* YHPrincipleUploadListVC.swift in Sources */,
047F3DF62CE8A1C4001B2A6D /* YHModifySchemeInfoCell.swift in Sources */,
A5EF21352BA6E05E005027E6 /* YHQuestionAndAnswerViewController.swift in Sources */, A5EF21352BA6E05E005027E6 /* YHQuestionAndAnswerViewController.swift in Sources */,
A5EF213B2BA6EC98005027E6 /* YHQuestionAndAnswerCell.swift in Sources */, A5EF213B2BA6EC98005027E6 /* YHQuestionAndAnswerCell.swift in Sources */,
04912F702CB765FE00CC3105 /* YHResignAppointTimeViewController.swift in Sources */, 04912F702CB765FE00CC3105 /* YHResignAppointTimeViewController.swift in Sources */,
......
...@@ -49,6 +49,8 @@ class YHMyNewSchemeViewController: YHBaseViewController { ...@@ -49,6 +49,8 @@ class YHMyNewSchemeViewController: YHBaseViewController {
tableView.register(YHDocumentListCell.self, forCellReuseIdentifier: YHDocumentListCell.cellReuseIdentifier) tableView.register(YHDocumentListCell.self, forCellReuseIdentifier: YHDocumentListCell.cellReuseIdentifier)
tableView.register(YHImproveSchemeCell.self, forCellReuseIdentifier: YHImproveSchemeCell.cellReuseIdentifier) tableView.register(YHImproveSchemeCell.self, forCellReuseIdentifier: YHImproveSchemeCell.cellReuseIdentifier)
tableView.register(YHImproveTargetCell.self, forCellReuseIdentifier: YHImproveTargetCell.cellReuseIdentifier) tableView.register(YHImproveTargetCell.self, forCellReuseIdentifier: YHImproveTargetCell.cellReuseIdentifier)
tableView.register(YHModifySchemeInfoCell.self, forCellReuseIdentifier: YHModifySchemeInfoCell.cellReuseIdentifier)
tableView.bounces = false tableView.bounces = false
tableView.tableFooterView = bottomLogoView tableView.tableFooterView = bottomLogoView
return tableView return tableView
...@@ -107,7 +109,7 @@ class YHMyNewSchemeViewController: YHBaseViewController { ...@@ -107,7 +109,7 @@ class YHMyNewSchemeViewController: YHBaseViewController {
func requestData() { func requestData() {
items.removeAll() items.removeAll()
let isPass = true let isPass = false
if isPass { if isPass {
let item1 = YHSchemeItem(type: .evaluate) let item1 = YHSchemeItem(type: .evaluate)
let item2 = YHSchemeItem(type: .hkRequireList) let item2 = YHSchemeItem(type: .hkRequireList)
...@@ -186,6 +188,11 @@ extension YHMyNewSchemeViewController : UITableViewDelegate, UITableViewDataSour ...@@ -186,6 +188,11 @@ extension YHMyNewSchemeViewController : UITableViewDelegate, UITableViewDataSour
return listCell return listCell
} }
if item.type == .modifyInfo {
let listCell = tableView.dequeueReusableCell(withIdentifier: YHModifySchemeInfoCell.cellReuseIdentifier, for: indexPath) as! YHModifySchemeInfoCell
return listCell
}
if item.type == .improveTarget { if item.type == .improveTarget {
let listCell = tableView.dequeueReusableCell(withIdentifier: YHImproveTargetCell.cellReuseIdentifier, for: indexPath) as! YHImproveTargetCell let listCell = tableView.dequeueReusableCell(withIdentifier: YHImproveTargetCell.cellReuseIdentifier, for: indexPath) as! YHImproveTargetCell
return listCell return listCell
...@@ -220,6 +227,6 @@ extension YHMyNewSchemeViewController : UITableViewDelegate, UITableViewDataSour ...@@ -220,6 +227,6 @@ extension YHMyNewSchemeViewController : UITableViewDelegate, UITableViewDataSour
} }
func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat { func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
return 0.01 return 12.0
} }
} }
...@@ -48,6 +48,21 @@ class YHDocumentListCell: UITableViewCell { ...@@ -48,6 +48,21 @@ class YHDocumentListCell: UITableViewCell {
return label return label
}() }()
lazy var rightBtn: UIButton = {
let button = UIButton(type: .custom)
button.titleLabel?.font = UIFont.PFSC_M(ofSize: 12)
button.backgroundColor = UIColor(hex: 0xd48638).withAlphaComponent(0.08)
button.contentHorizontalAlignment = .center
button.setTitle("文书写作", for: .normal)
button.setImage(UIImage(named: "scheme_button_icon"), for: .normal)
button.setTitleColor(UIColor(hex:0xd48638), for: .normal)
button.layer.cornerRadius = kCornerRadius3
button.clipsToBounds = true
button.YH_clickEdgeInsets = UIEdgeInsets(top: 0, left: 20, bottom: 20, right: 20)
// button.addTarget(self, action: #selector(goNext), for: .touchUpInside)
return button
}()
required init?(coder: NSCoder) { required init?(coder: NSCoder) {
super.init(coder: coder) super.init(coder: coder)
} }
...@@ -69,7 +84,8 @@ class YHDocumentListCell: UITableViewCell { ...@@ -69,7 +84,8 @@ class YHDocumentListCell: UITableViewCell {
whiteContentView.addSubview(markImgV) whiteContentView.addSubview(markImgV)
whiteContentView.addSubview(titleLabel) whiteContentView.addSubview(titleLabel)
whiteContentView.addSubview(tips1Label) whiteContentView.addSubview(tips1Label)
whiteContentView.addSubview(rightBtn)
whiteContentView.snp.makeConstraints { make in whiteContentView.snp.makeConstraints { make in
make.left.equalTo(8.5) make.left.equalTo(8.5)
make.right.equalTo(-8.5) make.right.equalTo(-8.5)
...@@ -103,6 +119,15 @@ class YHDocumentListCell: UITableViewCell { ...@@ -103,6 +119,15 @@ class YHDocumentListCell: UITableViewCell {
make.top.equalTo(titleLabel.snp.bottom).offset(18) make.top.equalTo(titleLabel.snp.bottom).offset(18)
make.bottom.equalTo(-26) make.bottom.equalTo(-26)
} }
rightBtn.snp.makeConstraints { make in
make.width.equalTo(76)
make.height.equalTo(27)
make.right.equalTo(-24)
make.top.equalTo(titleLabel)
}
rightBtn.iconInRight(with: 2)
} }
......
...@@ -46,6 +46,21 @@ class YHImproveSchemeCell: UITableViewCell { ...@@ -46,6 +46,21 @@ class YHImproveSchemeCell: UITableViewCell {
return label return label
}() }()
lazy var rightBtn: UIButton = {
let button = UIButton(type: .custom)
button.titleLabel?.font = UIFont.PFSC_M(ofSize: 12)
button.backgroundColor = UIColor(hex: 0xd48638).withAlphaComponent(0.08)
button.contentHorizontalAlignment = .center
button.setTitle("查看详情", for: .normal)
button.setImage(UIImage(named: "scheme_button_icon"), for: .normal)
button.setTitleColor(UIColor(hex:0xd48638), for: .normal)
button.layer.cornerRadius = kCornerRadius3
button.clipsToBounds = true
button.YH_clickEdgeInsets = UIEdgeInsets(top: 0, left: 20, bottom: 20, right: 20)
// button.addTarget(self, action: #selector(goNext), for: .touchUpInside)
return button
}()
required init?(coder: NSCoder) { required init?(coder: NSCoder) {
super.init(coder: coder) super.init(coder: coder)
} }
...@@ -67,7 +82,8 @@ class YHImproveSchemeCell: UITableViewCell { ...@@ -67,7 +82,8 @@ class YHImproveSchemeCell: UITableViewCell {
whiteContentView.addSubview(markImgV) whiteContentView.addSubview(markImgV)
whiteContentView.addSubview(titleLabel) whiteContentView.addSubview(titleLabel)
whiteContentView.addSubview(tips1Label) whiteContentView.addSubview(tips1Label)
whiteContentView.addSubview(rightBtn)
whiteContentView.snp.makeConstraints { make in whiteContentView.snp.makeConstraints { make in
make.left.equalTo(8.5) make.left.equalTo(8.5)
make.right.equalTo(-8.5) make.right.equalTo(-8.5)
...@@ -101,6 +117,14 @@ class YHImproveSchemeCell: UITableViewCell { ...@@ -101,6 +117,14 @@ class YHImproveSchemeCell: UITableViewCell {
make.top.equalTo(titleLabel.snp.bottom).offset(18) make.top.equalTo(titleLabel.snp.bottom).offset(18)
make.bottom.equalTo(-32) make.bottom.equalTo(-32)
} }
rightBtn.snp.makeConstraints { make in
make.width.equalTo(76)
make.height.equalTo(27)
make.right.equalTo(-24)
make.top.equalTo(titleLabel)
}
rightBtn.iconInRight(with: 2)
} }
......
...@@ -57,6 +57,21 @@ class YHMaterialListCell: UITableViewCell { ...@@ -57,6 +57,21 @@ class YHMaterialListCell: UITableViewCell {
return label return label
}() }()
lazy var rightBtn: UIButton = {
let button = UIButton(type: .custom)
button.titleLabel?.font = UIFont.PFSC_M(ofSize: 12)
button.backgroundColor = UIColor(hex: 0xd48638).withAlphaComponent(0.08)
button.contentHorizontalAlignment = .center
button.setTitle("资料清单", for: .normal)
button.setImage(UIImage(named: "scheme_button_icon"), for: .normal)
button.setTitleColor(UIColor(hex:0xd48638), for: .normal)
button.layer.cornerRadius = kCornerRadius3
button.clipsToBounds = true
button.YH_clickEdgeInsets = UIEdgeInsets(top: 0, left: 20, bottom: 20, right: 20)
// button.addTarget(self, action: #selector(goNext), for: .touchUpInside)
return button
}()
required init?(coder: NSCoder) { required init?(coder: NSCoder) {
super.init(coder: coder) super.init(coder: coder)
} }
...@@ -79,7 +94,8 @@ class YHMaterialListCell: UITableViewCell { ...@@ -79,7 +94,8 @@ class YHMaterialListCell: UITableViewCell {
whiteContentView.addSubview(titleLabel) whiteContentView.addSubview(titleLabel)
whiteContentView.addSubview(tips1Label) whiteContentView.addSubview(tips1Label)
whiteContentView.addSubview(tips2Label) whiteContentView.addSubview(tips2Label)
whiteContentView.addSubview(rightBtn)
whiteContentView.snp.makeConstraints { make in whiteContentView.snp.makeConstraints { make in
make.left.equalTo(8.5) make.left.equalTo(8.5)
make.right.equalTo(-8.5) make.right.equalTo(-8.5)
...@@ -119,8 +135,16 @@ class YHMaterialListCell: UITableViewCell { ...@@ -119,8 +135,16 @@ class YHMaterialListCell: UITableViewCell {
make.top.equalTo(tips1Label.snp.bottom).offset(6) make.top.equalTo(tips1Label.snp.bottom).offset(6)
make.bottom.equalTo(-26) make.bottom.equalTo(-26)
} }
}
rightBtn.snp.makeConstraints { make in
make.width.equalTo(76)
make.height.equalTo(27)
make.right.equalTo(-24)
make.top.equalTo(titleLabel)
}
rightBtn.iconInRight(with: 2)
}
} }
//
// YHModifySchemeInfoCell.swift
// galaxy
//
// Created by Dufet on 2024/11/16.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
class YHModifySchemeInfoCell: UITableViewCell {
static let cellReuseIdentifier = "YHModifySchemeInfoCell"
lazy var bottomBtn: UIButton = {
let btn = UIButton()
btn.backgroundColor = .white
btn.setTitleColor(.init(hex: 0xD48638), for: .normal)
btn.layer.borderColor = UIColor.init(hex: 0xD48638).cgColor
btn.layer.borderWidth = 1.0
btn.titleLabel?.font = .PFSC_M(ofSize: 16)
btn.layer.cornerRadius = 3
btn.setTitle("修改信息", for: .normal)
return btn
}()
lazy var whiteContentView: UIView = {
let view = UIView()
view.backgroundColor = .white
view.clipsToBounds = true
return view
}()
required init?(coder: NSCoder) {
super.init(coder: coder)
}
override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
super.init(style: style, reuseIdentifier: reuseIdentifier)
setupUI()
}
func setupUI() {
selectionStyle = .none
contentView.backgroundColor = .clear
backgroundColor = .clear
contentView.clipsToBounds = true
contentView.addSubview(whiteContentView)
whiteContentView.addSubview(bottomBtn)
whiteContentView.snp.makeConstraints { make in
make.left.equalTo(8.5)
make.right.equalTo(-8.5)
make.top.bottom.equalToSuperview()
}
bottomBtn.snp.makeConstraints { make in
make.left.equalTo(24)
make.right.equalTo(-24)
make.top.equalTo(0)
make.bottom.equalTo(-24)
make.height.equalTo(46)
}
}
}
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