Commit 36c912ae authored by Steven杜宇's avatar Steven杜宇

// 删除待确认在港

parent 0853cb1c
...@@ -329,7 +329,6 @@ class YHResignAppointScheduleListViewController: YHBaseViewController { ...@@ -329,7 +329,6 @@ class YHResignAppointScheduleListViewController: YHBaseViewController {
if lastLeftUnselectUsers.count > 0 { // 如果还有剩余的人 这批人不在行程列表里 可能是在后台随意操作删除用户的 if lastLeftUnselectUsers.count > 0 { // 如果还有剩余的人 这批人不在行程列表里 可能是在后台随意操作删除用户的
let model = YHResignAppointTimeSettingModel() let model = YHResignAppointTimeSettingModel()
let status = YHResignConfirmHKStatus.waitConfirmHK
model.isHaveAppointed = false model.isHaveAppointed = false
model.ready_to_submit_at = "" model.ready_to_submit_at = ""
model.leave_hk_at = "" model.leave_hk_at = ""
......
...@@ -70,16 +70,17 @@ class YHResignAppointGroup: SmartCodable { ...@@ -70,16 +70,17 @@ class YHResignAppointGroup: SmartCodable {
dateFormatter.dateFormat = "yyyy-MM-dd HH:mm" dateFormatter.dateFormat = "yyyy-MM-dd HH:mm"
let nowDateString = dateFormatter.string(from: Date()) let nowDateString = dateFormatter.string(from: Date())
var confirmStatus = YHResignConfirmHKStatus.waitConfirmHK var confirmStatus = YHResignConfirmHKStatus.canConfirmHK
if self.determine_hk_at.isEmpty { if self.determine_hk_at.isEmpty {
// 是否到了预约递交时间 // 是否到了预约递交时间
let isArriveSubmitTime = compareDates(self.ready_to_submit_at, nowDateString) // let isArriveSubmitTime = compareDates(self.ready_to_submit_at, nowDateString)
if isArriveSubmitTime { // if isArriveSubmitTime {
confirmStatus = .waitConfirmHK // confirmStatus = .waitConfirmHK
} else { // } else {
// confirmStatus = .canConfirmHK
// }
confirmStatus = .canConfirmHK confirmStatus = .canConfirmHK
}
} else { // 有确认在港日期 } else { // 有确认在港日期
confirmStatus = .haveConfirmHK confirmStatus = .haveConfirmHK
......
...@@ -10,9 +10,9 @@ import UIKit ...@@ -10,9 +10,9 @@ import UIKit
class YHPickTimeHoldView: UIView { class YHPickTimeHoldView: UIView {
var clickConfirmBtnBlock: ((YHResignConfirmHKStatus) -> Void)? // var clickConfirmBtnBlock: ((YHResignConfirmHKStatus) -> Void)?
//
var confirmHKStatus: YHResignConfirmHKStatus = .waitConfirmHK // var confirmHKStatus: YHResignConfirmHKStatus = .waitConfirmHK
lazy var lineView: UIView = { lazy var lineView: UIView = {
let view = UIView() let view = UIView()
...@@ -61,7 +61,7 @@ class YHPickTimeHoldView: UIView { ...@@ -61,7 +61,7 @@ class YHPickTimeHoldView: UIView {
} }
@objc func didConfirmInHKBtnClicked() { @objc func didConfirmInHKBtnClicked() {
clickConfirmBtnBlock?(self.confirmHKStatus) // clickConfirmBtnBlock?(self.confirmHKStatus)
} }
func createUI() { func createUI() {
......
...@@ -13,7 +13,7 @@ class YHResignAppointedScheduleSingleItemView: UIView { ...@@ -13,7 +13,7 @@ class YHResignAppointedScheduleSingleItemView: UIView {
var clickConfirmBtnBlock: ((YHResignConfirmHKStatus) -> Void)? var clickConfirmBtnBlock: ((YHResignConfirmHKStatus) -> Void)?
var applyPaymentBlock: (() -> Void)? var applyPaymentBlock: (() -> Void)?
var confirmHKStatus: YHResignConfirmHKStatus = .waitConfirmHK var confirmHKStatus: YHResignConfirmHKStatus = .canConfirmHK
lazy var lineView: UIView = { lazy var lineView: UIView = {
let view = UIView() let view = UIView()
...@@ -120,9 +120,11 @@ class YHResignAppointedScheduleSingleItemView: UIView { ...@@ -120,9 +120,11 @@ class YHResignAppointedScheduleSingleItemView: UIView {
confirmInHKBtn.isHidden = (self.confirmHKStatus == .haveConfirmHK) confirmInHKBtn.isHidden = (self.confirmHKStatus == .haveConfirmHK)
var statusWidth = 71.0 var statusWidth = 71.0
if self.confirmHKStatus == .waitConfirmHK { // if self.confirmHKStatus == .waitConfirmHK {
statusWidth = 71.0 // statusWidth = 71.0
} else if self.confirmHKStatus == .canConfirmHK { // } else
if self.confirmHKStatus == .canConfirmHK {
statusWidth = 68.0 statusWidth = 68.0
} else if self.confirmHKStatus == .haveConfirmHK { } else if self.confirmHKStatus == .haveConfirmHK {
statusWidth = 65.0 statusWidth = 65.0
...@@ -133,15 +135,17 @@ class YHResignAppointedScheduleSingleItemView: UIView { ...@@ -133,15 +135,17 @@ class YHResignAppointedScheduleSingleItemView: UIView {
make.right.equalTo(-18-statusWidth-18) make.right.equalTo(-18-statusWidth-18)
} }
if self.confirmHKStatus == .waitConfirmHK { // if self.confirmHKStatus == .waitConfirmHK {
confirmInHKBtn.setTitle("待确认在港", for: .normal) // confirmInHKBtn.setTitle("待确认在港", for: .normal)
confirmInHKBtn.setTitleColor(.mainTextColor, for: .normal) // confirmInHKBtn.setTitleColor(.mainTextColor, for: .normal)
confirmInHKBtn.backgroundColor = .init(hex: 0xF4F6FA) // confirmInHKBtn.backgroundColor = .init(hex: 0xF4F6FA)
confirmInHKBtn.snp.updateConstraints { make in // confirmInHKBtn.snp.updateConstraints { make in
make.width.equalTo(71) // make.width.equalTo(71)
} // }
//
// } else
} else if self.confirmHKStatus == .canConfirmHK { if self.confirmHKStatus == .canConfirmHK {
confirmInHKBtn.setTitle("确认在港", for: .normal) confirmInHKBtn.setTitle("确认在港", for: .normal)
confirmInHKBtn.setTitleColor(.white, for: .normal) confirmInHKBtn.setTitleColor(.white, for: .normal)
confirmInHKBtn.backgroundColor = .brandMainColor confirmInHKBtn.backgroundColor = .brandMainColor
......
...@@ -12,7 +12,7 @@ class YHResignScheduleMultipleInfoCell: UITableViewCell { ...@@ -12,7 +12,7 @@ class YHResignScheduleMultipleInfoCell: UITableViewCell {
static let cellReuseIdentifier = "YHResignScheduleMultipleInfoCell" static let cellReuseIdentifier = "YHResignScheduleMultipleInfoCell"
var confirmHKStatus: YHResignConfirmHKStatus = .waitConfirmHK var confirmHKStatus: YHResignConfirmHKStatus = .canConfirmHK
var clickConfirmBtnBlock: ((YHResignConfirmHKStatus) -> Void)? var clickConfirmBtnBlock: ((YHResignConfirmHKStatus) -> Void)?
var applyPaymentBlock: (() -> Void)? var applyPaymentBlock: (() -> Void)?
...@@ -148,15 +148,17 @@ class YHResignScheduleMultipleInfoCell: UITableViewCell { ...@@ -148,15 +148,17 @@ class YHResignScheduleMultipleInfoCell: UITableViewCell {
haveConfirmInHKLabel.isHidden = (self.confirmHKStatus != .haveConfirmHK) haveConfirmInHKLabel.isHidden = (self.confirmHKStatus != .haveConfirmHK)
confirmInHKBtn.isHidden = (self.confirmHKStatus == .haveConfirmHK) confirmInHKBtn.isHidden = (self.confirmHKStatus == .haveConfirmHK)
if self.confirmHKStatus == .waitConfirmHK { // if self.confirmHKStatus == .waitConfirmHK {
confirmInHKBtn.setTitle("待确认在港", for: .normal) // confirmInHKBtn.setTitle("待确认在港", for: .normal)
confirmInHKBtn.setTitleColor(.mainTextColor, for: .normal) // confirmInHKBtn.setTitleColor(.mainTextColor, for: .normal)
confirmInHKBtn.backgroundColor = .init(hex: 0xF4F6FA) // confirmInHKBtn.backgroundColor = .init(hex: 0xF4F6FA)
confirmInHKBtn.snp.updateConstraints { make in // confirmInHKBtn.snp.updateConstraints { make in
make.width.equalTo(71) // make.width.equalTo(71)
} // }
//
// } else
} else if self.confirmHKStatus == .canConfirmHK { if self.confirmHKStatus == .canConfirmHK {
confirmInHKBtn.setTitle("确认在港", for: .normal) confirmInHKBtn.setTitle("确认在港", for: .normal)
confirmInHKBtn.setTitleColor(.white, for: .normal) confirmInHKBtn.setTitleColor(.white, for: .normal)
confirmInHKBtn.backgroundColor = .brandMainColor confirmInHKBtn.backgroundColor = .brandMainColor
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
import UIKit import UIKit
enum YHResignConfirmHKStatus: Int { enum YHResignConfirmHKStatus: Int {
case waitConfirmHK = 0 // 待确认在港 // case waitConfirmHK = 0 // 待确认在港
case canConfirmHK = 1 // 可点击确认在港 case canConfirmHK = 1 // 可点击确认在港
case haveConfirmHK = 2 // 已确认在港 case haveConfirmHK = 2 // 已确认在港
} }
......
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