切换货拉拉

GeliBusinessPlatform/Assets.xcassets/字体色/#E37847.colorset/Contents.json

+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.278",
+          "green" : "0.471",
+          "red" : "0.890"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

GeliBusinessPlatform/ViewController/代客下单（货运）/下运单/XiaYunDanViewController.swift

@@ -108,17 +108,58 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
         let vc = XiaDanChengGongViewController()
         self.navigationController?.pushViewController(vc, animated: true)
     }
+    @IBOutlet weak var topBtnView: UIView!
     @IBOutlet weak var bottomView: UIView!
     @IBOutlet weak var listView: UITableView!
+    var locBtn = UIButton()
+    
+    @IBOutlet weak var hListView: UITableView!
+    
+    
+    
+    @IBAction func selectAction(_ sender: UIButton) {
+        if rightBtn == sender {
+            rightBtn.isSelected = true
+            leftBtn.isSelected = false
+            lineV.frame.origin.x = fullScreenWidth * 0.5
+            hllView.isHidden = false
+            
+            if fullScreenHeight > 736 {
+                hBtnViewH.constant = 83
+            }else{
+                hBtnViewH.constant = 49
+            }
+        }else{
+            rightBtn.isSelected = false
+            leftBtn.isSelected = true
+            lineV.frame.origin.x = 0
+            hllView.isHidden = true
+        }
+    }
+    @IBOutlet weak var lineV: UIView!
+    @IBOutlet weak var leftBtn: UIButton!
+    
+    @IBOutlet weak var hBtnViewH: NSLayoutConstraint!
+    @IBOutlet weak var hllView: UIView!
+    
+    @IBOutlet weak var rightBtn: UIButton!
     override func viewDidLoad() {
         super.viewDidLoad()
+    
+        
         navbar.title = "运单列表"
         self.view.addSubview(navbar)
-        listView.snp.makeConstraints { (make) in
-            make.top.equalTo(NavCGRect.height)
-            make.left.right.equalTo(0)
-            make.bottom.equalTo(bottomView.snp_top)
-        }
+        
+        locBtn.backgroundColor = UIColor.red
+        self.view.addSubview(locBtn)
+        locBtn.snp_makeConstraints({ (make) in
+            make.right.equalTo(-15)
+            make.centerY.equalTo(navbar.snp_centerY).offset(10)
+            make.height.equalTo(30)
+            make.width.equalTo(100)
+        })
+        
+        SetTopFrame(view: topBtnView, height: 44)
         listView.separatorStyle = .none
         listView.register(UINib(nibName: "AdressSelectCell", bundle: nil), forCellReuseIdentifier: "AdressSelect")
         listView.register(UINib(nibName: "PersonCenterCell", bundle: nil), forCellReuseIdentifier: "PersonCenter")
@@ -127,7 +168,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
         // Do any additional setup after loading the view.
     }
     
-   
+    
     @objc func selectBtnClick(sender:UIButton){
         if sender.tag == 99 {
             //跳转查看合同页面
@@ -267,48 +308,49 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
         return 49
     }
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        switch indexPath.section {
-        case 0:
-            let cell = tableView.dequeueReusableCell(withIdentifier: "AdressSelect") as! AdressSelectCell
-            cell.titleLbl.text = "寄"
-            
-            cell.tag = indexPath.row
-            cell.delegate = self
-            cell.contentLbl.isHidden = false
-            cell.contentV.isHidden = true
-            if indexPath.row == 0 {
-                if sender != nil {
-                    cell.contentLbl.isHidden = true
-                    cell.contentV.isHidden = false
-                    cell.nameLbl.text = sender!
-                    cell.phoneLbl.text = sendPhone!
-                    cell.adrLbl.text = sendAdr!
+//        if tableView == listView {
+            switch indexPath.section {
+            case 0:
+                let cell = tableView.dequeueReusableCell(withIdentifier: "AdressSelect") as! AdressSelectCell
+                cell.titleLbl.text = "寄"
+                
+                cell.tag = indexPath.row
+                cell.delegate = self
+                cell.contentLbl.isHidden = false
+                cell.contentV.isHidden = true
+                if indexPath.row == 0 {
+                    if sender != nil {
+                        cell.contentLbl.isHidden = true
+                        cell.contentV.isHidden = false
+                        cell.nameLbl.text = sender!
+                        cell.phoneLbl.text = sendPhone!
+                        cell.adrLbl.text = sendAdr!
+                    }
                 }
-            }
-            if indexPath.row == 1 {
-                cell.titleLbl.backgroundColor = UIColor(named: "企业、预售字体")
-                cell.titleLbl.text = "收"
-                if receiver != nil {
-                    cell.contentLbl.isHidden = true
-                    cell.contentV.isHidden = false
-                    cell.nameLbl.text = receiver!
-                    cell.phoneLbl.text = receivePhone!
-                    cell.adrLbl.text = receiveAdr!
+                if indexPath.row == 1 {
+                    cell.titleLbl.backgroundColor = UIColor(named: "企业、预售字体")
+                    cell.titleLbl.text = "收"
+                    if receiver != nil {
+                        cell.contentLbl.isHidden = true
+                        cell.contentV.isHidden = false
+                        cell.nameLbl.text = receiver!
+                        cell.phoneLbl.text = receivePhone!
+                        cell.adrLbl.text = receiveAdr!
+                    }
                 }
-            }
-            return cell
-        case 1:
-            let cell = tableView.dequeueReusableCell(withIdentifier: "PersonCenter") as! PersonCenterCell
-            cell.titleLbl.text = titleArr[indexPath.row]
-            if indexPath.row == 0 {
-                cell.introLbl.text = "（必填）"
-                cell.introLbl.textColor = UIColor(named: "蓝色字体颜色")
-                cell.introLbl.isHidden = false
-                if isCheck != nil {
-                    cell.contentStr = itemName + "; \(count!)箱; \(weight!)kg"
+                return cell
+            case 1:
+                let cell = tableView.dequeueReusableCell(withIdentifier: "PersonCenter") as! PersonCenterCell
+                cell.titleLbl.text = titleArr[indexPath.row]
+                if indexPath.row == 0 {
+                    cell.introLbl.text = "（必填）"
+                    cell.introLbl.textColor = UIColor(named: "蓝色字体颜色")
+                    cell.introLbl.isHidden = false
+                    if isCheck != nil {
+                        cell.contentStr = itemName + "; \(count!)箱; \(weight!)kg"
+                    }
                 }
-            }
-            if indexPath.row == 1 {
+                if indexPath.row == 1 {
                     var sendStr = "上门提货"
                     if send != 0 {
                         sendStr = "自送到库"
@@ -318,26 +360,27 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
                         receiveStr = "到库自取"
                     }
                     cell.contentStr = sendStr + "; " + receiveStr
-            }
-            if indexPath.row == 2 {
-                cell.introLbl.isHidden = false
-                if price != nil {
-                    cell.contentStr = "报价金额:\(price!)"
                 }
-            }
-            if indexPath.row == 3 {
-                let cell = tableView.dequeueReusableCell(withIdentifier: "WenDu") as! WenDuCell
-                cell.titleLbl.text = titleArr[indexPath.row]
+                if indexPath.row == 2 {
+                    cell.introLbl.isHidden = false
+                    if price != nil {
+                        cell.contentStr = "报价金额:\(price!)"
+                    }
+                }
+                if indexPath.row == 3 {
+                    let cell = tableView.dequeueReusableCell(withIdentifier: "WenDu") as! WenDuCell
+                    cell.titleLbl.text = titleArr[indexPath.row]
+                    return cell
+                }
+                
+                
+                return cell
+            default:
+                let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndTFBtnCell") as! TitleAndTFBtnCell
+                cell.nameLbl.text = title2Arr[indexPath.row]
                 return cell
             }
-            
-            
-            return cell
-        default:
-            let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndTFBtnCell") as! TitleAndTFBtnCell
-            cell.nameLbl.text = title2Arr[indexPath.row]
-            return cell
-        }
+//        }
     }
     
 }

GeliBusinessPlatform/ViewController/工作中心/WorkCViewController.swift

@@ -37,6 +37,11 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
     
     override func viewDidLoad() {
         super.viewDidLoad()
+        
+        
+        
+          
+        
         setTabv()
         NotificationCenter.default.addObserver(self, selector: #selector(jpushServiceNotification(notion:)), name: NSNotification.Name(rawValue: "jpushServiceNotification2"), object: nil)
         
@@ -482,7 +487,9 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
         case 75: //收支统计
             //            HUD.flash(.label("敬请期待"),delay: 1.2)
             //            return
-            let vc = ShouZhiTongJiViewController()
+            
+            let vc = XiaYunDanViewController()
+//            let vc = ShouZhiTongJiViewController()
             self.navigationController?.pushViewController(vc, animated: true)
             return
         case 76: //收支详情

GeliBusinessPlatform/ViewController/登录/LoginViewController.swift

@@ -47,7 +47,7 @@ class LoginViewController: BaseViewController, CodeViewDelegate,GeliAlertViewDel
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         self.view.backgroundColor = UIColor(named:"白色背景色")
-        
+          print("f = ",fullScreenHeight)
     }
     
     @IBAction func selectLoginAction(_ sender: UIButton) {