From 0d8f5fc8a516bfd07e425909e4a4432600572ee7 Mon Sep 17 00:00:00 2001
From: younger_times <841720330@qq.com>
Date: 星期三, 05 七月 2023 21:21:35 +0800
Subject: [PATCH] 修复BUG
---
OKProject/Class/Home/View/HomeLeftMenuView.swift | 79 ++++++++++++++++++++-------------------
1 files changed, 40 insertions(+), 39 deletions(-)
diff --git a/OKProject/Class/Home/View/HomeLeftMenuView.swift b/OKProject/Class/Home/View/HomeLeftMenuView.swift
index 8372a5b..10ec438 100644
--- a/OKProject/Class/Home/View/HomeLeftMenuView.swift
+++ b/OKProject/Class/Home/View/HomeLeftMenuView.swift
@@ -50,32 +50,23 @@
var data = [HomeLeftMenuModel.init(image: "icon_me_order", name: "我的订单"),
HomeLeftMenuModel.init(image: "icon_me_coupons", name: "优惠券"),
HomeLeftMenuModel.init(image: "icon_me_card", name: "企业认证(\(app.userInfo.companyCount))"),
-// HomeLeftMenuModel.init(image: "icon_me_card", name: "我的卡包"),
+ HomeLeftMenuModel.init(image: "icon_me_card", name: "我的卡包"),
HomeLeftMenuModel.init(image: "icon_me_wallet", name: "钱包"),
-// HomeLeftMenuModel.init(image: "icon_me_wallet", name: "订单审核(\(app.userInfo.orderCount))"),
-// HomeLeftMenuModel.init(image: "icon_me_close", name: "亲密账户"),
+ HomeLeftMenuModel.init(image: "icon_me_close", name: "亲密账户"),
HomeLeftMenuModel.init(image: "icon_me_invoice", name: "开发票"),
-// HomeLeftMenuModel.init(image: "icon_me_service-1", name: "入驻成为商家"),
-// HomeLeftMenuModel.init(image: "icon_me_comment", name: "我的评论"),
-// HomeLeftMenuModel.init(image: "icon_me_publish", name: "我发布的")
- HomeLeftMenuModel.init(image: "icon_me_opinion", name: "意见反馈"),
- HomeLeftMenuModel.init(image: "icon_me_service", name: "客服"),
- HomeLeftMenuModel.init(image: "icon_me_set", name: "设置"),
- HomeLeftMenuModel.init(image: "icon_me_share", name: "分享")
+ HomeLeftMenuModel.init(image: "icon_me_service-1", name: "入驻成为商家"),
+ HomeLeftMenuModel.init(image: "icon_me_comment", name: "我的评论"),
+ HomeLeftMenuModel.init(image: "icon_me_publish", name: "我发布的"),
]
-// let data1 = [HomeLeftMenuModel.init(image: "icon_me_safety", name: "安全"),
-// HomeLeftMenuModel.init(image: "icon_me_opinion", name: "意见反馈"),
-// HomeLeftMenuModel.init(image: "icon_me_service", name: "客服"),
-// HomeLeftMenuModel.init(image: "icon_me_set", name: "设置"),
-// HomeLeftMenuModel.init(image: "icon_me_share", name: "分享")]
-
-// let data1 = []
-
-
+ let data1 = [HomeLeftMenuModel.init(image: "icon_me_safety", name: "安全"),
+ HomeLeftMenuModel.init(image: "icon_me_opinion", name: "意见反馈"),
+ HomeLeftMenuModel.init(image: "icon_me_service", name: "客服"),
+ HomeLeftMenuModel.init(image: "icon_me_set", name: "设置"),
+ HomeLeftMenuModel.init(image: "icon_me_share", name: "分享")]
/// 点击事件
- let didSelectRow = Delegate<Int,Void>()
+ let didSelectRow = Delegate<String,Void>()
/// 点击事件
let didSelectMineInfo = Delegate<Void,Void>()
@@ -155,6 +146,14 @@
}else{
// self.data[6].name = "入驻成为商家"
}
+
+ if data.approveOrder == 1 && !self.data.contains(where: {$0.name.contains("订单审核")}){
+ let m = HomeLeftMenuModel.init(image: "icon_me_wallet", name: "订单审核(\(app.userInfo.orderCount))")
+ self.data.insert(m, at: 4)
+ }else if data.approveOrder == 0 && self.data.contains(where: {$0.name.contains("订单审核")}){
+ self.data.remove(at: 4)
+ }
+
self.tableView.reloadData()
break
case .error(let error):
@@ -168,20 +167,22 @@
/// 显示
func show() {
- //73699 【我的评论】有人回复我的评论：我的评论未显示数量
viewModel.queryUserInfo()
- enterpriseViewModel.queryEnterpriseInfo { status in
- switch status {
- case .success(let m):
- if m?.authStatus == .Pass && !self.data.contains(where: {$0.name.contains("订单审核")}){
- let m = HomeLeftMenuModel.init(image: "icon_me_wallet", name: "订单审核(\(app.userInfo.orderCount))")
- self.data.insert(m, at: 4)
- self.tableView.reloadData()
- }
- break
- case .error(let _):break
- }
- }
+// if !self.data.contains(where: {$0.name.contains("订单审核")}){
+// enterpriseViewModel.queryEnterpriseInfo(needShow: false) { status in
+// switch status {
+// case .success(let m):
+// if m?.authStatus == .Pass {
+// let m = HomeLeftMenuModel.init(image: "icon_me_wallet", name: "订单审核(\(app.userInfo.orderCount))")
+// self.data.insert(m, at: 4)
+// self.tableView.reloadData()
+// }
+// break
+// case .error(let _):break
+// }
+// }
+// }
+
viewModel.queryMessNum { [weak self]m in
self?.data[7].num = m.commentNum
self?.data[8].num = m.carRental + m.sellingCarNum
@@ -234,7 +235,7 @@
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
dismiss { [unowned self] in
- self.didSelectRow.call(indexPath.row)
+ self.didSelectRow.call(data[indexPath.row].name)
}
}
}
@@ -256,21 +257,21 @@
extension HomeLeftMenuView:UICollectionViewDelegate{
func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
dismiss { [unowned self] in
- self.didSelectRow.call(indexPath.row + 9)
+ self.didSelectRow.call(data1[indexPath.row].name)
}
}
}
extension HomeLeftMenuView:UICollectionViewDataSource{
func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
- return 0
+ return data1.count
}
func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "_Common_SingleImg_CCell", for: indexPath) as! Common_SingleImg_CCell
-// let data = data1[indexPath.row]
-// cell.img.image = UIImage(named: data.image)
-// cell.titleL.text = data.name
+ let data = data1[indexPath.row]
+ cell.img.image = UIImage(named: data.image)
+ cell.titleL.text = data.name
return cell
}
--
Gitblit v1.7.1