Commit 8000161d authored by Alex朱枝文's avatar Alex朱枝文

增加参数

parent 29013413
...@@ -10,7 +10,7 @@ import UIKit ...@@ -10,7 +10,7 @@ import UIKit
class YHMemberCenterViewController: YHBaseViewController { class YHMemberCenterViewController: YHBaseViewController {
enum TableRow { enum TableRow {
case currentPrivilege(_ curLevel: YHMembershipLevel, _ count: Int, _ isOverLevel: Bool) case currentPrivilege(_ curLevel: YHMembershipLevel, _ count: Int, _ isOverLevel: Bool, _ myLevel: YHMembershipLevel)
case myPrivilege(_ myLevel: YHMembershipLevel, _ count: Int, _ redeemCount: Int, _ redeemedCount: Int, _ needShowBottom: Bool) case myPrivilege(_ myLevel: YHMembershipLevel, _ count: Int, _ redeemCount: Int, _ redeemedCount: Int, _ needShowBottom: Bool)
case action(_ title: String, _ detail: String, _ imageStr: String, _ ratio: CGFloat, _ buttonStr: String, _ buttonState: YHMemberCenterActionButton.ButtonState, _ id: String, _ contentType: YHMemberCenterCellContent) case action(_ title: String, _ detail: String, _ imageStr: String, _ ratio: CGFloat, _ buttonStr: String, _ buttonState: YHMemberCenterActionButton.ButtonState, _ id: String, _ contentType: YHMemberCenterCellContent)
} }
...@@ -174,7 +174,7 @@ class YHMemberCenterViewController: YHBaseViewController { ...@@ -174,7 +174,7 @@ class YHMemberCenterViewController: YHBaseViewController {
datas.append(row) datas.append(row)
} }
case .gold: case .gold:
datas.append(.currentPrivilege(currentLevel, currentLevel.privilegeCount, memberCenterInfo.currentLevel >= currentLevel.rawValue)) datas.append(.currentPrivilege(currentLevel, currentLevel.privilegeCount, memberCenterInfo.currentLevel >= currentLevel.rawValue, myLevel))
datas.append(.myPrivilege(myLevel, myLevel.privilegeCount, memberCenterInfo.exchangeCount, memberCenterInfo.exchangeCount, memberCenterInfo.currentLevel > YHMembershipLevel.normal.rawValue)) datas.append(.myPrivilege(myLevel, myLevel.privilegeCount, memberCenterInfo.exchangeCount, memberCenterInfo.exchangeCount, memberCenterInfo.currentLevel > YHMembershipLevel.normal.rawValue))
let services: [YHMemberCenterCellContent] = [.kidsBay, .luxury, .afternoonTea, .offlineSalons, .onSiteConsultation, .customerService, .pointsConsumption] let services: [YHMemberCenterCellContent] = [.kidsBay, .luxury, .afternoonTea, .offlineSalons, .onSiteConsultation, .customerService, .pointsConsumption]
let ids: [String] = [memberCenterInfo.highTeaBox.giftId, memberCenterInfo.experienceCenter.giftId, let ids: [String] = [memberCenterInfo.highTeaBox.giftId, memberCenterInfo.experienceCenter.giftId,
...@@ -193,7 +193,7 @@ class YHMemberCenterViewController: YHBaseViewController { ...@@ -193,7 +193,7 @@ class YHMemberCenterViewController: YHBaseViewController {
datas.append(row) datas.append(row)
} }
case .platinum: case .platinum:
datas.append(.currentPrivilege(currentLevel, currentLevel.privilegeCount, memberCenterInfo.currentLevel >= currentLevel.rawValue)) datas.append(.currentPrivilege(currentLevel, currentLevel.privilegeCount, memberCenterInfo.currentLevel >= currentLevel.rawValue, myLevel))
datas.append(.myPrivilege(myLevel, myLevel.privilegeCount, memberCenterInfo.exchangeCount, memberCenterInfo.exchangeCount, memberCenterInfo.currentLevel > YHMembershipLevel.normal.rawValue)) datas.append(.myPrivilege(myLevel, myLevel.privilegeCount, memberCenterInfo.exchangeCount, memberCenterInfo.exchangeCount, memberCenterInfo.currentLevel > YHMembershipLevel.normal.rawValue))
let services: [YHMemberCenterCellContent] = [.crossBorder, .kidsBay, .luxury, .afternoonTea, .offlineSalons, .onSiteConsultation, .customerService, .pointsConsumption] let services: [YHMemberCenterCellContent] = [.crossBorder, .kidsBay, .luxury, .afternoonTea, .offlineSalons, .onSiteConsultation, .customerService, .pointsConsumption]
let ids: [String] = [memberCenterInfo.carTransfer.giftId, let ids: [String] = [memberCenterInfo.carTransfer.giftId,
...@@ -214,7 +214,7 @@ class YHMemberCenterViewController: YHBaseViewController { ...@@ -214,7 +214,7 @@ class YHMemberCenterViewController: YHBaseViewController {
datas.append(row) datas.append(row)
} }
case .diamond: case .diamond:
datas.append(.currentPrivilege(currentLevel, currentLevel.privilegeCount, memberCenterInfo.currentLevel >= currentLevel.rawValue)) datas.append(.currentPrivilege(currentLevel, currentLevel.privilegeCount, memberCenterInfo.currentLevel >= currentLevel.rawValue, myLevel))
datas.append(.myPrivilege(myLevel, myLevel.privilegeCount, memberCenterInfo.exchangeCount, memberCenterInfo.exchangeCount, memberCenterInfo.currentLevel > YHMembershipLevel.normal.rawValue)) datas.append(.myPrivilege(myLevel, myLevel.privilegeCount, memberCenterInfo.exchangeCount, memberCenterInfo.exchangeCount, memberCenterInfo.currentLevel > YHMembershipLevel.normal.rawValue))
let services: [YHMemberCenterCellContent] = [.highEndMeeting, .crossBorder, .hkTravel,.drivingLicense, .schoolSelection, .brandPlanning, .kidsBay, .luxury, .afternoonTea, .offlineSalons, .onSiteConsultation, .customerService, .pointsConsumption] let services: [YHMemberCenterCellContent] = [.highEndMeeting, .crossBorder, .hkTravel,.drivingLicense, .schoolSelection, .brandPlanning, .kidsBay, .luxury, .afternoonTea, .offlineSalons, .onSiteConsultation, .customerService, .pointsConsumption]
let ids: [String] = [memberCenterInfo.highEndPrivilege.giftId, let ids: [String] = [memberCenterInfo.highEndPrivilege.giftId,
...@@ -389,7 +389,7 @@ class YHMemberCenterViewController: YHBaseViewController { ...@@ -389,7 +389,7 @@ class YHMemberCenterViewController: YHBaseViewController {
}) })
} }
private func gotoPrivilegePage() { private func gotoPrivilegePage(_ level: YHMembershipLevel) {
let vc = YHVipLevelRightViewController() let vc = YHVipLevelRightViewController()
navigationController?.pushViewController(vc) navigationController?.pushViewController(vc)
} }
...@@ -413,7 +413,7 @@ extension YHMemberCenterViewController: UITableViewDelegate, UITableViewDataSour ...@@ -413,7 +413,7 @@ extension YHMemberCenterViewController: UITableViewDelegate, UITableViewDataSour
} }
let section = datas[indexPath.section] let section = datas[indexPath.section]
switch section { switch section {
case let .currentPrivilege(level, count, isOverLevel): case let .currentPrivilege(level, count, isOverLevel, _):
if let cell = tableView.dequeueReusableCell(withIdentifier: YHMemberCenterCurrentPrivilegeCell.cellReuseIdentifier) as? YHMemberCenterCurrentPrivilegeCell { if let cell = tableView.dequeueReusableCell(withIdentifier: YHMemberCenterCurrentPrivilegeCell.cellReuseIdentifier) as? YHMemberCenterCurrentPrivilegeCell {
cell.setupCell(mid: "\(level.description)拥有特权\(count)项", isOverLevel: isOverLevel) cell.setupCell(mid: "\(level.description)拥有特权\(count)项", isOverLevel: isOverLevel)
return cell return cell
...@@ -455,12 +455,12 @@ extension YHMemberCenterViewController: UITableViewDelegate, UITableViewDataSour ...@@ -455,12 +455,12 @@ extension YHMemberCenterViewController: UITableViewDelegate, UITableViewDataSour
} }
let section = datas[indexPath.section] let section = datas[indexPath.section]
switch section { switch section {
case .currentPrivilege: case let .currentPrivilege(_, _, _, myLevel):
// 跳特权页 // 跳特权页
gotoPrivilegePage() gotoPrivilegePage(myLevel)
case .myPrivilege: case let .myPrivilege(myLevel, _, _, _, _):
// 跳特权页 // 跳特权页
gotoPrivilegePage() gotoPrivilegePage(myLevel)
case .action: case .action:
break break
} }
......
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