加载更多

galaxy/galaxy/Classes/Modules/Home(首页)/VM/YHHomePageViewModel.swift

@@ -160,6 +160,7 @@ extension YHHomePageViewModel {
             params = ["page": curPageIndex + 1,
                       "page_size": page_Size,
                       "classify_id[0]": classifyID]
+            curPageIndex = curPageIndex + 1
         }
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Common.article
         let _ = YHNetRequest.getRequest(url: strUrl, params: params) { [weak self] json, code in

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServerHKLifeViewController.swift

@@ -154,6 +154,7 @@ extension YHServerHKLifeViewController : UITableViewDelegate,UITableViewDataSour
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell0 = tableView.dequeueReusableCell(withClass: YHServerHKLifeViewCell.self)
         cell0.tableFootView.items = dataSouce
+        cell0.tableFootView.myCollectView.es.removeRefreshFooter()
         cell0.selectionStyle = .none
         return cell0
     }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHServerNoOrderView.swift

@@ -113,6 +113,7 @@ extension YHServerNoOrderView : UITableViewDelegate,UITableViewDataSource {
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell0 = tableView.dequeueReusableCell(withClass: YHServerHKLifeViewCell.self)
         cell0.tableFootView.items = dataSouce
+        cell0.tableFootView.myCollectView.es.removeRefreshFooter()
         cell0.selectionStyle = .none
         return cell0
     }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHServiceBannerView.swift

@@ -14,7 +14,7 @@ class YHServiceBannerView: UIView {
     // 位置、大小、图片、文本
     var dataArr: [YHBannerModel] = [] {
         didSet {
-            self.pageControl.numberOfPages = self.dataArr.count
+            self.indicatorView.indicatorItems = self.dataArr.count
             bannerView.reloadData()
         }
     }
@@ -46,6 +46,10 @@ class YHServiceBannerView: UIView {
         return view
     }()
     
+    lazy var indicatorView : YHHomeBannerIndicatorView = {
+        let view = YHHomeBannerIndicatorView()
+        return view
+    }()
 }
 
 private extension YHServiceBannerView {
@@ -60,7 +64,13 @@ private extension YHServiceBannerView {
             make.left.bottom.right.equalToSuperview()
             make.height.equalTo(25)
         }
-        setupPageControl()
+//        setupPageControl()
+        bannerView.addSubview(indicatorView)
+        indicatorView.snp.makeConstraints { make in
+            make.left.right.equalToSuperview()
+            make.height.equalTo(2)
+            make.bottom.equalTo(-14)
+        }
         bannerView.reloadData()
     }
     
@@ -157,10 +167,10 @@ extension YHServiceBannerView: FSPagerViewDataSource, FSPagerViewDelegate {
     }
     
     func pagerViewWillEndDragging(_ pagerView: FSPagerView, targetIndex: Int) {
-        self.pageControl.currentPage = targetIndex
+        self.indicatorView.curIndicatorIndex = targetIndex
     }
     
     func pagerViewDidEndScrollAnimation(_ pagerView: FSPagerView) {
-        self.pageControl.currentPage = pagerView.currentIndex
+        self.indicatorView.curIndicatorIndex = pagerView.currentIndex
     }
 }

galaxy/galaxy/Classes/Modules/Mine（我的）/ViewModel/YHMyLikeViewModel.swift

@@ -32,6 +32,7 @@ extension YHMyLikeViewModel {
             params = ["page": curPageIndex + 1,
                       "page_size": page_Size,
                       "operate_type": type]
+            curPageIndex = curPageIndex + 1
         }
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Common.user
         let _ = YHNetRequest.getRequest(url: strUrl, params: params) { [weak self] json, code in
@@ -86,6 +87,7 @@ extension YHMyLikeViewModel {
         } else {
             params = ["page": curPageIndex + 1,
                       "page_size": page_Size]
+            curPageIndex = curPageIndex + 1
         }
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Common.userLook
         let _ = YHNetRequest.getRequest(url: strUrl, params: params) { [weak self] json, code in