From fe02f75ab7a593f33d60c15308ddf7a974962db4 Mon Sep 17 00:00:00 2001 From: 杨锴 <841720330@qq.com> Date: 星期五, 27 十二月 2024 17:32:44 +0800 Subject: [PATCH] 提交版本: 1.0.0 --- XQMuse/Root/Me/VC/WatchHistoryDetailVC.swift | 45 ++++++++++++++++++++++++++++++++++++++------- 1 files changed, 38 insertions(+), 7 deletions(-) diff --git a/XQMuse/Root/Me/VC/WatchHistoryDetailVC.swift b/XQMuse/Root/Me/VC/WatchHistoryDetailVC.swift index a662566..1c4cb6c 100644 --- a/XQMuse/Root/Me/VC/WatchHistoryDetailVC.swift +++ b/XQMuse/Root/Me/VC/WatchHistoryDetailVC.swift @@ -98,14 +98,45 @@ func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) { let item = viewModel.dataSource.value[indexPath.row] - - Services.gvieCourseAgain(id: item.id).subscribe(onNext: {[weak self]data in - guard let weakSelf = self else { return } - if let m = data.data{ - let vc = PaymentOrderVC(pendingModel: m, type: weakSelf.viewModel.state.value == 1 ? .muse:.course) - JQ_currentViewController().jq_push(vc: vc) + if item.paymentStatus == .no{ + //音频 + if viewModel.state.value == 1{ + Services.getMeditationDetail(id: item.businessId).subscribe(onNext: {data in + if let m = data.data{ + let vc = HomeItemDetailVC(model: m) + JQ_currentViewController().jq_push(vc: vc) + } + }).disposed(by: disposeBag) } - }).disposed(by: disposeBag) + + //课程 + if viewModel.state.value == 2{ + Services.getCourseDetail(courseId: item.businessId).subscribe(onNext: {data in + if let m = data.data{ + if m.isVip == .no && m.chargeType == .vipFree{ + let vc = VIPCenterVC() + JQ_currentNavigationController().pushViewController(vc) + }else if m.courseType == .online{ + let vc = CourseDetialVC(courseModel: m) + JQ_currentViewController().jq_push(vc: vc) + }else{ + let vc = CourseDetialOfflineVC(courseId: m.id) + JQ_currentViewController().jq_push(vc: vc) + } + } + }).disposed(by: disposeBag) + } + }else{ + Services.gvieCourseAgain(id: item.id).subscribe(onNext: {[weak self]data in + guard let weakSelf = self else { return } + if let m = data.data{ + let vc = PaymentOrderVC(pendingModel: m, type: weakSelf.viewModel.state.value == 1 ? .muse:.course) + JQ_currentViewController().jq_push(vc: vc) + } + }).disposed(by: disposeBag) + } + + // if viewModel.state.value == 1{ // //待支付 -- Gitblit v1.7.1