no message

RainbowPlanet/RainbowPlanet/Modules/CommonModules/SearchModule/SearchResult/ViewController/SearchResultViewController.swift

@@ -96,6 +96,7 @@ class SearchResultViewController: BaseViewController {
     
     /// 搜索结果
     func productSearchApi(page:Int = 1) {
+        SwiftProgressHUD.shared().showWait()
         SwiftMoyaNetWorkServiceProduct.shared().productListApi(page:page ,keyword: self.keyWord) {
             [weak self] (productSearchListModel) -> (Void) in
             let productSearchListModel = productSearchListModel as? ProductSearchListModel
@@ -108,6 +109,7 @@ class SearchResultViewController: BaseViewController {
             }else {
                 self?.searchResultView.tableView.endFooterNoMoreData()
             }
+            SwiftProgressHUD.shared().hide()
         }
     }
     

RainbowPlanet/RainbowPlanet/Modules/OrderModule/Order/View/OrderDeliveryModeAndButtonTableViewCell.swift

@@ -65,6 +65,7 @@ class OrderDeliveryModeAndButtonTableViewCell: UITableViewCell {
             make.centerY.equalTo(oneButton)
             make.height.equalTo(28)
             make.width.greaterThanOrEqualTo(90)
+            make.right.equalTo(oneButton.snp_left).offset(-12)
         }
         
     }
@@ -73,6 +74,7 @@ class OrderDeliveryModeAndButtonTableViewCell: UITableViewCell {
         let addressLabel = UILabel()
         addressLabel.textColor = kfe352bColor
         addressLabel.font = kRegularFont13
+        addressLabel.numberOfLines = 0
         return addressLabel
     }()
     
@@ -107,6 +109,7 @@ class OrderDeliveryModeAndButtonTableViewCell: UITableViewCell {
     
     var orderModel: OrderModel? {
         didSet {
+            addressLabel.text = "自提地址：\(orderModel?.address ?? "")"
             switch orderModel?.status {
             case 0: //待付款
                 setButton(isHidden: false, button: oneButton, title: "去付款", titleColor: kffffffColor, backgroundColor: kFFA42FColor, borderColor: kFFA42FColor)

RainbowPlanet/RainbowPlanet/Modules/OrderModule/Order/View/OrderDeliveryModeTableViewCell.swift

@@ -52,6 +52,7 @@ class OrderDeliveryModeTableViewCell: UITableViewCell {
         let addressLabel = UILabel()
         addressLabel.textColor = kfe352bColor
         addressLabel.font = kRegularFont13
+        addressLabel.numberOfLines = 0
         addressLabel.text = "自提地址：碑林区建设西路新城南门柜机"
         return addressLabel
     }()

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/Category/ViewController/CategoryViewController.swift

@@ -137,6 +137,7 @@ class CategoryViewController: BaseViewController {
     func productSearchApi(page:Int = 1) {
         let categoryModel = categoryModelArray[leftIndexPath.row]
 
+        SwiftProgressHUD.shared().showWait()
         SwiftMoyaNetWorkServiceProduct.shared().productListApi(page:page ,categoryId:categoryModel.id ?? 0) {
             [weak self] (productSearchListModel) -> (Void) in
             let productSearchListModel = productSearchListModel as? ProductSearchListModel
@@ -149,6 +150,7 @@ class CategoryViewController: BaseViewController {
             }else {
                 self?.categoryView.rightTableView.endFooterNoMoreData()
             }
+            SwiftProgressHUD.shared().hide()
         }
     }
     

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ProductAllComment/ViewController/ProductAllCommentViewController.swift

@@ -53,6 +53,8 @@ class ProductAllCommentViewController: BaseViewController {
     ///
     /// - Parameter page: 分页
     func productCommentListApi(page:Int = 1) {
+       
+       SwiftProgressHUD.shared().showWait()
         SwiftMoyaNetWorkServiceProduct.shared().productCommentListApi(page:page,productId: productId ) {
             [weak self] (productCommentListModel) -> (Void) in
             let productCommentListModel = productCommentListModel as? ProductCommentListModel
@@ -66,6 +68,7 @@ class ProductAllCommentViewController: BaseViewController {
             }else {
                 self?.productAllCommentView.tableView.endFooterNoMoreData()
             }
+            SwiftProgressHUD.shared().hide()
         }
     }
 }

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ProductDetail/View/ProductDetailHeader/ProductDetailTableViewHeaderView.swift

@@ -34,9 +34,6 @@ class ProductDetailTableViewHeaderView: BaseView {
         pagerView.delegate = self
         pagerView.dataSource = self
         pagerView.scrollDirection = .horizontal
-        pagerView.automaticSlidingInterval = 3.0
-        pagerView.isInfinite = true
-        pagerView.transformer = FSPagerViewTransformer(type: FSPagerViewTransformerType.linear)
         pagerView.itemSize = CGSize(width:kScreenWidth, height:251)
         pagerView.decelerationDistance = FSPagerView.automaticDistance
         
@@ -74,6 +71,15 @@ class ProductDetailTableViewHeaderView: BaseView {
                     make.width.equalTo(pageControlWidth)
                 }
                 pageControl.numberOfPages = (productDetailModel?.imgs!.count)!
+                if  pageControl.numberOfPages > 1 {
+                    pageControl.isHidden = false
+                    pagerView.automaticSlidingInterval = 3.0
+                    pagerView.isInfinite = true
+                }else {
+                    pageControl.isHidden = true
+                    pagerView.automaticSlidingInterval = 0.0
+                    pagerView.isInfinite = false
+                }
                 if productDetailModel?.totalStock == 0 {
                     self.soldOutImageView.isHidden = false
                 }else {

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ProductDetail/View/ProductDetailView.swift

@@ -50,9 +50,9 @@ class ProductDetailView: BaseView {
     var productDetailModel : ProductDetailModel? {
         didSet {
             tableView.ly_startLoading()
-            tableView.reloadData()
             if productDetailModel != nil {
                 bottomBgView.isHidden = false
+                topButton.isHidden = false
                 if productDetailModel?.commentNumber != 0 && productDetailModel?.commentNumber != nil {
                     titles[2] = "商品评价" + "(" + "\(productDetailModel?.commentNumber ?? 0)" + ")"
                     
@@ -72,7 +72,9 @@ class ProductDetailView: BaseView {
                 }
             }else {
                 bottomBgView.isHidden = true
+                topButton.isHidden = true
             }
+            tableView.reloadData()
         }
     }
     
@@ -90,6 +92,7 @@ class ProductDetailView: BaseView {
     
     
     override func setupViews() {
+        backgroundColor = kf7f8faColor
         addSubview(bottomBgView)
         bottomBgView.addSubview(cartButton)
         cartButton.addSubview(cartImageView)
@@ -164,6 +167,8 @@ class ProductDetailView: BaseView {
     
     private lazy var bottomBgView: UIView = {
         let bottomBgView = UIView()
+        bottomBgView.isHidden = true
+        bottomBgView.backgroundColor = UIColor.white
         return bottomBgView
     }()
     
@@ -183,8 +188,6 @@ class ProductDetailView: BaseView {
     private lazy var cartImageView: UIImageView = {
         let cartImageView = UIImageView()
         cartImageView.image = kImage(name: "tabbar_shopping")
-        cartImageView.pp.badgeView.backgroundColor = kfe352bColor
-        cartImageView.pp.moveBadge(x: -2, y: 2)
         return cartImageView
     }()
     
@@ -232,6 +235,7 @@ class ProductDetailView: BaseView {
     private lazy var topButton : UIButton = {
         let topButton = UIButton(type: UIButton.ButtonType.custom)
         topButton.setImage(kImage(name: "product_detail_top"), for: UIControl.State.normal)
+        topButton.isHidden = true
         topButton.rx.tap.subscribe(onNext: { [weak self] (data) in
             self?.tableView.scrollToTop()
         }).disposed(by: disposeBag)
@@ -281,6 +285,8 @@ class ProductDetailView: BaseView {
             if productCartCount == 0 {
                 cartImageView.pp.hiddenBadge()
             }else {
+                cartImageView.pp.badgeView.backgroundColor = kfe352bColor
+                cartImageView.pp.moveBadge(x: -2, y: 2)
                 cartImageView.pp.addBadge(number: productCartCount)
             }
             self.view.hide()
@@ -293,6 +299,8 @@ class ProductDetailView: BaseView {
                 if productCartCountModel?.count == 0 {
                     cartImageView.pp.hiddenBadge()
                 }else {
+                    cartImageView.pp.badgeView.backgroundColor = kfe352bColor
+                    cartImageView.pp.moveBadge(x: -2, y: 2)
                     cartImageView.pp.addBadge(number: productCartCountModel?.count ?? 0)
                 }
             }

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ProductDetail/ViewController/ProductDetailViewController.swift

@@ -27,28 +27,22 @@ class ProductDetailViewController: BaseViewController {
 
     override func viewDidLoad() {
         super.viewDidLoad()
-        setupData()
         setupViews()
         setupLayouts()
+        setupData()
     }
     
     override func setupViews() {
         navigationBar.wr_setBackgroundAlpha(alpha: 0)
         view.addSubview(productDetailView)
         view.insertSubview(navigationBar, aboveSubview: productDetailView)
-        navigationBar.addSubview(segmentedView)
+        
     }
     
     override func setupLayouts() {
         productDetailView.snp.makeConstraints { (make) in
             make.edges.equalToSuperview()
         }
-        segmentedView.snp.makeConstraints { (make) in
-            make.top.equalTo(kSafeStatusBarHeight)
-            make.left.equalTo(50)
-            make.right.equalTo(-50)
-            make.bottom.equalToSuperview()
-        }
     }
     override func setupData() {
         productDetailView.tableView.addHeaderWithHeader(withBeginRefresh: true, animation: false) {
@@ -132,6 +126,13 @@ class ProductDetailViewController: BaseViewController {
             [weak self] (productDetailModel) -> (Void) in
             self?.productDetailModel = productDetailModel as? ProductDetailModel
             self?.productDetailView.productDetailModel = productDetailModel as? ProductDetailModel
+            self?.navigationBar.addSubview((self?.segmentedView)!)
+            self?.segmentedView.snp.makeConstraints { (make) in
+                make.top.equalTo(kSafeStatusBarHeight)
+                make.left.equalTo(50)
+                make.right.equalTo(-50)
+                make.bottom.equalToSuperview()
+            }
         }
     }
     

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/Shop/ViewController/ShopViewController.swift

@@ -100,6 +100,8 @@ class ShopViewController: BaseViewController {
     /// 获取商家商品列表
     private func productListApi(page:Int) {
         
+        SwiftProgressHUD.shared().showWait()
+
         SwiftMoyaNetWorkServiceProduct.shared().productListApi(page: page, shopId: shopId ?? 0,desc: self.shopSectionHeaderModel.state, fieldOrder: fieldOrder) {
             [weak self] (productListModel) -> (Void) in
             let productSearchListModel = productListModel as? ProductSearchListModel
@@ -116,6 +118,7 @@ class ShopViewController: BaseViewController {
             }else {
                 self?.shopView.tableView.endFooterNoMoreData()
             }
+            SwiftProgressHUD.shared().hide()
         }
     }
     

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServiceProduct/SwiftMoyaNetWorkServiceProduct.swift

@@ -68,10 +68,8 @@ class SwiftMoyaNetWorkServiceProduct: NSObject {
             parameters.updateValue(categoryId, forKey: "category_id1")
         }
 
-        SwiftProgressHUD.shared().showWait()
         SwiftMoyaNetWorkManager.shared()
             .request(ProductSearchListModel.self,target: MultiTarget(SwiftMoyaServiceProductApi.productSearch(parameters: parameters))) {(productSearchListModel) in
-            SwiftProgressHUD.shared().hide()
             completion(productSearchListModel)
         }
     }
@@ -162,10 +160,7 @@ class SwiftMoyaNetWorkServiceProduct: NSObject {
         var parameters = Dictionary<String,Any>()
         parameters.updateValue(productId, forKey: "product_id")
         parameters.updateValue(page, forKey: "page")
-        
-        SwiftProgressHUD.shared().showWait()
         SwiftMoyaNetWorkManager.shared().request(ProductCommentListModel.self,target: MultiTarget(SwiftMoyaServiceProductApi.productCommentList(parameters: parameters))) { (productCommentListModel) in
-            SwiftProgressHUD.shared().hide()
             completion(productCommentListModel)
         }
     }
@@ -457,7 +452,7 @@ class SwiftMoyaNetWorkServiceProduct: NSObject {
     ///   - completion: 回调
     func productGetCartCountApi(completion: @escaping apiCallBack) {
         var parameters = Dictionary<String,Any>()
-        SwiftProgressHUD.shared().showWait()
+        
         // 本地获取city_id
         let loacationModel = LocationModel.shared().getLocationModel()
         let baiduToCityModel = BaiduToCityFactory.shared.query(bjcityId: loacationModel!.cityCode)
@@ -466,7 +461,6 @@ class SwiftMoyaNetWorkServiceProduct: NSObject {
         let deliver_type = DeliveryMethodTypeModel.shared().getModel()?.deliveryMethodType
         parameters.updateValue(deliver_type ?? "2", forKey: "deliver_type")
         SwiftMoyaNetWorkManager.shared().request(ProductCartCountModel.self, target: MultiTarget(SwiftMoyaServiceProductApi.productGetCartCount(parameters: parameters))) { (productCartCountModel) in
-            SwiftProgressHUD.shared().hide()
             completion(productCartCountModel)
         }
     }