TabbarUI调整,部分页面UI调整，交易内持仓，历史订单等的接口数据对接

Koala/Koala.xcodeproj/project.pbxproj

@@ -55,6 +55,7 @@
 		04BAACF12ADE664300454882 /* JDSelectAccountTypePopView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04BAACF02ADE664300454882 /* JDSelectAccountTypePopView.swift */; };
 		04BAACF32ADE665700454882 /* JDSelectStatusTypePopView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04BAACF22ADE665700454882 /* JDSelectStatusTypePopView.swift */; };
 		04BAACF52ADE944A00454882 /* JDCashRecordModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04BAACF42ADE944A00454882 /* JDCashRecordModel.swift */; };
+		04BAACF92ADFAF7800454882 /* JDPositionModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04BAACF82ADFAF7800454882 /* JDPositionModel.swift */; };
 		04C283102AD5233200FC04AC /* JDMineVipOpenMindCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04C2830F2AD5233200FC04AC /* JDMineVipOpenMindCell.swift */; };
 		04C283142AD5371300FC04AC /* JDMineInviteCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04C283132AD5371300FC04AC /* JDMineInviteCell.swift */; };
 		04C283162AD5522200FC04AC /* JDMineInviteSecionHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04C283152AD5522200FC04AC /* JDMineInviteSecionHeaderView.swift */; };
@@ -871,6 +872,7 @@
 		04BAACF02ADE664300454882 /* JDSelectAccountTypePopView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JDSelectAccountTypePopView.swift; sourceTree = "<group>"; };
 		04BAACF22ADE665700454882 /* JDSelectStatusTypePopView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JDSelectStatusTypePopView.swift; sourceTree = "<group>"; };
 		04BAACF42ADE944A00454882 /* JDCashRecordModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JDCashRecordModel.swift; sourceTree = "<group>"; };
+		04BAACF82ADFAF7800454882 /* JDPositionModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JDPositionModel.swift; sourceTree = "<group>"; };
 		04C2830F2AD5233200FC04AC /* JDMineVipOpenMindCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JDMineVipOpenMindCell.swift; sourceTree = "<group>"; };
 		04C283132AD5371300FC04AC /* JDMineInviteCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JDMineInviteCell.swift; sourceTree = "<group>"; };
 		04C283152AD5522200FC04AC /* JDMineInviteSecionHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JDMineInviteSecionHeaderView.swift; sourceTree = "<group>"; };
@@ -1652,6 +1654,7 @@
 			isa = PBXGroup;
 			children = (
 				04CEE2712AB4311F00FAA760 /* JDTradeAccountModel.swift */,
+				04BAACF82ADFAF7800454882 /* JDPositionModel.swift */,
 			);
 			path = M;
 			sourceTree = "<group>";
@@ -4520,6 +4523,7 @@
 				04CEE2892AB9282C00FAA760 /* InformationMarketViewController.swift in Sources */,
 				04D38E7B2A9EE8A10047EF9C /* JXSegmentedTitleGradientItemModel.swift in Sources */,
 				6CC380022992B8A80079FA5C /* AssetsDealCell.swift in Sources */,
+				04BAACF92ADFAF7800454882 /* JDPositionModel.swift in Sources */,
 				6CC37FDC298FAFF90079FA5C /* AssetsSavingsViewModel.swift in Sources */,
 				04D38E8E2AA1C0C80047EF9C /* MarketMainDetailViewController.swift in Sources */,
 				6C00A9922433313300CE9ADB /* HXImageClipScrollView.swift in Sources */,

Koala/Koala.xcworkspace/xcuserdata/mac.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -663,22 +663,6 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "481DDB5C-A5DA-4900-ADDC-17B99BAEC281"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "Koala/Modular/JDTrade/VC/JDTradeAccountHoldViewController.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "62"
-            endingLineNumber = "62"
-            landmarkName = "requestEntrustList()"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
             uuid = "084B48CA-27AE-456A-BB4F-F174660CBD4C"
             shouldBeEnabled = "No"
             ignoreCount = "0"
@@ -740,5 +724,21 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "334645D6-45C7-4FA8-88AC-E650C2E607DF"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Koala/Modular/JDTrade/V/JDTradeDealListCell.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "149"
+            endingLineNumber = "149"
+            landmarkName = "setupCellByPositionModel(model:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

Koala/Koala/FX/Base/BaseTabBarController.swift

@@ -82,15 +82,14 @@ class BaseTabBarController: ESTabBarController {
         TabbarHoldIndex = 3
         TabbarAssetsIndex = 4
         
-        v1.tabBarItem = ESTabBarItem.init(getBasicContentView(), title: switchLanguage("首页"), image: UIImage(named: "jdtab_home_nor"), selectedImage: UIImage(named: "jdtab_home_sel")?.imageWithTintColor(color: Tabbar_SelectColor))
-        v2.tabBarItem = ESTabBarItem.init(getBasicContentView(), title: switchLanguage("市场"), image: UIImage(named: "jdtab_market_nor"), selectedImage: UIImage(named: "jdtab_market_sel")?.imageWithTintColor(color: Tabbar_SelectColor))
-//        v3.tabBarItem = ESTabBarItem.init(getBasicContentView(), title: switchLanguage("交易"), image: UIImage(named: "Tabar_unDeal"), selectedImage: UIImage(named: "Tabar_unDeal")?.imageWithTintColor(color: Tabbar_SelectColor))
-        v3.tabBarItem = ESTabBarItem.init(getBasicContentView(), title: switchLanguage("发现"), image: UIImage(named: "jdtab_found_nor"), selectedImage: UIImage(named: "Tabar_unDeal")?.imageWithTintColor(color: Tabbar_SelectColor))
-//        v4.tabBarItem = ESTabBarItem.init(getBasicContentView(), title: switchLanguage("持仓"), image: UIImage(named: "jdtab_trade_nor"), selectedImage: UIImage(named: "Tabar_unHold")?.imageWithTintColor(color: Tabbar_SelectColor))
-        v4.tabBarItem = ESTabBarItem.init(getBasicContentView(), title: switchLanguage("交易"), image: UIImage(named: "jdtab_trade_nor"), selectedImage: UIImage(named: "Tabar_unHold")?.imageWithTintColor(color: Tabbar_SelectColor))
-//        v5.tabBarItem = ESTabBarItem.init(getBasicContentView(), title: switchLanguage("资产"), image: UIImage(named: "Tabar_unAssets"), selectedImage: UIImage(named: "Tabar_unAssets")?.imageWithTintColor(color: Tabbar_SelectColor))
-        
-        v5.tabBarItem = ESTabBarItem.init(getBasicContentView(), title: switchLanguage("我的"), image: UIImage(named: "jdtab_mine_nor"), selectedImage: UIImage(named: "jdtab_mine_sel")?.imageWithTintColor(color: Tabbar_SelectColor))
+        v1.tabBarItem = ESTabBarItem.init(getBasicContentView(), title: switchLanguage("首页"), image: UIImage(named: "jdtab_home_nor"), selectedImage: UIImage(named: "jdtab_home_sel")/*?.imageWithTintColor(color: Tabbar_SelectColor)*/)
+        v2.tabBarItem = ESTabBarItem.init(getBasicContentView(), title: switchLanguage("市场"), image: UIImage(named: "jdtab_market_nor"), selectedImage: UIImage(named: "jdtab_market_sel")/*?.imageWithTintColor(color: Tabbar_SelectColor)*/)
+
+        v3.tabBarItem = ESTabBarItem.init(getBasicContentView(), title: switchLanguage("发现"), image: UIImage(named: "jdtab_found_nor"), selectedImage: UIImage(named: "jdtab_found_sel")/*?.imageWithTintColor(color: Tabbar_SelectColor)*/)
+
+        v4.tabBarItem = ESTabBarItem.init(getBasicContentView(), title: switchLanguage("交易"), image: UIImage(named: "jdtab_trade_nor"), selectedImage: UIImage(named: "jdtab_trade_sel")/*?.imageWithTintColor(color: Tabbar_SelectColor)*/)
+
+        v5.tabBarItem = ESTabBarItem.init(getBasicContentView(), title: switchLanguage("我的"), image: UIImage(named: "jdtab_mine_nor"), selectedImage: UIImage(named: "jdtab_mine_sel")/*?.imageWithTintColor(color: Tabbar_SelectColor)*/)
         
         self.viewControllers = [v1,v2,v4,v3,v5]
        

Koala/Koala/FX/NetClass/URLS.swift

@@ -175,6 +175,8 @@ let netForGetCashChannelPayList = "getCashChannelModelList"//法币支付方式
 //let netForGetCashChannelList = "getCashChannelList"//法币渠道商列表
 let netForInsertCashInto = "depositCash"//法币充值
 
+let netForGetCash = "getCash"   //获取钱包账户金额
+
 let netForSubmitDepositCashVoucher = "submitDepositCashVoucher"//法币充值
 
 

Koala/Koala/Modular/JDTrade/M/JDPositionModel.swift

@@ -0,0 +1,30 @@
+//
+//  JDPositionModel.swift
+//  Koala
+//
+//  Created by mac on 2023/10/18.
+//  Copyright © 2023 刘千军. All rights reserved.
+//
+
+import Foundation
+
+class JDPositionModel:BaseModel{
+    public var comment: String! = ""
+    public var account: String! = ""
+    public var mt_code: String! = ""
+    public var symbol: String! = ""
+    public var tp: String! = ""
+    public var profit: String! = ""
+    public var open_time: String! = ""
+    public var commission: String! = ""
+    public var ticket: String! = "0"
+    public var close_price: String! = ""
+    public var close_time: String! = ""
+    public var cmd: String! = ""
+    public var swaps:String! = ""
+    public var sl: String! = ""
+    public var open_price:String! = ""
+    public var volume: String! = ""
+    
+    public var title: String! = ""
+}

Koala/Koala/Modular/JDTrade/V/JDTradeAccountCell.swift

@@ -23,7 +23,7 @@ class JDTradeAccountCell: UITableViewCell {
         let v = UILabel()
         v.textColor = UIColor.pg_color(withHexString: "333333")
         v.font = .systemFont(ofSize: 16)
-        v.text = "钱包账户(2678)"
+        v.text = "钱包账户"
         return v
     }()
     
@@ -37,7 +37,7 @@ class JDTradeAccountCell: UITableViewCell {
         let v = UILabel()
         v.textColor = UIColor.pg_color(withHexString: "959595")
         v.font = .systemFont(ofSize: 12)
-        v.text = "资产净值.美元"
+        v.text = "资产净值.USD"
         return v
     }()
     
@@ -184,25 +184,7 @@ class JDTradeAccountCell: UITableViewCell {
             networthTipLb.text = "资产净值.USD"
         }
         
-        networthLb.text = model.equity
-        
-        //        self.leftConstraint.constant = 15
-//        self.nameLab.setTextFont(.PFSR, 14)
-//        self.hintLab.setTextFont(.PFSR, 12)
-//        self.valueLab.setTextFont(.PFSR, 16)
-//        self.value1Lab.setTextFont(.PFSR, 12)
-//        self.nameLab.textColor = TitleTextColor
-//        self.hintLab.textColor = _color("#68727e&#68727e")
-//        self.valueLab.textColor = TitleTextColor
-//
-//        self.nameLab.text = model.symbol
-//        self.hintLab.text = model.description
-//
-//        self.updateNewPrice(model: model)
-//
-//        if let url = URL.init(string:fileLinkPackage(path:"png/"+model.symbol+".png")) {
-//            self.currencyView.kf.setImage(with:url, placeholder: _image("Base_W_Default_Currency&Base_W_Default_Currency"))
-//        }
+        networthLb.text = precisionString(with: model.equity, precision: "2") //model.equity
         
     }
 

Koala/Koala/Modular/JDTrade/V/JDTradeAccountInfoHeaderView.swift

@@ -378,7 +378,10 @@ extension JDTradeAccountInfoHeaderView {
         }
         
         assetLb.text = model.balance
-        
+        jyLb.text = precisionString(with: model.balance, precision: "2")
+        djLb.text = precisionString(with: model.margin, precision: "2")
+        kyLb.text = precisionString(with: model.margin_free, precision: "2")
+        gmlLb.text = precisionString(with: model.margin_free, precision: "2")
     }
     
 }

Koala/Koala/Modular/JDTrade/V/JDTradeDealListCell.swift

@@ -14,36 +14,39 @@ class JDTradeDealListCell: BaseTableViewCell {
     lazy var nameLb : UILabel = {
         
         let v = UILabel()
-        v.textColor = UIColor.pg_color(withHexString: "333333")
-        v.font = .systemFont(ofSize: 15)
-        v.text = "新力控股集团"
+        v.textColor = _color("#333333&#333333")
+        v.setTextFont(.PFSR, 15)
+
+        v.text = "集团"
         return v
     }()
     
     lazy var  unitLb : UILabel = {
         
         let v = UILabel()
-        v.textColor = UIColor.pg_color(withHexString: "333333")
-        v.font = .systemFont(ofSize: 14)
-        v.text = "73738.00"
+        v.textColor = _color("#333333&#333333")
+        v.setTextFont(.PFSR, 14)
+
+        v.text = "1"
         return v
     }()
     
     lazy var  nowPriceLb : UILabel = {
         
         let v = UILabel()
-        v.textColor = UIColor.pg_color(withHexString: "333333")
-        v.font = .systemFont(ofSize: 14)
-        v.text = "0.36"
+        v.textColor = _color("#333333&#333333")
+        v.setTextFont(.PFSR, 14)
+        
         return v
     }()
     
     lazy var  codeLb : UILabel = {
         
         let v = UILabel()
-        v.textColor = UIColor.pg_color(withHexString: "AEAEAE")
-        v.font = .systemFont(ofSize: 12)
-        v.text = "345523"
+        
+        v.textColor = _color("#AEAEAE&#AEAEAE")
+        v.setTextFont(.PFSR, 12)
+        
         return v
     }()
     
@@ -51,27 +54,29 @@ class JDTradeDealListCell: BaseTableViewCell {
     lazy var  countLb : UILabel = {
         
         let v = UILabel()
-        v.textColor = UIColor.pg_color(withHexString: "AEAEAE")
-        v.font = .systemFont(ofSize: 12)
-        v.text = "93298.2"
+        
+        v.textColor = _color("#AEAEAE&#AEAEAE")
+        v.setTextFont(.PFSR, 12)
+        v.text = "100"
         return v
     }()
     
     lazy var  buyPriceLb : UILabel = {
         
         let v = UILabel()
-        v.textColor = UIColor.pg_color(withHexString: "AEAEAE")
-        v.font = .systemFont(ofSize: 12)
-        v.text = "93298.2"
+        
+        v.textColor = _color("#AEAEAE&#AEAEAE")
+        v.setTextFont(.PFSR, 12)
         return v
     }()
     
     lazy var  updownLb : UILabel = {
         
         let v = UILabel()
-        v.textColor = UIColor.pg_color(withHexString: "959595")
-        v.font = .systemFont(ofSize: 14)
-        v.text = "+0.80"
+
+        v.textColor = _color("#959595&#959595")
+        v.setTextFont(.PFSR, 14)
+        v.text = ""
         return v
     }()
     
@@ -132,7 +137,22 @@ class JDTradeDealListCell: BaseTableViewCell {
         fatalError("init(coder:) has not been implemented")
     }
     
+}
+
+extension JDTradeDealListCell {
     
+    func setupCellByPositionModel(model : JDPositionModel) ->Void{
+        
+        
+        nameLb.text = model.title
+        codeLb.text = model.symbol
+        
+        nowPriceLb.text = precisionString(with: model.close_price, precision: "2")
+        buyPriceLb.text = precisionString(with: model.open_price, precision: "2")
+        
+        updownLb.text = precisionString(with: model.profit, precision: "2")
+        
+    }
     
     
 }

Koala/Koala/Modular/JDTrade/VC/JDTradeAccountHistoryOrderViewController.swift

@@ -15,6 +15,23 @@ class JDTradeAccountHistoryOrderViewController: BaseViewController {
     
     var accountModel : JDTradeAccountModel?
     var dateStr:(String,String) = ("","")
+    
+    var startDate:String = dateToString(stmap: decimalNumber(A:currentTimeStamp(), B: "86400", type: .Subtract) , formatter: "yyyy-MM-dd"){
+        didSet{
+//            self.netGetCloseOrderList()
+        }
+    }
+    var endDate:String = dateToString(stmap: currentTimeStamp(), formatter: "yyyy-MM-dd"){
+        didSet{
+//            self.netGetCloseOrderList()
+        }
+    }
+    
+    lazy var orderList:[JDPositionModel] = {
+        let arr:[JDPositionModel] = [JDPositionModel]()
+        return arr
+    }()
+    
     lazy var tableView : UITableView = {
         
         let v = UITableView(frame: .zero, style: .plain)
@@ -28,6 +45,21 @@ class JDTradeAccountHistoryOrderViewController: BaseViewController {
         
     }()
     
+    lazy var totalLrLb : UILabel = {
+        let v = UILabel()
+        v.setTextFont(.PFSR, 15)
+        v.textColor = _color("#333333&#333333")
+        v.text = "0"
+        return v
+    }()
+    lazy var totalJyLb : UILabel = {
+        let v = UILabel()
+        v.setTextFont(.PFSR, 15)
+        v.textColor = _color("#333333&#333333")
+        v.text = "0"
+        return v
+    }()
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         
@@ -41,41 +73,47 @@ class JDTradeAccountHistoryOrderViewController: BaseViewController {
             make.edges.equalTo(self.view)
         }
         
-        self.requestEntrustList()
+        self.netGetCloseOrderList()
     }
     
 }
 
 extension JDTradeAccountHistoryOrderViewController {
     
-    func requestEntrustList() ->Void {
+    func netGetCloseOrderList() ->Void {
         
         
         let param = [
+            
+            "pageNum" : "1",
+            "startDate" : self.startDate,
+            "endDate" : self.endDate,
             "account": self.accountModel?.account ?? "" ,
             "server" : self.accountModel?.server ?? ""
             
         ] as [String : Any]
         
         
-        NetWork.NetWorkInstance.requestData(requestType: .Post, URLString: netForGetEntrustList,parameters: param,success: { (code, result) in
-            
+        NetWork.NetWorkInstance.requestData(requestType: .Post, URLString: netForGetCloseOrderList,parameters: param,success: { (code, result) in
+        
             ProgressHUD.hideHud()
-//            if let dict:NSDictionary = result as? NSDictionary {
-//                if let list:[NSDictionary] = dict["list"] as? [NSDictionary]{
-//                    self.entrustList.removeAll()
-//                    for dic in list {
-//                       let model = EntrustListModel.deserialize(from: dic)!
-//                        self.entrustList.append(model)
-//                    }
-//                    observer.send(value: true)
-//                }else{
-//                    observer.send(value: false)
-//                }
-//            }else{
-//                observer.send(value: false)
-//            }
-//            observer.sendCompleted()
+            
+            if let dict: NSDictionary = result as? NSDictionary {
+                
+                if let list: [NSDictionary] = dict["list"] as? [NSDictionary]{
+                    self.orderList.removeAll()
+                    
+                    for dic in list {
+                        
+                        let model = JDPositionModel.deserialize(from: dic)!
+                        
+                        self.orderList.append(model)
+                        
+                    }
+                }
+                
+                self.tableView.reloadData()
+            }
         }) { (code, result) in
             ProgressHUD.showError(status: result as! String)
         }
@@ -100,13 +138,15 @@ extension JDTradeAccountHistoryOrderViewController: UITableViewDelegate,UITableV
         dateView.segmentedControl.indexChangeBlock = {[weak self](index) in
             guard let self = self else{return}
             if index == 0 {
-//                self.VM?.startDate = dateToString(stmap: decimalNumber(A:currentTimeStamp(), B: "86400", type: .Subtract) , formatter: "yyyy-MM-dd")
+                self.startDate = dateToString(stmap: decimalNumber(A:currentTimeStamp(), B: "86400", type: .Subtract) , formatter: "yyyy-MM-dd")
+                
+                
             }
             else if index == 1{
-//                self.VM?.startDate = dateToString(stmap: decimalNumber(A:currentTimeStamp(), B: "604800", type: .Subtract) , formatter: "yyyy-MM-dd")
+                self.startDate = dateToString(stmap: decimalNumber(A:currentTimeStamp(), B: "604800", type: .Subtract) , formatter: "yyyy-MM-dd")
             }
             else if index == 2{
-//                self.VM?.startDate = dateToString(stmap: decimalNumber(A:currentTimeStamp(), B: "2592000", type: .Subtract) , formatter: "yyyy-MM-dd")
+                self.startDate = dateToString(stmap: decimalNumber(A:currentTimeStamp(), B: "2592000", type: .Subtract) , formatter: "yyyy-MM-dd")
             }else if index == 3{
                 let pop = PositionHistoryDatePopView()
                 if self.dateStr.0.length == 0 {
@@ -115,11 +155,14 @@ extension JDTradeAccountHistoryOrderViewController: UITableViewDelegate,UITableV
                 }
                 pop.showPopupView(date: self.dateStr) { dateStr in
                     self.dateStr = dateStr
-//                    self.VM?.endDate = dateStr.1
-//                    self.VM?.startDate = dateStr.0
+                    self.endDate = dateStr.1
+                    self.startDate = dateStr.0
                    
                 }
             }
+            
+            self.netGetCloseOrderList()
+            
         }
         headerView.addSubview(dateView)
         
@@ -177,12 +220,76 @@ extension JDTradeAccountHistoryOrderViewController: UITableViewDelegate,UITableV
     }
     
     func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
-        return 54
+        return 54 + 80
     }
     
     func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
         
-        let v = UIView(frame: CGRectMake(0, 0, SCREEN_WIDTH, 54))
+        let v = UIView(frame: CGRectMake(0, 0, SCREEN_WIDTH, 54 + 80))
+        
+        let lrView = UIView()
+        v.addSubview(lrView)
+        lrView.snp.makeConstraints { make in
+            make.left.top.right.equalTo(v)
+            make.height.equalTo(40)
+        }
+        
+        let lrLb = UILabel()
+        lrLb.setTextFont(.PFSR, 15)
+        lrLb.textColor = _color("#7C7C7C&#7C7C7C")
+        lrLb.text = switchLanguage("利润")
+        
+        lrView.addSubview(lrLb)
+        lrLb.snp.makeConstraints { make in
+            make.centerY.equalTo(lrView)
+            make.left.equalTo(lrView.snp.left).offset(17)
+        }
+        
+        lrView.addSubview(totalLrLb)
+        totalLrLb.snp.makeConstraints { make in
+            make.centerY.equalTo(lrView)
+            make.right.equalTo(lrView.snp.right).offset(-17)
+        }
+        
+        let lineView = UIView()
+        
+        lineView.backgroundColor = _color("#F0F0F0&#F0F0F0")
+        v.addSubview(lineView)
+        lineView.snp.makeConstraints { make in
+            make.left.right.equalTo(v)
+            make.top.equalTo(lrView.snp.bottom)
+            make.height.equalTo(1)
+        }
+        
+        let jyView = UIView()
+        v.addSubview(jyView)
+        jyView.snp.makeConstraints { make in
+            make.top.equalTo(lineView.snp.bottom)
+            make.left.right.equalTo(v)
+            make.height.equalTo(40)
+        }
+        
+       
+        
+        let jyLb = UILabel()
+        jyLb.setTextFont(.PFSR, 15)
+        jyLb.textColor = _color("#7C7C7C&#7C7C7C")
+        jyLb.text = switchLanguage("结余")
+        
+        jyView.addSubview(jyLb)
+        jyLb.snp.makeConstraints { make in
+            make.centerY.equalTo(jyView)
+            make.left.equalTo(jyView.snp.left).offset(17)
+        }
+       
+        jyView.addSubview(totalJyLb)
+        totalJyLb.snp.makeConstraints { make in
+            make.centerY.equalTo(jyView)
+            make.right.equalTo(jyView.snp.right).offset(-17)
+        }
+        
+        totalJyLb.text = precisionString(with: self.accountModel?.balance ?? "0.00", precision: "2")
+        
         let tipLb = UILabel()
         tipLb.font = .systemFont(ofSize: 12)
         tipLb.textColor = UIColor.pg_color(withHexString: "B1B9C1")
@@ -190,42 +297,27 @@ extension JDTradeAccountHistoryOrderViewController: UITableViewDelegate,UITableV
         tipLb.textAlignment = .center
         v.addSubview(tipLb)
         tipLb.snp.makeConstraints { make in
-            make.center.equalTo(v)
+            make.top.equalTo(jyView.snp.bottom).offset(15)
+            make.centerX.equalTo(v)
         }
         return v
     }
     
-    
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        1
+        return  orderList.count
     }
     
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-//        let cell:DealListCell = tableView.dequeueReusableCell(withIdentifier: "DealListCell") as! DealListCell
-//        if self.headerView.segmentedControl.selectedSegmentIndex == 0 {
-//            let model = self.VM?.positionList[indexPath.row]
-//            cell.updatePositionCellWith(model: model!)
-//        }
-//        else if self.headerView.segmentedControl.selectedSegmentIndex == 1{
-//            let model = self.VM?.entrustList[indexPath.row]
-//            cell.updateEntrustCellWith(model: model!)
-//        }else{
-//            let model = self.VM?.closeOrderList[indexPath.row]
-//            cell.updateCloseOrderCellWith(model: model!)
-//        }
         
         let cell = tableView.dequeueReusableCell(withIdentifier: JDTradeDealListCell.description()) as! JDTradeDealListCell
-        
+        cell.setupCellByPositionModel(model: self.orderList[indexPath.row])
         return cell
     }
     
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
         return 62
     }
-    
-    
-    
-    
+ 
 }
 
 extension JDTradeAccountHistoryOrderViewController: JXSegmentedListContainerViewListDelegate {

Koala/Koala/Modular/JDTrade/VC/JDTradeAccountHoldViewController.swift

@@ -14,19 +14,35 @@ class JDTradeAccountHoldViewController: BaseViewController {
     
     var accountModel : JDTradeAccountModel?
     
+    lazy var positionList:[JDPositionModel] = {
+        let arr:[JDPositionModel] = [JDPositionModel]()
+        return arr
+    }()
+    
     lazy var tableView : UITableView = {
         
         let v = UITableView(frame: .zero, style: .plain)
         v.delegate = self
         v.dataSource = self
         v.separatorStyle = .singleLine
-//        v.register(UINib.init(nibName: "DealListCell", bundle: nil), forCellReuseIdentifier: "DealListCell")
         
         v.register(JDTradeDealListCell.self, forCellReuseIdentifier: JDTradeDealListCell.description())
+        v.ly_emptyView = emptyView
         return v
         
     }()
     
+    lazy var emptyView:HDEmptyView = {
+        let emptyV:HDEmptyView = HDEmptyView.emptyActionViewWithImageStr(image: NO_DATA_IMAGE, titleStr: switchLanguage("暂无数据") as NSString, detailStr: "", btnTitleStr: "") {
+            // Dlog("点击刷新按钮")
+        }
+        emptyV.titleLabFont = _PFSR(16)
+        emptyV.titleLabTextColor = TitleTextColor
+        emptyV.backgroundColor = .clear
+        emptyV.autoShowEmptyView = true
+        return emptyV
+    }()
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         
@@ -57,24 +73,27 @@ extension JDTradeAccountHoldViewController {
         ] as [String : Any]
         
         
-        NetWork.NetWorkInstance.requestData(requestType: .Post, URLString: netForGetEntrustList,parameters: param,success: { (code, result) in
+        NetWork.NetWorkInstance.requestData(requestType: .Post, URLString: netForGetPositionList,parameters: param,success: { (code, result) in
             
             ProgressHUD.hideHud()
-//            if let dict:NSDictionary = result as? NSDictionary {
-//                if let list:[NSDictionary] = dict["list"] as? [NSDictionary]{
-//                    self.entrustList.removeAll()
-//                    for dic in list {
-//                       let model = EntrustListModel.deserialize(from: dic)!
-//                        self.entrustList.append(model)
-//                    }
-//                    observer.send(value: true)
-//                }else{
-//                    observer.send(value: false)
-//                }
-//            }else{
-//                observer.send(value: false)
-//            }
-//            observer.sendCompleted()
+            
+            if let dict: NSDictionary = result as? NSDictionary {
+                
+                if let list: [NSDictionary] = dict["list"] as? [NSDictionary]{
+                    self.positionList.removeAll()
+                    
+                    for dic in list {
+                        
+                        let model = JDPositionModel.deserialize(from: dic)!
+                        
+                        self.positionList.append(model)
+                        
+                    }
+                }
+                
+                self.tableView.reloadData()
+            }
+            
         }) { (code, result) in
             ProgressHUD.showError(status: result as! String)
         }
@@ -95,7 +114,7 @@ extension JDTradeAccountHoldViewController: UITableViewDelegate,UITableViewDataS
         
         let view = UIView(frame: CGRect(x: 0, y: 0, width: SCREEN_WIDTH, height: 40))
         
-       
+        
         let codeLb = UILabel()
         codeLb.font = .systemFont(ofSize: 12)
         codeLb.textColor = UIColor.pg_color(withHexString: "AEAEAE")
@@ -106,13 +125,13 @@ extension JDTradeAccountHoldViewController: UITableViewDelegate,UITableViewDataS
             make.centerY.equalTo(view)
             make.left.equalTo(view.snp.left).offset(18)
         }
-            
+        
         
         let countLb = UILabel()
         countLb.font = .systemFont(ofSize: 12)
         countLb.textColor = UIColor.pg_color(withHexString: "AEAEAE")
         countLb.text = "单位/数量"
-    
+        
         view.addSubview(countLb)
         countLb.snp.makeConstraints { make in
             make.centerY.equalTo(view)
@@ -123,26 +142,26 @@ extension JDTradeAccountHoldViewController: UITableViewDelegate,UITableViewDataS
         priceLb.font = .systemFont(ofSize: 12)
         priceLb.textColor = UIColor.pg_color(withHexString: "AEAEAE")
         priceLb.text = "现价/成本"
-    
+        
         view.addSubview(priceLb)
         priceLb.snp.makeConstraints { make in
             make.centerY.equalTo(view)
             make.left.equalTo(view.snp.centerX).offset(20)
         }
-
+        
         let holdLb = UILabel()
         holdLb.font = .systemFont(ofSize: 12)
         holdLb.textColor = UIColor.pg_color(withHexString: "AEAEAE")
         holdLb.text = "持仓盈亏"
-    
+        
         view.addSubview(holdLb)
         holdLb.snp.makeConstraints { make in
             make.centerY.equalTo(view)
             make.right.equalTo(view.snp.right).offset(-17)
         }
-
         
-         return view
+        
+        return view
     }
     
     func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
@@ -166,25 +185,25 @@ extension JDTradeAccountHoldViewController: UITableViewDelegate,UITableViewDataS
     
     
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        1
+        return self.positionList.count
     }
     
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-//        let cell:DealListCell = tableView.dequeueReusableCell(withIdentifier: "DealListCell") as! DealListCell
-//        if self.headerView.segmentedControl.selectedSegmentIndex == 0 {
-//            let model = self.VM?.positionList[indexPath.row]
-//            cell.updatePositionCellWith(model: model!)
-//        }
-//        else if self.headerView.segmentedControl.selectedSegmentIndex == 1{
-//            let model = self.VM?.entrustList[indexPath.row]
-//            cell.updateEntrustCellWith(model: model!)
-//        }else{
-//            let model = self.VM?.closeOrderList[indexPath.row]
-//            cell.updateCloseOrderCellWith(model: model!)
-//        }
+        //        let cell:DealListCell = tableView.dequeueReusableCell(withIdentifier: "DealListCell") as! DealListCell
+        //        if self.headerView.segmentedControl.selectedSegmentIndex == 0 {
+        //            let model = self.VM?.positionList[indexPath.row]
+        //            cell.updatePositionCellWith(model: model!)
+        //        }
+        //        else if self.headerView.segmentedControl.selectedSegmentIndex == 1{
+        //            let model = self.VM?.entrustList[indexPath.row]
+        //            cell.updateEntrustCellWith(model: model!)
+        //        }else{
+        //            let model = self.VM?.closeOrderList[indexPath.row]
+        //            cell.updateCloseOrderCellWith(model: model!)
+        //        }
         
         let cell = tableView.dequeueReusableCell(withIdentifier: JDTradeDealListCell.description()) as! JDTradeDealListCell
-        
+        cell.setupCellByPositionModel(model: self.positionList[indexPath.row])
         return cell
     }
     
@@ -192,9 +211,6 @@ extension JDTradeAccountHoldViewController: UITableViewDelegate,UITableViewDataS
         return 62
     }
     
-    
-    
-    
 }
 
 extension JDTradeAccountHoldViewController: JXSegmentedListContainerViewListDelegate {

Koala/Koala/Modular/JDTrade/VC/JDTradeAccountPositionViewController.swift

@@ -14,19 +14,36 @@ class JDTradeAccountPositionViewController: BaseViewController {
     
     var accountModel : JDTradeAccountModel?
     
+    lazy var positionList:[JDPositionModel] = {
+        let arr:[JDPositionModel] = [JDPositionModel]()
+        return arr
+    }()
+    
     lazy var tableView : UITableView = {
         
         let v = UITableView(frame: .zero, style: .plain)
         v.delegate = self
         v.dataSource = self
         v.separatorStyle = .singleLine
-//        v.register(UINib.init(nibName: "DealListCell", bundle: nil), forCellReuseIdentifier: "DealListCell")
         
         v.register(JDTradeDealListCell.self, forCellReuseIdentifier: JDTradeDealListCell.description())
+        v.ly_emptyView = emptyView
         return v
         
     }()
     
+    lazy var emptyView:HDEmptyView = {
+        let emptyV:HDEmptyView = HDEmptyView.emptyActionViewWithImageStr(image: NO_DATA_IMAGE, titleStr: switchLanguage("暂无数据") as NSString, detailStr: "", btnTitleStr: "") {
+            // Dlog("点击刷新按钮")
+        }
+        emptyV.titleLabFont = _PFSR(16)
+        emptyV.titleLabTextColor = TitleTextColor
+        emptyV.backgroundColor = .clear
+        emptyV.autoShowEmptyView = true
+        return emptyV
+    }()
+    
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         
@@ -57,24 +74,27 @@ extension JDTradeAccountPositionViewController {
         ] as [String : Any]
         
         
-        NetWork.NetWorkInstance.requestData(requestType: .Post, URLString: netForGetPositionList,parameters: param,success: { (code, result) in
+        NetWork.NetWorkInstance.requestData(requestType: .Post, URLString: netForGetEntrustList,parameters: param,success: { (code, result) in
             
             ProgressHUD.hideHud()
-//            if let dict:NSDictionary = result as? NSDictionary {
-//                if let list:[NSDictionary] = dict["list"] as? [NSDictionary]{
-//                    self.entrustList.removeAll()
-//                    for dic in list {
-//                       let model = EntrustListModel.deserialize(from: dic)!
-//                        self.entrustList.append(model)
-//                    }
-//                    observer.send(value: true)
-//                }else{
-//                    observer.send(value: false)
-//                }
-//            }else{
-//                observer.send(value: false)
-//            }
-//            observer.sendCompleted()
+            
+            if let dict: NSDictionary = result as? NSDictionary {
+                
+                if let list: [NSDictionary] = dict["list"] as? [NSDictionary]{
+                    self.positionList.removeAll()
+                    
+                    for dic in list {
+                        
+                        let model = JDPositionModel.deserialize(from: dic)!
+                        
+                        self.positionList.append(model)
+                        
+                    }
+                }
+                
+                self.tableView.reloadData()
+            }
+            
         }) { (code, result) in
             ProgressHUD.showError(status: result as! String)
         }
@@ -166,7 +186,7 @@ extension JDTradeAccountPositionViewController: UITableViewDelegate,UITableViewD
     
     
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        1
+        return self.positionList.count
     }
     
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {

Koala/Koala/Modular/JDTrade/VC/JDTradeViewController.swift

@@ -29,6 +29,9 @@ class JDTradeViewController: BaseViewController {
         return v
     }()
     
+    var cashBalance : String = "0.00"
+    var isOpen : Bool = true
+    
     lazy var tableView : UITableView = {
         
         let v = UITableView(frame: .zero, style: .plain)
@@ -57,6 +60,53 @@ class JDTradeViewController: BaseViewController {
         }
         
         self.requestAccountList()
+        self.netForGetCashInfo()
+        
+    }
+    
+}
+
+extension JDTradeViewController {
+    
+    func requestAccountList() {
+        
+        NetWork.NetWorkInstance.requestData(requestType: .Post, URLString: netForGetAccountList) { (code,result ) in
+            
+            if let list : [NSDictionary] = result?["list"] as? [NSDictionary] {
+                self.accountList.removeAll()
+                
+                for dic in list {
+                    
+                    let model = JDTradeAccountModel.deserialize(from: dic)
+                    
+                    self.accountList.append(model!)
+                }
+                
+            }
+            
+            self.tableView.reloadData()
+            
+        } failured: {(code, result) in
+            ProgressHUD.showError(status: result as! String)
+        }
+    
+    }
+    
+    
+    func netForGetCashInfo(){
+        NetWork.NetWorkInstance.requestData(requestType: .Post, URLString: netForGetCash) { code, result in
+            
+            self.cashBalance = result?["balance"] as? String ?? "0.00"
+            
+            self.tableView.reloadData()
+            
+            
+        } failured: { code, result in
+            ProgressHUD.showError(status: result as! String)
+            
+        }
+
+        
     }
     
 }
@@ -79,7 +129,13 @@ extension JDTradeViewController : UITableViewDataSource{
             return 1
         } else {
             
-            return accountList.count
+            if self.isOpen == true {
+                
+                return accountList.count
+            }else{
+                
+                return 0
+            }
         }
     }
     
@@ -100,10 +156,12 @@ extension JDTradeViewController : UITableViewDataSource{
             let cell = tableView.dequeueReusableCell(withIdentifier: JDTradeAccountCell.description()) as! JDTradeAccountCell
             
             cell.iconIv.image = UIImage(named: "account_wallet")
-//            let model : JDTradeAccountModel = self.accountList[indexPath.row]
-////            cell.updateMarketCellWith(model: model)
-//            cell.updateHomeCellWith(model: model)
-//
+            cell.titleLb.text = switchLanguage("钱包账户")
+            cell.networthTipLb.text = switchLanguage("资产净值.USD")
+            cell.networthLb.text = precisionString(with: cashBalance, precision: "2")
+            cell.todayTipLb.isHidden = true
+            cell.todayProfitLb.isHidden = true
+            cell.todayRateLb.isHidden = true
             return cell
             
             
@@ -113,7 +171,7 @@ extension JDTradeViewController : UITableViewDataSource{
 //            let model:KSymbolModel = (self.VM?.screenSymbolList[indexPath.row])!;
             
             let model : JDTradeAccountModel = self.accountList[indexPath.row]
-//            cell.updateMarketCellWith(model: model)
+
             cell.updateHomeCellWith(model: model)
             
             return cell
@@ -122,33 +180,7 @@ extension JDTradeViewController : UITableViewDataSource{
     
 }
 
-extension JDTradeViewController {
-    
-    func requestAccountList() {
-        
-        NetWork.NetWorkInstance.requestData(requestType: .Post, URLString: netForGetAccountList) { (code,result ) in
-            
-            if let list : [NSDictionary] = result?["list"] as? [NSDictionary] {
-                self.accountList.removeAll()
-                
-                for dic in list {
-                    
-                    let model = JDTradeAccountModel.deserialize(from: dic)
-                    
-                    self.accountList.append(model!)
-                }
-                
-            }
-            
-            self.tableView.reloadData()
-            
-        } failured: {(code, result) in
-            ProgressHUD.showError(status: result as! String)
-        }
-    
-    }
-    
-}
+
 
 
 extension JDTradeViewController : UITableViewDelegate{
@@ -163,6 +195,13 @@ extension JDTradeViewController : UITableViewDelegate{
         }
     }
     
+    @objc func closeAction()->Void{
+        
+        self.isOpen = !self.isOpen
+        
+        self.tableView.reloadData()
+    }
+    
     func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
     
         if section == 3 {
@@ -181,19 +220,18 @@ extension JDTradeViewController : UITableViewDelegate{
                 make.centerY.equalTo(view)
                 make.left.equalTo(view.snp.left).offset(18)
             }
-            let iv = UIImageView()
             
+            let closeBtn : UIButton = UIButton(type: .custom)
+            closeBtn.setImage(_image("Base_W_DownArrows&Base_W_DownArrows"), for: .normal)
+            closeBtn.addTarget(self, action: #selector(closeAction), for: .touchUpInside)
             
-            iv.image = UIImage(named: "Base_W_DownArrows")
-            
-            view.addSubview(iv)
-            iv.snp.makeConstraints { make in
+            view.addSubview(closeBtn)
+            closeBtn.snp.makeConstraints { make in
                 make.centerY.equalTo(view)
                 make.right.equalTo(view.snp.right).offset(-28)
                 make.size.equalTo(CGSize(width: 17, height: 10))
             }
             
-            
             return view
         } else {
             

Koala/Koala/Modular/Mine/VC/MineViewController.swift

@@ -27,17 +27,42 @@ class MineViewController: BaseViewController {
         self.mySwitchLanguage()
     }
     
+    lazy var bgIv : UIImageView = {
+        let v = UIImageView()
+        v.image = _image("Mine_Top_Bg&Mine_Top_Bg")
+        return v
+    }()
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         self.myNavigationBar.left_SuperView.isHidden = false
         self.myNavigationBar.title_Label.text = "个人中心"
         self.myNavigationBar.left_Button.setImage(NavViewSpecialBlackImage, for: .normal)
         self.myNavigationBar.left_Button.addTarget(self, action: #selector(clickLeftBtnAction), for: .touchUpInside)
+        self.myNavigationBar.left_Button.backgroundColor = .clear
+        self.myNavigationBar.backgroundColor = .clear
+        self.myNavigationBar.back_ImageView.isHidden = true
+        self.myNavigationBar.left_ImageView.isHidden = true
+        self.myNavigationBar.left_SuperView.backgroundColor = .clear
+        
+        self.view.addSubview(bgIv)
+        bgIv.snp.makeConstraints { make in
+            make.left.right.equalTo(self.view)
+            make.top.equalTo(self.myNavigationBar.snp.top)
+            make.height.equalTo(230)
+        }
        
+        self.view.bringSubviewToFront(self.myNavigationBar)
+        
     }
     
     override func subView() {
+        
+        self.view.backgroundColor = .white
+        
         self.view.addSubview(mineView)
+        
+        
     }
     
     override func updateViewConstraints() {

Koala/Koala/Other/Assets.xcassets/JDTabbar/jdtab_found_sel.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "路径 2备份 2@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "路径 2备份 2@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Koala/Koala/Other/Assets.xcassets/JDTabbar/jdtab_trade_sel.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "路径 2备份 2@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "路径 2备份 2@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Koala/Koala/Other/Assets.xcassets/Mine/Mine_Top_Bg.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "编组 13@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "编组 13@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}