Commit c8c15dc5 authored by lujunye's avatar lujunye

1

parent 7ad93b5d
...@@ -67,48 +67,48 @@ class RetailManageViewController: BaseViewController,UITableViewDelegate,UITable ...@@ -67,48 +67,48 @@ class RetailManageViewController: BaseViewController,UITableViewDelegate,UITable
page = 1 page = 1
let dic = ["user_token":UserToken as Any,"keyword":keyword,"page":page,"dbt_type":dbt_type,"dbt_people":dbt_people,"start_time":startTime as Any,"end_time":endTime as Any] let dic = ["user_token":UserToken as Any,"keyword":keyword,"page":page,"dbt_type":dbt_type,"dbt_people":dbt_people,"start_time":startTime as Any,"end_time":endTime as Any]
dbtOrderLis(dic) { (data) in // dbtOrderLis(dic) { (data) in
let dataM = data as! dbtOrderLisModel // let dataM = data as! dbtOrderLisModel
//
self.dataArr.removeAll() // self.dataArr.removeAll()
dataM.data?.forEach({ (model) in // dataM.data?.forEach({ (model) in
self.dataArr.append(model) // self.dataArr.append(model)
}) // })
self.listView.mj_header?.endRefreshing() // self.listView.mj_header?.endRefreshing()
//
self.listView.reloadData() // self.listView.reloadData()
if dataM.data?.count == 0 { // if dataM.data?.count == 0 {
self.listView.mj_footer?.endRefreshingWithNoMoreData() // self.listView.mj_footer?.endRefreshingWithNoMoreData()
}else{ // }else{
self.listView.mj_footer?.endRefreshing() // self.listView.mj_footer?.endRefreshing()
} // }
self.page = 2 // self.page = 2
//
} failture: { (error) in // } failture: { (error) in
self.listView.mj_header?.endRefreshing() // self.listView.mj_header?.endRefreshing()
} // }
} }
@objc func loadMoreData(){ @objc func loadMoreData(){
let dic = ["user_token":UserToken as Any,"keyword":keyword,"page":page,"dbt_type":dbt_type,"dbt_people":dbt_people,"start_time":startTime as Any,"end_time":endTime as Any] let dic = ["user_token":UserToken as Any,"keyword":keyword,"page":page,"dbt_type":dbt_type,"dbt_people":dbt_people,"start_time":startTime as Any,"end_time":endTime as Any]
dbtOrderLis(dic) { (data) in // dbtOrderLis(dic) { (data) in
let dataM = data as! dbtOrderLisModel // let dataM = data as! dbtOrderLisModel
if dataM.data?.count == 0 { // if dataM.data?.count == 0 {
self.listView.mj_footer?.endRefreshingWithNoMoreData() // self.listView.mj_footer?.endRefreshingWithNoMoreData()
}else{ // }else{
self.page += 1 // self.page += 1
dataM.data?.forEach({ (model) in // dataM.data?.forEach({ (model) in
self.dataArr.append(model) // self.dataArr.append(model)
}) // })
self.listView.reloadData() // self.listView.reloadData()
self.listView.mj_footer?.endRefreshing() // self.listView.mj_footer?.endRefreshing()
} // }
//
//
//
} failture: { (error) in // } failture: { (error) in
self.listView.mj_footer?.endRefreshing() // self.listView.mj_footer?.endRefreshing()
//
} // }
} }
func numberOfSections(in tableView: UITableView) -> Int { func numberOfSections(in tableView: UITableView) -> Int {
......
...@@ -732,6 +732,7 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD ...@@ -732,6 +732,7 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
return return
case 157://分销订单管理 case 157://分销订单管理
let vc = RetailListMgVC() let vc = RetailListMgVC()
vc.titleStr = "分销订单管理"
self.navigationController?.pushViewController(vc, animated: true) self.navigationController?.pushViewController(vc, animated: true)
return return
case 159://上游供应商管理 case 159://上游供应商管理
...@@ -748,6 +749,7 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD ...@@ -748,6 +749,7 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
return return
case 162://代理订单管理 case 162://代理订单管理
let vc = RetailListMgVC() let vc = RetailListMgVC()
vc.titleStr = "代理订单管理"
self.navigationController?.pushViewController(vc, animated: true) self.navigationController?.pushViewController(vc, animated: true)
return return
case 164://上游供应商管理 case 164://上游供应商管理
......
...@@ -125,8 +125,8 @@ class WorkItemTableViewCell: UITableViewCell , UICollectionViewDelegate, UIColle ...@@ -125,8 +125,8 @@ class WorkItemTableViewCell: UITableViewCell , UICollectionViewDelegate, UIColle
}else{ }else{
if isOften { if isOften {
cell.itemImgV.sd_setImage(with: URL(string:SERVERCE_ImageHost + rowModel.app_icon_bg!), placeholderImage: UIImage.init(named: "worktest1"),options:.allowInvalidSSLCertificates) // cell.itemImgV.sd_setImage(with: URL(string:SERVERCE_ImageHost + rowModel.app_icon_bg!), placeholderImage: UIImage.init(named: "worktest1"),options:.allowInvalidSSLCertificates)
cell.itemImgV.sd_setImage(with: URL(string:SERVERCE_ImageHost + rowModel.app_icon!), placeholderImage: UIImage.init(named: "worktest1"),options:.allowInvalidSSLCertificates)
}else{ }else{
cell.itemImgV.sd_setImage(with: URL(string:SERVERCE_ImageHost + rowModel.app_icon!), placeholderImage: UIImage.init(named: "worktest1"),options:.allowInvalidSSLCertificates) cell.itemImgV.sd_setImage(with: URL(string:SERVERCE_ImageHost + rowModel.app_icon!), placeholderImage: UIImage.init(named: "worktest1"),options:.allowInvalidSSLCertificates)
} }
......
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