Commit 34ed0b8a authored by 刘俊宏's avatar 刘俊宏

同上,补全工作中心

parent 48738a91
...@@ -250,15 +250,15 @@ class AppDelegate: UIResponder, UIApplicationDelegate,loginDelegate, UITabBarCon ...@@ -250,15 +250,15 @@ class AppDelegate: UIResponder, UIApplicationDelegate,loginDelegate, UITabBarCon
v1.tabBarItem = ESTabBarItem.init(ExampleBouncesContentView(), title: "订单管理", image: UIImage(named: "tab_btn_dingdao_nor"), selectedImage: UIImage(named: "tab_btn_dingdan_hig")) v1.tabBarItem = ESTabBarItem.init(ExampleBouncesContentView(), title: "订单管理", image: UIImage(named: "tab_btn_dingdao_nor"), selectedImage: UIImage(named: "tab_btn_dingdan_hig"))
v2.tabBarItem = ESTabBarItem.init(ExampleBouncesContentView(), title: "商品管理", image: UIImage(named: "tab_btn_shangpin_nor"), selectedImage: UIImage(named: "tab_btn_shangpin_hig")) v2.tabBarItem = ESTabBarItem.init(ExampleBouncesContentView(), title: "商品管理", image: UIImage(named: "tab_btn_shangpin_nor"), selectedImage: UIImage(named: "tab_btn_shangpin_hig"))
// v3.tabBarItem = ESTabBarItem.init(ExampleBouncesContentView(), title: "工作中心", image: UIImage(named: "tab_btn_gongzuo_nor"), selectedImage: UIImage(named: "tab_btn_gongzuo_hig")) v3.tabBarItem = ESTabBarItem.init(ExampleBouncesContentView(), title: "工作中心", image: UIImage(named: "tab_btn_gongzuo_nor"), selectedImage: UIImage(named: "tab_btn_gongzuo_hig"))
v4.tabBarItem = ESTabBarItem.init(ExampleBouncesContentView(), title: "仓库管理", image: UIImage(named: "tab_btn_cangku_nor"), selectedImage: UIImage(named: "tab_btn_cangku_hig")) v4.tabBarItem = ESTabBarItem.init(ExampleBouncesContentView(), title: "仓库管理", image: UIImage(named: "tab_btn_cangku_nor"), selectedImage: UIImage(named: "tab_btn_cangku_hig"))
v5.tabBarItem = ESTabBarItem.init(ExampleBouncesContentView(), title: "个人中心", image: UIImage(named: "tab_btn_geren_nor"), selectedImage: UIImage(named: "tab_btn_geren_hig")) v5.tabBarItem = ESTabBarItem.init(ExampleBouncesContentView(), title: "个人中心", image: UIImage(named: "tab_btn_geren_nor"), selectedImage: UIImage(named: "tab_btn_geren_hig"))
// Create the SwiftUI view that provides the window contents. // Create the SwiftUI view that provides the window contents.
tabBarController.viewControllers = [v1, v2, v4, v5] tabBarController.viewControllers = [v1, v2, v3, v4, v5]
tabBarController.selectedIndex = 1 tabBarController.selectedIndex = 2
......
...@@ -505,6 +505,16 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD ...@@ -505,6 +505,16 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
case 116: //字段列表 case 116: //字段列表
HUD.flash(.label("敬请期待"),delay: 1.2) HUD.flash(.label("敬请期待"),delay: 1.2)
return return
case 117: //新增商品
let vc = ProductDetailViewController()
self.navigationController?.pushViewController(vc, animated: true)
return
case 118: //新增采购单
HUD.flash(.label("敬请期待"),delay: 1.2)
return
case 119: //商品毛利统计
HUD.flash(.label("敬请期待"),delay: 1.2)
return
default: default:
break; break;
} }
......
...@@ -72,8 +72,6 @@ class WorkItemTableViewCell: UITableViewCell , UICollectionViewDelegate, UIColle ...@@ -72,8 +72,6 @@ class WorkItemTableViewCell: UITableViewCell , UICollectionViewDelegate, UIColle
cellForItemAt indexPath: IndexPath) -> UICollectionViewCell { cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "WorkItemCollectionViewCell", let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "WorkItemCollectionViewCell",
for: indexPath) as! WorkItemCollectionViewCell for: indexPath) as! WorkItemCollectionViewCell
//临时代码
cell.itemImgV.image = UIImage.init(named: "worktest1")
//常用功能无数据处理 //常用功能无数据处理
if dataIndexSection == 1 && itemArrs.count == 0{ if dataIndexSection == 1 && itemArrs.count == 0{
...@@ -112,6 +110,13 @@ class WorkItemTableViewCell: UITableViewCell , UICollectionViewDelegate, UIColle ...@@ -112,6 +110,13 @@ class WorkItemTableViewCell: UITableViewCell , UICollectionViewDelegate, UIColle
}else{ }else{
cell.countLbl.isHidden = true cell.countLbl.isHidden = true
let rowModel = self.itemDataArrs[indexPath.row]
if rowModel.app_icon != nil {
cell.itemImgV.sd_setImage(with: URL(string:SERVERCE_ImageHost + rowModel.app_icon!), placeholderImage: UIImage.init(named: "worktest1"))
}else{
cell.itemImgV.image = UIImage.init(named: "worktest1")
}
} }
cell.itemNameLbl.text = itemArrs[indexPath.row] cell.itemNameLbl.text = itemArrs[indexPath.row]
......
...@@ -140,7 +140,7 @@ class EditWorkCViewController: BaseViewController, UICollectionViewDelegate, UIC ...@@ -140,7 +140,7 @@ class EditWorkCViewController: BaseViewController, UICollectionViewDelegate, UIC
if collectionView == self.itemListCollectionView { if collectionView == self.itemListCollectionView {
cell.itemImgV.image = UIImage.init(named: "worktest2")
cell.bgImV.image = UIImage.init(named: "workjia") cell.bgImV.image = UIImage.init(named: "workjia")
//MARK:--如果oftenArr(常用有,这边就显示添加icon) //MARK:--如果oftenArr(常用有,这边就显示添加icon)
var chlicdAuthResModelArr:[WorkcenterIndexAuthResModel] = [] var chlicdAuthResModelArr:[WorkcenterIndexAuthResModel] = []
...@@ -151,6 +151,13 @@ class EditWorkCViewController: BaseViewController, UICollectionViewDelegate, UIC ...@@ -151,6 +151,13 @@ class EditWorkCViewController: BaseViewController, UICollectionViewDelegate, UIC
} }
}) })
let rowModel = chlicdAuthResModelArr[indexPath.row] let rowModel = chlicdAuthResModelArr[indexPath.row]
if rowModel.app_icon != nil {
cell.itemImgV.sd_setImage(with: URL(string:SERVERCE_ImageHost + rowModel.app_icon!), placeholderImage: UIImage.init(named: "worktest1"))
}else{
cell.itemImgV.image = UIImage.init(named: "worktest1")
}
cell.itemNameLbl.text = rowModel.auth_name cell.itemNameLbl.text = rowModel.auth_name
oftenArr?.forEach({ (md) in oftenArr?.forEach({ (md) in
if md.auth_id == rowModel.auth_id { if md.auth_id == rowModel.auth_id {
...@@ -169,9 +176,15 @@ class EditWorkCViewController: BaseViewController, UICollectionViewDelegate, UIC ...@@ -169,9 +176,15 @@ class EditWorkCViewController: BaseViewController, UICollectionViewDelegate, UIC
cell.itemNameLbl.isHidden = false cell.itemNameLbl.isHidden = false
cell.itemImgV.isHidden = false cell.itemImgV.isHidden = false
let rowModel = oftenArr![indexPath.row] let rowModel = oftenArr![indexPath.row]
if rowModel.app_icon != nil {
cell.itemImgV.sd_setImage(with: URL(string:SERVERCE_ImageHost + rowModel.app_icon!), placeholderImage: UIImage.init(named: "worktest1"))
}else{
cell.itemImgV.image = UIImage.init(named: "worktest1")
}
cell.itemNameLbl.text = rowModel.auth_name cell.itemNameLbl.text = rowModel.auth_name
cell.itemImgV.image = UIImage.init(named: "worktest2")
cell.bgImV.image = UIImage.init(named: "workjian") cell.bgImV.image = UIImage.init(named: "workjian")
} }
......
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