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

交互优化

parent 43d2a99d
...@@ -177,7 +177,7 @@ extension YHRangeDatePickerSheetView2 { ...@@ -177,7 +177,7 @@ extension YHRangeDatePickerSheetView2 {
@objc func clickSureBtn() { @objc func clickSureBtn() {
if isChooseOk() { if isChooseOk() {
if let date1 = datePickView.startDate,let time = selectedTime { if let date1 = selectedDate,let time = selectedTime {
let dateFormatter = DateFormatter() let dateFormatter = DateFormatter()
dateFormatter.dateFormat = "yyyy-MM-dd" dateFormatter.dateFormat = "yyyy-MM-dd"
let dateString = dateFormatter.string(from: date1) let dateString = dateFormatter.string(from: date1)
...@@ -185,9 +185,10 @@ extension YHRangeDatePickerSheetView2 { ...@@ -185,9 +185,10 @@ extension YHRangeDatePickerSheetView2 {
} }
dismiss() dismiss()
} else { } else {
var msg = ""
var msg = "请选择日期" if selectedDate == nil {
if selectedTime == nil { msg = "请选择日期"
} else {
msg = "请选择具体时间" msg = "请选择具体时间"
} }
YHHUD.flash(message: msg) YHHUD.flash(message: msg)
...@@ -203,13 +204,13 @@ extension YHRangeDatePickerSheetView2 { ...@@ -203,13 +204,13 @@ extension YHRangeDatePickerSheetView2 {
} }
func checkSubmitButtonStatus() { // func checkSubmitButtonStatus() {
if isChooseOk() { // if isChooseOk() {
setSubmitButtonDisable(false) // setSubmitButtonDisable(false)
} else { // } else {
setSubmitButtonDisable(true) // setSubmitButtonDisable(true)
} // }
} // }
} }
private extension YHRangeDatePickerSheetView2 { private extension YHRangeDatePickerSheetView2 {
...@@ -229,14 +230,16 @@ private extension YHRangeDatePickerSheetView2 { ...@@ -229,14 +230,16 @@ private extension YHRangeDatePickerSheetView2 {
return button return button
}() }()
*/ */
rewardBtn.isEnabled = !disableFlag rewardBtn.isEnabled = true
if disableFlag { rewardBtn.backgroundColor = UIColor.brandMainColor
//不可点击
rewardBtn.backgroundColor = UIColor.brandMainColor30 // if disableFlag {
} else { // //不可点击
//可点击 // rewardBtn.backgroundColor = UIColor.brandMainColor30
rewardBtn.backgroundColor = UIColor.brandMainColor // } else {
} // //可点击
// rewardBtn.backgroundColor = UIColor.brandMainColor
// }
} }
func setupUI() { func setupUI() {
...@@ -337,11 +340,13 @@ private extension YHRangeDatePickerSheetView2 { ...@@ -337,11 +340,13 @@ private extension YHRangeDatePickerSheetView2 {
datePickView.block = { [weak self] date in datePickView.block = { [weak self] date in
self?.selectedDate = date self?.selectedDate = date
self?.checkSubmitButtonStatus() // self?.checkSubmitButtonStatus()
if self?.selectedTime == nil { // if self?.selectedTime == nil {
YHHUD.flash(message: "选择具体时间") // YHHUD.flash(message: "选择具体时间")
} // }
// self?.clickSureBtn()
} }
} }
...@@ -350,7 +355,7 @@ private extension YHRangeDatePickerSheetView2 { ...@@ -350,7 +355,7 @@ private extension YHRangeDatePickerSheetView2 {
self.selectedTime = date self.selectedTime = date
self.defaultTime = date self.defaultTime = date
self.timeHoldView.timeTextField.text = date self.timeHoldView.timeTextField.text = date
self.checkSubmitButtonStatus() // self.checkSubmitButtonStatus()
} dismiss: { } dismiss: {
} }
} }
......
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