sell phone

CAISHEN/AppDelegate/KXBaseViewController.m

@@ -20,7 +20,7 @@
     [super viewDidLoad];
     // Do any additional setup after loading the view.
     self.automaticallyAdjustsScrollViewInsets=NO;
-    self.view.backgroundColor= [UIColor KXColorWithRed:239 green:239 blue:244];
+    self.view.backgroundColor= [UIColor KXColorWithHex:0xf5f5f5];
     [self createTitleLabel];
     [[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(reach:) name:KXNETREACHABLE object:nil];
     [self checkReach];

CAISHEN/SellPhone2/Mine/Controller/KXSPMineViewController.swift

@@ -16,6 +16,7 @@ class KXSPMineViewController: KXBaseViewController, UITableViewDelegate, UITable
 
     override func viewDidLoad() {
         super.viewDidLoad()
+        setNav()
         setUpUI()
     }
     
@@ -29,6 +30,15 @@ class KXSPMineViewController: KXBaseViewController, UITableViewDelegate, UITable
         view.addSubview(tableView)
     }
     
+    func setNav() -> Void {
+        navigationController?.navigationBar.shadowImage = UIImage()
+        navigationController?.navigationBar.setBackgroundImage(UIImage(), for: UIBarMetrics.default)
+        navigationController?.navigationBar.barTintColor = UIColor.gradientHeight(from: UIColor.kxColor(withHex: 0xDB8DFF), to: UIColor.kxColor(withHex: 0xE9C4FA), withHeight: Int32(NavHeight))
+        let navView: UIView = UIView(frame: CGRect(x: 0, y: 0, width: SCREEN_WIDTH, height: 44))
+        navView.backgroundColor = UIColor.gradientHeight(from: UIColor.kxColor(withHex: 0xE9C4FA), to: UIColor.kxColor(withHex: 0xf5f5f5), withHeight: 44)
+        view.addSubview(navView)
+    }
+    
     lazy var tableView: UITableView = {
         let table: UITableView = UITableView.init(frame: CGRect.init(x: 12, y: 0, width: SCREEN_WIDTH-24, height: SCREEN_HEIGHT-NavHeight-TabbarHeight), style: .plain)
         table.backgroundColor = UIColor.clear

CAISHEN/SellPhone2/Order/Controller/KXSPOrderDetailViewController.swift

@@ -14,6 +14,7 @@ class KXSPOrderDetailViewController: KXBaseViewController, UITableViewDelegate,
     
     override func viewDidLoad() {
         super.viewDidLoad()
+        setNav()
         addBackBtn()
         setUpUI()
     }
@@ -23,6 +24,12 @@ class KXSPOrderDetailViewController: KXBaseViewController, UITableViewDelegate,
         view.addSubview(tableView)
     }
     
+    func setNav() -> Void {
+        let navView: UIView = UIView(frame: CGRect(x: 0, y: 0, width: SCREEN_WIDTH, height: 44))
+        navView.backgroundColor = UIColor.gradientHeight(from: UIColor.kxColor(withHex: 0xE9C4FA), to: UIColor.kxColor(withHex: 0xf5f5f5), withHeight: 44)
+        view.addSubview(navView)
+    }
+    
     lazy var tableView: UITableView = {
         let table: UITableView = UITableView.init(frame: CGRect.init(x: 12, y: 0, width: SCREEN_WIDTH-24, height: SCREEN_HEIGHT-NavHeight), style: .plain)
         table.backgroundColor = UIColor.clear

CAISHEN/SellPhone2/Order/Controller/KXSPOrderViewController.swift

@@ -17,6 +17,7 @@ class KXSPOrderViewController: KXBaseViewController, UITableViewDelegate, UITabl
     
     override func viewDidLoad() {
         super.viewDidLoad()
+        setNav()
         setUpUI()
     }
     
@@ -25,6 +26,15 @@ class KXSPOrderViewController: KXBaseViewController, UITableViewDelegate, UITabl
         tableView.mj_header.beginRefreshing()
     }
     
+    func setNav() -> Void {
+        navigationController?.navigationBar.shadowImage = UIImage()
+        navigationController?.navigationBar.setBackgroundImage(UIImage(), for: UIBarMetrics.default)
+        navigationController?.navigationBar.barTintColor = UIColor.gradientHeight(from: UIColor.kxColor(withHex: 0xDB8DFF), to: UIColor.kxColor(withHex: 0xE9C4FA), withHeight: Int32(NavHeight))
+        let navView: UIView = UIView(frame: CGRect(x: 0, y: 0, width: SCREEN_WIDTH, height: 44))
+        navView.backgroundColor = UIColor.gradientHeight(from: UIColor.kxColor(withHex: 0xE9C4FA), to: UIColor.kxColor(withHex: 0xf5f5f5), withHeight: 44)
+        view.addSubview(navView)
+    }
+    
     override func setUpUI() {
         name = "订单"
         view.addSubview(segView)
@@ -32,7 +42,7 @@ class KXSPOrderViewController: KXBaseViewController, UITableViewDelegate, UITabl
     }
     
     lazy var segView: UISegmentedControl = {
-        let seg: UISegmentedControl = UISegmentedControl.init(items: ["手机","平板","电脑"])
+        let seg: UISegmentedControl = UISegmentedControl.init(items: ["手机","电脑","平板"])
         seg.frame = CGRect.init(x: 12, y: 0, width: SCREEN_WIDTH-24, height: Fitesize(48))
         seg.layer.cornerRadius = 8
         seg.setTitleTextAttributes([NSAttributedString.Key.font: UIFont.init(name: "PingFangSC-Light", size: Fitesize(17))!], for: .normal)
@@ -48,10 +58,10 @@ class KXSPOrderViewController: KXBaseViewController, UITableViewDelegate, UITabl
             module = "phone"
             tableView.mj_header.beginRefreshing()
         case 1:
-            module = "pad"
+            module = "computer"
             tableView.mj_header.beginRefreshing()
         case 2:
-            module = "computer"
+            module = "pad"
             tableView.mj_header.beginRefreshing()
         default:
             break
@@ -59,7 +69,7 @@ class KXSPOrderViewController: KXBaseViewController, UITableViewDelegate, UITabl
     }
     
     lazy var tableView: UITableView = {
-        let table: UITableView = UITableView.init(frame: CGRect.init(x: 12, y: Fitesize(48), width: SCREEN_WIDTH-24, height: SCREEN_HEIGHT-NavHeight-Fitesize(48)), style: .grouped)
+        let table: UITableView = UITableView.init(frame: CGRect.init(x: 12, y: Fitesize(48), width: SCREEN_WIDTH-24, height: SCREEN_HEIGHT-NavHeight-Fitesize(48)-TabbarHeight), style: .grouped)
         table.showsVerticalScrollIndicator = false
         table.showsHorizontalScrollIndicator = false
         table.delegate = self
@@ -70,6 +80,8 @@ class KXSPOrderViewController: KXBaseViewController, UITableViewDelegate, UITabl
         table.estimatedSectionHeaderHeight = 0
         table.estimatedSectionFooterHeight = 0
         table.separatorStyle = .none
+        table.tableHeaderView = UIView(frame: CGRect(x: 0, y: 0, width: table.frame.width, height: 0.1))
+        table.tableFooterView = UIView(frame: CGRect(x: 0, y: 0, width: table.frame.width, height: 0.1))
         let header = MJRefreshNormalHeader.init()
         header.setRefreshingTarget(self, refreshingAction: #selector(refreshWithHeader(header:)))
         table.mj_header = header
@@ -97,33 +109,35 @@ class KXSPOrderViewController: KXBaseViewController, UITableViewDelegate, UITabl
     }
     
     func requestDataSourceWithPage(Page : Int) -> Void {
-        let urlString: String = KXURL + "/recycle/getList"
-        KXHTTP.post(urlString, params: ["page": Page, "module": module], success: { (json) in
-            let response: NSDictionary = json as! NSDictionary
-            let arr: NSArray = response["data"] as! [NSDictionary] as NSArray
-            if Page == 1 {
-                self.dataSource.removeAllObjects()
-            }
-            arr.enumerateObjects({ (obj, index, bool) in
-                var dict = obj as! Dictionary<String, Any>
-                let jsonString: String = dict["content"] as! String
-                let jssonData: Data = jsonString.data(using: .utf8)!
-                let jsonDict = try? JSONSerialization.jsonObject(with: jssonData, options: .mutableContainers)
-                let mo: KXAssessViewModel = KXAssessViewModel.yy_model(withJSON: jsonDict!)!
-                dict["content"] = mo
-                let combineMo: KXSPOrderCombineModel = KXSPOrderCombineModel.yy_model(withJSON: dict)!
-                self.dataSource.add(combineMo)
-            })
-            self.tableView.mj_header.endRefreshing()
-            self.tableView.mj_footer.endRefreshing()
-            self.tableView.reloadData()
-        }) { (error) in
-            if Page == 1 {
-                self.dataSource.removeAllObjects()
+        if KXLoginManager.shareInstance()?.isLogin() == true {
+            let urlString: String = KXURL + "/recycle/getList"
+            KXHTTP.post(urlString, params: ["page": Page, "module": module], success: { (json) in
+                let response: NSDictionary = json as! NSDictionary
+                let arr: NSArray = response["data"] as! [NSDictionary] as NSArray
+                if Page == 1 {
+                    self.dataSource.removeAllObjects()
+                }
+                arr.enumerateObjects({ (obj, index, bool) in
+                    var dict = obj as! Dictionary<String, Any>
+                    let jsonString: String = dict["content"] as! String
+                    let jssonData: Data = jsonString.data(using: .utf8)!
+                    let jsonDict = try? JSONSerialization.jsonObject(with: jssonData, options: .mutableContainers)
+                    let mo: KXAssessViewModel = KXAssessViewModel.yy_model(withJSON: jsonDict!)!
+                    dict["content"] = mo
+                    let combineMo: KXSPOrderCombineModel = KXSPOrderCombineModel.yy_model(withJSON: dict)!
+                    self.dataSource.add(combineMo)
+                })
+                self.tableView.mj_header.endRefreshing()
+                self.tableView.mj_footer.endRefreshing()
+                self.tableView.reloadData()
+            }) { (error) in
+                if Page == 1 {
+                    self.dataSource.removeAllObjects()
+                }
+                self.tableView.mj_header.endRefreshing()
+                self.tableView.mj_footer.endRefreshing()
+                self.tableView.reloadData()
             }
-            self.tableView.mj_header.endRefreshing()
-            self.tableView.mj_footer.endRefreshing()
-            self.tableView.reloadData()
         }
         
     }
@@ -150,6 +164,22 @@ class KXSPOrderViewController: KXBaseViewController, UITableViewDelegate, UITabl
         navigationController?.pushViewController(detail, animated: true)
     }
     
+    func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
+        return UIView()
+    }
+    
+    func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
+        return 10
+    }
+    
+    func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
+        return UIView()
+    }
+    
+    func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
+        return 0.1
+    }
+    
 }
 
 class KXSPOrderTableViewCell: UITableViewCell {
@@ -230,17 +260,26 @@ class KXSPOrderTableViewCell: UITableViewCell {
     override func configTableViewCell(model: AnyObject, indexPath: NSIndexPath) {
         let mo: KXSPOrderCombineModel = model as! KXSPOrderCombineModel
         iconImageView.image = UIImage(named: "icon_check_" + mo.module + "_" + mo.content.type)
+        nameLabel.text = mo.content.type
         let att: NSMutableAttributedString = NSMutableAttributedString()
         att.append(NSAttributedString(string: "预估计：", attributes: [NSAttributedString.Key.foregroundColor: UIColor.kxColor(withHex: 0x666666), NSAttributedString.Key.font: UIFont(name: "PingFangSC-Regular", size: Fitesize(14))!]))
         att.append(NSAttributedString(string: mo.content.price, attributes: [NSAttributedString.Key.foregroundColor: UIColor.kxColor(withHex: 0xAD63FF), NSAttributedString.Key.font: UIFont(name: "PingFangSC-Medium", size: Fitesize(18))!]))
-        nameLabel.text = mo.content.type
-        xinghao.text = "手机型号：" + mo.content.type
-        priceLabel.text = "预估计：" + mo.content.price
+        priceLabel.attributedText = att
+        xinghao.text = "型号：" + mo.content.type
         neicun.text = "内存：" + mo.content.memory
-        yanse.text = "颜色：" + mo.content.color
-        shijian.text = "购买时间：" + mo.content.time
         chengse.text = "新旧成色：" + mo.content.quality
         weixiu.text = "维修：" + mo.content.maintain
+        if mo.module == "phone" {
+            yanse.text = "颜色：" + mo.content.color
+            shijian.text = "购买时间：" + mo.content.time
+        } else if mo.module == "pad" {
+            yanse.text = "网络模式：" + mo.content.netModel
+            shijian.text = "购买时间：" + mo.content.time
+        } else {
+            yanse.text = "硬盘：" + mo.content.hardDisk
+            shijian.text = "处理器：" + mo.content.cpu
+        }
+        
     }
     
     lazy var iconImageView: UIImageView = {