Commit 53553155 authored by lujunye's avatar lujunye

修复分销商品全选bug

parent ce652027
...@@ -36,6 +36,7 @@ class GYS_FX_ProductCellTableViewCell: UITableViewCell { ...@@ -36,6 +36,7 @@ class GYS_FX_ProductCellTableViewCell: UITableViewCell {
@IBOutlet weak var submitBtn: UIButton! @IBOutlet weak var submitBtn: UIButton!
@IBOutlet weak var old_price_line: UIView! @IBOutlet weak var old_price_line: UIView!
@IBOutlet weak var leftValue: NSLayoutConstraint! @IBOutlet weak var leftValue: NSLayoutConstraint!
override func awakeFromNib() { override func awakeFromNib() {
super.awakeFromNib() super.awakeFromNib()
// Initialization code // Initialization code
......
...@@ -9,25 +9,27 @@ ...@@ -9,25 +9,27 @@
import UIKit import UIKit
class GYS_HZ_Vc: BaseViewController,UITableViewDelegate,UITableViewDataSource, UISearchBarDelegate, SearchBarViewDelegate,GYS_GuanLi_CellDelegate, GeliAlertViewDelegate{ class GYS_HZ_Vc: BaseViewController,UITableViewDelegate,UITableViewDataSource, UISearchBarDelegate, SearchBarViewDelegate,GYS_GuanLi_CellDelegate, GeliAlertViewDelegate{
let UserToken = UserDefaults.standard.value(forKey: "user_token")
var keyword = ""
var title_str = ""
func sureGeliAlertViewAction(sender: UIButton) { func sureGeliAlertViewAction(sender: UIButton) {
if title_str == "分销商管理" { if title_str == "分销商管理" {
let model = dbt_datas[sender.tag] let model = dbt_datas[sender.tag]
stopContract(["user_token":UserToken as Any,"dbt_id":model.dbt_id]) { (data) in stopContract(["user_token":UserToken as Any,"dbt_id":model.dbt_id]) { (data) in
HUD.flash(.label("删除成功~"), delay: 1.2) HUD.flash(.label("删除成功~"), delay: 1.2)
self.home_list_tbv.mj_header?.beginRefreshing() self.home_list_tbv.mj_header?.beginRefreshing()
} failture: { (err) in } failture: { (err) in}
}
return return
} }
let model = gys_datas[sender.tag] let model = gys_datas[sender.tag]
stopContract(["user_token":UserToken as Any,"sup_id":model.sup_id]) { (data) in stopContract(["user_token":UserToken as Any,"sup_id":model.sup_id]) { (data) in
HUD.flash(.label("终止合作成功~"), delay: 1.2) HUD.flash(.label("终止合作成功~"), delay: 1.2)
self.home_list_tbv.mj_header?.beginRefreshing() self.home_list_tbv.mj_header?.beginRefreshing()
} failture: { (err) in } failture: { (err) in}
}
} }
let UserToken = UserDefaults.standard.value(forKey: "user_token")
func GYS_GuanLi_CellStopAction(idx:Int) { func GYS_GuanLi_CellStopAction(idx:Int) {
var content = "终止和单个供应商的合作后,从该供应商处代销的所有产品都将不再能订单回流,且立即生效,是否确认终止合作?" var content = "终止和单个供应商的合作后,从该供应商处代销的所有产品都将不再能订单回流,且立即生效,是否确认终止合作?"
if title_str == "分销商管理" { if title_str == "分销商管理" {
...@@ -40,7 +42,6 @@ class GYS_HZ_Vc: BaseViewController,UITableViewDelegate,UITableViewDataSource, U ...@@ -40,7 +42,6 @@ class GYS_HZ_Vc: BaseViewController,UITableViewDelegate,UITableViewDataSource, U
alertView.rightBtn.setAttributedTitle(NSAttributedString(string: "确定"), for: .normal) alertView.rightBtn.setAttributedTitle(NSAttributedString(string: "确定"), for: .normal)
alertView.rightBtn.tag = idx alertView.rightBtn.tag = idx
self.view.window?.addSubview(alertView) self.view.window?.addSubview(alertView)
} }
func rightBtnClick() { func rightBtnClick() {
...@@ -53,24 +54,19 @@ class GYS_HZ_Vc: BaseViewController,UITableViewDelegate,UITableViewDataSource, U ...@@ -53,24 +54,19 @@ class GYS_HZ_Vc: BaseViewController,UITableViewDelegate,UITableViewDataSource, U
self.view.window?.addSubview(alertView) self.view.window?.addSubview(alertView)
} }
var keyword = ""
func searchBarSearchButtonClicked(_ searchBar: UISearchBar) { func searchBarSearchButtonClicked(_ searchBar: UISearchBar) {
print("点击搜索进行--") print("点击搜索进行--")
searchBar.resignFirstResponder() searchBar.resignFirstResponder()
keyword = searchBar.text! keyword = searchBar.text!
removeBlackBtnView() removeBlackBtnView()
self.home_list_tbv.mj_header?.beginRefreshing() self.home_list_tbv.mj_header?.beginRefreshing()
} }
//MARK:--取消搜索代理 //MARK:--取消搜索代理
func clearSearchAction() { func clearSearchAction() {
print("取消搜索代理了--") print("取消搜索代理了--")
// keyword = ""
// self.home_list_tbv.mj_header?.beginRefreshing()
} }
func searchBarTextDidEndEditing(_ searchBar: UISearchBar) { func searchBarTextDidEndEditing(_ searchBar: UISearchBar) {
print("编辑即将结束了--") print("编辑即将结束了--")
if keyword.count > 0 { if keyword.count > 0 {
keyword = searchBar.text! keyword = searchBar.text!
if keyword.count == 0 { if keyword.count == 0 {
...@@ -98,7 +94,7 @@ class GYS_HZ_Vc: BaseViewController,UITableViewDelegate,UITableViewDataSource, U ...@@ -98,7 +94,7 @@ class GYS_HZ_Vc: BaseViewController,UITableViewDelegate,UITableViewDataSource, U
blackBtnView.addTarget(self, action: #selector(removeBlackBtnView), for: .touchUpInside) blackBtnView.addTarget(self, action: #selector(removeBlackBtnView), for: .touchUpInside)
return true return true
} }
var title_str = ""
weak var searchV: SearchBarView? = nil weak var searchV: SearchBarView? = nil
@IBOutlet weak var search_view: UIView! @IBOutlet weak var search_view: UIView!
@IBOutlet weak var home_list_tbv: UITableView! @IBOutlet weak var home_list_tbv: UITableView!
...@@ -106,9 +102,6 @@ class GYS_HZ_Vc: BaseViewController,UITableViewDelegate,UITableViewDataSource, U ...@@ -106,9 +102,6 @@ class GYS_HZ_Vc: BaseViewController,UITableViewDelegate,UITableViewDataSource, U
var dbt_datas:Array<dbtListDataModel> = [] var dbt_datas:Array<dbtListDataModel> = []
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
// title_str = "分销商管理"
SetTopFrame(view: search_view, height: 44) SetTopFrame(view: search_view, height: 44)
navbar.title = title_str navbar.title = title_str
......
...@@ -28,7 +28,7 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat ...@@ -28,7 +28,7 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat
sku_id += StringByInt(number: model.sku_id!) sku_id += StringByInt(number: model.sku_id!)
} }
} }
let dic = ["user_token":UserToken as Any, let dic = ["user_token":UserToken as Any,
"operation_type":operation_type as Any, "operation_type":operation_type as Any,
"sku_id":sku_id as Any, "sku_id":sku_id as Any,
...@@ -131,7 +131,6 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat ...@@ -131,7 +131,6 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat
showSelectV = showSelectView showSelectV = showSelectView
showSelectView.dataArr = ["上架", "下架"] showSelectView.dataArr = ["上架", "下架"]
showSelectView.selectIndx = selectIndexArr[1] showSelectView.selectIndx = selectIndexArr[1]
} }
break break
default: break default: break
...@@ -165,7 +164,7 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat ...@@ -165,7 +164,7 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat
func clearSearchAction() { func clearSearchAction() {
print("取消搜索代理了--") print("取消搜索代理了--")
// home_list_tbv.mj_header?.beginRefreshing() // home_list_tbv.mj_header?.beginRefreshing()
} }
func searchBarTextDidEndEditing(_ searchBar: UISearchBar) { func searchBarTextDidEndEditing(_ searchBar: UISearchBar) {
print("编辑即将结束了--") print("编辑即将结束了--")
...@@ -190,15 +189,12 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat ...@@ -190,15 +189,12 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat
return true return true
} }
@IBAction func allSelect(_ sender: UIButton) { @IBAction func allSelect(_ sender: UIButton) {
sender.isSelected = !sender.isSelected sender.isSelected = !sender.isSelected
selectItem.removeAll() selectItem.removeAll()
if sender.isSelected { if sender.isSelected {
home_list_tbv.visibleCells.forEach { (item) in datas.forEach { (model) in
let cell = item as! GYS_FX_ProductCellTableViewCell selectItem.append(model.sku_id!)
selectItem.append(cell.tag)
} }
} }
home_list_tbv.reloadData() home_list_tbv.reloadData()
...@@ -221,6 +217,7 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat ...@@ -221,6 +217,7 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat
} }
home_list_tbv.reloadData() home_list_tbv.reloadData()
} }
@IBOutlet weak var home_list_tbv: UITableView! @IBOutlet weak var home_list_tbv: UITableView!
@IBOutlet weak var right_title: UILabel! @IBOutlet weak var right_title: UILabel!
@IBOutlet weak var left_title: UILabel! @IBOutlet weak var left_title: UILabel!
...@@ -229,7 +226,6 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat ...@@ -229,7 +226,6 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat
@IBOutlet weak var count_lbl: UILabel!//数量 @IBOutlet weak var count_lbl: UILabel!//数量
@IBOutlet weak var search_view: UIView! @IBOutlet weak var search_view: UIView!
weak var searchV: SearchBarView? = nil weak var searchV: SearchBarView? = nil
weak var selectV: HeaderSelectView! = nil weak var selectV: HeaderSelectView! = nil
@IBOutlet weak var top_btn_bg_view: UIView! @IBOutlet weak var top_btn_bg_view: UIView!
...@@ -311,8 +307,9 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat ...@@ -311,8 +307,9 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat
cell.left_btn.isUserInteractionEnabled = true cell.left_btn.isUserInteractionEnabled = true
cell.select_Img.isHidden = false cell.select_Img.isHidden = false
cell.select_Img.image = UIImage(named: "daixuan") cell.select_Img.image = UIImage(named: "daixuan")
selectItem.forEach { (idx) in selectItem.forEach { (idx) in
print("abc = ",idx,model.sku_id)
if idx == model.sku_id{ if idx == model.sku_id{
cell.select_Img.image = UIImage(named: "yuxuan") cell.select_Img.image = UIImage(named: "yuxuan")
} }
...@@ -337,15 +334,15 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat ...@@ -337,15 +334,15 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat
cell.old_price_Lbl.text = "¥" + model.price! cell.old_price_Lbl.text = "¥" + model.price!
if model.commission_type == 1{ if model.commission_type == 1{
cell.FX_Percent_Lbl.isHidden = false cell.FX_Percent_Lbl.isHidden = false
cell.FX_Percent_Lbl.text = "分销(" + StringByInt(number: model.commission_per!) + "%)" cell.FX_Percent_Lbl.text = "分销(" + StringByInt(number: model.commission_per!) + "%)"
}else if model.commission_type == 2{ }else if model.commission_type == 2{
cell.FX_Percent_Lbl.isHidden = false cell.FX_Percent_Lbl.isHidden = false
cell.FX_Percent_Lbl.text = "分销(" + model.commission_val! + "元)" cell.FX_Percent_Lbl.text = "分销(" + model.commission_val! + "元)"
}else{ }else{
cell.FX_Percent_Lbl.isHidden = true cell.FX_Percent_Lbl.isHidden = true
} }
cell.title_Lbl.text = model.goods_name cell.title_Lbl.text = model.goods_name
cell.sell_total_Lbl.text = "销量:-" cell.sell_total_Lbl.text = "销量:-"
if model.dbt_sale != nil { if model.dbt_sale != nil {
...@@ -363,7 +360,6 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat ...@@ -363,7 +360,6 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat
return cell return cell
} }
var selectItem:Array<Int> = [] var selectItem:Array<Int> = []
func GYS_FX_ProductCellTableViewCellSelect(idx: Int) { func GYS_FX_ProductCellTableViewCellSelect(idx: Int) {
let model = datas[idx] let model = datas[idx]
if selectItem.contains(idx){ if selectItem.contains(idx){
...@@ -416,7 +412,7 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat ...@@ -416,7 +412,7 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat
self.home_list_tbv.reloadData() self.home_list_tbv.reloadData()
self.home_list_tbv?.mj_header?.endRefreshing() self.home_list_tbv?.mj_header?.endRefreshing()
self.page = 2 self.page = 2
// self.count_lbl.text = "0" // self.count_lbl.text = "0"
if model.data?.res?.count == 0 || model.data?.res != nil { if model.data?.res?.count == 0 || model.data?.res != nil {
...@@ -427,7 +423,6 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat ...@@ -427,7 +423,6 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat
} failture: { (err) in } failture: { (err) in
self.home_list_tbv?.mj_header?.endRefreshing() self.home_list_tbv?.mj_header?.endRefreshing()
} }
} }
//MARK:--加载更多数据 //MARK:--加载更多数据
@objc func loadMoreData(){ @objc func loadMoreData(){
......
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