From 6f7f02d5c8880ff670b2c694fe61f5af5a6e3e36 Mon Sep 17 00:00:00 2001
From: 无故事王国 <841720330@qq.com>
Date: 星期四, 06 六月 2024 18:56:52 +0800
Subject: [PATCH] fix
---
DolphinEnglishLearnStudent/Moudle/Home/Listen/VC/HomeListenMenuVC.swift | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/DolphinEnglishLearnStudent/Moudle/Home/Listen/VC/HomeListenMenuVC.swift b/DolphinEnglishLearnStudent/Moudle/Home/Listen/VC/HomeListenMenuVC.swift
index 366d310..93f03ff 100644
--- a/DolphinEnglishLearnStudent/Moudle/Home/Listen/VC/HomeListenMenuVC.swift
+++ b/DolphinEnglishLearnStudent/Moudle/Home/Listen/VC/HomeListenMenuVC.swift
@@ -26,7 +26,7 @@
private func getData(){
- Services.weekList(quarter: selectIndexPath.row).subscribe(onNext: {result in
+ Services.weekList(quarter: selectIndexPath.row + 1).subscribe(onNext: {result in
self.dataItems[self.selectIndexPath.row] = result.data ?? []
self.collectionView.reloadData()
}).disposed(by: disposeBag)
@@ -53,14 +53,21 @@
extension HomeListenMenuVC:UICollectionViewDelegate,UICollectionViewDataSource,UICollectionViewDelegateFlowLayout{
func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
- let vc = HomeListenVC()
+ let model = dataItems[selectIndexPath.row][indexPath.row]
+
+ let quarter = selectIndexPath.row + 1 //季度
+ let week = model.week //周
+ let vc = HomeListenVC(quarter: quarter, week: week)
push(vc: vc)
}
func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "_HomeListenMenuCCell", for: indexPath) as! HomeListenMenuCCell
- cell.setTitle(week: "第一周", title: "提示基础认知能力", coin: 2000)
- cell.contentView.backgroundColor = UIColor.qmui_random()
+ let seal = indexPath.row % 10
+ cell.contentView.backgroundColor = UIColor(hexString: repeatColors[seal])
+ let model = dataItems[selectIndexPath.row][indexPath.row]
+ cell.setTitle(week: "第\(model.week.jq_cn)周", title: model.title, coin: model.totalIntegral)
+
return cell
}
@@ -91,6 +98,7 @@
getData()
}
tableView.reloadData()
+ collectionView.reloadData()
}
func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
@@ -154,6 +162,12 @@
private var label_title = UILabel()
private var label_completeCoin = UILabel()
+ var listenWeekModel:ListenWeekModel!{
+ didSet{
+
+ }
+ }
+
override init(frame: CGRect) {
super.init(frame: frame)
--
Gitblit v1.7.1