From 54e863346e9c246d199c7684e506de4f7437b3bb Mon Sep 17 00:00:00 2001 From: 无故事王国 <841720330@qq.com> Date: 星期一, 16 十月 2023 18:58:28 +0800 Subject: [PATCH] 修改 --- WanPai/Root/Course/VC/SignUpCourseVC.swift | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/WanPai/Root/Course/VC/SignUpCourseVC.swift b/WanPai/Root/Course/VC/SignUpCourseVC.swift index f9ebbbe..631255e 100644 --- a/WanPai/Root/Course/VC/SignUpCourseVC.swift +++ b/WanPai/Root/Course/VC/SignUpCourseVC.swift @@ -16,11 +16,11 @@ var packageTypeData = BehaviorRelay<[NormalSimpleModel]?>(value: nil) var selectPackeType = BehaviorRelay<NormalSimpleModel?>(value: nil) - var courseTypeId = BehaviorRelay<Int?>(value: nil) + var courseType = BehaviorRelay<NormalSimpleModel?>(value: nil) var search = BehaviorRelay<String?>(value: nil) override func api() -> (Observable<BaseResponse<[SignUpCourseItemModel]>>)? { - return Services.registeredCourse(courseTypeId: courseTypeId.value, search: search.value) + return Services.registeredCourse(courseTypeId: courseType.value?.id, search: search.value) } func getDefaultData(){ @@ -72,6 +72,7 @@ }else{ self?.viewModel.search.accept(self?.tf_search.text!) } + self?.viewModel.beginRefresh() }).disposed(by: disposeBag) } @@ -84,13 +85,13 @@ guard !sender.isSelected else {return} cleanOther() sender.isSelected = true - showSubTypeView = CourseSubTypeView.show(inView: self.view, afterView: view_topView, items: viewModel.packageTypeData.value!,selectModel: viewModel.selectPackeType.value) { [weak self] m in + showSubTypeView = CourseSubTypeView.show(inView: self.view, afterView: view_topView, items: viewModel.packageTypeData.value!,selectModel: viewModel.courseType.value) { [weak self] m in if m.name != "全部"{ sender.setTitle(m.name, for: .normal) - self?.viewModel.selectPackeType.accept(m) + self?.viewModel.courseType.accept(m) }else{ sender.setTitle("课程类型", for: .normal) - self?.viewModel.selectPackeType.accept(nil) + self?.viewModel.courseType.accept(nil) } sender.isSelected = false self?.viewModel.beginRefresh() @@ -100,9 +101,9 @@ } @IBAction func searchAction(_ sender: UIButton) { + view.endEditing(true) viewModel.beginRefresh() } - } extension SignUpCourseVC:UITableViewDelegate{ -- Gitblit v1.7.1