Merge branch 'feature/nanxinlin' into develop

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

@@ -65,8 +65,8 @@ class ProductDetailView: BaseView {
                     productDetailTableViewHeaderView.productDetailModel = productDetailModel
                 }
                 //是否可以点击购买
-                if productDetailModel?.totalStock == 0 {
-                    self.nuablebuyLabel.isHidden = true
+                if productDetailModel?.totalStock == 0 ||   productDetailModel?.upStatus == 0 {
+                    self.nuablebuyLabel.isHidden = false
                 }else {
                     self.nuablebuyLabel.isHidden = true
                 }

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

@@ -138,7 +138,7 @@ class ProductDetailViewController: BaseViewController {
     
     /// 获取商家商品列表
     private func productListApi() {
-        SwiftMoyaNetWorkServiceProduct.shared().productListApi(page: 1, shopId: productId ?? 0,desc: 2, fieldOrder: 1) {
+        SwiftMoyaNetWorkServiceProduct.shared().productListApi(page: 1, shopId: shopId ?? 0,desc: 2, fieldOrder: 1) {
             [weak self] (productListModel) -> (Void) in
             let productSearchListModel = productListModel as? ProductSearchListModel
             self?.productDetailView.productSearchListModel = productSearchListModel

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ProductView/CollectionViewCell/ProductDetailHotSell/ProductDetailHotSellCollectionViewCell.swift

@@ -156,7 +156,7 @@ class ProductDetailHotSellCollectionViewCell: UICollectionViewCell {
             let attributeString = NSMutableAttributedString(string:priceConversion(price: productSearchModel?.originPrice ?? 0))
             attributeString.changeStrikethrough(atAllStyle: NSUnderlineStyle.single, color: kbbbbbbColor)
             markPriceLabel.attributedText = attributeString
-            if productSearchModel?.totalStock == 0 {
+            if productSearchModel?.stock == 0 {
                 self.plusButton.isHidden = true
             }else {
                 self.plusButton.isHidden = false

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ProductView/CollectionViewCell/ProductMallBarChart/ProductMallBarChartCollectionViewCell.swift

@@ -183,7 +183,7 @@ class ProductMallBarChartCollectionViewCell: UICollectionViewCell {
             attributeString.changeStrikethrough(atAllStyle: NSUnderlineStyle.single, color: kbbbbbbColor)
             markPriceLabel.attributedText = attributeString
            
-            if productModel?.totalStock == 0 {
+            if productModel?.stock == 0 {
                 plusButton.isHidden = true
             }else {
                 plusButton.isHidden = false

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ProductView/CollectionViewCell/ProductMallRightSideleftPicture/ProductRightSideleftPictureCollectionViewCell.swift

@@ -158,7 +158,7 @@ class ProductRightSideleftPictureCollectionViewCell: UICollectionViewCell {
             let attributeString = NSMutableAttributedString(string:priceConversion(price: productModel?.originPrice ?? 0))
             attributeString.changeStrikethrough(atAllStyle: NSUnderlineStyle.single, color: kbbbbbbColor)
             markPriceLabel.attributedText = attributeString
-            if productModel?.totalStock == 0 {
+            if productModel?.stock == 0 {
                 self.plusButton.isHidden = true
             }else {
                 self.plusButton.isHidden = false

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ProductView/CollectionViewCell/ProductMallSlidingLeftRight/ProductSlidingLeftRightCollectionViewCell.swift

@@ -162,7 +162,7 @@ class ProductSlidingLeftRightCollectionViewCell: UICollectionViewCell {
             let attributeString = NSMutableAttributedString(string:priceConversion(price: productSearchModel?.originPrice ?? 0))
             attributeString.changeStrikethrough(atAllStyle: NSUnderlineStyle.single, color: kbbbbbbColor)
             markPriceLabel.attributedText = attributeString
-            if productModel?.totalStock == 0 {
+            if productModel?.stock == 0 {
                 self.plusButton.isHidden = true
             }else {
                 self.plusButton.isHidden = false

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ProductView/CollectionViewCell/ProductSlidingTopBottom/ProductSlidingTopBottomCollectionViewCell.swift

@@ -22,7 +22,7 @@ class ProductSlidingTopBottomCollectionViewCell: UICollectionViewCell {
             let attrString = NSMutableAttributedString(string:priceConversion(price: productSearchModel?.originPrice ?? 0))
             attrString.changeStrikethrough(atAllStyle: NSUnderlineStyle.single, color: kbbbbbbColor)
             markPriceLabel.attributedText = attrString
-            if productSearchModel?.totalStock == 0 {
+            if productSearchModel?.stock == 0 {
                 self.plusButton.isHidden = true
             }else {
                 self.plusButton.isHidden = false

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ProductView/TableViewCell/ProductHBigTableViewCell.swift

@@ -168,7 +168,7 @@ class ProductHBigTableViewCell: UITableViewCell {
             attributeString.changeStrikethrough(atAllStyle: NSUnderlineStyle.single, color: kbbbbbbColor)
             markPriceLabel.attributedText = attributeString
             markPriceLabel.textColor = kbbbbbbColor
-            if productSearchModel?.totalStock == 0 {
+            if productSearchModel?.stock == 0 {
                 self.plusButton.isHidden = true
             }else {
                 self.plusButton.isHidden = false

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ProductView/TableViewCell/ProductHSmallTableViewCell.swift

@@ -157,7 +157,7 @@ class ProductHSmallTableViewCell: UITableViewCell {
             let attributeString = NSMutableAttributedString(string:priceConversion(price: productSearchModel?.originPrice ?? 0))
             attributeString.changeStrikethrough(atAllStyle: NSUnderlineStyle.single, color: kbbbbbbColor)
             markPriceLabel.attributedText = attributeString
-            if productSearchModel?.totalStock == 0 {
+            if productSearchModel?.stock == 0 {
                 self.plusButton.isHidden = true
             }else {
                 self.plusButton.isHidden = false

RainbowPlanet/RainbowPlanet/Service/Model/ProductModel/ProductDetailModel.swift

@@ -44,11 +44,11 @@ class ProductDetailModel : NSObject, Mappable{
     var video : String?
     var commentNumber : Int?
     var skuPrice : String?
+    var upStatus : Int?
     var label : [ProductDetailLabelModel]?
     var parameter : [ProductDetailParameterModel]?
     var sku : [ProductDetailSkuModel]?
     var spec : [ProductDetailSpecModel]?
-    
     var skuStr : [ProductDetailSkuModel ]?
     
     func mapping(map: Map)
@@ -88,6 +88,7 @@ class ProductDetailModel : NSObject, Mappable{
         video <- map["video"]
         commentNumber <- map["comment_number"]
         skuPrice <- map["sku_price"]
+        upStatus <- map["up_status"]
         
     }
 }

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServiceConfig/SwiftMoyaNetWorkServiceConfig.swift

@@ -124,6 +124,10 @@ class SwiftMoyaNetWorkServiceConfig: NSObject {
             SwiftProgressHUD.shared().hide()
             completion(imgUrlArr)
         }
+//        SwiftRXMoyaReamlObjectSwiftJsonNetWorkManager.shared.requestAny(target: MultiTarget(SwiftMoyaServiceProductApi.productAddComment(parameters: parameters))) { (imgUrlArr) in
+//            completion(imgUrlArr)
+//
+//        }
     }
             
 }