Skip to content

G
GeliBusinessPlatform
Commit c8c15dc5 authored by lujunye's avatar lujunye
Browse files
Options

1

parent 7ad93b5d
Hide whitespace changes
Inline Side-by-side
Showing with 329 additions and 79 deletions
GeliBusinessPlatform/ViewController/分销订单管理/RetailListMgVC.swift
View file @ c8c15dc5
...@@ -9,8 +9,9 @@ ...@@ -9,8 +9,9 @@
import UIKit import UIKit
import Parchment import Parchment
class RetailListMgVC: BaseViewController,PagingViewControllerDelegate, UISearchBarDelegate, SearchBarViewDelegate ,HeaderSelectViewDelegate ,SelectContentViewDelegate,TimeShowDownViewDeleagte{ class RetailListMgVC: BaseViewController,PagingViewControllerDelegate, UISearchBarDelegate, SearchBarViewDelegate ,HeaderSelectViewDelegate ,SelectContentViewDelegate,TimeShowDownViewDeleagte, UITableViewDelegate, UITableViewDataSource, GeliAlertViewDelegate, RetailManageFooterViewDelagte{
let UserToken = UserDefaults.standard.value(forKey: "user_token")
var dataArr:Array<dbtOrderLisDataModel> = []
@IBOutlet weak var contentV: UIView! @IBOutlet weak var contentV: UIView!
fileprivate let cities = [ fileprivate let cities = [
...@@ -23,48 +24,122 @@ class RetailListMgVC: BaseViewController,PagingViewControllerDelegate, UISearchB ...@@ -23,48 +24,122 @@ class RetailListMgVC: BaseViewController,PagingViewControllerDelegate, UISearchB
] ]
//头部滚动视图 //头部滚动视图
weak var pagingVC : PagingViewController? weak var pagingVC : PagingViewController?
var titleStr = ""
var list_view:UITableView?
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
navbar.title = "分销订单管理" navbar.title = titleStr
navbar.lineView.isHidden = true navbar.lineView.isHidden = true
self.view.addSubview(navbar) self.view.addSubview(navbar)
SetTopFrameView(view: contentV, btmView: self.view) SetTopFrameView(view: contentV, btmView: self.view)
if titleStr == "代理订单管理" {
let pagingViewController = PagingViewController(viewControllers: viewControllers) if list_view == nil {
pagingViewController.indicatorColor = UIColor.init(named: "蓝色字体颜色")! list_view = UITableView()
pagingViewController.menuItemSize = .fixed(width: 0, height: 44*glscale) list_view?.delegate = self
pagingViewController.font = UIFont.systemFont(ofSize: 13) list_view?.dataSource = self
pagingViewController.selectedFont = UIFont.systemFont(ofSize: 13) list_view?.separatorStyle = .none
pagingViewController.textColor = UIColor.init(named: "灰色字体颜色")! list_view?.backgroundColor = UIColor(named: "app底色")
pagingViewController.selectedTextColor = UIColor.init(named: "蓝色字体颜色")! self.view.addSubview(list_view!)
pagingViewController.delegate = self list_view?.register(UINib(nibName: "RetailManageViewCell", bundle: nil), forCellReuseIdentifier: "RetailManageViewCell")
pagingViewController.dataSource = self headerMJ.setRefreshingTarget(self, refreshingAction: #selector(loadData))
pagingViewController.sizeDelegate = self list_view?.mj_header = headerMJ
addChild(pagingViewController) footerMJ.setRefreshingTarget(self, refreshingAction: #selector(loadMoreData))
contentV.addSubview(pagingViewController.view) list_view?.mj_footer = footerMJ
contentV.backgroundColor = UIColor(named: "app底色")! list_view?.mj_header?.beginRefreshing()
contentV.constrainToEdges(pagingViewController.view) }
pagingViewController.didMove(toParent: self) }else{
pagingVC = pagingViewController let pagingViewController = PagingViewController(viewControllers: viewControllers)
pagingViewController.indicatorColor = UIColor.init(named: "蓝色字体颜色")!
pagingViewController.menuItemSize = .fixed(width: 0, height: 44*glscale)
pagingViewController.font = UIFont.systemFont(ofSize: 13)
pagingViewController.selectedFont = UIFont.systemFont(ofSize: 13)
pagingViewController.textColor = UIColor.init(named: "灰色字体颜色")!
pagingViewController.selectedTextColor = UIColor.init(named: "蓝色字体颜色")!
pagingViewController.delegate = self
pagingViewController.dataSource = self
pagingViewController.sizeDelegate = self
addChild(pagingViewController)
contentV.addSubview(pagingViewController.view)
contentV.backgroundColor = UIColor(named: "app底色")!
contentV.constrainToEdges(pagingViewController.view)
pagingViewController.didMove(toParent: self)
pagingVC = pagingViewController
}
initSearchBar() initSearchBar()
initHeaderSelectView() initHeaderSelectView()
} }
var page = 0
@objc func loadData(){
// isUpData = true
//结算方式（0全部1人工结算 2自动结算(3待自动结算、4已自动结算)(5待人工结算6已人工结算)）
page = 1
let dic = ["user_token":UserToken as Any,"keyword":keyword,"page":page,"start_time":startTime as Any,"end_time":endTime as Any]
// dbtOrderLis(dic) { (data) in
// let dataM = data as! dbtOrderLisModel
//
// self.dataArr.removeAll()
// dataM.data?.forEach({ (model) in
// self.dataArr.append(model)
// })
// self.listView.mj_header?.endRefreshing()
//
// self.listView.reloadData()
// if dataM.data?.count == 0 {
// self.listView.mj_footer?.endRefreshingWithNoMoreData()
// }else{
// self.listView.mj_footer?.endRefreshing()
// }
// self.page = 2
//
// } failture: { (error) in
// self.listView.mj_header?.endRefreshing()
// }
}
@objc func loadMoreData(){
let dic = ["user_token":UserToken as Any,"keyword":keyword,"page":page,"start_time":startTime as Any,"end_time":endTime as Any]
// dbtOrderLis(dic) { (data) in
// let dataM = data as! dbtOrderLisModel
// if dataM.data?.count == 0 {
// self.listView.mj_footer?.endRefreshingWithNoMoreData()
// }else{
// self.page += 1
// dataM.data?.forEach({ (model) in
// self.dataArr.append(model)
// })
// self.listView.reloadData()
// self.listView.mj_footer?.endRefreshing()
// }
//
//
//
// } failture: { (error) in
// self.listView.mj_footer?.endRefreshing()
//
// }
}
weak var searchV: SearchBarView? = nil weak var searchV: SearchBarView? = nil
var blackBtnView:UIButton! = nil var blackBtnView:UIButton! = nil
var keyword = "" var keyword = ""
let SearchBarContentV = UIView() let SearchBarContentV = UIView()
var btn_view = UIView() var btn_view = UIView()
var btn_line_view = UIView() var btn_line_view = UIView()
func initSearchBar() { func initSearchBar() {
contentV.addSubview(btn_view) contentV.addSubview(btn_view)
btn_view.snp.makeConstraints { (make) in btn_view.snp.makeConstraints { (make) in
make.left.right.equalToSuperview() make.left.right.equalToSuperview()
make.top.equalTo(50) if titleStr == "代理订单管理" {
make.top.equalTo(0)
}else{
make.top.equalTo(50)
}
make.height.equalTo(40) make.height.equalTo(40)
} }
contentV.addSubview(btn_line_view) contentV.addSubview(btn_line_view)
let titles = ["全部","待付款","待发货","已收货","交易关闭"] let titles = ["全部","待付款","待发货","已收货","交易关闭"]
...@@ -100,7 +175,7 @@ class RetailListMgVC: BaseViewController,PagingViewControllerDelegate, UISearchB ...@@ -100,7 +175,7 @@ class RetailListMgVC: BaseViewController,PagingViewControllerDelegate, UISearchB
contentV.addSubview(SearchBarContentV) contentV.addSubview(SearchBarContentV)
SearchBarContentV.snp.makeConstraints { (make) in SearchBarContentV.snp.makeConstraints { (make) in
make.left.right.equalToSuperview() make.left.right.equalToSuperview()
make.top.equalTo(90) make.top.equalTo(btn_view.snp_bottom)
make.height.equalTo(45) make.height.equalTo(45)
} }
let searchBr = SearchBarView.init() let searchBr = SearchBarView.init()
...@@ -146,7 +221,7 @@ class RetailListMgVC: BaseViewController,PagingViewControllerDelegate, UISearchB ...@@ -146,7 +221,7 @@ class RetailListMgVC: BaseViewController,PagingViewControllerDelegate, UISearchB
} }
func clearSearchAction() { func clearSearchAction() {
} }
func searchBarTextDidEndEditing(_ searchBar: UISearchBar) { func searchBarTextDidEndEditing(_ searchBar: UISearchBar) {
removeBlackBtnView() removeBlackBtnView()
...@@ -169,8 +244,8 @@ class RetailListMgVC: BaseViewController,PagingViewControllerDelegate, UISearchB ...@@ -169,8 +244,8 @@ class RetailListMgVC: BaseViewController,PagingViewControllerDelegate, UISearchB
} }
let vc = viewControllers[selectIndex] let vc = viewControllers[selectIndex]
vc.listView.mj_header?.beginRefreshing() vc.listView.mj_header?.beginRefreshing()
} }
@objc func removeBlackBtnView(){ @objc func removeBlackBtnView(){
if blackBtnView != nil { if blackBtnView != nil {
blackBtnView.removeFromSuperview() blackBtnView.removeFromSuperview()
...@@ -213,7 +288,14 @@ class RetailListMgVC: BaseViewController,PagingViewControllerDelegate, UISearchB ...@@ -213,7 +288,14 @@ class RetailListMgVC: BaseViewController,PagingViewControllerDelegate, UISearchB
make.top.equalTo(SearchBarContentV.snp_bottom) make.top.equalTo(SearchBarContentV.snp_bottom)
make.height.equalTo(45) make.height.equalTo(45)
} }
if titleStr == "代理订单管理" {
if list_view != nil {
list_view?.snp.makeConstraints { (make) in
make.top.equalTo(changeBgView.snp_bottom)
make.bottom.left.right.equalTo(0)
}
}
}
let selectView = HeaderSelectView() let selectView = HeaderSelectView()
selectView.firstBtn.setTitle("结算方式", for: .normal) selectView.firstBtn.setTitle("结算方式", for: .normal)
selectView.secBtn.setTitle("结算时间", for: .normal) selectView.secBtn.setTitle("结算时间", for: .normal)
...@@ -272,7 +354,7 @@ class RetailListMgVC: BaseViewController,PagingViewControllerDelegate, UISearchB ...@@ -272,7 +354,7 @@ class RetailListMgVC: BaseViewController,PagingViewControllerDelegate, UISearchB
} }
} }
break break
default: break default: break
} }
} }
...@@ -315,16 +397,19 @@ class RetailListMgVC: BaseViewController,PagingViewControllerDelegate, UISearchB ...@@ -315,16 +397,19 @@ class RetailListMgVC: BaseViewController,PagingViewControllerDelegate, UISearchB
startTime = Int(timeInterval) startTime = Int(timeInterval)
endTime = Int(timeIntervalEnd) endTime = Int(timeIntervalEnd)
} }
viewControllers.forEach { (vc) in if titleStr == "代理订单管理"{
vc.startTime = startTime list_view?.mj_header?.beginRefreshing()
vc.endTime = endTime }else{
vc.isUpData = false viewControllers.forEach { (vc) in
vc.startTime = startTime
vc.endTime = endTime
vc.isUpData = false
}
let vc = viewControllers[selectIndex]
vc.listView.mj_header?.beginRefreshing()
} }
let vc = viewControllers[selectIndex]
vc.listView.mj_header?.beginRefreshing()
} }
//MARK:---滚动选择 //MARK:---滚动选择
var selectIndex = 0 var selectIndex = 0
func pagingViewController(_ pagingViewController: PagingViewController, didScrollToItem pagingItem: PagingItem, startingViewController: UIViewController?, destinationViewController: UIViewController, transitionSuccessful: Bool) { func pagingViewController(_ pagingViewController: PagingViewController, didScrollToItem pagingItem: PagingItem, startingViewController: UIViewController?, destinationViewController: UIViewController, transitionSuccessful: Bool) {
...@@ -345,7 +430,170 @@ class RetailListMgVC: BaseViewController,PagingViewControllerDelegate, UISearchB ...@@ -345,7 +430,170 @@ class RetailListMgVC: BaseViewController,PagingViewControllerDelegate, UISearchB
} }
} }
} }
func numberOfSections(in tableView: UITableView) -> Int {
return self.dataArr.count
}
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
let goodArrModel = self.dataArr[section]
return goodArrModel.order_goods!.count
}
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let cell = tableView.dequeueReusableCell(withIdentifier: "RetailManageViewCell") as! RetailManageViewCell
let goodArrModel = self.dataArr[indexPath.section]
let goodModel = goodArrModel.order_goods![indexPath.row]
cell.goodsLbl.text = goodModel.goods_name
cell.numLbl.text = "x" + StringByInt(number: goodModel.goods_number!)
cell.priceLbl.text = "￥" + goodModel.amount!
if (indexPath.row + 1) == goodArrModel.order_goods?.count {
cell.dotImgV.isHidden = true
}else{
cell.dotImgV.isHidden = false
}
return cell
}
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
if self.title == "代销订单" {
let vc = RetailManageDetailViewController()
let goodArrModel = self.dataArr[indexPath.section]
vc.orderId = goodArrModel.order_id
vc.dbt_shop_id = goodArrModel.shop_id
self.navigationController?.pushViewController(vc, animated: true)
}else{
let vc = RetailManageDetailViewController()
let goodArrModel = self.dataArr[indexPath.section]
vc.orderId = goodArrModel.order_id
self.navigationController?.pushViewController(vc, animated: true)
}
}
@objc func didselectCellHorF(sender:UITapGestureRecognizer){
if self.title == "代销订单" {
let vc = RetailManageDetailViewController()
let goodArrModel = self.dataArr[sender.view!.tag]
vc.orderId = goodArrModel.order_id
vc.dbt_shop_id = goodArrModel.shop_id
self.navigationController?.pushViewController(vc, animated: true)
}else{
let vc = RetailManageDetailViewController()
let goodArrModel = self.dataArr[sender.view!.tag]
vc.orderId = goodArrModel.order_id
self.navigationController?.pushViewController(vc, animated: true)
}
}
func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
let headerV = UIView()
let tap = UITapGestureRecognizer(target: self, action: #selector(didselectCellHorF))
headerV.addGestureRecognizer(tap)
headerV.tag = section
let contentV = RetailManageHeaderView()
headerV.addSubview(contentV)
contentV.snp_makeConstraints { (make) in
make.left.top.right.bottom.equalToSuperview()
}
let model = self.dataArr[section]
contentV.snNumLbl.text = model.order_sn
var dbt_typeStr = "人工结算"
if model.dbt_type == 2 {
dbt_typeStr = "自动结算"
}
switch model.pay_status {
case 2:
contentV.stateLbl.text = "已付款/" + dbt_typeStr
break
case 10:
contentV.stateLbl.text = "月结/" + dbt_typeStr
break
case 11:
contentV.stateLbl.text = "已退款/" + dbt_typeStr
break
default:
contentV.stateLbl.text = "未付款/" + dbt_typeStr
break
}
return headerV
}
func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
return 50
}
func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
let footerV = UIView()
let tap = UITapGestureRecognizer(target: self, action: #selector(didselectCellHorF))
footerV.addGestureRecognizer(tap)
footerV.tag = section
let contentV = RetailManageFooterView()
footerV.addSubview(contentV)
contentV.snp_makeConstraints { (make) in
make.left.top.right.bottom.equalToSuperview()
}
let model = self.dataArr[section]
contentV.priceLbl.text = model.sum_amount!
if model.commission_status == 1 {
contentV.moneyLbl.text = model.sum_commission_val! + "(已结算)"
}else{
contentV.moneyLbl.text = model.sum_commission_val! + "(未结算)"
}
contentV.actionBtn.tag = section
contentV.delgate = self
return footerV
}
func tapRetailManageFooterBtnAction(sender: Int) {
//标记为人工结算
let alertView = GeliAlertView(frame: self.view.window!.bounds)
alertView.delegate = self;
alertView.tishiLbl.text = ""
alertView.titileLbl.text = "是否把该订单标记为已人工结算？"
alertView.rightBtn.setAttributedTitle(NSAttributedString(string: "确定"), for: .normal)
alertView.rightBtn.tag = sender
self.view.window?.addSubview(alertView)
}
func sureGeliAlertViewAction(sender: UIButton) {
HUD.flash(.progress)
let model = self.dataArr[sender.tag]
editCommissionStatus(["user_token":UserToken as Any,"order_id":model.order_id as Any]) { (data) in
HUD.hide()
model.commission_status = 1
HUD.flash(.labeledSubSuccess(subtitle: "确认成功"),delay: 1.2)
self.list_view!.reloadSections([sender.tag], with: .none)
} failture: { (error) in
}
}
func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
let model = self.dataArr[section]
//已结算
if model.commission_status == 1 {
return 48
}
//或 自动结算 不需要显示标记
if model.dbt_type == 2 {
return 48
}
return 100
}
} }
extension RetailListMgVC: PagingViewControllerDataSource { extension RetailListMgVC: PagingViewControllerDataSource {
func pagingViewController(_: PagingViewController, pagingItemAt index: Int) -> PagingItem { func pagingViewController(_: PagingViewController, pagingItemAt index: Int) -> PagingItem {
......
GeliBusinessPlatform/ViewController/分销订单管理/RetailManageViewController.swift
View file @ c8c15dc5
...@@ -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 {
......
GeliBusinessPlatform/ViewController/工作中心/WorkCViewController.swift
View file @ c8c15dc5
...@@ -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://上游供应商管理
......
GeliBusinessPlatform/ViewController/工作中心/WorkItemTableViewCell.swift
View file @ c8c15dc5
...@@ -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