Commit 289d532f authored by Steven杜宇's avatar Steven杜宇

// 报名结果bug修复

parent f6c7585b
...@@ -10,7 +10,7 @@ import UIKit ...@@ -10,7 +10,7 @@ import UIKit
class YHActivityDetailViewController: YHBaseViewController { class YHActivityDetailViewController: YHBaseViewController {
var activityId : String = "" var activityId : String = ""
var activityName: String = ""
lazy var viewModel: YHActivityViewModel = { lazy var viewModel: YHActivityViewModel = {
let vm = YHActivityViewModel() let vm = YHActivityViewModel()
return vm return vm
...@@ -182,7 +182,7 @@ extension YHActivityDetailViewController { ...@@ -182,7 +182,7 @@ extension YHActivityDetailViewController {
let vc = YHApplyActivityResultViewController() let vc = YHApplyActivityResultViewController()
vc.isSuccessFlag = true vc.isSuccessFlag = true
vc.activityTravelId = self.viewModel.travelModel?.id ?? "" vc.activityTravelId = self.viewModel.travelModel?.id ?? ""
vc.activityName = self.viewModel.activityDetailModel?.name ?? "" vc.activityName = self.viewModel.activityDetailModel?.name ?? self.activityName
self.navigationController?.pushViewController(vc) self.navigationController?.pushViewController(vc)
} }
} else { } else {
...@@ -190,7 +190,7 @@ extension YHActivityDetailViewController { ...@@ -190,7 +190,7 @@ extension YHActivityDetailViewController {
let vc = YHApplyActivityResultViewController() let vc = YHApplyActivityResultViewController()
vc.isSuccessFlag = false vc.isSuccessFlag = false
vc.activityTravelId = self.viewModel.travelModel?.id ?? "" vc.activityTravelId = self.viewModel.travelModel?.id ?? ""
vc.activityName = self.viewModel.activityDetailModel?.name ?? "" vc.activityName = self.viewModel.activityDetailModel?.name ?? self.activityName
self.navigationController?.pushViewController(vc) self.navigationController?.pushViewController(vc)
} else { } else {
let msg = error?.errorMsg ?? "报名失败,请重试" let msg = error?.errorMsg ?? "报名失败,请重试"
......
...@@ -268,6 +268,7 @@ extension YHActivityListViewController: UITableViewDelegate, UITableViewDataSour ...@@ -268,6 +268,7 @@ extension YHActivityListViewController: UITableViewDelegate, UITableViewDataSour
let vc = YHActivityDetailViewController() let vc = YHActivityDetailViewController()
vc.activityId = String(model.id) vc.activityId = String(model.id)
vc.activityName = model.name
navigationController?.pushViewController(vc) navigationController?.pushViewController(vc)
} }
} }
......
...@@ -158,6 +158,7 @@ extension YHActivityTravelViewController { ...@@ -158,6 +158,7 @@ extension YHActivityTravelViewController {
let vc = YHActivityDetailViewController() let vc = YHActivityDetailViewController()
vc.activityId = String(self.viewModel.activityTravelModel?.id ?? 0) vc.activityId = String(self.viewModel.activityTravelModel?.id ?? 0)
vc.activityName = self.viewModel.activityDetailModel?.name ?? ""
navigationController?.pushViewController(vc) navigationController?.pushViewController(vc)
} }
} }
......
...@@ -74,6 +74,7 @@ extension YHApplyActivityResultViewController { ...@@ -74,6 +74,7 @@ extension YHApplyActivityResultViewController {
func setupUI() { func setupUI() {
gk_navigationBar.isHidden = false gk_navigationBar.isHidden = false
gk_navigationBar.backgroundColor = .clear gk_navigationBar.backgroundColor = .clear
gk_navTitle = "报名结果"
// view.backgroundColor = UIColor.pageBkgColor // view.backgroundColor = UIColor.pageBkgColor
view.backgroundColor = UIColor.white view.backgroundColor = UIColor.white
...@@ -110,11 +111,16 @@ extension YHApplyActivityResultViewController { ...@@ -110,11 +111,16 @@ extension YHApplyActivityResultViewController {
} }
if isSuccessFlag { if isSuccessFlag {
titleLabel.text = "报名成功"
statusImageV.image = UIImage(named: "activity_apply_result_success") statusImageV.image = UIImage(named: "activity_apply_result_success")
nameLabel.text = "已报名成功活动【" + activityName + "】,记得准时参加哦" nameLabel.text = "已报名成功活动【" + activityName + "】,记得准时参加哦"
submitButton.setTitle("查看行程单", for: .normal)
} else { } else {
titleLabel.text = "报名失败"
statusImageV.image = UIImage(named: "activity_apply_result_fail") statusImageV.image = UIImage(named: "activity_apply_result_fail")
nameLabel.text = "活动【" + activityName + "】,活动时间已结束,请您看看其他活动~" nameLabel.text = "活动【" + activityName + "】,活动时间已结束,请您看看其他活动~"
submitButton.setTitle("返回活动列表", for: .normal)
} }
} }
......
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