From 3e3bfd1ad307ec2ea42f66e298ccb24cec26955f Mon Sep 17 00:00:00 2001 From: younger_times <841720330@qq.com> Date: 星期三, 26 七月 2023 18:13:33 +0800 Subject: [PATCH] 新增 --- WanPai/Root/Course/VC/CourseInfoVC.swift | 42 +++++++++++++++++++++++------------------- 1 files changed, 23 insertions(+), 19 deletions(-) diff --git a/WanPai/Root/Course/VC/CourseInfoVC.swift b/WanPai/Root/Course/VC/CourseInfoVC.swift index e474a2e..4ff3af3 100644 --- a/WanPai/Root/Course/VC/CourseInfoVC.swift +++ b/WanPai/Root/Course/VC/CourseInfoVC.swift @@ -13,11 +13,11 @@ class CourseInfoVC: BaseVC { - private struct MentalInfo { - var img:UIImage! - var t1:String! - var t2:String! - } +// private struct MentalInfo { +// var img:UIImage! +// var t1:String! +// var t2:String! +// } @IBOutlet weak var scrollView: CourseInfoScrollView! @IBOutlet weak var view_container: UIView! @@ -41,7 +41,7 @@ var startClouseHomeModel:StartClouseHomeModel? private var currentDate = Date() - private var mentals = [MentalInfo]() + private var mentals = [StudentMedalModel]() private var pageMenu:SPPageMenu = { let pageMenu = SPPageMenu(frame: .zero, trackerStyle: .line) @@ -96,6 +96,7 @@ super.viewDidLoad() if let m = startClouseHomeModel{ + img_header.sd_setImage(with: URL(string: m.stuImg)) label_stu_name.text = m.stuName img_gender.image = m.stuSex == .man ? UIImage(named: "icon_man") : UIImage(named: "icon_woman") @@ -112,6 +113,17 @@ cons_menuHeight.constant = 25 pageMenu.setItems(m.courseList.map({$0.courseName}), selectedItemIndex: 0) } + + + Services.studMedalList(studentId: m.stuId).subscribe(onNext: {[weak self] data in + guard let weakSelf = self else { return } + if let models = data.data{ + weakSelf.mentals = models + weakSelf.mentalCollectionView.reloadData() + let he = ceil(Double(models.count) / 3) * 91 + floor(Double(models.count) / 3) * 35 + weakSelf.cons_mentalViewHei.constant = he + } + }).disposed(by: disposeBag) } } @@ -157,15 +169,6 @@ exerciseCollectionView.register(UINib(nibName: "StudentVideoCCell", bundle: nil), forCellWithReuseIdentifier: "_StudentVideoCCell") - mentals.append(MentalInfo(img: UIImage(named: "icon_coupon_1"), t1: "COURSE", t2: "俱乐部之星")) - mentals.append(MentalInfo(img: UIImage(named: "icon_coupon_2"), t1: "EVENTS", t2: "运动大人")) - mentals.append(MentalInfo(img: UIImage(named: "icon_coupon_3"), t1: "ON_LINE", t2: "社区之王")) - mentals.append(MentalInfo(img: UIImage(named: "icon_coupon_4"), t1: "APPOINTMENT", t2: "深度玩家")) - mentals.append(MentalInfo(img: UIImage(named: "icon_coupon_5"), t1: "EVENTS", t2: "月度冠军")) - mentals.append(MentalInfo(img: UIImage(named: "icon_coupon_6"), t1: "MORE", t2: "更多")) - - cons_mentalViewHei.constant = ceil(Double(mentals.count) / 3) * 91 + floor(Double(mentals.count) / 3) * 30 - navigationItem.leftBarButtonItem = UIBarButtonItem(customView: leftBtn) } @@ -207,7 +210,8 @@ } @IBAction func bookingRecordAction(_ sender: UIButton) { - let vc = CourseBookingListVC() + guard startClouseHomeModel != nil else {return} + let vc = CourseBookingListVC(student: startClouseHomeModel!) push(vc: vc) } @@ -270,9 +274,9 @@ func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell { if collectionView.tag == 1000{ let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "_StudentMedalCCell", for: indexPath) as! StudentMedalCCell - cell.img.image = mentals[indexPath.row].img - cell.t1.text = mentals[indexPath.row].t1 - cell.t2.text = mentals[indexPath.row].t2 + cell.img.image = mentals[indexPath.row].medalType.image + cell.t1.text = mentals[indexPath.row].medalType.title_en + cell.t2.text = mentals[indexPath.row].medalType.title return cell } else{ let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "_StudentVideoCCell", for: indexPath) as! StudentVideoCCell -- Gitblit v1.7.1