货拉拉点击跳转

GeliBusinessPlatform.xcodeproj/project.pbxproj

@@ -94,6 +94,7 @@
 		E030DF372485DD3E002764D3 /* NewRKCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E030DF352485DD3E002764D3 /* NewRKCell.xib */; };
 		E030DF3B248651A5002764D3 /* NewRKVc.swift in Sources */ = {isa = PBXBuildFile; fileRef = E030DF39248651A5002764D3 /* NewRKVc.swift */; };
 		E030DF3C248651A5002764D3 /* NewRKVc.xib in Resources */ = {isa = PBXBuildFile; fileRef = E030DF3A248651A5002764D3 /* NewRKVc.xib */; };
+		E0329EA424D808B1000D547E /* PayPassView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0329EA324D808B1000D547E /* PayPassView.swift */; };
 		E0336DD5244EC40000380BE9 /* CreatNewSpecsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0336DD3244EC40000380BE9 /* CreatNewSpecsViewController.swift */; };
 		E0336DD6244EC40000380BE9 /* CreatNewSpecsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0336DD4244EC40000380BE9 /* CreatNewSpecsViewController.xib */; };
 		E0337EED2464EED000952EF4 /* PinPaiListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0337EEB2464EED000952EF4 /* PinPaiListViewController.swift */; };
@@ -706,6 +707,7 @@
 		E030DF352485DD3E002764D3 /* NewRKCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = NewRKCell.xib; sourceTree = "<group>"; };
 		E030DF39248651A5002764D3 /* NewRKVc.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewRKVc.swift; sourceTree = "<group>"; };
 		E030DF3A248651A5002764D3 /* NewRKVc.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = NewRKVc.xib; sourceTree = "<group>"; };
+		E0329EA324D808B1000D547E /* PayPassView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PayPassView.swift; sourceTree = "<group>"; };
 		E0336DD3244EC40000380BE9 /* CreatNewSpecsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreatNewSpecsViewController.swift; sourceTree = "<group>"; };
 		E0336DD4244EC40000380BE9 /* CreatNewSpecsViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CreatNewSpecsViewController.xib; sourceTree = "<group>"; };
 		E0337EEB2464EED000952EF4 /* PinPaiListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PinPaiListViewController.swift; sourceTree = "<group>"; };
@@ -1907,6 +1909,7 @@
 				F9023F642449A3AE00DD5A63 /* Cell */,
 				F95D9B4E24484F140080D6E3 /* AlertView */,
 				E09B03C42445BF4600211A51 /* NavBarView */,
+				E0329EA324D808B1000D547E /* PayPassView.swift */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -3497,6 +3500,7 @@
 				E0571C6C248DC60000E85711 /* AddressListModel.swift in Sources */,
 				E0A2E82B24555D8600D6DB34 /* KuCunXiangQingCell.swift in Sources */,
 				F933F6C22452C68B00189561 /* PKHUDAnimating.swift in Sources */,
+				E0329EA424D808B1000D547E /* PayPassView.swift in Sources */,
 				E00E48C62457C99900F16545 /* KuCunShangPinXQViewController.swift in Sources */,
 				E02D586B2477A1480065A9EB /* GetAddrsInfoModel.swift in Sources */,
 				F9531F3C2465108800724BEE /* JXPhotoBrowserSmoothZoomAnimator.swift in Sources */,

GeliBusinessPlatform/View/PayPassView.swift

+import UIKit
+//文本内容发生改变时调用
+@objc protocol PasswordViewDelegate {
+    //文本发生改变(插入或删除)时调用
+    @objc optional func passwordView(textChanged: String, length: Int)
+    
+    //输入完成(输入的长度与指定的密码最大长度相同)时调用
+    func passwordView(textFinished: String)
+}
+
+class PayPassView: UIView, UIKeyInput {
+    //输入的文本
+    private var text: NSMutableString = ""
+    
+    //文本发生改变时的代理
+    var delegate: PasswordViewDelegate?
+    
+    //密码最大长度
+    var maxLength: Int = 6
+    
+    var hasText: Bool {
+        return text.length > 0
+    }
+    
+    func insertText(_ text: String) {
+        if self.text.length < maxLength {
+            self.text.append(text)
+            delegate?.passwordView?(textChanged: self.text as String, length: self.text.length)
+            setNeedsDisplay()
+            if self.text.length == maxLength {
+                self.resignFirstResponder()
+                delegate?.passwordView(textFinished: self.text as String)
+            }
+        }
+    }
+    
+    func deleteBackward() {
+        if self.text.length > 0 {
+            self.text.deleteCharacters(in: NSRange(location: text.length - 1, length: 1))
+            delegate?.passwordView?(textChanged: self.text as String, length: self.text.length)
+            setNeedsDisplay()
+        }
+    }
+    
+    override func draw(_ rect: CGRect) {
+        guard let context = UIGraphicsGetCurrentContext() else { return }
+        let width = rect.width / CGFloat(maxLength) //每一个小格子的宽度
+        context.setStrokeColor(UIColor.lightGray.cgColor)
+        context.setLineWidth(1)
+        //外边框
+        context.stroke(rect)
+        let path = UIBezierPath()
+        //画中间分隔的竖线
+        (1..<maxLength).forEach { (index) in
+            path.move(to: CGPoint(x: rect.origin.x + CGFloat(index) * width, y: rect.origin.y))
+            path.addLine(to: CGPoint(x: rect.origin.x + CGFloat(index) * width, y: rect.origin.y + rect.height))
+        }
+        context.addPath(path.cgPath)
+        context.strokePath()
+        //画圓点
+        let pointSize = CGSize(width: width * 0.3, height: width * 0.3)
+        (0..<self.text.length).forEach { (index) in
+            let origin = CGPoint(x: rect.origin.x + CGFloat(index) * width + (width - pointSize.width) / 2, y: rect.origin.y + (rect.height - pointSize.height) / 2)
+            let pointRect = CGRect(origin: origin, size: pointSize)
+            context.fillEllipse(in: pointRect)
+        }
+    }
+    
+    //键盘的样式 (UITextInputTraits中的属性)
+    var keyboardType: UIKeyboardType {
+        get{
+            return .numberPad
+        } set{
+            
+        }
+    }
+    
+    override var canBecomeFirstResponder: Bool {
+        return true
+    }
+
+    override func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent?) {
+        if !isFirstResponder {
+            becomeFirstResponder()
+        }
+    }
+}

GeliBusinessPlatform/ViewController/代客下单（货运）/运单详情/YunDanXiangQingViewController.swift

@@ -15,7 +15,7 @@ class YunDanXiangQingViewController: BaseViewController,UITableViewDelegate,UITa
     
     @IBOutlet weak var listView: UITableView!
     @IBOutlet weak var btmView: UIView!
-    let btnTitleArr = ["1","2","3"]
+    let btnTitleArr = ["支付运费","2","3"]
     override func viewDidLoad() {
         super.viewDidLoad()
         navbar.title = "运单详情"
@@ -75,6 +75,9 @@ class YunDanXiangQingViewController: BaseViewController,UITableViewDelegate,UITa
     }
     @objc func btnClick(sender:UIButton){
         print(sender.tag)
+        if sender.titleLabel!.text == "支付运费" {
+            
+        }
         let vc = WuLiuGenZongViewController()
         self.navigationController?.pushViewController(vc, animated: true)
     }

GeliBusinessPlatform/ViewController/货拉拉/收发货地址/ToAndFormSelectViewController.swift

@@ -60,18 +60,18 @@ class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLo
         IQKeyboardManager.shared.resignFirstResponder()
     }
     
-    @IBOutlet weak var rightBtn: UIButton!
+    
     @IBOutlet weak var leftBtn: UIButton!
     @IBAction func listViewRefresh(_ sender: UIButton) {
-        if sender == leftBtn {
-            leftBtn.isSelected = true
-            rightBtn.isSelected = false
-            lineX.constant = 0
-        }else{
-            leftBtn.isSelected = false
-            rightBtn.isSelected = true
-            lineX.constant = fullScreenWidth * 0.5
-        }
+//        if sender == leftBtn {
+//            leftBtn.isSelected = true
+//            rightBtn.isSelected = false
+//            lineX.constant = 0
+//        }else{
+//            leftBtn.isSelected = false
+//            rightBtn.isSelected = true
+//            lineX.constant = fullScreenWidth * 0.5
+//        }
     }
     @IBOutlet weak var listViewBG: UIView!
     

GeliBusinessPlatform/ViewController/货拉拉/调整地址/TestViewController.swift

@@ -32,8 +32,6 @@ UITableViewDataSource,UIGestureRecognizerDelegate {
         self.tableView!.setEditing(true, animated:true)
         self.tableView!.separatorStyle = .none
 
-
-        
     }
     
     //在本例中，只有一个分区

GeliBusinessPlatform/ViewController/货拉拉/运单详情/cell/HLLTopCell.swift

@@ -40,10 +40,8 @@ class HLLTopCell: UITableViewCell,UIScrollViewDelegate {
         if scrollView.contentOffset.x/scViewBg.bounds.size.width <= 0 {
             leftBtn.isHidden = true
         }
-        var num = datas.count-1
-        if num > 4 {
-             num = 4
-        }
+        let num = datas.count - 1
+    
         if scrollView.contentOffset.x/scViewBg.bounds.size.width >= CGFloat(num) {
             rightBtn.isHidden = true
         }
@@ -78,10 +76,7 @@ class HLLTopCell: UITableViewCell,UIScrollViewDelegate {
         scrollView?.showsHorizontalScrollIndicator = false
         scrollView?.delegate = self
         
-        var num = datas.count - 1
-        if num > 5 {
-            num = 5
-        }
+        var num = datas.count
         scrollView?.contentSize = CGSize(width: (scViewBg.bounds.size.width) * CGFloat(num), height: (scViewBg.bounds.size.height))
         
         for i in 0 ..< num{