Chris 6 anni fa
parent
commit
686f574621

+ 7 - 1
RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderPayOrder/View/ShoppingCartOrderPayView.swift

@@ -44,6 +44,12 @@ class ShoppingCartOrderPayView: BaseView {
             if self.deliverType == "1" {
                 let addr: SelfMentionAddressModel = SelfMentionAddressModel.getModel()!
                 selfAddressLabel.text = "\(addr.cityName ?? "")\(addr.address ?? "")"
+            } else {
+                selfAddressView.isHidden = true
+                tableView.snp.remakeConstraints { (make) in
+                    make.top.left.right.equalToSuperview()
+                    make.bottom.equalTo(accountView.snp_top)
+                }
             }
         }
     }
@@ -98,7 +104,7 @@ class ShoppingCartOrderPayView: BaseView {
         }
         
         tableView.snp.makeConstraints { (make) in
-            make.edges.equalToSuperview()
+            make.top.left.right.equalToSuperview()
             make.bottom.equalTo(selfAddressView.snp_top)
         }
     }

+ 2 - 2
RainbowPlanet/RainbowPlanet/Modules/ShoppingCartModule/ShoppingCart/View/ShoppingCartList/ShoppingCartListTableViewCell.swift

@@ -43,8 +43,8 @@ class ShoppingCartListTableViewCell: UITableViewCell {
             iconImageView.kf.setImage(with: kURLImage(name: productMdl?.productImg ?? ""), placeholder: kImage(name: "pic_preload"))
             // 商品名称
             titleLabel.text = productMdl?.productName
-            // 预计配送时间
-            deliveryTime.text = "预计配送时间:次日达"
+            // 预计配送时间            
+            deliveryTime.text = "预计配送时间:\(productMdl?.receiveTime ?? "")"
             // 规格
             sellScaleLabel.text = "规格:\(productMdl?.skuName ?? "")"
             // 数量

+ 1 - 4
RainbowPlanet/RainbowPlanet/Modules/ShoppingCartModule/ShoppingCart/View/ShoppingCartView.swift

@@ -352,10 +352,6 @@ extension ShoppingCartView : UITableViewDelegate, UITableViewDataSource {
                 (isSectionSel) in
                 let proListMdl: CartProductListModel = (self?.cartListModelArr![section])!
                 self?.productCartIsSelApi(shop_id: proListMdl.shopId!, isSel: isSectionSel, section: section)
-                
-//                self?.shopSelectedAction(isSectionSel, section: section)
-//                self?.judgeAllSelectedStatus()
-//                self?.refreshAccountView()
             }
             headerView.shopClickedBlock = {
                 [weak self] in
@@ -396,6 +392,7 @@ extension ShoppingCartView : UITableViewDelegate, UITableViewDataSource {
             SwiftMoyaNetWorkServiceProduct.shared().productCartDeleteApi(id: productId ?? 0) { [weak self] (data) -> (Void) in
                 self?.cartListModelArr![indexPath.section].productList?.remove(at: indexPath.row)
                 tableView.deleteRows(at: [indexPath], with: .none)
+                self?.refreshAccountView()
                 
                 // 删除后商店为空,刷新table
                 if self?.cartListModelArr![indexPath.section].productList?.isEmpty ?? true {