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

张旭
2 parents d10ae240 8bb40c64
Showing 11 changed files with 392 additions and 53 deletions
metaCode/Classes/Environment/CNLiveEnvironment.swift
metaCode/Classes/Extensions/NSObject+CNLiveExtensions.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineAddInfoViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineEarnListViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineEarnViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineQuestViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineViewController.swift
metaCode/Classes/Main/MinePage/View/CNLiveMineBodyListView.swift
metaCode/Classes/Main/MinePage/View/CNLiveMineHeaderView.swift
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineBaseModel.swift
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineViewModel.swift
@@ -11,6 +11,10 @@ import Foundation
 let APPId: String  = CNLiveEnvironmentManager.shared.appId
 ///当前应用的APPKey
 let APPKey: String = CNLiveEnvironmentManager.shared.appKey
+///网家家应用的APPID
+let APPId_wjj: String  = CNLiveEnvironmentManager.shared.appId_wjj
+///网家家应用的APPKey
+let APPKey_wjj: String = CNLiveEnvironmentManager.shared.appKey_wjj
 ///当前应用的登录请求域名
 let APPLoginHost: String! = CNLiveEnvironmentManager.shared.loginHost
 ///当前应用的Secret
@@ -19,6 +23,8 @@ let APPSecret: String = CNLiveEnvironmentManager.shared.appSecret
 let APPBaseMCUrl: String = CNLiveEnvironmentManager.shared.base_mc_url
 /// 网家家内接口
 let APPBaseWjjUrl: String = CNLiveEnvironmentManager.shared.base_wjj_url
+/// 网家家内电商接口
+let APPBaseWjjShopUrl: String = CNLiveEnvironmentManager.shared.base_mjj_shop_url
 ///当前APP的环境
 let APPCurrentEnvironment: CNLiveEnvironment = CNLiveEnvironmentManager.shared.currentEnvironment
@@ -48,6 +54,8 @@ class CNLiveEnvironmentManager: NSObject{
     var appId: String
     var appKey: String
+    var appId_wjj: String
+    var appKey_wjj: String
     var appSecret: String
     ///登录接口域名
     var loginHost: String
@@ -57,6 +65,8 @@ class CNLiveEnvironmentManager: NSObject{
     var base_wjj_url: String
     /// 获取IM token 请求域名
     var img_token_url: String
+    /// 网家家电商域名请求
+    var base_mjj_shop_url: String
     ///当前环境
     var currentEnvironment: CNLiveEnvironment
@@ -65,11 +75,14 @@ class CNLiveEnvironmentManager: NSObject{
     private override init() {
         self.appId = ""
         self.appKey = ""
+        self.appId_wjj = ""
+        self.appKey_wjj = ""
         self.loginHost = ""
         self.appSecret = ""
         self.base_mc_url = ""
         self.img_token_url = ""
         self.base_wjj_url = ""
+        self.base_mjj_shop_url = ""
         self.currentEnvironment = .development
     }
     //重新copy 和 mutableCopy 方法
@@ -100,31 +113,40 @@ class CNLiveEnvironmentManager: NSObject{
     func developmentEnvironment(){
         self.appId = "802_li40qhp922"
         self.appKey = "ae3a7ad3e4b9beb7cfe2078db648ebb89aa249ca2e82ac"
+        self.appId_wjj = "769_jetj7bq525"
+        self.appKey_wjj = "0d57b045ec0c3988a682d94c644e66b9b8e0d2b8ef937d"
         self.appSecret = "3cc9f12db322a3d3656012ef929604cf6d6847471535f9"
         self.loginHost = "https://api.cnlive.com"
         self.img_token_url = "https://api.cnlive.com/open/api2"
         self.base_mc_url = "https://metacode.cnlive.com/api"
         self.base_wjj_url = "https://apiwjj.cnlive.com"
+        self.base_mjj_shop_url = "https://manageshop.cnlive.com"
     }
     //testFlight 环境配置
     func testFlightEnvironment(){
         self.appId = "802_li40qhp922"
         self.appKey = "ae3a7ad3e4b9beb7cfe2078db648ebb89aa249ca2e82ac"
+        self.appId_wjj = "769_jetj7bq525"
+        self.appKey_wjj = "0d57b045ec0c3988a682d94c644e66b9b8e0d2b8ef937d"
         self.appSecret = "3cc9f12db322a3d3656012ef929604cf6d6847471535f9"
         self.loginHost = "https://api.cnlive.com"
         self.img_token_url = "https://api.cnlive.com/open/api2"
         self.base_mc_url = "https://metacode.cnlive.com/api"
         self.base_wjj_url = "https://apiwjj.cnlive.com"
+        self.base_mjj_shop_url = "https://manageshop.cnlive.com"
     }
     //production 生产环境配置
     func productionEnvironment(){
         self.appId = "769_li40lrkt53"
         self.appKey = "064f392f84dfe7bbe9f1eabeda53ea02044213019b0406"
+        self.appId_wjj = "769_jetj7bq525"
+        self.appKey_wjj = "0d57b045ec0c3988a682d94c644e66b9b8e0d2b8ef937d"
         self.appSecret = "68b5cc42fbdb466d56c2e22b00b1494feec8149f9dd32e"
         self.loginHost = "https://api.cnlive.com"
         self.img_token_url = "https://api.cnlive.com/open/api2"
         self.base_mc_url = "https://metacode.cnlive.com/api"
         self.base_wjj_url = "https://apiwjj.cnlive.com"
+        self.base_mjj_shop_url = "https://manageshop.cnlive.com"
     }
 }
@@ -138,7 +138,7 @@ func jsonToModel(_ jsonStr:String,_ modelType:HandyJSON.Type) -&gt; BaseModel {
 /**
  *  Json转数组对象
  */
-func jsonArrayToModel(_ jsonArrayStr:String, _ modelType:HandyJSON.Type) ->[BaseModel] {
+func jsonArrayToModel(_ jsonArrayStr:String, _ modelType:HandyJSON.Type,_ path: String) ->[BaseModel] {
     if jsonArrayStr == "" || jsonArrayStr.count == 0 {
         #if DEBUG
             print("jsonToModelArray:字符串为空")
@@ -149,7 +149,7 @@ func jsonArrayToModel(_ jsonArrayStr:String, _ modelType:HandyJSON.Type) -&gt;[Base
     let data = jsonArrayStr.data(using: String.Encoding.utf8)
     let peoplesArray = try! JSONSerialization.jsonObject(with:data!, options: JSONSerialization.ReadingOptions()) as? [AnyObject]
     for people in peoplesArray! {
-        modelArray.append(dictionaryToModel(people as! [String : Any], modelType,""))
+        modelArray.append(dictionaryToModel(people as! [String : Any], modelType,path))
     }
     return modelArray
@@ -121,6 +121,8 @@ class CNLiveMineAddInfoViewController : CNLiveBaseViewController, UITableViewDel
                         self!.tableView.reloadData()
                         self!.tableView.mj_header?.endRefreshing()
                         self!.tableView.mj_footer?.endRefreshing()
+                    }else{
+                        
                     }
                     if listBaseModel.total == listBaseModel.pageNum {
                         self!.tableView.mj_footer?.endRefreshing()
@@ -7,6 +7,7 @@
 import Foundation
 import JXPagingView
+import MJRefresh
 enum MineEarnShowType {
     case record //积分记录
@@ -35,26 +36,69 @@ class CNLiveMineEarnListViewController: CNLiveBaseViewController, JXPagingViewLi
         return tableView
     }()
+    lazy var dataArray: NSMutableArray = {
+        let dataArray = NSMutableArray()
+        return dataArray
+    }()
+    
+    var pageNum: NSInteger!
     var _callBack: CallBack!
     var _show_type : MineEarnShowType!
     init(show_type: MineEarnShowType) {
+        pageNum = 1
         super.init(nibName: nil, bundle: nil)
         _show_type = show_type
     }
+    func loadDataWithTradRecord(page: NSInteger) {
+        
+        if _show_type == .balance {
+            CNLiveMineViewModel.requestWithTradRecord(page: page) {result, respStatue in
+                if respStatue == .success {
+                    self.dataArray.removeAllObjects()
+                    self.dataArray.addObjects(from: result as! [MineTradingRecordModel])
+                    self.tableView.reloadData()
+                    self.tableView.mj_header?.endRefreshing()
+                    self.tableView.mj_footer?.endRefreshing()
+                }
+            }
+        }
+        if _show_type == .record {
+            CNLiveMineViewModel.requestWithIntegralRecord(page: page) { result, respStatue in
+                if respStatue == .success {
+                    self.dataArray.removeAllObjects()
+                    self.dataArray.addObjects(from: (result as! MineIntegralRecordModel).integralList)
+                    self.tableView.reloadData()
+                    self.tableView.mj_header?.endRefreshing()
+                    self.tableView.mj_footer?.endRefreshing()
+                }
+            }
+        }
+    }
+    
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
     override func viewDidLoad() {
         super.viewDidLoad()
-        
+    
+        loadDataWithTradRecord(page: self.pageNum)
         view.addSubview(tableView)
         tableView.snp.makeConstraints { make in
             make.top.bottom.equalToSuperview()
             make.left.equalToSuperview().offset(20)
             make.right.equalToSuperview().offset(-20)
         }
+        
+        addRefreshView()
+    }
+    
+    private func addRefreshView() {
+        tableView.mj_footer = MJRefreshFooter.init(refreshingBlock: {[weak self] in
+            self!.pageNum += 1
+            self!.loadDataWithTradRecord(page: self!.pageNum)
+        })
     }
 }
 extension CNLiveMineEarnListViewController {
@@ -64,14 +108,20 @@ extension CNLiveMineEarnListViewController {
     }
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        return 6
+        return dataArray.count
     }
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         guard let cell = tableView.dequeueReusableCell(withIdentifier: kMIneBodyFiveViewCellIdentifier) as? MIneBodyFiveViewCell else {
             return MIneBodyFiveViewCell()
         }
-        cell.setupWithDataSource(isLast: indexPath.row == 5)
+        if _show_type == .balance {
+            cell.setupWithBalanceDataSource(isLast: indexPath.row == dataArray.count - 1,dataModel: dataArray[indexPath.row] as! MineTradingRecordModel)
+        }
+        if _show_type == .record {
+            cell.setupWithRecordDataSource(isLast: indexPath.row == dataArray.count - 1,dataModel: dataArray[indexPath.row] as! MineIntegralRecordDescModel)
+        }
+
         return cell
     }
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
@@ -8,6 +8,7 @@
 import Foundation
 import JXSegmentedView
 import JXPagingView
+import MJRefresh
 let kCNLiveSectionTitleHeight = 70//标题显示
 let kCNLiveSectionHeaderHeight = 200//头视图高度
@@ -99,15 +100,17 @@ class CNLiveMineEarnViewController: CNLiveBaseViewController, JXPagingViewDelega
     }()
     lazy var headerView: MineEarnHeaderView = {
-        let headerView = MineEarnHeaderView.init(frame: CGRectMake(0, 0, KSreenWidth, CGFloat(kCNLiveSectionHeaderHeight)))
+        let headerView = MineEarnHeaderView.init(frame: CGRectMake(0, 0, KSreenWidth, CGFloat(kCNLiveSectionHeaderHeight)), checkModel: _checkModel)
         headerView.backgroundColor = .clear
         return headerView
     }()
     var _index : Int!
-    init(index: Int) {
+    var _checkModel: MinePointCheckInModel!
+    init(index: Int, checkModel:MinePointCheckInModel) {
         super.init(nibName: nil, bundle: nil)
         _index = index
+        _checkModel = checkModel
     }
     required init?(coder: NSCoder) {
@@ -126,6 +129,12 @@ class CNLiveMineEarnViewController: CNLiveBaseViewController, JXPagingViewDelega
         view.addSubview(pagingView)
         pagingView.listContainerView.didClickSelectedItem(at: _index)
+        
+        pagingView.mainTableView.mj_header = MJRefreshNormalHeader.init(refreshingBlock: { [self] in
+            pagingView.mainTableView.mj_header?.endRefreshing()
+//            self!.pageNum = 1
+//            self!.loadDataWithTradRecord(page: self!.pageNum)
+        })
     }
 }
@@ -17,7 +17,8 @@ class CNLiveMineQuestViewController: CNLiveBaseViewController, UITableViewDelega
         tableView.backgroundColor = .clear
         tableView.separatorStyle = .none
         tableView.register(MineBodyFourViewCell.self, forCellReuseIdentifier: kMineBodyFourViewCellIdentifier)
-        tableView.tableHeaderView = MineQuestHeaderView.init(frame: CGRectMake(0, 10, KSreenWidth, 150))
+        let headerView = MineQuestHeaderView.init(frame: CGRectMake(0, 10, KSreenWidth, 150), checkModel: _checkModel)
+        tableView.tableHeaderView = headerView
         let footerView = UIView(frame: CGRect(x: 0, y: 0, width: KSreenWidth - 40, height: 10))
         footerView.clipsToBounds = true
         footerView.backgroundColor = .white
@@ -56,19 +57,26 @@ class CNLiveMineQuestViewController: CNLiveBaseViewController, UITableViewDelega
     lazy var dataArray: NSMutableArray = {
         let dataArray = NSMutableArray.init()
-        dataArray.add(["icon":"temp_quest_list_img01","name":"分享目击者视频","desc":"积分值+100  完成0/10"])
-        dataArray.add(["icon":"temp_quest_list_img02","name":"分享目击者视频","desc":"积分值+100  完成0/10"])
-        dataArray.add(["icon":"temp_quest_list_img03","name":"分享目击者视频","desc":"积分值+100  完成0/10"])
-        dataArray.add(["icon":"temp_quest_list_img04","name":"分享目击者视频","desc":"积分值+100  完成0/10"])
         return dataArray
     }()
+    var _checkModel: MinePointCheckInModel!
+    init(checkModel:MinePointCheckInModel) {
+       super.init(nibName:nil, bundle:nil)
+        _checkModel = checkModel
+    }
+    
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
     override func viewDidLoad() {
         super.viewDidLoad()
         navigationBarHidden = false
         titleName = "任务中心"
+        loadDataWithTaskList()
         view.addSubview(tableView)
         tableView.snp.makeConstraints { make in
             make.top.equalToSuperview().offset(KNavigationHeight)
@@ -78,6 +86,14 @@ class CNLiveMineQuestViewController: CNLiveBaseViewController, UITableViewDelega
         }
     }
+    func loadDataWithTaskList() {
+        CNLiveMineViewModel.requestWithTaskList { result, respStatue in
+            if respStatue == .success {
+                self.dataArray.addObjects(from: result as! [MineTaskCheckListModel])
+                self.tableView.reloadData()
+            }
+        }
+    }
 }
 extension CNLiveMineQuestViewController {
@@ -91,7 +107,7 @@ extension CNLiveMineQuestViewController {
         guard let cell = tableView.dequeueReusableCell(withIdentifier: kMineBodyFourViewCellIdentifier) as? MineBodyFourViewCell else {
             return MineBodyFourViewCell()
         }
-        cell.setupWithData(dict: dataArray[indexPath.row] as! NSDictionary)
+        cell.setupWithData(listModel: dataArray[indexPath.row] as! MineTaskCheckListModel)
         return cell
     }
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
@@ -52,6 +52,7 @@ class CNLiveMineViewController : CNLiveBaseViewController, UITableViewDelegate, 
         return headerView
     }()
+    var checkModel: MinePointCheckInModel!
     override func viewDidLoad() {
         super.viewDidLoad()
         view.backgroundColor = HexColor("#f9f9f9")
@@ -71,8 +72,10 @@ class CNLiveMineViewController : CNLiveBaseViewController, UITableViewDelegate, 
     public func loadDataWithPoint() {
         CNLiveMineViewModel.requestWithCheckIn { [weak self] result, respStatue in
-            print("\(result)")
-//            if respStatue == .succ
+            if respStatue == .success {
+                self?.checkModel = result as? MinePointCheckInModel
+                self?.tableView.reloadData()
+            }
         }
     }
@@ -105,7 +108,7 @@ extension CNLiveMineViewController {
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         if indexPath.section == 0 {
             let cell = tableView.dequeueReusableCell(withIdentifier: kMineBodyThreeViewCellIdentifier) as! MineBodyThreeViewCell
-            
+            cell.checkModel = self.checkModel
             return cell
         }
         if indexPath.section == 1 {
@@ -133,7 +136,7 @@ extension CNLiveMineViewController {
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         if indexPath.section == 0 {
-            self.navigationController?.pushViewController(CNLiveMineQuestViewController.init(), animated: true)
+            self.navigationController?.pushViewController(CNLiveMineQuestViewController.init(checkModel: checkModel), animated: true)
         }
         if indexPath.section == 1 {
             self.navigationController?.pushViewController(CNLiveMineAddInfoViewController.init(show_type: .info), animated: true)
@@ -6,7 +6,7 @@
 //
 import Foundation
-
+import Kingfisher
 class MineBodyOneListViewCell : UITableViewCell {
@@ -351,7 +351,7 @@ class MineBodyThreeViewCell: UITableViewCell {
     lazy var balanceNumberLabel: UILabel = {
         let balanceNumberLabel = UILabel.init()
-        balanceNumberLabel.text = "2130"
+        balanceNumberLabel.text = "0"
         balanceNumberLabel.font = BoldFont_19_Fit
         balanceNumberLabel.textAlignment = .left
         balanceNumberLabel.textColor = HexColor("#FFE4C4")
@@ -369,13 +369,25 @@ class MineBodyThreeViewCell: UITableViewCell {
     lazy var pointNumberLabel: UILabel = {
         let pointNumberLabel = UILabel.init()
-        pointNumberLabel.text = "10.28W"
         pointNumberLabel.font = BoldFont_19_Fit
+        pointNumberLabel.text = "0"
         pointNumberLabel.textAlignment = .left
         pointNumberLabel.textColor = HexColor("#FFE4C4")
         return pointNumberLabel
     }()
+    var _checkModel : MinePointCheckInModel?
+    var checkModel : MinePointCheckInModel? {
+        get{
+            return _checkModel
+        }
+        set{
+            _checkModel = newValue
+            balanceNumberLabel.text = newValue?.money
+            pointNumberLabel.text = newValue?.integral
+        }
+    }
+    
     override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
         super.init(style: style, reuseIdentifier: reuseIdentifier)
         self.selectionStyle = .none
@@ -494,13 +506,13 @@ class MineBodyFourViewCell: UITableViewCell {
     lazy var shareBtn: UIButton = {
         let shareBtn = UIButton.init(type: .custom)
         shareBtn.frame = CGRect(x: 0, y: 0, width: 70, height: 30)
-        shareBtn.setTitle("去分享", for: .normal)
-        shareBtn.setImage(UIImage(named: "mine_list_icon_right_white_more"), for: .normal)
         shareBtn.setTitleColor(.white, for: .normal)
         shareBtn.titleLabel?.font = Font_12
-        shareBtn.setupButtonImageAndTitlePossitionWith(padding: 0, style: .right)
         shareBtn.layer.cornerRadius = 15
         shareBtn.layer.masksToBounds = true
+        shareBtn.setTitle("去完成", for: .normal)
+        shareBtn.setImage(UIImage(named: "mine_list_icon_right_white_more"), for: .normal)
+        shareBtn.setupButtonImageAndTitlePossitionWith(padding: 0, style: .right)
         return shareBtn
     }()
@@ -545,10 +557,14 @@ class MineBodyFourViewCell: UITableViewCell {
     }
-    func setupWithData(dict: NSDictionary) {
-        iconView.image = UIImage(named: "\(dict.object(forKey: "icon") ?? "")")
-        nameLabel.text = "\(dict.object(forKey: "name") ?? "")"
-        descLabel.text = "\(dict.object(forKey: "desc") ?? "")"
+    func setupWithData(listModel: MineTaskCheckListModel) {
+        
+        iconView.kf.setImage(with: URL(string: listModel.icon ?? "") , placeholder: UIImage.imageWithColor(color: HexColor("#f9f9f9")!, size: CGSizeMake(50, 50)))
+        nameLabel.text = listModel.title ?? ""
+        descLabel.text = "积分值+\(listModel.score ?? "")"
+        if listModel.taskId!.contains("check_in") {
+            shareBtn.setTitle("去签到", for: .normal)
+        }
     }
     required init?(coder: NSCoder) {
@@ -567,7 +583,6 @@ class MIneBodyFiveViewCell: UITableViewCell {
     lazy var nameLabel: UILabel = {
         let nameLabel = UILabel.init()
-        nameLabel.text = "签到"
         nameLabel.textColor = HexColor("#666666")
         nameLabel.font = Font_16
         nameLabel.backgroundColor = .white
@@ -576,7 +591,6 @@ class MIneBodyFiveViewCell: UITableViewCell {
     lazy var descLabel: UILabel = {
         let descLabel = UILabel.init()
-        descLabel.text = "2013-01-23"
         descLabel.textColor = HexColor("#999999")
         descLabel.font = Font_12
         descLabel.backgroundColor = .clear
@@ -585,7 +599,6 @@ class MIneBodyFiveViewCell: UITableViewCell {
     lazy var pointLabel: UILabel = {
         let pointLabel = UILabel.init()
-        pointLabel.text = "+1000 积分"
         pointLabel.textColor = HexColor("#F5A623")
         pointLabel.font = BoldFont_16_Fit
         pointLabel.backgroundColor = .clear
@@ -635,8 +648,26 @@ class MIneBodyFiveViewCell: UITableViewCell {
         }
     }
-    func setupWithDataSource(isLast: Bool) {
+    func setupWithBalanceDataSource(isLast: Bool, dataModel: MineTradingRecordModel) {
+        line_label.isHidden = isLast
+        nameLabel.text = dataModel.iconBean.nickName
+        descLabel.text = dataModel.time
+ 
+        if dataModel.sum!.contains("-") {
+            pointLabel.text = "+\(dataModel.sum!)元"
+        }
+        if dataModel.sourceType!.contains("wjj_balance_transfer_refund") {
+            pointLabel.text = "+\(dataModel.sum!)元"
+        }else{
+            pointLabel.text = "\(dataModel.sum ?? "")元"
+        }
+    }
+    
+    func setupWithRecordDataSource(isLast: Bool, dataModel: MineIntegralRecordDescModel) {
         line_label.isHidden = isLast
+        nameLabel.text = dataModel.integralDesc
+        descLabel.text = dataModel.exchangeTime
+        pointLabel.text = "\(dataModel.integral ?? "")积分"
     }
     required init?(coder: NSCoder) {
@@ -310,13 +310,17 @@ class MineQuestHeaderView: UIView {
         pointBtn.backgroundColor = .clear
         pointBtn.setTitle("积分收益", for: .normal)
         pointBtn.setTitleColor(.white, for: .normal)
-        pointBtn.setImage(UIImage(named: "mine_list_icon_right_white_more"), for: .normal)
         pointBtn.titleLabel?.font = Font_15
         pointBtn.setupButtonImageAndTitlePossitionWith(padding: 0, style: .right)
         pointBtn.addTarget(self, action: #selector(pushEarnRecordAction), for: .touchUpInside)
         return pointBtn
     }()
+//    lazy var pointView: UIImageView = {
+//        
+//        return <#value#>
+//    }()
+    
     lazy var balanceBtn: UIButton = {
         let balanceBtn = UIButton(type: .custom)
         balanceBtn.size = CGSize(width: 102, height: 20)
@@ -332,7 +336,7 @@ class MineQuestHeaderView: UIView {
     lazy var pointLabel: UILabel = {
         let pointLabel = UILabel.init()
-        pointLabel.text = "10.28W"
+        pointLabel.text = "0"
         pointLabel.textColor = .white
         pointLabel.backgroundColor = .clear
         pointLabel.font = BoldFont_25_Fit
@@ -341,7 +345,7 @@ class MineQuestHeaderView: UIView {
     lazy var balanceLabel: UILabel = {
         let balanceLabel = UILabel.init()
-        balanceLabel.text = "3.15"
+        balanceLabel.text = "0"
         balanceLabel.textColor = .white
         balanceLabel.backgroundColor = .clear
         balanceLabel.font = BoldFont_25_Fit
@@ -358,10 +362,12 @@ class MineQuestHeaderView: UIView {
         return descBtn
     }()
-    override init(frame: CGRect) {
+    var _checkModel: MinePointCheckInModel!
+    init(frame: CGRect, checkModel : MinePointCheckInModel) {
         super.init(frame: frame)
         self.backgroundColor = .clear
+        _checkModel = checkModel
         addSubview(mainView)
         mainView.addSubview(pointBtn)
         mainView.addSubview(balanceBtn)
@@ -369,6 +375,9 @@ class MineQuestHeaderView: UIView {
         mainView.addSubview(balanceLabel)
         mainView.addSubview(descBtn)
+        balanceLabel.text = checkModel.money
+        pointLabel.text = checkModel.integral
+        
         setupConstraints()
     }
@@ -404,11 +413,11 @@ class MineQuestHeaderView: UIView {
     }
     @objc func pushEarnRecordAction() {
-        currentViewController()?.navigationController?.pushViewController(CNLiveMineEarnViewController.init(index: 1), animated: true)
+        currentViewController()?.navigationController?.pushViewController(CNLiveMineEarnViewController.init(index: 0, checkModel: _checkModel), animated: true)
     }
     @objc func pushEarnBalanceAction() {
-        currentViewController()?.navigationController?.pushViewController(CNLiveMineEarnViewController.init(index: 0), animated: true)
+        currentViewController()?.navigationController?.pushViewController(CNLiveMineEarnViewController.init(index: 1, checkModel: _checkModel), animated: true)
     }
     required init?(coder: NSCoder) {
@@ -470,7 +479,7 @@ class MineEarnHeaderView: UIView {
     lazy var left_Label: UILabel = {
         let left_Label = UILabel.init()
         left_Label.backgroundColor = .clear
-        left_Label.text = "1024.28W"
+        left_Label.text = "0"
         left_Label.textColor = .white
         left_Label.textAlignment = .left
         left_Label.font = BoldFont_18_Fit
@@ -480,7 +489,7 @@ class MineEarnHeaderView: UIView {
     lazy var right_Label: UILabel = {
         let right_Label = UILabel.init()
         right_Label.backgroundColor = .clear
-        right_Label.text = "10.28"
+        right_Label.text = "0"
         right_Label.textColor = .white
         right_Label.textAlignment = .left
         right_Label.font = BoldFont_18_Fit
@@ -519,8 +528,8 @@ class MineEarnHeaderView: UIView {
         return tipLabel
     }()
-    
-    override init(frame: CGRect) {
+    var _checkModel: MinePointCheckInModel!
+    init(frame: CGRect, checkModel: MinePointCheckInModel) {
         super.init(frame: frame)
         addSubview(mainView)
@@ -536,6 +545,9 @@ class MineEarnHeaderView: UIView {
         mainView.addSubview(tipView)
         tipView.addSubview(tipLabel)
+        left_Label.text = checkModel.integral
+        right_Label.text = checkModel.money
+        
         setupConstraints()
     }
@@ -290,12 +290,74 @@ final class MineAuthListModel: BaseModel , TableCodable {
     }
 }
-// !!!: /Daren/integral/checkIn.action 数据返回
+// !!!: /Api/Index3/myOrderCount 数据返回
 class MinePointCheckInModel: BaseModel {
-    var scores = [String]()
-    var status: String? = ""
+    
+    var pay_order_count: String? = ""//待支付 数量
+    var send_order_count: String? = ""//待发货 数量
+    var confirm_order_count: Int = 0 //待收货 数量
+    var cart_count: String? = "" //购物车数量 数量
+    var money: String? = ""//补贴余额
+    var coupon_count: String? = ""//优惠券数量
+    var integral: String? = ""//积分数量
+}
+// !!!: /Daren/integral/getTasks.action任务列表界面数据
+class MineTaskCheckListModel: BaseModel {
+    var icon: String? = ""
     var score: String? = ""
-    var times: String? = ""
+    var status: String? = ""
+    var taskId: String? = ""
+    var taskType: String? = ""
+    var times: Int = 0
+    var title: String? = ""
+    var totalCount: String? = ""
     var url: String? = ""
 }
+// !!!: /Daren/transaction/getTransactionRecord.action 余额交易记录
+class MineTradingRecordModel: BaseModel {
+    
+    var disburseRecord: String? = ""//支出
+    var incomeRecord: String? = ""  //收入
+    var fromId: String? = ""
+    var payType: String? = ""
+    var recordId: String? = ""
+    var sourceId: String? = ""
+    var sourceType: String? = ""
+    var sum: String? = ""
+    var time: String? = ""
+    
+    /// wjj_balance_transfer  转账标识
+    /// wjj_balance_transfer_refund 退款标识
+    /// wjj_balance_transfer_collection 确认收款标识
+    /// wjj_balance_transfer_overdue_refund 转账过期
+    var finalType: String? = ""
+    
+    var iconBean = MineTradingRecordUserModel()
+    
+    var fromType: String? = "" //1:收入 2:支出 0:全部
+    var toType: String? = "" // 0全部(默认) 1收入 2支出
+    var defray: String? = "" //总支出
+    var income: String? = "" //总收入
+}
+
+class MineTradingRecordUserModel: BaseModel {
+    var image: String? = ""
+    var nickName: String? = ""
+    var userId: String? = ""
+}
+
+// !!!: /Daren/integral/myIntegralRecord.action 积分明细列表
+class MineIntegralRecordModel: BaseModel {
+    var obtainIntegral: Int = 0
+    var hasNext: Bool = false
+    var payIntegral: Int = 0
+    var integralList = [MineIntegralRecordDescModel]()
+}
+
+class MineIntegralRecordDescModel: BaseModel {
+    var exchangeTime: String? = ""
+    var state: String? = ""
+    var integral: String? = ""
+    var integralDesc: String? = ""
+}
@@ -64,7 +64,6 @@ class CNLiveMineViewModel: NSObject {
         }
         param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "uid")
         param.setValue(UserInfoManager.shared.userInfo.token, forKey: "token")
-        print("给后台的数据是=>\(param)")
         showLoading(message: "")
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
@@ -254,7 +253,7 @@ class CNLiveMineViewModel: NSObject {
     ///   - resultBlock: 返回
     static func requestAuthStandList(page: NSInteger, resultBlock: @escaping resultNewsBlock) {
         let param = NSMutableDictionary()
-        param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "sid")//10458139 UserInfoManager.shared.userInfo.uid
+        param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "sid")
         param.setValue("10", forKey: "pageSize")
         param.setValue("\(page)", forKey: "page")
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
@@ -590,19 +589,24 @@ class CNLiveMineViewModel: NSObject {
     /// - Parameter resultBlock: 返回
     static func requestWithCheckIn(resultBlock: @escaping resultNewsBlock) {
         let param = NSMutableDictionary()
-        param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "sid")
+        param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "uid")
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(APPId_wjj, forKey: "appId")
+        custom_param.setValue(APPKey_wjj, forKey: "appKey")
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
-        CNLiveNetworking.requestNetwork(with: .POST, urlString: APPBaseWjjUrl+"/Daren/integral/checkIn.action", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
+        CNLiveNetworking.setupDSRequest(true)
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
+        CNLiveNetworking.requestNetwork(with: .POST, urlString: APPBaseWjjShopUrl+"/Api/Index3/myOrderCount", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
             hiddenLoading()
             if (error == nil) {
                 let resp = result as! NSDictionary
-                let errorCode = "\(resp["errorCode"] ?? "0")"
-                if (errorCode == "0") {
+                let errorCode = "\(resp["code"] ?? "0")"
+                if (errorCode == "200") {
                     let listModel = dictionaryToModel(resp as! [String : Any], MinePointCheckInModel.self,"data") as! MinePointCheckInModel
                     resultBlock(listModel,.success)
                 } else {
-                    showMessage(message: resp["errorMessage"] as! String)
+                    showMessage(message: resp["message"] as! String)
                     resultBlock(NSNull(),.failed)
                 }
             } else {
@@ -620,7 +624,135 @@ class CNLiveMineViewModel: NSObject {
     /// 获取任务列表接口
     /// - Parameter resultBlock: 返回
     static func requestWithTaskList(resultBlock: @escaping resultNewsBlock) {
-        
+        let param = NSMutableDictionary()
+        param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "sid")
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(APPId_wjj, forKey: "appId")
+        custom_param.setValue(APPKey_wjj, forKey: "appKey")
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.setupSignRequestKey(APPKey_wjj)
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
+        CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseWjjUrl+"/Daren/integral/getTasks.action", param: (param as! [AnyHashable : Any]), cacheType: .networkOnly) { task, result, error in
+            hiddenLoading()
+            if (error == nil) {
+                let resp = result as! NSDictionary
+                let errorCode = "\(resp["errorCode"] ?? "0")"
+                if (errorCode == "0") {
+                    let dict = resp["data"] as! NSDictionary
+                    let array = dict["dailyTask"] as! NSArray
+                    let tempArray = NSMutableArray()
+                    for item in array {
+                        let listModel = dictionaryToModel(item as! [String : Any], MineTaskCheckListModel.self,"") as! MineTaskCheckListModel
+                        if listModel.taskId!.contains("check_in") {
+                            tempArray.add(listModel)
+                        }
+                    }
+                    resultBlock(tempArray,.success)
+                } else {
+                    showMessage(message: resp["errorMessage"] as! String)
+                    resultBlock(NSNull(),.failed)
+                }
+            } else {
+                if CNLiveNetworking.isNetworking() {
+                    showMessage(message: "获取失败")
+                    resultBlock(NSNull(),.failed)
+                } else {
+                    showMessage(message: "似乎与网络断开链接")
+                    resultBlock(NSNull(),.noNetwork)
+                }
+            }
+        }
+    }
+    
+    /// 获取网家家余额数据
+    /// - Parameters:
+    ///   - page: 页数
+    ///   - resultBlock: 返回
+    static func requestWithTradRecord(page: NSInteger, resultBlock: @escaping resultNewsBlock) {
+        let param = NSMutableDictionary()
+        param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "targetId")
+        param.setValue("0", forKey: "type")//0全部(默认) 1收入 2支出
+        param.setValue("10", forKey: "pageSize")
+        param.setValue("\(page)", forKey: "pageNo")
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(APPId_wjj, forKey: "appId")
+        custom_param.setValue(APPKey_wjj, forKey: "appKey")
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.setupSignRequestKey(APPKey_wjj)
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
+        CNLiveNetworking.requestNetwork(with: .POST, urlString: APPBaseWjjUrl+"/Daren/transaction/getTransactionRecord.action", param: (param as! [AnyHashable : Any]), cacheType: .networkOnly) { task, result, error in
+            hiddenLoading()
+            if (error == nil) {
+                let resp = result as! NSDictionary
+                let errorCode = "\(resp["errorCode"] ?? "0")"
+                if (errorCode == "0") {
+                    let dict = resp["data"] as! NSDictionary
+                    let array = dict["list"] as! NSArray
+                    let tempArray = NSMutableArray()
+                    for item in array {
+                        let listModel = dictionaryToModel(item as! [String : Any], MineTradingRecordModel.self,"") as! MineTradingRecordModel
+                        tempArray.add(listModel)
+                    }
+                    resultBlock(tempArray,.success)
+                } else {
+                    showMessage(message: resp["errorMessage"] as! String)
+                    resultBlock(NSNull(),.failed)
+                }
+            } else {
+                if CNLiveNetworking.isNetworking() {
+                    showMessage(message: "获取失败")
+                    resultBlock(NSNull(),.failed)
+                } else {
+                    showMessage(message: "似乎与网络断开链接")
+                    resultBlock(NSNull(),.noNetwork)
+                }
+            }
+        }
+    }
+    
+    /// 获取积分明细
+    /// - Parameters:
+    ///   - page: 页数
+    ///   - resultBlock: 返回
+    static func requestWithIntegralRecord(page: NSInteger, resultBlock: @escaping resultNewsBlock) {
+        let param = NSMutableDictionary()
+        param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "sid")
+        param.setValue("2022-08-21", forKey: "startTime")//开始时间
+        param.setValue("2022-09-20", forKey: "endTime")//开始时间
+        param.setValue("1", forKey: "type")
+        param.setValue("10", forKey: "pageSize")
+        param.setValue("\(page)", forKey: "pageNo")
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(APPId_wjj, forKey: "appId")
+        custom_param.setValue(APPKey_wjj, forKey: "appKey")
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.setupSignRequestKey(APPKey_wjj)
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
+        CNLiveNetworking.requestNetwork(with: .POST, urlString: APPBaseWjjUrl+"/Daren/integral/myIntegralRecord.action", param: (param as! [AnyHashable : Any]), cacheType: .networkOnly) { task, result, error in
+            hiddenLoading()
+            if (error == nil) {
+                let resp = result as! NSDictionary
+                let errorCode = "\(resp["errorCode"] ?? "0")"
+                if (errorCode == "0") {
+                    let listModel = dictionaryToModel(resp as! [String : Any], MineIntegralRecordModel.self,"data") as! MineIntegralRecordModel
+                    resultBlock(listModel,.success)
+                } else {
+                    showMessage(message: resp["errorMessage"] as! String)
+                    resultBlock(NSNull(),.failed)
+                }
+            } else {
+                if CNLiveNetworking.isNetworking() {
+                    showMessage(message: "获取失败")
+                    resultBlock(NSNull(),.failed)
+                } else {
+                    showMessage(message: "似乎与网络断开链接")
+                    resultBlock(NSNull(),.noNetwork)
+                }
+            }
+        }
     }
     /// 获取十位时间戳