Commit 07848f25 authored by lujunye's avatar lujunye

禅道bug修复

parent 6f3b472c
...@@ -11,6 +11,7 @@ import IQKeyboardManagerSwift ...@@ -11,6 +11,7 @@ import IQKeyboardManagerSwift
@objc protocol GLAlertSelectViewDelegate { @objc protocol GLAlertSelectViewDelegate {
@objc optional func GLAlertSelectViewFinish(sender:UIButton,title:String,cellTag:Int) @objc optional func GLAlertSelectViewFinish(sender:UIButton,title:String,cellTag:Int)
@objc optional func GLAlertSelectDone()
//普通状态(单多选) //普通状态(单多选)
@objc optional func GLAlertSelectViewClick(selectNum:Int,view:GLAlertSelectView)//单选 @objc optional func GLAlertSelectViewClick(selectNum:Int,view:GLAlertSelectView)//单选
@objc optional func GLAlertMoreSelectViewClick(sender:Array<Int>,view:UIView)//多选 @objc optional func GLAlertMoreSelectViewClick(sender:Array<Int>,view:UIView)//多选
...@@ -273,6 +274,10 @@ class GLAlertSelectView: UIView,UITableViewDelegate,UITableViewDataSource,TitleA ...@@ -273,6 +274,10 @@ class GLAlertSelectView: UIView,UITableViewDelegate,UITableViewDataSource,TitleA
return return
} }
if isYsYf { if isYsYf {
if deSelectArr.count > 0 {
delegate?.GLAlertSelectDone?()
return
}
let alertView = GeliAlertView(frame: self.window!.bounds) let alertView = GeliAlertView(frame: self.window!.bounds)
alertView.delegate = self; alertView.delegate = self;
alertView.tishiLbl.text = "" alertView.tishiLbl.text = ""
...@@ -281,6 +286,7 @@ class GLAlertSelectView: UIView,UITableViewDelegate,UITableViewDataSource,TitleA ...@@ -281,6 +286,7 @@ class GLAlertSelectView: UIView,UITableViewDelegate,UITableViewDataSource,TitleA
alertView.rightBtn.tag = selectNum! alertView.rightBtn.tag = selectNum!
self.window?.addSubview(alertView) self.window?.addSubview(alertView)
}else{ }else{
delegate?.GLAlertSelectViewClick?(selectNum: selectNum!,view: self) delegate?.GLAlertSelectViewClick?(selectNum: selectNum!,view: self)
} }
}else{ }else{
......
...@@ -113,10 +113,10 @@ class XinZengAndBianJiKeHuViewController: BaseViewController,UITableViewDataSour ...@@ -113,10 +113,10 @@ class XinZengAndBianJiKeHuViewController: BaseViewController,UITableViewDataSour
HUD.flash(.label("请填写客户公司名称"), delay: 1.2) HUD.flash(.label("请填写客户公司名称"), delay: 1.2)
return return
} }
if bindKehu.count == 0 { // if bindKehu.count == 0 {
HUD.flash(.label("请选择绑定用户"), delay: 1.2) // HUD.flash(.label("请选择绑定用户"), delay: 1.2)
return // return
} // }
// if discount.count == 0 { // if discount.count == 0 {
// HUD.flash(.label("请填写折扣数,没有折扣请输入0"), delay: 1.2) // HUD.flash(.label("请填写折扣数,没有折扣请输入0"), delay: 1.2)
// return // return
...@@ -141,9 +141,6 @@ class XinZengAndBianJiKeHuViewController: BaseViewController,UITableViewDataSour ...@@ -141,9 +141,6 @@ class XinZengAndBianJiKeHuViewController: BaseViewController,UITableViewDataSour
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
print("===",bindKehu,phoneNum,companyName)
navbar.title = titleStr navbar.title = titleStr
if (titleStr?.contains("编辑"))! { if (titleStr?.contains("编辑"))! {
navbar.rightTitle = "删除" navbar.rightTitle = "删除"
......
...@@ -408,6 +408,12 @@ class CGDXQVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,GLAl ...@@ -408,6 +408,12 @@ class CGDXQVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,GLAl
} }
} }
} }
func GLAlertSelectDone() {
glSelectView?.removeFromSuperview()
glSelectView = nil
}
func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
if indexPath.section == 0 { if indexPath.section == 0 {
......
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