From e86e19e5e5909f46e09adec1df430e0214a81590 Mon Sep 17 00:00:00 2001
From: 无故事王国 <841720330@qq.com>
Date: 星期三, 18 十月 2023 18:34:19 +0800
Subject: [PATCH] 修复BUG
---
WanPai/Root/Yard/View/YardBookingTimeView.swift | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 deletions(-)
diff --git a/WanPai/Root/Yard/View/YardBookingTimeView.swift b/WanPai/Root/Yard/View/YardBookingTimeView.swift
index bd4ffd5..2eff145 100644
--- a/WanPai/Root/Yard/View/YardBookingTimeView.swift
+++ b/WanPai/Root/Yard/View/YardBookingTimeView.swift
@@ -13,6 +13,8 @@
@IBOutlet weak var cons_viewTop: NSLayoutConstraint!
@IBOutlet weak var tf_startTime: UITextField!
@IBOutlet weak var tf_endTime: UITextField!
+ private var defaultStarTime:String?
+ private var defaultEndTime:String?
private var closeClouse:((String,String)->Void)?
@@ -24,10 +26,14 @@
}
@discardableResult
- static func show(inView:UIView,afterView:UIView,closeClouse:@escaping (String,String)->Void)->YardBookingTimeView{
+ static func show(inView:UIView,afterView:UIView,defaultStarTime:String? = nil,defaultEndTime:String? = nil,closeClouse:@escaping (String,String)->Void)->YardBookingTimeView{
let yardBookingTimeView = YardBookingTimeView.jq_loadNibView()
inView.addSubview(yardBookingTimeView)
yardBookingTimeView.closeClouse = closeClouse
+ yardBookingTimeView.defaultStarTime = defaultStarTime
+ yardBookingTimeView.defaultEndTime = defaultEndTime
+ yardBookingTimeView.tf_startTime.text = defaultStarTime
+ yardBookingTimeView.tf_endTime.text = defaultEndTime
yardBookingTimeView.snp.makeConstraints { make in
make.top.equalTo(afterView.snp.bottom)
make.left.right.bottom.equalTo(inView)
@@ -43,19 +49,38 @@
@IBAction func startTimeAction(_ sender: Any) {
+ tf_endTime.text = ""
CommonDatePickerView.show(type: .HHmm) {[weak self] _, _, _,hour,minute in
self?.tf_startTime.text = String(format: "%02ld:%02ld", hour!,minute!)
}
}
@IBAction func endTimeAction(_ sender: Any) {
+ if tf_startTime.text == ""{
+ alert(msg: "请先选择开始时间");return
+ }
CommonDatePickerView.show(type: .HHmm) { [weak self] _, _, _,hour,minute in
+ if hour ?? 0 < self?.tf_startTime.text!.components(separatedBy: ":").first?.int ?? 0{
+ alert(msg: "结束时间不能小于开始时间");return
+ }
self?.tf_endTime.text = String(format: "%02ld:%02ld", hour!,minute!)
+
+ self?.cons_viewTop.constant = -133
+ UIView.animate(withDuration: 0.4) {
+ self!.alpha = 0
+ self!.layoutIfNeeded()
+ } completion: { _ in
+ let startDate = self!.tf_startTime.text!
+ let endDate = self!.tf_endTime.text!
+ self!.closeClouse?(startDate,endDate)
+ self!.removeFromSuperview()
+ }
}
}
@IBAction func closeAction(_ sender: Any) {
+ //以下，点击空白收回，可能废弃
cons_viewTop.constant = -133
UIView.animate(withDuration: 0.4) {
self.alpha = 0
--
Gitblit v1.7.1