订单支付--View

RainbowPlanet/RainbowPlanet.xcodeproj/project.pbxproj

@@ -251,6 +251,11 @@
 		BD7AB83622841A8B0030646A /* ShoppingCartPayOrderItemCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD7AB83522841A8B0030646A /* ShoppingCartPayOrderItemCell.swift */; };
 		BD7AB838228420310030646A /* ShoppingCartPayOrderHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD7AB837228420310030646A /* ShoppingCartPayOrderHeader.swift */; };
 		BD7AB83A2284288D0030646A /* ShoppingCartPayOrderFooter.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD7AB8392284288D0030646A /* ShoppingCartPayOrderFooter.swift */; };
+		BD7AB83D228438020030646A /* OrderPayExpressInfoShowCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD7AB83C228438020030646A /* OrderPayExpressInfoShowCell.swift */; };
+		BD7AB83F228438290030646A /* OrderPayExpressAddInfoCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD7AB83E228438290030646A /* OrderPayExpressAddInfoCell.swift */; };
+		BD7AB841228438C80030646A /* OrderPaySelfPickAddressCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD7AB840228438C80030646A /* OrderPaySelfPickAddressCell.swift */; };
+		BD7AB8432284390B0030646A /* OrderPaySelfPickInfoCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD7AB8422284390B0030646A /* OrderPaySelfPickInfoCell.swift */; };
+		BD7AB8452284398A0030646A /* OrderPaySelfPickAddInfoCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD7AB8442284398A0030646A /* OrderPaySelfPickAddInfoCell.swift */; };
 		BDD4FB1222840597006FE833 /* ShoppingCartPayOrderController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDD4FB1122840597006FE833 /* ShoppingCartPayOrderController.swift */; };
 		BDD4FB1422840954006FE833 /* ShoppingCartOrderPayView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDD4FB1322840954006FE833 /* ShoppingCartOrderPayView.swift */; };
 		BDD4FB1722840DD3006FE833 /* OrderPayAcountView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDD4FB1622840DD3006FE833 /* OrderPayAcountView.swift */; };
@@ -539,6 +544,11 @@
 		BD7AB83522841A8B0030646A /* ShoppingCartPayOrderItemCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShoppingCartPayOrderItemCell.swift; sourceTree = "<group>"; };
 		BD7AB837228420310030646A /* ShoppingCartPayOrderHeader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShoppingCartPayOrderHeader.swift; sourceTree = "<group>"; };
 		BD7AB8392284288D0030646A /* ShoppingCartPayOrderFooter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShoppingCartPayOrderFooter.swift; sourceTree = "<group>"; };
+		BD7AB83C228438020030646A /* OrderPayExpressInfoShowCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrderPayExpressInfoShowCell.swift; sourceTree = "<group>"; };
+		BD7AB83E228438290030646A /* OrderPayExpressAddInfoCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrderPayExpressAddInfoCell.swift; sourceTree = "<group>"; };
+		BD7AB840228438C80030646A /* OrderPaySelfPickAddressCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrderPaySelfPickAddressCell.swift; sourceTree = "<group>"; };
+		BD7AB8422284390B0030646A /* OrderPaySelfPickInfoCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrderPaySelfPickInfoCell.swift; sourceTree = "<group>"; };
+		BD7AB8442284398A0030646A /* OrderPaySelfPickAddInfoCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrderPaySelfPickAddInfoCell.swift; sourceTree = "<group>"; };
 		BD9052C044FD3AE4E62D3929 /* Pods-RainbowPlanet.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RainbowPlanet.debug.xcconfig"; path = "Pods/Target Support Files/Pods-RainbowPlanet/Pods-RainbowPlanet.debug.xcconfig"; sourceTree = "<group>"; };
 		BDD4FB1122840597006FE833 /* ShoppingCartPayOrderController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShoppingCartPayOrderController.swift; sourceTree = "<group>"; };
 		BDD4FB1322840954006FE833 /* ShoppingCartOrderPayView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShoppingCartOrderPayView.swift; sourceTree = "<group>"; };
@@ -2152,9 +2162,22 @@
 			path = ShoppingCartFinishPay;
 			sourceTree = "<group>";
 		};
+		BD7AB83B228437940030646A /* AdressCell */ = {
+			isa = PBXGroup;
+			children = (
+				BD7AB83C228438020030646A /* OrderPayExpressInfoShowCell.swift */,
+				BD7AB83E228438290030646A /* OrderPayExpressAddInfoCell.swift */,
+				BD7AB8442284398A0030646A /* OrderPaySelfPickAddInfoCell.swift */,
+				BD7AB840228438C80030646A /* OrderPaySelfPickAddressCell.swift */,
+				BD7AB8422284390B0030646A /* OrderPaySelfPickInfoCell.swift */,
+			);
+			path = AdressCell;
+			sourceTree = "<group>";
+		};
 		BDD4FB1522840A69006FE833 /* ShoppingCartOrderPay */ = {
 			isa = PBXGroup;
 			children = (
+				BD7AB83B228437940030646A /* AdressCell */,
 				BD7AB837228420310030646A /* ShoppingCartPayOrderHeader.swift */,
 				BD7AB8392284288D0030646A /* ShoppingCartPayOrderFooter.swift */,
 				BD7AB83522841A8B0030646A /* ShoppingCartPayOrderItemCell.swift */,
@@ -2511,9 +2534,11 @@
 				A72A72BE22321DE000B21995 /* Extension+RxTimer.swift in Sources */,
 				A7CC74EA22706ACD003C4F38 /* MessageViewController.swift in Sources */,
 				BDF47D7E22827C3F00941AB9 /* ProductSlidingTopBottomCollectionViewCell.swift in Sources */,
+				BD7AB83D228438020030646A /* OrderPayExpressInfoShowCell.swift in Sources */,
 				A72A72C422321DE000B21995 /* Extension+CAGradientLayer.swift in Sources */,
 				A7778CA72243A05400C7C47A /* IQKeyboardManagerSwiftManager.swift in Sources */,
 				A7B4E738228191CC0012914A /* CommondModel.swift in Sources */,
+				BD7AB841228438C80030646A /* OrderPaySelfPickAddressCell.swift in Sources */,
 				A7CC74D4226FF1AA003C4F38 /* MineView.swift in Sources */,
 				A71AA5152272160A008FF1A5 /* ExpressAddressListTableViewCell.swift in Sources */,
 				A72A72B722321DE000B21995 /* Extension+NSMutableAttributedString.swift in Sources */,
@@ -2556,6 +2581,7 @@
 				A71AA51F22729F35008FF1A5 /* AuthorizationSwift.swift in Sources */,
 				A7A98E3622802AD7005306E9 /* ShoppingMallBannerFSPagerViewCell.swift in Sources */,
 				A7824AFD2271EAC900ABA381 /* SelfMentionContactsListTableViewCell.swift in Sources */,
+				BD7AB83F228438290030646A /* OrderPayExpressAddInfoCell.swift in Sources */,
 				A7CC74DA22702E41003C4F38 /* MineOrderTableViewCell.swift in Sources */,
 				A77F2CB92232010F001BD3F6 /* ShoppingCartViewController.swift in Sources */,
 				A72A72B822321DE000B21995 /* Extension+UserDefaults.swift in Sources */,
@@ -2627,6 +2653,7 @@
 				A7A98E02227E8900005306E9 /* ProductSearchListModel.swift in Sources */,
 				A7A98E17227EED76005306E9 /* SpecialViewController.swift in Sources */,
 				A7778CB32244D73400C7C47A /* RegisterLoginViewController.swift in Sources */,
+				BD7AB8432284390B0030646A /* OrderPaySelfPickInfoCell.swift in Sources */,
 				A7CC752F2271A1F2003C4F38 /* SetPasswordView.swift in Sources */,
 				A7A98E09227EB8DD005306E9 /* CategoryView.swift in Sources */,
 				A7CC75362271AC14003C4F38 /* AddressManagerView.swift in Sources */,
@@ -2688,6 +2715,7 @@
 				A72A726722321DBD00B21995 /* LocationModel.swift in Sources */,
 				A7A98E10227EC531005306E9 /* ProductHSmallTableViewCell.swift in Sources */,
 				A7A98DFD227E84F4005306E9 /* SwiftMoyaServiceProductApi.swift in Sources */,
+				BD7AB8452284398A0030646A /* OrderPaySelfPickAddInfoCell.swift in Sources */,
 				A72A72D222321E2700B21995 /* Common.swift in Sources */,
 				A71AF0A6226EDDC8001730FE /* SearchViewController.swift in Sources */,
 				BD20F1CF2283CE2300677D8E /* ShoppingCartFinishPayView.swift in Sources */,

RainbowPlanet/RainbowPlanet/Macro/ColorMacro.swift

@@ -105,3 +105,5 @@ let kFE5706Color = UIColor(hexString: "FE5706")
 let kFFF1EBColor = UIColor(hexString: "FFF1EB")
 
 let kD2D3D5Color = UIColor(hexString: "D2D3D5")
+
+let kfee5e4Color = UIColor(hexString: "fee5e4")

RainbowPlanet/RainbowPlanet/Modules/ShoppingCartModule/ShoppingCart/View/ShoppingCartOrderPay/AdressCell/OrderPayExpressAddInfoCell.swift

@@ -0,0 +1,107 @@
+//
+//  OrderPayExpressAddInfoCell.swift
+//  RainbowPlanet
+//
+//  Created by Christopher on 2019/5/9.
+//  Copyright © 2019 RainbowPlanet. All rights reserved.
+//  订单支付--添加快递信息Cell
+
+import UIKit
+
+class OrderPayExpressAddInfoCell: UITableViewCell {
+    
+    override var frame: CGRect {
+        get {
+            return super.frame
+        }
+        set {
+            var frame = newValue
+            frame.origin.x += 14 * kScaleWidth
+            frame.size.width -= 14 * kScaleWidth * 2
+            super.frame = frame
+        }
+    }
+    
+    class func cellWith(tableView:UITableView,indexPath:IndexPath) -> OrderPayExpressAddInfoCell {
+        let ID = "OrderPayExpressAddInfoCell"
+        tableView.register(OrderPayExpressAddInfoCell.self, forCellReuseIdentifier: ID)
+        let cell : OrderPayExpressAddInfoCell = tableView.dequeueReusableCell(withIdentifier: ID, for: indexPath) as! OrderPayExpressAddInfoCell
+        cell.indexPath = indexPath
+        return cell
+    }
+    
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        setupViews()
+        setupLayouts()
+    }
+    
+    required init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    var indexPath: IndexPath? {
+        didSet {
+            
+        }
+    }
+    //MRAK: - 设置View
+    private func setupViews() {
+        self.selectionStyle = .none
+        addSubview(plusImageView)
+        addSubview(titleLabel)
+        addSubview(arrowImageView)
+        addSubview(sepLineImageView)
+    }
+    
+    private func setupLayouts() {
+        plusImageView.snp.makeConstraints { (make) in
+            make.left.equalTo(14)
+            make.width.height.equalTo(18)
+            make.top.equalToSuperview().offset(37)
+            make.bottom.equalToSuperview().offset(-38)
+        }
+        titleLabel.snp.makeConstraints { (make) in
+            make.left.equalTo(plusImageView.snp_right).offset(8)
+            make.height.equalTo(23)
+            make.centerY.equalTo(plusImageView)
+        }
+        arrowImageView.snp.makeConstraints { (make) in
+            make.centerY.equalTo(plusImageView)
+            make.right.equalTo(-14)
+            make.width.equalTo(8)
+            make.height.equalTo(14)
+        }
+        sepLineImageView.snp.makeConstraints { (make) in
+            make.left.right.bottom.equalToSuperview()
+            make.height.equalTo(1)
+        }
+    }
+    
+    private lazy var plusImageView: UIImageView = {
+        let plusImageView = UIImageView()
+        plusImageView.image = kImage(name: "my_address_add")
+        return plusImageView
+    }()
+    
+    private lazy var titleLabel: UILabel = {
+        let titleLabel = UILabel()
+        titleLabel.text = "添加快递收货地址"
+        titleLabel.textColor = k333333Color
+        titleLabel.font = kBoldFont16
+        return titleLabel
+    }()
+    
+    private lazy var arrowImageView: UIImageView = {
+        let arrowImageView = UIImageView()
+        arrowImageView.image = kImage(name: "my_arrows_unfold")
+        return arrowImageView
+    }()
+    
+    private lazy var sepLineImageView: UIImageView = {
+        let sepLineImageView = UIImageView()
+        sepLineImageView.image = kImage(name: "orderPay_separateLine")
+        return sepLineImageView
+    }()
+    
+}

RainbowPlanet/RainbowPlanet/Modules/ShoppingCartModule/ShoppingCart/View/ShoppingCartOrderPay/AdressCell/OrderPayExpressInfoShowCell.swift

@@ -0,0 +1,144 @@
+//
+//  OrderPayExpressInfoShowCell.swift
+//  RainbowPlanet
+//
+//  Created by Christopher on 2019/5/9.
+//  Copyright © 2019 RainbowPlanet. All rights reserved.
+//  订单支付--快递信息Cell
+
+import UIKit
+
+class OrderPayExpressInfoShowCell: UITableViewCell {
+    
+    override var frame: CGRect {
+        get {
+            return super.frame
+        }
+        set {
+            var frame = newValue
+            frame.origin.x += 14 * kScaleWidth
+            frame.size.width -= 14 * kScaleWidth * 2
+            super.frame = frame
+        }
+    }
+    
+    class func cellWith(tableView:UITableView,indexPath:IndexPath) -> OrderPayExpressInfoShowCell {
+        let ID = "OrderPayExpressInfoShowCell"
+        tableView.register(OrderPayExpressInfoShowCell.self, forCellReuseIdentifier: ID)
+        let cell : OrderPayExpressInfoShowCell = tableView.dequeueReusableCell(withIdentifier: ID, for: indexPath) as! OrderPayExpressInfoShowCell
+        cell.indexPath = indexPath
+        return cell
+    }
+    
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        setupViews()
+        setupLayouts()
+    }
+    
+    required init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    var indexPath: IndexPath? {
+        didSet {
+            
+        }
+    }
+    //MRAK: - 设置View
+    private func setupViews() {
+        self.selectionStyle = .none
+        addSubview(nameLabel)
+        addSubview(phoneLabel)
+        addSubview(typeLabel)
+        addSubview(titleLabel)
+        addSubview(arrowImageView)
+        addSubview(sepLineImageView)
+    }
+    
+    private func setupLayouts() {
+        nameLabel.snp.remakeConstraints { (make) in
+            make.left.equalTo(14)
+            make.width.lessThanOrEqualTo(67)
+            make.height.equalTo(20)
+            make.top.equalToSuperview().offset(20)
+            make.bottom.equalToSuperview().offset(-50)
+        }
+        phoneLabel.snp.makeConstraints { (make) in
+            make.left.equalTo(nameLabel.snp_right).offset(10)
+            make.height.equalTo(20)
+            make.centerY.equalTo(nameLabel)
+        }
+        typeLabel.snp.makeConstraints { (make) in
+            make.top.equalTo(nameLabel.snp_bottom).offset(10)
+            make.left.equalTo(14)
+            make.width.equalTo(40)
+            make.height.equalTo(20)
+        }
+        arrowImageView.snp.makeConstraints { (make) in
+            make.centerY.equalToSuperview()
+            make.right.equalTo(-14)
+            make.width.equalTo(8)
+            make.height.equalTo(14)
+        }
+        titleLabel.snp.makeConstraints { (make) in
+            make.left.equalTo(typeLabel.snp_right).offset(4)
+            make.right.equalTo(arrowImageView.snp_left).offset(-20)
+            make.height.equalTo(20)
+            make.centerY.equalTo(typeLabel)
+        }
+        sepLineImageView.snp.makeConstraints { (make) in
+            make.left.right.bottom.equalToSuperview()
+            make.height.equalTo(1)
+        }
+    }
+    
+    private lazy var nameLabel: UILabel = {
+        let nameLabel = UILabel()
+        nameLabel.text = "范德炮"
+        nameLabel.textColor = k333333Color
+        nameLabel.font = kBoldFont16
+        return nameLabel
+    }()
+    
+    private lazy var phoneLabel: UILabel = {
+        let phoneLabel = UILabel()
+        phoneLabel.text = "158xxxx5481"
+        phoneLabel.textColor = k333333Color
+        phoneLabel.font = kBoldFont16
+        return phoneLabel
+    }()
+    
+    private lazy var typeLabel: UILabel = {
+        let typeLabel = UILabel()
+        typeLabel.text = "快递"
+        typeLabel.textAlignment = .center
+        typeLabel.backgroundColor = kfee5e4Color
+        typeLabel.textColor = kfe352bColor
+        typeLabel.font = kRegularFont13
+        typeLabel.cornerRadius = 10
+        typeLabel.masksToBounds = true
+        return typeLabel
+    }()
+    
+    private lazy var titleLabel: UILabel = {
+        let titleLabel = UILabel()
+        titleLabel.text = "西安市碑林区xxxxxx"
+        titleLabel.textColor = k666666Color
+        titleLabel.font = kRegularFont14
+        return titleLabel
+    }()
+    
+    private lazy var arrowImageView: UIImageView = {
+        let arrowImageView = UIImageView()
+        arrowImageView.image = kImage(name: "my_arrows_unfold")
+        return arrowImageView
+    }()
+    
+    private lazy var sepLineImageView: UIImageView = {
+        let sepLineImageView = UIImageView()
+        sepLineImageView.image = kImage(name: "orderPay_separateLine")
+        return sepLineImageView
+    }()
+    
+}

RainbowPlanet/RainbowPlanet/Modules/ShoppingCartModule/ShoppingCart/View/ShoppingCartOrderPay/AdressCell/OrderPaySelfPickAddInfoCell.swift

@@ -0,0 +1,96 @@
+//
+//  OrderPaySelfPickAddInfoCell.swift
+//  RainbowPlanet
+//
+//  Created by Christopher on 2019/5/9.
+//  Copyright © 2019 RainbowPlanet. All rights reserved.
+//  订单支付--自提添加收货人信息Cell
+
+import UIKit
+
+class OrderPaySelfPickAddInfoCell: UITableViewCell {
+    
+    override var frame: CGRect {
+        get {
+            return super.frame
+        }
+        set {
+            var frame = newValue
+            frame.origin.x += 14 * kScaleWidth
+            frame.size.width -= 14 * kScaleWidth * 2
+            super.frame = frame
+        }
+    }
+    
+    class func cellWith(tableView:UITableView,indexPath:IndexPath) -> OrderPaySelfPickAddInfoCell {
+        let ID = "OrderPaySelfPickAddInfoCell"
+        tableView.register(OrderPaySelfPickAddInfoCell.self, forCellReuseIdentifier: ID)
+        let cell : OrderPaySelfPickAddInfoCell = tableView.dequeueReusableCell(withIdentifier: ID, for: indexPath) as! OrderPaySelfPickAddInfoCell
+        cell.indexPath = indexPath
+        return cell
+    }
+    
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        setupViews()
+        setupLayouts()
+    }
+    
+    required init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    var indexPath: IndexPath? {
+        didSet {
+            
+        }
+    }
+    //MRAK: - 设置View
+    private func setupViews() {
+        self.selectionStyle = .none
+        addSubview(plusImageView)
+        addSubview(titleLabel)
+        addSubview(arrowImageView)
+    }
+    
+    private func setupLayouts() {
+        plusImageView.snp.makeConstraints { (make) in
+            make.left.equalTo(14)
+            make.width.height.equalTo(18)
+            make.top.equalToSuperview().offset(15)
+            make.bottom.equalToSuperview().offset(-15)
+        }
+        titleLabel.snp.makeConstraints { (make) in
+            make.left.equalTo(plusImageView.snp_right).offset(8)
+            make.height.equalTo(20)
+            make.centerY.equalTo(plusImageView)
+        }
+        arrowImageView.snp.makeConstraints { (make) in
+            make.centerY.equalTo(plusImageView)
+            make.right.equalTo(-14)
+            make.width.equalTo(8)
+            make.height.equalTo(14)
+        }
+    }
+    
+    private lazy var plusImageView: UIImageView = {
+        let plusImageView = UIImageView()
+        plusImageView.image = kImage(name: "my_address_add")
+        return plusImageView
+    }()
+    
+    private lazy var titleLabel: UILabel = {
+        let titleLabel = UILabel()
+        titleLabel.text = "添加收货人信息"
+        titleLabel.textColor = k333333Color
+        titleLabel.font = kBoldFont14
+        return titleLabel
+    }()
+    
+    private lazy var arrowImageView: UIImageView = {
+        let arrowImageView = UIImageView()
+        arrowImageView.image = kImage(name: "my_arrows_unfold")
+        return arrowImageView
+    }()
+    
+}

RainbowPlanet/RainbowPlanet/Modules/ShoppingCartModule/ShoppingCart/View/ShoppingCartOrderPay/AdressCell/OrderPaySelfPickAddressCell.swift

@@ -0,0 +1,115 @@
+//
+//  OrderPaySelfPickAddressCell.swift
+//  RainbowPlanet
+//
+//  Created by Christopher on 2019/5/9.
+//  Copyright © 2019 RainbowPlanet. All rights reserved.
+//  订单支付--自提地址信息Cell
+
+import UIKit
+
+class OrderPaySelfPickAddressCell: UITableViewCell {
+    
+    override var frame: CGRect {
+        get {
+            return super.frame
+        }
+        set {
+            var frame = newValue
+            frame.origin.x += 14 * kScaleWidth
+            frame.size.width -= 14 * kScaleWidth * 2
+            super.frame = frame
+        }
+    }
+    
+    class func cellWith(tableView:UITableView,indexPath:IndexPath) -> OrderPaySelfPickAddressCell {
+        let ID = "OrderPaySelfPickAddressCell"
+        tableView.register(OrderPaySelfPickAddressCell.self, forCellReuseIdentifier: ID)
+        let cell : OrderPaySelfPickAddressCell = tableView.dequeueReusableCell(withIdentifier: ID, for: indexPath) as! OrderPaySelfPickAddressCell
+        cell.indexPath = indexPath
+        return cell
+    }
+    
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        setupViews()
+        setupLayouts()
+    }
+    
+    required init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    var indexPath: IndexPath? {
+        didSet {
+            
+        }
+    }
+    //MRAK: - 设置View
+    private func setupViews() {
+        self.selectionStyle = .none
+        addSubview(typeLabel)
+        addSubview(titleLabel)
+        addSubview(arrowImageView)
+        addSubview(sepLineImageView)
+    }
+    
+    private func setupLayouts() {
+        typeLabel.snp.makeConstraints { (make) in
+            make.left.equalTo(14)
+            make.width.equalTo(40)
+            make.height.equalTo(20)
+            make.top.equalToSuperview().offset(14)
+            make.bottom.equalToSuperview().offset(-14)
+        }
+        arrowImageView.snp.makeConstraints { (make) in
+            make.centerY.equalTo(typeLabel)
+            make.right.equalTo(-14)
+            make.width.equalTo(8)
+            make.height.equalTo(14)
+        }
+        titleLabel.snp.makeConstraints { (make) in
+            make.left.equalTo(typeLabel.snp_right).offset(8)
+            make.right.equalTo(arrowImageView.snp_left).offset(-20)
+            make.height.equalTo(20)
+            make.centerY.equalTo(typeLabel)
+        }
+        sepLineImageView.snp.makeConstraints { (make) in
+            make.left.right.bottom.equalToSuperview()
+            make.height.equalTo(1)
+        }
+    }
+    
+    private lazy var typeLabel: UILabel = {
+        let typeLabel = UILabel()
+        typeLabel.text = "自提"
+        typeLabel.textAlignment = .center
+        typeLabel.backgroundColor = kfee5e4Color
+        typeLabel.textColor = kfe352bColor
+        typeLabel.font = kRegularFont13
+        typeLabel.cornerRadius = 10
+        typeLabel.masksToBounds = true
+        return typeLabel
+    }()
+    
+    private lazy var titleLabel: UILabel = {
+        let titleLabel = UILabel()
+        titleLabel.text = "西安市碑林区xxxxxx"
+        titleLabel.textColor = k333333Color
+        titleLabel.font = kRegularFont14
+        return titleLabel
+    }()
+    
+    private lazy var arrowImageView: UIImageView = {
+        let arrowImageView = UIImageView()
+        arrowImageView.image = kImage(name: "my_arrows_unfold")
+        return arrowImageView
+    }()
+    
+    private lazy var sepLineImageView: UIImageView = {
+        let sepLineImageView = UIImageView()
+        sepLineImageView.image = kImage(name: "orderPay_separateLine")
+        return sepLineImageView
+    }()
+    
+}

RainbowPlanet/RainbowPlanet/Modules/ShoppingCartModule/ShoppingCart/View/ShoppingCartOrderPay/AdressCell/OrderPaySelfPickInfoCell.swift

@@ -0,0 +1,99 @@
+//
+//  OrderPaySelfPickInfoCell.swift
+//  RainbowPlanet
+//
+//  Created by Christopher on 2019/5/9.
+//  Copyright © 2019 RainbowPlanet. All rights reserved.
+//  订单支付--自提个人信息Cell
+
+import UIKit
+
+class OrderPaySelfPickInfoCell: UITableViewCell {
+    
+    override var frame: CGRect {
+        get {
+            return super.frame
+        }
+        set {
+            var frame = newValue
+            frame.origin.x += 14 * kScaleWidth
+            frame.size.width -= 14 * kScaleWidth * 2
+            super.frame = frame
+        }
+    }
+    
+    class func cellWith(tableView:UITableView,indexPath:IndexPath) -> OrderPaySelfPickInfoCell {
+        let ID = "OrderPaySelfPickInfoCell"
+        tableView.register(OrderPaySelfPickInfoCell.self, forCellReuseIdentifier: ID)
+        let cell : OrderPaySelfPickInfoCell = tableView.dequeueReusableCell(withIdentifier: ID, for: indexPath) as! OrderPaySelfPickInfoCell
+        cell.indexPath = indexPath
+        return cell
+    }
+    
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        setupViews()
+        setupLayouts()
+    }
+    
+    required init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    var indexPath: IndexPath? {
+        didSet {
+            
+        }
+    }
+    //MRAK: - 设置View
+    private func setupViews() {
+        self.selectionStyle = .none
+        addSubview(nameLabel)
+        addSubview(phoneLabel)
+        addSubview(arrowImageView)
+    }
+    
+    private func setupLayouts() {
+        nameLabel.snp.remakeConstraints { (make) in
+            make.left.equalTo(14)
+            make.width.lessThanOrEqualTo(56)
+            make.height.equalTo(20)
+            make.top.equalToSuperview().offset(14)
+            make.bottom.equalToSuperview().offset(-14)
+        }
+        phoneLabel.snp.makeConstraints { (make) in
+            make.left.equalTo(nameLabel.snp_right).offset(12)
+            make.height.equalTo(20)
+            make.centerY.equalTo(nameLabel)
+        }
+        arrowImageView.snp.makeConstraints { (make) in
+            make.centerY.equalTo(nameLabel)
+            make.right.equalTo(-14)
+            make.width.equalTo(8)
+            make.height.equalTo(14)
+        }
+    }
+    
+    private lazy var nameLabel: UILabel = {
+        let nameLabel = UILabel()
+        nameLabel.text = "范德彪"
+        nameLabel.textColor = k333333Color
+        nameLabel.font = kRegularFont14
+        return nameLabel
+    }()
+    
+    private lazy var phoneLabel: UILabel = {
+        let phoneLabel = UILabel()
+        phoneLabel.text = "158xxxx5481"
+        phoneLabel.textColor = k333333Color
+        phoneLabel.font = kRegularFont14
+        return phoneLabel
+    }()
+    
+    private lazy var arrowImageView: UIImageView = {
+        let arrowImageView = UIImageView()
+        arrowImageView.image = kImage(name: "my_arrows_unfold")
+        return arrowImageView
+    }()
+    
+}

RainbowPlanet/RainbowPlanet/Modules/ShoppingCartModule/ShoppingCart/View/ShoppingCartOrderPayView.swift

@@ -66,7 +66,18 @@ extension ShoppingCartOrderPayView : UITableViewDelegate, UITableViewDataSource
     
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         if indexPath.section == 0 {
-            let cell = ShoppingCartListNoneItemCell.cellWith(tableView: tableView, indexPath: indexPath)
+            // 快递添加地址
+//            let cell = OrderPayExpressAddInfoCell.cellWith(tableView: tableView, indexPath: indexPath)
+            // 自提添加收货人信息
+//            let cell = OrderPaySelfPickAddInfoCell.cellWith(tableView: tableView, indexPath: indexPath)
+            // 自提地址信息
+//            let cell = OrderPaySelfPickAddressCell.cellWith(tableView: tableView, indexPath: indexPath)
+            // 自提个人信息
+//            let cell = OrderPaySelfPickInfoCell.cellWith(tableView: tableView, indexPath: indexPath)
+            // 快递
+            let cell = OrderPayExpressInfoShowCell.cellWith(tableView: tableView, indexPath: indexPath)
+            
+            
             return cell
             
         } else {

RainbowPlanet/RainbowPlanet/Supporting Files/ShoppingCartModule.xcassets/orderPay_separateLine.imageset/Contents.json

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