Commit 5feaf3a7 authored by David黄金龙's avatar David黄金龙

离港 不展示 最佳

parent aa7c78de
...@@ -153,6 +153,13 @@ class YHRangeDatePickerSheetView2: UIView { ...@@ -153,6 +153,13 @@ class YHRangeDatePickerSheetView2: UIView {
titleLable.text = viewTitle titleLable.text = viewTitle
} }
} }
var showBestFlag : Bool = true {
didSet {
datePickView.showBestDateFlag = showBestFlag
}
}
} }
extension YHRangeDatePickerSheetView2 { extension YHRangeDatePickerSheetView2 {
...@@ -320,6 +327,8 @@ private extension YHRangeDatePickerSheetView2 { ...@@ -320,6 +327,8 @@ private extension YHRangeDatePickerSheetView2 {
datePickView.maxDate = maxDate datePickView.maxDate = maxDate
} }
datePickView.showBestDateFlag = showBestFlag
......
...@@ -108,6 +108,13 @@ class YHRangeDatePickerView2: UIView,FSCalendarDataSource, FSCalendarDelegate, F ...@@ -108,6 +108,13 @@ class YHRangeDatePickerView2: UIView,FSCalendarDataSource, FSCalendarDelegate, F
var endDate: Date? var endDate: Date?
var showBestDateFlag : Bool = true {
didSet {
calendar.reloadData()
}
}
override init(frame: CGRect) { override init(frame: CGRect) {
super.init(frame: .zero) super.init(frame: .zero)
setupUI() setupUI()
...@@ -124,7 +131,7 @@ extension YHRangeDatePickerView2 { ...@@ -124,7 +131,7 @@ extension YHRangeDatePickerView2 {
func calendar(_ calendar: FSCalendar, subtitleFor date: Date) -> String? { func calendar(_ calendar: FSCalendar, subtitleFor date: Date) -> String? {
if let maxBestDate = maxBestDate { if showBestDateFlag ,let maxBestDate = maxBestDate {
print(maxBestDate) print(maxBestDate)
let result = self.gregorian.compare(date, to: maxBestDate, toGranularity: .day) let result = self.gregorian.compare(date, to: maxBestDate, toGranularity: .day)
......
...@@ -162,6 +162,7 @@ class YHResignAppointTimeMultipleCell: UITableViewCell { ...@@ -162,6 +162,7 @@ class YHResignAppointTimeMultipleCell: UITableViewCell {
view.viewTitle = "选择预计离港时间" view.viewTitle = "选择预计离港时间"
view.minDateStr = startDate view.minDateStr = startDate
view.maxDateStr = endDate view.maxDateStr = endDate
view.showBestFlag = false
view.block = { view.block = {
[weak self] (selectDateStr, hourTime) in [weak self] (selectDateStr, hourTime) in
guard let self = self else { return } guard let self = self else { return }
......
...@@ -113,6 +113,7 @@ class YHResignAppointTimeSingleCell: UITableViewCell { ...@@ -113,6 +113,7 @@ class YHResignAppointTimeSingleCell: UITableViewCell {
view.viewTitle = "选择预计离港时间" view.viewTitle = "选择预计离港时间"
view.minDateStr = startDate view.minDateStr = startDate
view.maxDateStr = endDate view.maxDateStr = endDate
view.showBestFlag = false
view.block = { view.block = {
[weak self] (selectDateStr, hourTime) in [weak self] (selectDateStr, hourTime) in
guard let self = self else { return } guard let self = self else { return }
......
...@@ -408,7 +408,7 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource { ...@@ -408,7 +408,7 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
let vc = YHAboutGalaxyViewController() let vc = YHAboutGalaxyViewController()
self.navigationController?.pushViewController(vc) self.navigationController?.pushViewController(vc)
case .myOrder: case .myOrder:
//我的订单 // 我的订单
if let token = YHLoginManager.shared.userModel?.token,token.count > 5 { if let token = YHLoginManager.shared.userModel?.token,token.count > 5 {
var url = YHBaseUrlManager.shared.curH5URL() + "superAppBridge.html#/order/my" var url = YHBaseUrlManager.shared.curH5URL() + "superAppBridge.html#/order/my"
url = url + "?param=" + YHLoginManager.shared.h5Token url = url + "?param=" + YHLoginManager.shared.h5Token
...@@ -426,6 +426,7 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource { ...@@ -426,6 +426,7 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
// view.maxDateStr = "2024-11-19" // view.maxDateStr = "2024-11-19"
//// view.defaultTime = "12:00" //// view.defaultTime = "12:00"
// view.viewTitle = "Demo" // view.viewTitle = "Demo"
// view.showBestFlag = false
// view.block = { // view.block = {
// [weak self] (startDate,time) in // [weak self] (startDate,time) in
// guard self != nil else { return } // guard self != nil else { return }
......
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