From 5ff885af9af801927e688163171b26336ae6bc25 Mon Sep 17 00:00:00 2001 From: 无故事王国 <841720330@qq.com> Date: 星期五, 12 四月 2024 17:44:47 +0800 Subject: [PATCH] fix bug --- WanPai/ViewModel/RefreshModel.swift | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/WanPai/ViewModel/RefreshModel.swift b/WanPai/ViewModel/RefreshModel.swift index 40264f1..6b77ca9 100644 --- a/WanPai/ViewModel/RefreshModel.swift +++ b/WanPai/ViewModel/RefreshModel.swift @@ -38,7 +38,7 @@ private var handle:UIScrollView! lazy var refreshSubject = PublishSubject<RefreshState>() - var page:Int = 0 + var page:Int = 1 var pageSize:Int = 20 private var needRefreshData:Bool = true lazy var dataSource = BehaviorRelay<[T]>(value: []) @@ -63,7 +63,13 @@ } func beginRefresh(){ - handle.mj_header?.beginRefreshing() + guard handle != nil else {return} + api()?.subscribe(onNext: { data in + if let datas = data.data{ + self.dataSource.accept(datas) + self.refreshSubject.onNext(.completedRefresh) + } + }).disposed(by: disposeBag) } func refreshData() ->(()->Void) { -- Gitblit v1.7.1