自定义支付View

RainbowPlanet/RainbowPlanet.xcodeproj/project.pbxproj

@@ -251,6 +251,7 @@
 		BD20F1D32283D0ED00677D8E /* ShoppingCartPaySuccessCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD20F1D22283D0ED00677D8E /* ShoppingCartPaySuccessCell.swift */; };
 		BD20F1D52283D15500677D8E /* ShoppingCartPayFailureCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD20F1D42283D15500677D8E /* ShoppingCartPayFailureCell.swift */; };
 		BD20F1D82283D2AA00677D8E /* ShoppingCartModule.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = BD20F1D72283D2AA00677D8E /* ShoppingCartModule.xcassets */; };
+		BD3474F522857B85000908C5 /* CommonPayHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD3474F422857B85000908C5 /* CommonPayHeader.swift */; };
 		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 */; };
@@ -264,6 +265,8 @@
 		BDD4FB1722840DD3006FE833 /* OrderPayAcountView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDD4FB1622840DD3006FE833 /* OrderPayAcountView.swift */; };
 		BDE3045D22851E4F001D050F /* ProductCartListModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDE3045C22851E4F001D050F /* ProductCartListModel.swift */; };
 		BDE3045F228554CA001D050F /* ProductCartAmountModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDE3045E228554CA001D050F /* ProductCartAmountModel.swift */; };
+		BDEF7791228571DC00ED0AC0 /* CommonPayView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDEF7790228571DC00ED0AC0 /* CommonPayView.swift */; };
+		BDEF7793228575A800ED0AC0 /* CommonPayCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDEF7792228575A800ED0AC0 /* CommonPayCell.swift */; };
 		BDF47D7A228271F600941AB9 /* ShoppingCartView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDF47D79228271F600941AB9 /* ShoppingCartView.swift */; };
 		BDF47D7E22827C3F00941AB9 /* ProductSlidingTopBottomCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDF47D7D22827C3F00941AB9 /* ProductSlidingTopBottomCollectionViewCell.swift */; };
 		BDF47D80228288F900941AB9 /* ShoppingCartAccountView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDF47D7F228288F900941AB9 /* ShoppingCartAccountView.swift */; };
@@ -549,6 +552,7 @@
 		BD20F1D22283D0ED00677D8E /* ShoppingCartPaySuccessCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShoppingCartPaySuccessCell.swift; sourceTree = "<group>"; };
 		BD20F1D42283D15500677D8E /* ShoppingCartPayFailureCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShoppingCartPayFailureCell.swift; sourceTree = "<group>"; };
 		BD20F1D72283D2AA00677D8E /* ShoppingCartModule.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = ShoppingCartModule.xcassets; sourceTree = "<group>"; };
+		BD3474F422857B85000908C5 /* CommonPayHeader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommonPayHeader.swift; sourceTree = "<group>"; };
 		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>"; };
@@ -563,6 +567,8 @@
 		BDD4FB1622840DD3006FE833 /* OrderPayAcountView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrderPayAcountView.swift; sourceTree = "<group>"; };
 		BDE3045C22851E4F001D050F /* ProductCartListModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProductCartListModel.swift; sourceTree = "<group>"; };
 		BDE3045E228554CA001D050F /* ProductCartAmountModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProductCartAmountModel.swift; sourceTree = "<group>"; };
+		BDEF7790228571DC00ED0AC0 /* CommonPayView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommonPayView.swift; sourceTree = "<group>"; };
+		BDEF7792228575A800ED0AC0 /* CommonPayCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommonPayCell.swift; sourceTree = "<group>"; };
 		BDF47D79228271F600941AB9 /* ShoppingCartView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShoppingCartView.swift; sourceTree = "<group>"; };
 		BDF47D7D22827C3F00941AB9 /* ProductSlidingTopBottomCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProductSlidingTopBottomCollectionViewCell.swift; sourceTree = "<group>"; };
 		BDF47D7F228288F900941AB9 /* ShoppingCartAccountView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShoppingCartAccountView.swift; sourceTree = "<group>"; };
@@ -1107,6 +1113,7 @@
 		A72A730522321F1D00B21995 /* PayManager */ = {
 			isa = PBXGroup;
 			children = (
+				BDEF778F228571C200ED0AC0 /* PayManagerView */,
 				A72A7331223256D700B21995 /* PayManager */,
 				A72A730622321F2900B21995 /* AlipayManager */,
 				A72A730722321F3700B21995 /* WeChatpayManager */,
@@ -2216,6 +2223,16 @@
 			path = ShoppingCartOrderPay;
 			sourceTree = "<group>";
 		};
+		BDEF778F228571C200ED0AC0 /* PayManagerView */ = {
+			isa = PBXGroup;
+			children = (
+				BDEF7790228571DC00ED0AC0 /* CommonPayView.swift */,
+				BD3474F422857B85000908C5 /* CommonPayHeader.swift */,
+				BDEF7792228575A800ED0AC0 /* CommonPayCell.swift */,
+			);
+			path = PayManagerView;
+			sourceTree = "<group>";
+		};
 		BDF47D782282645900941AB9 /* View */ = {
 			isa = PBXGroup;
 			children = (
@@ -2638,6 +2655,7 @@
 				A7824B042271F10300ABA381 /* EditSelfMentionContactsView.swift in Sources */,
 				A7A98E332280272A005306E9 /* ShoppingMallBannerTableViewCell.swift in Sources */,
 				A7B4E754228278320012914A /* ShoppingMallFloorTableViewCell.swift in Sources */,
+				BD3474F522857B85000908C5 /* CommonPayHeader.swift in Sources */,
 				A71AF0B6226EF99A001730FE /* SearchResultViewController.swift in Sources */,
 				A757C9302274839900226355 /* SelfMentionAddressListModel.swift in Sources */,
 				A72A72D522321E2700B21995 /* ColorMacro.swift in Sources */,
@@ -2649,6 +2667,7 @@
 				BDF47D80228288F900941AB9 /* ShoppingCartAccountView.swift in Sources */,
 				A7284401224DBB7700F82F30 /* SwiftMoyaNetWorkServiceUser.swift in Sources */,
 				A7B4E728228160BA0012914A /* ShoppingMallRightSideleftPictureCollectionViewCell.swift in Sources */,
+				BDEF7793228575A800ED0AC0 /* CommonPayCell.swift in Sources */,
 				A72843FC224DB6B800F82F30 /* SwiftMoyaServiceUserApi.swift in Sources */,
 				A7CC750622714306003C4F38 /* MessageNoticeHeaderCollectionReusableView.swift in Sources */,
 				A7C3DD1A226422BF00FA262E /* SwiftMoyaServiceSMSApi.swift in Sources */,
@@ -2752,6 +2771,7 @@
 				A7A98DFD227E84F4005306E9 /* SwiftMoyaServiceProductApi.swift in Sources */,
 				BD7AB8452284398A0030646A /* OrderPaySelfPickAddInfoCell.swift in Sources */,
 				A72A72D222321E2700B21995 /* Common.swift in Sources */,
+				BDEF7791228571DC00ED0AC0 /* CommonPayView.swift in Sources */,
 				A71AF0A6226EDDC8001730FE /* SearchViewController.swift in Sources */,
 				BD20F1CF2283CE2300677D8E /* ShoppingCartFinishPayView.swift in Sources */,
 				A7A98E4322804851005306E9 /* ShoppingMallSepcialFlowLayout.swift in Sources */,

RainbowPlanet/RainbowPlanet/Manager/PayManager/PayManagerView/CommonPayCell.swift

@@ -0,0 +1,83 @@
+//
+//  CommonPayCell.swift
+//  RainbowPlanet
+//
+//  Created by Christopher on 2019/5/10.
+//  Copyright © 2019 RainbowPlanet. All rights reserved.
+//
+
+import UIKit
+
+class CommonPayCell: UITableViewCell {
+    
+    var iconImageView: UIImageView = {
+        let iconImageView = UIImageView()
+        return iconImageView
+    }()
+    
+    var titleLabel: UILabel = {
+        let titleLabel = UILabel()
+        titleLabel.textColor = k333333Color
+        titleLabel.font = kRegularFont14
+        titleLabel.textAlignment = .left
+        return titleLabel
+    }()
+    
+    var statusImageView: UIImageView = {
+        let statusImageView = UIImageView()
+        return statusImageView
+    }()
+    
+    class func cellWith(tableView:UITableView,indexPath:IndexPath) -> CommonPayCell {
+        let ID = "CommonPayCell"
+        tableView.register(CommonPayCell.self, forCellReuseIdentifier: ID)
+        let cell : CommonPayCell = tableView.dequeueReusableCell(withIdentifier: ID, for: indexPath) as! CommonPayCell
+        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(iconImageView)
+        addSubview(titleLabel)
+        addSubview(statusImageView)
+    }
+    
+    private func setupLayouts() {
+        iconImageView.snp.makeConstraints { (make) in
+            make.left.equalToSuperview().offset(20)
+            make.width.height.equalTo(20)
+            make.centerY.equalToSuperview()
+        }
+        titleLabel.snp.makeConstraints { (make) in
+            make.left.equalTo(iconImageView.snp_right).offset(10)
+            make.height.equalTo(20)
+            make.centerY.equalToSuperview()
+        }
+        statusImageView.snp.makeConstraints { (make) in
+            make.right.equalToSuperview().offset(-20)
+            make.width.height.equalTo(18)
+            make.centerY.equalToSuperview()
+        }
+        
+    }
+    
+}

RainbowPlanet/RainbowPlanet/Manager/PayManager/PayManagerView/CommonPayHeader.swift

@@ -0,0 +1,60 @@
+//
+//  CommonPayHeader.swift
+//  RainbowPlanet
+//
+//  Created by Christopher on 2019/5/10.
+//  Copyright © 2019 RainbowPlanet. All rights reserved.
+//
+
+import UIKit
+import RxSwift
+import RxCocoa
+
+class CommonPayHeader: BaseView {
+    
+    var payAmount: Int? {
+        didSet {
+            titleLabel.text = "支付金额¥\(payAmount ?? 0)"
+        }
+    }
+    
+    override func setupViews() {
+        self.backgroundColor = kffffffColor
+        addSubview(dismissBtn)
+        addSubview(titleLabel)
+    }
+    
+    override func setupLayouts() {
+        dismissBtn.snp.makeConstraints { (make) in
+            make.left.equalTo(15)
+            make.width.height.equalTo(28)
+            make.centerY.equalToSuperview()
+        }
+        titleLabel.snp.makeConstraints { (make) in
+            make.height.equalTo(25)
+            make.center.equalToSuperview()
+        }
+    }
+    
+    private lazy var dismissBtn: UIButton = {
+        let dismissBtn = UIButton(type: UIButton.ButtonType.custom)
+        dismissBtn.setImage(kImage(name: "common_order_close"), for: .normal)
+        dismissBtn.rx.tap.subscribe(onNext: { [weak self] (data) in
+            
+            //            if let loginBlock = self?.loginBlock {
+            //                loginBlock((self?.phoneNumber)!,(self?.password)!)
+            //            }
+            print("点击了关闭支付弹窗")
+            
+        }).disposed(by: disposeBag)
+        return dismissBtn
+    }()
+    
+    private lazy var titleLabel: UILabel = {
+        let titleLabel = UILabel()
+        titleLabel.textColor = k333333Color
+        titleLabel.font = kRegularFont18
+        return titleLabel
+    }()
+    
+}

RainbowPlanet/RainbowPlanet/Manager/PayManager/PayManagerView/CommonPayView.swift

@@ -0,0 +1,146 @@
+//
+//  CommonPayView.swift
+//  RainbowPlanet
+//
+//  Created by Christopher on 2019/5/10.
+//  Copyright © 2019 RainbowPlanet. All rights reserved.
+//  支付View
+
+import UIKit
+import FWPopupView
+import RxSwift
+import RxCocoa
+
+enum PayType {
+    case wechatPay
+    case aliPay
+}
+
+class CommonPayView: FWPopupView {
+    
+    let disposeBag = DisposeBag()
+    
+    var curPayType : PayType = PayType.wechatPay
+    
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        
+        self.backgroundColor = kf7f8faColor
+        addSubview(confirmPayBtn)
+        addSubview(tableView)
+        
+        setupLayouts()
+    }
+    
+    required init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    func setupLayouts() {
+        confirmPayBtn.snp.makeConstraints { (make) in
+            make.left.right.equalToSuperview()
+            make.bottom.equalTo(-kSafeTabBarHeight)
+            make.height.equalTo(50)
+        }
+        tableView.snp.makeConstraints { (make) in
+            make.left.right.top.equalToSuperview()
+            make.bottom.equalTo(confirmPayBtn.snp_top).offset(-20)
+        }
+    }
+    
+    lazy var tableView: UITableView = {
+        let tableView = UITableView(frame: CGRect.zero, style: UITableView.Style.grouped)
+        tableView.separatorStyle = .none
+        tableView.backgroundColor = kf7f8faColor
+        tableView.dataSource = self
+        tableView.delegate = self
+        tableView.estimatedRowHeight = 0.000001
+        tableView.estimatedSectionFooterHeight = 0.000001
+        tableView.estimatedSectionHeaderHeight = 0.000001
+        return tableView
+    }()
+    
+    private lazy var confirmPayBtn: UIButton = {
+        let confirmPayBtn = UIButton(type: UIButton.ButtonType.custom)
+        confirmPayBtn.backgroundColor = kFFA42FColor
+        confirmPayBtn.setTitle("确认支付", for: UIControl.State.normal)
+        confirmPayBtn.setTitleColor(kffffffColor, for: UIControl.State.normal)
+        confirmPayBtn.titleLabel?.font = kScaleRegularFont16
+        confirmPayBtn.rx.tap.subscribe(onNext: { [weak self] (data) in
+            
+            print("点击--确认支付")
+        }).disposed(by: disposeBag)
+        return confirmPayBtn
+    }()
+    
+}
+
+extension CommonPayView : UITableViewDelegate, UITableViewDataSource {
+    
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return 2
+    }
+    
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        switch indexPath.row {
+        case 0:
+            let cell = CommonPayCell.cellWith(tableView: tableView, indexPath: indexPath)
+            cell.titleLabel.text = "微信"
+            cell.iconImageView.image = kImage(name: "common_pay_wechat")
+            
+            if (curPayType == PayType.wechatPay) {
+                cell.statusImageView.image = kImage(name: "common_check_icon")
+            } else {
+                cell.statusImageView.image = kImage(name: "common_uncheck_icon")
+            }
+            
+            return cell
+        case 1:
+            let cell = CommonPayCell.cellWith(tableView: tableView, indexPath: indexPath)
+            cell.titleLabel.text = "支付宝"
+            cell.iconImageView.image = kImage(name: "common_pay_alipay")
+            
+            if (curPayType == PayType.aliPay) {
+                cell.statusImageView.image = kImage(name: "common_check_icon")
+            } else {
+                cell.statusImageView.image = kImage(name: "common_uncheck_icon")
+            }
+            
+            return cell
+            
+        default:
+            return UITableViewCell()
+        }
+    }
+    
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        if indexPath.row == 0 {
+            curPayType = PayType.wechatPay
+        } else {
+            curPayType = PayType.aliPay
+        }
+        tableView.reloadData()
+    }
+    
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        return 48
+    }
+    
+    func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
+        return 50
+    }
+    
+    func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
+        let headerView = CommonPayHeader(frame: CGRect(x: 0, y: 0, width: kScreenWidth, height: 50))
+        headerView.payAmount = 155
+        return headerView
+    }
+    
+    func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
+        return 0.000001
+    }
+    func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
+        return nil
+    }
+    
+}

RainbowPlanet/RainbowPlanet/Modules/MineModule/AddressManager/View/AddressManagerExpressTableViewCell.swift

@@ -112,8 +112,8 @@ class AddressManagerExpressTableViewCell: UITableViewCell {
     
     private lazy var selectedButton: UIButton = {
         let selectedButton = UIButton(type: UIButton.ButtonType.custom)
-        selectedButton.setImage(kImage(name: "my_address_uncheck"), for: UIControl.State.normal)
-        selectedButton.setImage(kImage(name: "my_address_check"), for: UIControl.State.selected)
+        selectedButton.setImage(kImage(name: "common_uncheck_icon"), for: UIControl.State.normal)
+        selectedButton.setImage(kImage(name: "common_check_icon"), for: UIControl.State.selected)
         return selectedButton
     }()
     

RainbowPlanet/RainbowPlanet/Modules/MineModule/AddressManager/View/AddressManagerSelfMentionTableViewCell.swift

@@ -62,8 +62,8 @@ class AddressManagerSelfMentionTableViewCell: UITableViewCell {
     
     private lazy var selectedButton: UIButton = {
         let selectedButton = UIButton(type: UIButton.ButtonType.custom)
-        selectedButton.setImage(kImage(name: "my_address_uncheck"), for: UIControl.State.normal)
-        selectedButton.setImage(kImage(name: "my_address_check"), for: UIControl.State.selected)
+        selectedButton.setImage(kImage(name: "common_uncheck_icon"), for: UIControl.State.normal)
+        selectedButton.setImage(kImage(name: "common_check_icon"), for: UIControl.State.selected)
         return selectedButton
     }()
     

RainbowPlanet/RainbowPlanet/Modules/MineModule/ExpressAddressList/View/ExpressAddressListTableViewCell.swift

@@ -173,8 +173,8 @@ class ExpressAddressListTableViewCell: UITableViewCell {
     
     private lazy var selectedButton: UIButton = {
         let selectedButton = UIButton(type: UIButton.ButtonType.custom)
-        selectedButton.setImage(kImage(name: "my_address_uncheck"), for: UIControl.State.normal)
-        selectedButton.setImage(kImage(name: "my_address_check"), for: UIControl.State.selected)
+        selectedButton.setImage(kImage(name: "common_uncheck_icon"), for: UIControl.State.normal)
+        selectedButton.setImage(kImage(name: "common_check_icon"), for: UIControl.State.selected)
         return selectedButton
     }()
     

RainbowPlanet/RainbowPlanet/Modules/MineModule/SelfMentionContactsList/View/SelfMentionContactsListTableViewCell.swift

@@ -99,8 +99,8 @@ class SelfMentionContactsListTableViewCell: UITableViewCell {
     
     private lazy var setDefalutButton: UIButton = {
         let setDefalutButton = UIButton(type: UIButton.ButtonType.custom)
-        setDefalutButton.setImage(kImage(name: "my_address_uncheck"), for: UIControl.State.normal)
-        setDefalutButton.setImage(kImage(name: "my_address_check"), for: UIControl.State.selected)
+        setDefalutButton.setImage(kImage(name: "common_uncheck_icon"), for: UIControl.State.normal)
+        setDefalutButton.setImage(kImage(name: "common_check_icon"), for: UIControl.State.selected)
         return setDefalutButton
     }()
     

RainbowPlanet/RainbowPlanet/Modules/ShoppingCartModule/ShoppingCart/View/ShoppingCartList/ShoppingCartListTableViewCell.swift

@@ -125,8 +125,8 @@ class ShoppingCartListTableViewCell: UITableViewCell {
     
     private lazy var selectedButton: UIButton = {
         let selectedButton = UIButton(type: UIButton.ButtonType.custom)
-        selectedButton.setImage(kImage(name: "my_address_uncheck"), for: UIControl.State.normal)
-        selectedButton.setImage(kImage(name: "my_address_check"), for: UIControl.State.selected)
+        selectedButton.setImage(kImage(name: "common_uncheck_icon"), for: UIControl.State.normal)
+        selectedButton.setImage(kImage(name: "common_check_icon"), for: UIControl.State.selected)
         return selectedButton
     }()
 

RainbowPlanet/RainbowPlanet/Supporting Files/Assets.xcassets/CommonIcon/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

RainbowPlanet/RainbowPlanet/Supporting Files/MineModule.xcassets/my_address_check.imageset/Contents.json

@@ -2,17 +2,16 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "my_address_check.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "my_address_check@2x.png",
+      "filename" : "common_check_icon@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "my_address_check@3x.png",
+      "filename" : "common_check_icon@3x.png",
       "scale" : "3x"
     }
   ],

RainbowPlanet/RainbowPlanet/Supporting Files/MineModule.xcassets/my_address_uncheck.imageset/Contents.json

@@ -2,17 +2,16 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "my_address_uncheck.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "my_address_uncheck@2x.png",
+      "filename" : "common_order_close@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "my_address_uncheck@3x.png",
+      "filename" : "common_order_close@3x.png",
       "scale" : "3x"
     }
   ],

RainbowPlanet/RainbowPlanet/Supporting Files/Assets.xcassets/CommonIcon/common_pay_alipay.imageset/Contents.json

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

RainbowPlanet/RainbowPlanet/Supporting Files/Assets.xcassets/CommonIcon/common_pay_wechat.imageset/Contents.json

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

RainbowPlanet/RainbowPlanet/Supporting Files/Assets.xcassets/CommonIcon/common_uncheck_icon.imageset/Contents.json

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

RainbowPlanet/RainbowPlanet/Tools/AlertSheetView/AlertSheetView.swift

@@ -90,4 +90,25 @@ class AlertSheetView: NSObject {
         }
     }
     
+    /// 自定义支付View
+    class func payAlertSheetView(sureClosure:@escaping () -> Void) {
+        let payView = CommonPayView(frame: CGRect(x: 0, y: 0, width: UIScreen.main.bounds.width, height: kSafeTabBarHeight + 300))
+        
+        let vProperty = FWPopupViewProperty()
+        vProperty.popupCustomAlignment = .bottomCenter
+        vProperty.popupAnimationType = .frame
+        vProperty.maskViewColor = UIColor(white: 0, alpha: 0.5)
+        vProperty.touchWildToHide = "1"
+        vProperty.popupViewEdgeInsets = UIEdgeInsets(top: 0, left: 0, bottom: 0, right: 0)
+        vProperty.animationDuration = 0.5
+        payView.vProperty = vProperty
+        payView.show()
+//        payView.sureClosure = {
+//            () in
+//            payView.hide(popupDidDisappearBlock: { (popupView) in
+//                sureClosure(province, city,area)
+//            })
+//        }
+    }
+    
 }