视图显示 fixed

RainbowPlanet/RainbowPlanet/Macro/ColorMacro.swift

@@ -115,3 +115,5 @@ let kfee5e4Color = UIColor(hexString: "fee5e4")
 let kccccccColor = UIColor(hexString: "cccccc")
 
 let kfafafaColor = UIColor(hexString: "fafafa")
+
+let kfff8efColor = UIColor(hexString: "fff8ef")

RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderPayOrder/View/AdressCell/OrderPaySelfPickAddressCell.swift

@@ -10,6 +10,12 @@ import UIKit
 
 class OrderPaySelfPickAddressCell: UITableViewCell {
     
+    var selfAddressMdl: SelfMentionAddressModel? {
+        didSet {
+            titleLabel.text = "\(selfAddressMdl?.cityName ?? "")\(selfAddressMdl?.address ?? "")"
+        }
+    }
+    
     override var frame: CGRect {
         get {
             return super.frame
@@ -94,7 +100,6 @@ class OrderPaySelfPickAddressCell: UITableViewCell {
     
     private lazy var titleLabel: UILabel = {
         let titleLabel = UILabel()
-        titleLabel.text = "西安市碑林区xxxxxx"
         titleLabel.textColor = k333333Color
         titleLabel.font = kRegularFont14
         return titleLabel

RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderPayOrder/View/ShoppingCartOrderPayView.swift

@@ -38,7 +38,14 @@ class ShoppingCartOrderPayView: BaseView {
     }
     
     // 配送方式
-    var deliverType: String?
+    var deliverType: String? {
+        didSet {
+            if self.deliverType == "1" {
+                let addr: SelfMentionAddressModel = SelfMentionAddressModel.getModel()!
+                selfAddressLabel.text = "\(addr.cityName ?? "")\(addr.address ?? "")"
+            }
+        }
+    }
     
     // 快递地址信息Mdl
     var expressAddressMdl: ExpressAddresModel? {
@@ -61,6 +68,8 @@ class ShoppingCartOrderPayView: BaseView {
     override func setupViews() {
         self.backgroundColor = kf7f8faColor
         addSubview(accountView)
+        addSubview(selfAddressView)
+        selfAddressView.addSubview(selfAddressLabel)
         addSubview(tableView)
         let emptyView =  EmptyView.shared.diyCustomEmptyViewStyle2(iconStr: "page04", titleStr: "当前暂无数据")
         emptyView.contentViewY = kScaleValue(value: 182)
@@ -74,9 +83,22 @@ class ShoppingCartOrderPayView: BaseView {
             make.bottom.equalTo(-kSafeTabBarHeight)
             make.height.equalTo(48)
         }
+        
+        selfAddressView.snp.makeConstraints { (make) in
+            make.bottom.equalTo(accountView.snp_top)
+            make.left.right.equalToSuperview()
+        }
+        
+        selfAddressLabel.snp.remakeConstraints { (make) in
+            make.left.equalToSuperview().offset(14)
+            make.right.equalToSuperview().offset(-26)
+            make.top.bottom.equalToSuperview()
+            make.height.equalTo(40)
+        }
+        
         tableView.snp.makeConstraints { (make) in
             make.edges.equalToSuperview()
-            make.bottom.equalTo(accountView.snp_top).offset(-20)
+            make.bottom.equalTo(selfAddressView.snp_top).offset(-20)
         }
     }
     
@@ -115,6 +137,21 @@ class ShoppingCartOrderPayView: BaseView {
         return accountView
     }()
     
+    private lazy var selfAddressView: UIView = {
+        let selfAddressView = UIView()
+        selfAddressView.backgroundColor = kfff8efColor
+        return selfAddressView
+    }()
+    
+    private lazy var selfAddressLabel: UILabel = {
+        let selfAddressLabel = UILabel()
+        selfAddressLabel.textColor = kFFA42FColor
+        selfAddressLabel.font = kRegularFont13
+        selfAddressLabel.textAlignment = .left
+        selfAddressLabel.numberOfLines = 0
+        return selfAddressLabel
+    }()
+    
     lazy var tableView: UITableView = {
         let tableView = UITableView(frame: CGRect.zero, style: UITableView.Style.grouped)
         tableView.separatorStyle = .none
@@ -166,6 +203,7 @@ extension ShoppingCartOrderPayView : UITableViewDelegate, UITableViewDataSource
                     } else {
                         // 自提地址信息
                         let cell = OrderPaySelfPickAddressCell.cellWith(tableView: tableView, indexPath: indexPath)
+                        cell.selfAddressMdl = SelfMentionAddressModel.getModel()
                         return cell
                     }
                 } else {
@@ -177,6 +215,7 @@ extension ShoppingCartOrderPayView : UITableViewDelegate, UITableViewDataSource
                     } else {
                         // 自提地址信息
                         let cell = OrderPaySelfPickAddressCell.cellWith(tableView: tableView, indexPath: indexPath)
+                        cell.selfAddressMdl = SelfMentionAddressModel.getModel()
                         return cell
                     }
                 }

RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderPayOrder/View/ShoppingCartPayOrderFooter.swift

@@ -17,7 +17,8 @@ class ShoppingCartPayOrderFooter: BaseView {
     
     var tPrice: Int? {
         didSet {
-            let originStr = "合计 ¥\(tPrice ?? 0)"
+            let priceStr = priceConversion(price: tPrice ?? 0)
+            let originStr = "合计 \(priceStr)"
             let attrStr = NSMutableAttributedString(string:originStr)
             attrStr.changeForegroundColor(kfe352bColor, range: NSRange(location: 2, length: originStr.count-2))
             priceLabel.attributedText = attrStr

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

@@ -24,6 +24,9 @@ class ShoppingCartListTableViewCell: UITableViewCell {
     
     var productMdl : ProductModel? {
         didSet {
+            // 初始化默认下架/售罄隐藏
+            disableLabel.isHidden = true
+            
             // 已下架
             if productMdl?.upStatus == 0 {
                 self.resetDisableWithTitle("已下架")

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ShoppingMall/View/ShoppingMallView.swift

@@ -28,9 +28,23 @@ class ShoppingMallView: BaseView {
     }
     
     func setupView() {
-       addSubview(scrollView)
-       addSubview(segmentedView)
-       addSubview(listContainerView)
+        addSubview(scrollView)
+        addSubview(segmentedView)
+        addSubview(listContainerView)
+        
+        let deliverType = DeliveryMethodTypeModel.shared().getModel()?.deliveryMethodType
+        if deliverType == "1" {
+            // 自提
+            addSubview(selfAddressPopView)
+            selfAddressPopView.snp.makeConstraints { (make) in
+                make.top.equalTo(segmentedView.snp_top)
+                make.left.equalToSuperview().offset(14)
+                make.height.equalTo(32)
+            }
+            DispatchQueue.main.asyncAfter(deadline: .now() + .seconds(2)) {
+                self.selfAddressPopView.removeFromSuperview()
+            }
+        }                
     }
 
     func setupLayout() {
@@ -102,6 +116,14 @@ class ShoppingMallView: BaseView {
         return listContainerView
     }()
     
+    //5.初始化自提地址提示View
+    lazy var selfAddressPopView: PopTopTriangleView = {
+        let selfAddressPopView = PopTopTriangleView()
+        let addrMdl = SelfMentionAddressModel.getModel()
+        selfAddressPopView.address = addrMdl?.address
+        return selfAddressPopView
+    }()
+    
 }
 
 extension ShoppingMallView : JXSegmentedViewDelegate {