Commit a5a1a6d8 authored by David黄金龙's avatar David黄金龙

双 11 活动

parent 42661bed
...@@ -174,10 +174,10 @@ extension YHHomeBannerView: FSPagerViewDataSource, FSPagerViewDelegate { ...@@ -174,10 +174,10 @@ extension YHHomeBannerView: FSPagerViewDataSource, FSPagerViewDelegate {
let vc = YHH5WebViewVC() let vc = YHH5WebViewVC()
vc.url = tUrl vc.url = tUrl
vc.isFullScreenFlag = false // vc.isFullScreenFlag = false
if model.is_double_11_flag { if model.is_double_11_flag {
vc.isHideNavigationBar = true vc.isHideNavigationBar = false//确认了不隐藏导航栏
} }
......
...@@ -95,7 +95,7 @@ class YHRangeDatePickerSheetView2: UIView { ...@@ -95,7 +95,7 @@ class YHRangeDatePickerSheetView2: UIView {
lazy var timeHoldView : YHPickTimeHoldView = { lazy var timeHoldView : YHPickTimeHoldView = {
let imageV = YHPickTimeHoldView() let imageV = YHPickTimeHoldView()
imageV.backgroundColor = .yellow //52 // imageV.backgroundColor = .yellow //for test hjl
return imageV return imageV
}() }()
...@@ -116,8 +116,30 @@ class YHRangeDatePickerSheetView2: UIView { ...@@ -116,8 +116,30 @@ class YHRangeDatePickerSheetView2: UIView {
typealias Block = (String,String) -> () typealias Block = (String,String) -> ()
var block: Block? var block: Block?
var minDateStr : String = "2024-10-01 14:00" var minDateStr : String = "2024-10-01 14:00" {
var maxDateStr : String = "2025-10-01 14:00" didSet {
let dateFormatter = DateFormatter()
dateFormatter.dateFormat = "yyyy-MM-dd HH:mm"
if minDateStr.count == "2024-11-10 14:20".count {
let miniDate = dateFormatter.date(from: minDateStr)
datePickView.minDate = miniDate
}
}
}
var maxDateStr : String = "2025-10-01 14:00" {
didSet {
let dateFormatter = DateFormatter()
dateFormatter.dateFormat = "yyyy-MM-dd HH:mm"
if maxDateStr.count == "2024-11-10 14:20".count {
let maxDate = dateFormatter.date(from: maxDateStr)
datePickView.maxDate = maxDate
}
}
}
} }
extension YHRangeDatePickerSheetView2 { extension YHRangeDatePickerSheetView2 {
......
...@@ -136,14 +136,14 @@ extension YHRangeDatePickerView2 { ...@@ -136,14 +136,14 @@ extension YHRangeDatePickerView2 {
if let minDate = minDate { if let minDate = minDate {
return minDate return minDate
} }
return self.gregorian.date(byAdding: .day, value: 1, to: Date())! return self.gregorian.date(byAdding: .day, value: 0, to: Date())!
} }
func maximumDate(for calendar: FSCalendar) -> Date { func maximumDate(for calendar: FSCalendar) -> Date {
if let maxDate = maxDate { if let maxDate = maxDate {
return maxDate return maxDate
} }
return self.gregorian.date(byAdding: .day, value: 365, to: Date())! return self.gregorian.date(byAdding: .day, value: 30, to: Date())!
} }
func calendar(_ calendar: FSCalendar, cellFor date: Date, at monthPosition: FSCalendarMonthPosition) -> FSCalendarCell { func calendar(_ calendar: FSCalendar, cellFor date: Date, at monthPosition: FSCalendarMonthPosition) -> FSCalendarCell {
...@@ -200,7 +200,7 @@ private extension YHRangeDatePickerView2 { ...@@ -200,7 +200,7 @@ private extension YHRangeDatePickerView2 {
make.height.equalTo(YHRangeDatePickerView2.viewH2) make.height.equalTo(YHRangeDatePickerView2.viewH2)
} }
calendar.backgroundColor = .red //for test hjl // calendar.backgroundColor = .red //for test hjl
} }
func tapOneDate(_ date : Date) { func tapOneDate(_ date : Date) {
......
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