Merge branch 'develop' into feature/nanxinlin

RainbowPlanet/RainbowPlanet/Modules/MineModule/EditExpressAddress/ViewController/EditExpressAddressViewController.swift

@@ -69,6 +69,23 @@ class EditExpressAddressViewController: BaseViewController {
     
      /// 添加保存地址 //编辑
     func userAddExpressAddress() {
+        if expressAddresModel?.contactName == "" || expressAddresModel?.contactName == nil {
+            SwiftProgressHUD.shared().showText("收货人信息不能为空")
+            return
+        }
+        if isMobileVerification(mobile: expressAddresModel?.contactMobile ?? "") == false {
+            return
+        }
+        if expressAddresModel?.provinceName == "" || expressAddresModel?.provinceName == nil {
+            SwiftProgressHUD.shared().showText("请输入所在地区")
+            return
+        }
+        if expressAddresModel?.address == "" || expressAddresModel?.address == nil {
+            SwiftProgressHUD.shared().showText("请输入详细地址")
+            return
+        }
+        
+        
         SwiftMoyaNetWorkServiceUser.shared().userAddExpressAddressApi(
         expressAddresModel:expressAddresModel!) {
             [weak self] (data) -> (Void) in

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

@@ -115,7 +115,10 @@ class ShoppingCartListTableViewCell: UITableViewCell {
             make.height.equalTo(20)
         }
         selectedButton.snp.makeConstraints { (make) in
-            make.edges.equalTo(disableLabel.snp_edges)
+            make.left.equalTo(disableLabel.snp_left)
+            make.right.equalTo(disableLabel.snp_right)
+            make.centerY.equalTo(disableLabel.snp_centerY)
+            make.height.equalTo(50)
         }
         iconImageView.snp.makeConstraints { (make) in
             make.left.equalToSuperview().offset(40)

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

@@ -82,9 +82,9 @@ class ShoppingCartListTableViewHeader: BaseView {
         }
         
         selectedButton.snp.makeConstraints { (make) in
-            make.left.equalTo(10)
+            make.left.equalTo(7)
             make.centerY.equalTo(titleButton)
-            make.size.equalTo(18)
+            make.size.equalTo(24)
         }
         
         bottomLineView.snp.makeConstraints { (make) in

RainbowPlanet/RainbowPlanet/Modules/ShoppingCartModule/ShoppingCart/ViewController/ShoppingCartViewController.swift

@@ -60,10 +60,7 @@ class ShoppingCartViewController: BaseViewController {
         shoppingCartView.tableView.addHeaderWithHeader(withBeginRefresh: true, animation: false) { [weak self] (page) in
             self?.shoppingCartView.shoppingCartVCType = self?.shoppingCartVCType ?? .none
             self?.productCartListApi()
-            self?.productHotSaleApi(page: page)
-        }
-        shoppingCartView.tableView.addFooterWithWithHeader(withAutomaticallyRefresh: false) { [weak self] (page) in
-            self?.productHotSaleApi(page: page)
+            self?.productHotSaleApi()
         }
         
         shoppingCartView.orderPayTransBlock = {
@@ -115,8 +112,8 @@ class ShoppingCartViewController: BaseViewController {
     }
     
     /// 商品热销
-    func productHotSaleApi(page:Int = 1) {
-        SwiftMoyaNetWorkServiceProduct.shared().productHotSaleApi(page: page) { [weak self] (productSearchListModel) -> (Void) in
+    func productHotSaleApi() {
+        SwiftMoyaNetWorkServiceProduct.shared().productHotSaleApi() { [weak self] (productSearchListModel) -> (Void) in
             let productSearchListModel = productSearchListModel as? ProductSearchListModel
             if productSearchListModel?.pagination?.currentPage ?? 1  <= productSearchListModel?.pagination?.totalPages ?? 1 {
                 if productSearchListModel?.pagination?.currentPage == 1{

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ShoppingMall/View/MainView/ShoppingMallNavigationBarView.swift

@@ -83,6 +83,9 @@ class ShoppingMallNavigationBarView: BaseView {
         addressLabel.text = LocationModel.shared().getLocationModel()?.city ?? "西安市"
         addressLabel.textColor = k999999Color
         addressLabel.font = kScaleRegularFont14
+        let tapGesture = UITapGestureRecognizer(target: self, action: #selector(tapGesClick(tap:)))
+        addressLabel.isUserInteractionEnabled = true
+        addressLabel.addGestureRecognizer(tapGesture)
         return addressLabel
     }()
     
@@ -124,4 +127,10 @@ class ShoppingMallNavigationBarView: BaseView {
         return categoryButton
     }()
     
+    @objc func tapGesClick(tap: UITapGestureRecognizer) {
+        if let selfAddrTipClosure = self.selfAddrTipClosure {
+            selfAddrTipClosure()
+        }
+    }
+    
 }