Commit 1a16fcf8 authored by David黄金龙's avatar David黄金龙

几处细节修改

parent 327469b1
...@@ -89,7 +89,7 @@ extension YHActivityDetailViewController { ...@@ -89,7 +89,7 @@ extension YHActivityDetailViewController {
} }
func showApplyUI() { func showApplyUI() {
YHApplyActivityAlert.showApplyActivityAlertView { (tag,name,number,phone) in YHApplyActivityAlert.showApplyActivityAlertView(name: self.viewModel.activityDetailModel?.businessCardName ?? "") { (tag,name,number,phone) in
if tag { if tag {
printLog(tag) printLog(tag)
printLog(name) printLog(name)
......
...@@ -23,5 +23,5 @@ class YHActivityDetailModel: YHActivityModel { ...@@ -23,5 +23,5 @@ class YHActivityDetailModel: YHActivityModel {
var introduce : String = "" //活动介绍 var introduce : String = "" //活动介绍
var posters : [String] = [] //活动海报 var posters : [String] = [] //活动海报
var businessCardName : String = "" //报名人姓名
} }
...@@ -20,9 +20,6 @@ class YHApplyActivityAlert: UIView { ...@@ -20,9 +20,6 @@ class YHApplyActivityAlert: UIView {
var messageLabel: UILabel! var messageLabel: UILabel!
var agreeButton: UIButton! var agreeButton: UIButton!
private let contentViewH : CGFloat = 386.0 private let contentViewH : CGFloat = 386.0
private var applyName : String = "" private var applyName : String = ""
private var applyNumber : Int = 1 private var applyNumber : Int = 1
...@@ -30,6 +27,7 @@ class YHApplyActivityAlert: UIView { ...@@ -30,6 +27,7 @@ class YHApplyActivityAlert: UIView {
private var needCheckFlag : Bool = false private var needCheckFlag : Bool = false
lazy var nameTextField:UITextField = { lazy var nameTextField:UITextField = {
let textField = UITextField() let textField = UITextField()
textField.backgroundColor = .clear textField.backgroundColor = .clear
...@@ -140,8 +138,10 @@ class YHApplyActivityAlert: UIView { ...@@ -140,8 +138,10 @@ class YHApplyActivityAlert: UIView {
}() }()
//类方法 - 展示 //类方法 - 展示
static func showApplyActivityAlertView(callBack: @escaping Block) { static func showApplyActivityAlertView(name : String = "",callBack: @escaping Block) {
let view = YHApplyActivityAlert(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: KScreenHeight)) let view = YHApplyActivityAlert(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: KScreenHeight))
view.applyName = name
view.nameTextField.text = name
view.block = callBack view.block = callBack
let window = UIApplication.shared.yhKeyWindow() let window = UIApplication.shared.yhKeyWindow()
window?.addSubview(view) window?.addSubview(view)
...@@ -292,7 +292,6 @@ extension YHApplyActivityAlert { ...@@ -292,7 +292,6 @@ extension YHApplyActivityAlert {
@objc func clickSubmitBtn() { @objc func clickSubmitBtn() {
subButton.isEnabled = false subButton.isEnabled = false
// needCheckFlag = true
DispatchQueue.main.async { DispatchQueue.main.async {
self.subButton.isEnabled = true self.subButton.isEnabled = true
if self.allDataIsOK() { if self.allDataIsOK() {
...@@ -510,6 +509,7 @@ extension YHApplyActivityAlert { ...@@ -510,6 +509,7 @@ extension YHApplyActivityAlert {
phoneLable.attributed.text = aaa + bbb phoneLable.attributed.text = aaa + bbb
centerView.addSubview(phoneTextField) centerView.addSubview(phoneTextField)
phoneTextField.snp.makeConstraints { make in phoneTextField.snp.makeConstraints { make in
make.left.equalTo(subButton.snp.left) make.left.equalTo(subButton.snp.left)
...@@ -517,6 +517,7 @@ extension YHApplyActivityAlert { ...@@ -517,6 +517,7 @@ extension YHApplyActivityAlert {
make.centerY.equalTo(phoneLable) make.centerY.equalTo(phoneLable)
make.right.equalTo(-20) make.right.equalTo(-20)
} }
phoneTextField.keyboardType = .phonePad
centerView.addSubview(line4) centerView.addSubview(line4)
line4.snp.makeConstraints { make in line4.snp.makeConstraints { make in
...@@ -565,7 +566,7 @@ extension YHApplyActivityAlert { ...@@ -565,7 +566,7 @@ extension YHApplyActivityAlert {
guard let name = nameTextField.text,name.isEmpty == false,let number = applyNumberTextField.text,number.isEmpty == false,let phone = phoneTextField.text,phone.isEmpty == false else { guard let name = nameTextField.text,name.isEmpty == false,let number = applyNumberTextField.text,number.isEmpty == false,let phone = phoneTextField.text,phone.isEmpty == false else {
self.submitButton.isEnabled = false self.submitButton.isEnabled = false
self.submitButton.backgroundColor = UIColor.mainTextColor18 self.submitButton.backgroundColor = UIColor.brandMainColor30
return return
} }
...@@ -599,6 +600,10 @@ extension YHApplyActivityAlert: UITextFieldDelegate { ...@@ -599,6 +600,10 @@ extension YHApplyActivityAlert: UITextFieldDelegate {
textField.text = "10" textField.text = "10"
YHHUD.flash(message: "最多添加10人") YHHUD.flash(message: "最多添加10人")
return false return false
} else if let item = Int(newText),item < 1 {
textField.text = "1"
YHHUD.flash(message: "至少添加1人")
return false
} }
} else if textField == phoneTextField { } else if textField == phoneTextField {
......
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