解决筛选问题

galaxy/galaxy/Classes/Modules/Home(首页)/InvitationWithGifts(邀请有礼)/V/YHInvitationWithGiftsSecondTableViewCell.swift

@@ -451,10 +451,11 @@ class YHInvitationWithGiftsSecondTableViewCell: UITableViewCell {
                 viewModel.state = two
                 self.page = 1
                 //请求刷新数据
+                self.tableView.es.resetNoMoreData()
                 self.viewModel.postRecord(page: 1) {[weak self] success, error in
                     guard let self = self else { return }
-                    self.tableView.es.stopLoadingMore()
-                    if self.viewModel.recordModel.page_count == self.page {
+//                    self.tableView.es.stopLoadingMore()
+                    if self.viewModel.recordModel.page_count == 1 {
                         self.tableView.es.noticeNoMoreData()
                         self.tableView.footer?.alpha = 1
                     }

galaxy/galaxy/Classes/Modules/Home(首页)/InvitationWithGifts(邀请有礼)/VM/YHInvitationWithGiftsViewModel.swift

@@ -46,10 +46,10 @@ class YHInvitationWithGiftsViewModel: YHBaseViewModel {
             param.updateValue(self.startTime, forKey: "registered_date.begin_date")
         }
         if self.endTime.count != 0 {
-            param.updateValue(self.endTime, forKey: "egistered_date.end_date")
+            param.updateValue(self.endTime, forKey: "registered_date.end_date")
         }
         if self.state < 3 {
-            param.updateValue(self.state + 1, forKey: "status")
+            param.updateValue((2 - self.state) + 1, forKey: "status")
         }
         let _ = YHNetRequest.getRequest(url: strUrl, params: param) { [weak self] json, code in
             guard let self = self else { return }
@@ -83,7 +83,7 @@ class YHInvitationWithGiftsViewModel: YHBaseViewModel {
         var param: [String: Any] = ["page": page,
                                     "pagesize": 20]
         if self.state < 3 {
-            param.updateValue(self.state + 1, forKey: "status")
+            param.updateValue((2 - self.state) + 1, forKey: "status")
         }
         if !registered_date.isEmpty {
             param.updateValue(registered_date, forKey: "registered_date")

galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMyViewController.swift

@@ -95,14 +95,14 @@ class YHMyViewController: YHBaseViewController, ConstraintRelatableTarget {
         let view = YHUserInfoHeaderView.createView()
         view.settingBlock = {
             [weak self] in
-//            guard let self = self else { return }
-//            if !checkLogin() { return }
-//            let vc = YHMySettingViewController()
-//            self.navigationController?.pushViewController(vc)
+            guard let self = self else { return }
+            if !checkLogin() { return }
+            let vc = YHMySettingViewController()
+            self.navigationController?.pushViewController(vc)
             
             
-            let vc = YHOfficialApprovalResultVC()
-            self?.navigationController?.pushViewController(vc) //for test hjl
+//            let vc = YHOfficialApprovalResultVC()
+//            self?.navigationController?.pushViewController(vc) //for test hjl
         }
         view.evaluateBlock = {
             [weak self] in