Commit 5f478c06 authored by David黄金龙's avatar David黄金龙

1、处理 已下架 逻辑 及UI

2、处理一处bug
parent c4d57a39
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
buildConfiguration = "Debug"> buildConfiguration = "Debug">
</AnalyzeAction> </AnalyzeAction>
<ArchiveAction <ArchiveAction
buildConfiguration = "Release" buildConfiguration = "UatRelease"
revealArchiveInOrganizer = "YES"> revealArchiveInOrganizer = "YES">
</ArchiveAction> </ArchiveAction>
</Scheme> </Scheme>
...@@ -87,6 +87,8 @@ extension YHActivityDetailViewController { ...@@ -87,6 +87,8 @@ extension YHActivityDetailViewController {
case .end: case .end:
printLog("活动已结束") printLog("活动已结束")
// YHHUD.flash(message: "活动已结束") // YHHUD.flash(message: "活动已结束")
case .soldout:
printLog("已下架")
default: default:
printLog("") printLog("")
} }
......
...@@ -39,7 +39,7 @@ enum YHActivityStatus: Int { ...@@ -39,7 +39,7 @@ enum YHActivityStatus: Int {
} }
} }
var titleForMyApplyList : String { var titleForMyApplyList : String {
switch self { switch self {
case .notApply: case .notApply:
return "立即报名" return "立即报名"
...@@ -67,6 +67,8 @@ enum YHActivityStatus: Int { ...@@ -67,6 +67,8 @@ enum YHActivityStatus: Int {
return "活动结束" return "活动结束"
case .canceled: case .canceled:
return "立即报名" return "立即报名"
case .soldout:
return "已下架"
default: default:
return "" return ""
} }
......
...@@ -46,17 +46,6 @@ class YHActivityTravelViewController: YHBaseViewController { ...@@ -46,17 +46,6 @@ class YHActivityTravelViewController: YHBaseViewController {
}() }()
lazy var topView : UIView = {
let view = UIView()
return view
}()
lazy var bottomView : YHActivityDetailBottomView = {
let view = YHActivityDetailBottomView()
return view
}()
// MARK: - 生命周期方法 // MARK: - 生命周期方法
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
...@@ -163,47 +152,6 @@ extension YHActivityTravelViewController { ...@@ -163,47 +152,6 @@ extension YHActivityTravelViewController {
navigationController?.pushViewController(vc) navigationController?.pushViewController(vc)
} }
} }
// func showApplyUI() {
// YHApplyActivityAlert.showApplyActivityAlertView { (tag,name,number,phone) in
// if tag {
// printLog(tag)
// printLog(name)
// printLog(number)
// printLog(phone)
// if tag {
// if let model = self.viewModel.activityTravelModel,model.id > 0 {
// let param = ["id" : model.id,
// "name":name,
// "mobile":phone,
// "number":number]
// self.applyActivity(param: param)
// }
// }
// }
// }
// }
// func applyActivity(param : [String : Any]) {
//
// viewModel.applyActivity(param: param) { success, error in
// if success {
// YHHUD.flash(message: "报名成功")
// self.loadData()
// DispatchQueue.main.async {
// let vc = YHApplyActivityResultViewController()
// vc.activityTravelId = String(self.viewModel.activityTravelModel?.id ?? 0)
//
// self.navigationController?.pushViewController(vc)
// }
// } else {
// let msg = error?.errorMsg ?? "报名失败,请重试"
// YHHUD.flash(message: msg)
// }
// }
// }
} }
extension YHActivityTravelViewController: UITableViewDelegate, UITableViewDataSource { extension YHActivityTravelViewController: UITableViewDelegate, UITableViewDataSource {
......
...@@ -18,7 +18,7 @@ class YHActivityListCell: UITableViewCell { ...@@ -18,7 +18,7 @@ class YHActivityListCell: UITableViewCell {
} }
} }
var type : Int = 0 var type : Int = 0 //0-活动列表 1-我的报名活动
var sessionIndex : Int = 0 { var sessionIndex : Int = 0 {
......
...@@ -121,9 +121,13 @@ extension YHActivityTravelCell { ...@@ -121,9 +121,13 @@ extension YHActivityTravelCell {
cancelButton.isHidden = true cancelButton.isHidden = true
statusLable.text = "活动结束" statusLable.text = "活动结束"
} else if model.status.int == 5 {
cancelButton.isHidden = true
statusLable.text = "活动已下架"
} }
else { else {
cancelButton.isHidden = true cancelButton.isHidden = true
statusLable.text = ""
} }
......
...@@ -140,8 +140,11 @@ class YHApplyActivityAlert: UIView { ...@@ -140,8 +140,11 @@ class YHApplyActivityAlert: UIView {
//类方法 - 展示 //类方法 - 展示
static func showApplyActivityAlertView(name : String = "",callBack: @escaping Block) { static func showApplyActivityAlertView(name : String = "",callBack: @escaping Block) {
let view = YHApplyActivityAlert(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: KScreenHeight)) let view = YHApplyActivityAlert(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: KScreenHeight))
view.applyName = name
view.nameTextField.text = name var ttt = name
let tName = ttt.slice(from: 0, length: 10)
view.applyName = tName
view.nameTextField.text = tName
view.block = callBack view.block = callBack
let window = UIApplication.shared.yhKeyWindow() let window = UIApplication.shared.yhKeyWindow()
window?.addSubview(view) window?.addSubview(view)
......
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