iOS Team / CNLiveMateCode · Commits

Commit 6a7dcb1ae6a793407aa2ed5d946730701c8b3fb5

Authored by “张旭”
2 parents 217263ab 574676de

Merge branch 'master' of http://bj.gitlab.cnlive.com/ios-team/CNLiveMateCode

Inline Side-by-side
Showing 2 changed files with 5 additions and 4 deletions
metaCode/Classes/Main/MinePage/Controller/CNLiveMineEarnListViewController.swift
  View file @6a7dcb1
@@ -140,7 +140,7 @@ class CNLiveMineEarnListViewController: CNLiveBaseViewController, JXPagingViewLi @@ -140,7 +140,7 @@ class CNLiveMineEarnListViewController: CNLiveBaseViewController, JXPagingViewLi
140 self!.pageNum += 1 140 self!.pageNum += 1
141 self!.loadDataWithTradRecord(page: self!.pageNum) {result,respStatue in } 141 self!.loadDataWithTradRecord(page: self!.pageNum) {result,respStatue in }
142 }) 142 })
143 - footerView.setTitle("123456", for: .noMoreData) 143 + footerView.setTitle("没有更多数据了", for: .noMoreData)
144 tableView.mj_footer = footerView 144 tableView.mj_footer = footerView
145 } 145 }
146 } 146 }
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineViewModel.swift
  View file @6a7dcb1
@@ -809,13 +809,13 @@ class CNLiveMineViewModel: NSObject { @@ -809,13 +809,13 @@ class CNLiveMineViewModel: NSObject {
809 /// - page: 页数 809 /// - page: 页数
810 /// - resultBlock: 返回 810 /// - resultBlock: 返回
811 static func requestWithIntegralRecord(page: NSInteger, resultBlock: @escaping resultNewsBlock) { 811 static func requestWithIntegralRecord(page: NSInteger, resultBlock: @escaping resultNewsBlock) {
812 - let startTime = NSDate.timeIntervalChangeToTimeStr(timeInterval: Double((timeStamp * 1000) - 30*24*60*60))  
813 - let endTime = NSDate.timeIntervalChangeToTimeStr(timeInterval: Double(timeStamp * 1000)) 812 + let startTime = NSDate.timeIntervalChangeToTimeStr(timeInterval: Double(timeStamp + 8*60*60) - 30*24*60*60)
  813 + let endTime = NSDate.timeIntervalChangeToTimeStr(timeInterval: Double(timeStamp + 8*60*60))
814 let param = NSMutableDictionary() 814 let param = NSMutableDictionary()
815 param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "sid") 815 param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "sid")
816 param.setValue(startTime, forKey: "startTime")//开始时间 "2022-08-21" 816 param.setValue(startTime, forKey: "startTime")//开始时间 "2022-08-21"
817 param.setValue(endTime, forKey: "endTime")//开始时间 "2022-09-20" 817 param.setValue(endTime, forKey: "endTime")//开始时间 "2022-09-20"
818 - param.setValue("0", forKey: "type")//0全部(默认) 1收入 2支出 818 + param.setValue("1", forKey: "type")//0全部(默认) 1收入 2支出
819 param.setValue("10", forKey: "pageSize") 819 param.setValue("10", forKey: "pageSize")
820 param.setValue("\(page)", forKey: "pageNo") 820 param.setValue("\(page)", forKey: "pageNo")
821 let custom_param = NSMutableDictionary() 821 let custom_param = NSMutableDictionary()
@@ -823,6 +823,7 @@ class CNLiveMineViewModel: NSObject { @@ -823,6 +823,7 @@ class CNLiveMineViewModel: NSObject {
823 custom_param.setValue(CNLiveEnvironmentManager.shared.appKey_wjj, forKey: "appKey") 823 custom_param.setValue(CNLiveEnvironmentManager.shared.appKey_wjj, forKey: "appKey")
824 CNLiveNetworking.setAllowRequestDefaultArgument(true) 824 CNLiveNetworking.setAllowRequestDefaultArgument(true)
825 CNLiveNetworking.setupShowDataResult(false) 825 CNLiveNetworking.setupShowDataResult(false)
  826 + CNLiveNetworking.setupShowResult(true)
826 CNLiveNetworking.setupSignRequestKey(CNLiveEnvironmentManager.shared.appKey_wjj) 827 CNLiveNetworking.setupSignRequestKey(CNLiveEnvironmentManager.shared.appKey_wjj)
827 CNLiveNetworking.setupCustomParam(custom_param as? [String : String]) 828 CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
828 CNLiveNetworking.requestNetwork(with: .POST, urlString: APPBaseWjjUrl+"/Daren/integral/myIntegralRecord.action", param: (param as! [AnyHashable : Any]), cacheType: .networkOnly) { task, result, error in 829 CNLiveNetworking.requestNetwork(with: .POST, urlString: APPBaseWjjUrl+"/Daren/integral/myIntegralRecord.action", param: (param as! [AnyHashable : Any]), cacheType: .networkOnly) { task, result, error in