单/多图上传Api - finish

RainbowPlanet/Podfile.lock

@@ -169,4 +169,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 8367a381fb27c958a744db1b81ae93efe4c465ee
 
-COCOAPODS: 1.6.2
+COCOAPODS: 1.6.1

RainbowPlanet/RainbowPlanet.xcodeproj/project.pbxproj

@@ -324,6 +324,7 @@
 		BD20F1D32283D0ED00677D8E /* ShoppingCartPaySuccessCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD20F1D22283D0ED00677D8E /* ShoppingCartPaySuccessCell.swift */; };
 		BD20F1D52283D15500677D8E /* ShoppingCartPayFailureCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD20F1D42283D15500677D8E /* ShoppingCartPayFailureCell.swift */; };
 		BD20F1D82283D2AA00677D8E /* ShoppingCartModule.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = BD20F1D72283D2AA00677D8E /* ShoppingCartModule.xcassets */; };
+		BD29A92E228F99780018CFC3 /* OrderCommentParameterModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD29A92D228F99780018CFC3 /* OrderCommentParameterModel.swift */; };
 		BD3474F522857B85000908C5 /* CommonPayHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD3474F422857B85000908C5 /* CommonPayHeader.swift */; };
 		BD7AB83622841A8B0030646A /* ShoppingCartPayOrderItemCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD7AB83522841A8B0030646A /* ShoppingCartPayOrderItemCell.swift */; };
 		BD7AB838228420310030646A /* ShoppingCartPayOrderHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD7AB837228420310030646A /* ShoppingCartPayOrderHeader.swift */; };
@@ -714,6 +715,7 @@
 		BD20F1D22283D0ED00677D8E /* ShoppingCartPaySuccessCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShoppingCartPaySuccessCell.swift; sourceTree = "<group>"; };
 		BD20F1D42283D15500677D8E /* ShoppingCartPayFailureCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShoppingCartPayFailureCell.swift; sourceTree = "<group>"; };
 		BD20F1D72283D2AA00677D8E /* ShoppingCartModule.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = ShoppingCartModule.xcassets; sourceTree = "<group>"; };
+		BD29A92D228F99780018CFC3 /* OrderCommentParameterModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrderCommentParameterModel.swift; sourceTree = "<group>"; };
 		BD3474F422857B85000908C5 /* CommonPayHeader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommonPayHeader.swift; sourceTree = "<group>"; };
 		BD7AB83522841A8B0030646A /* ShoppingCartPayOrderItemCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShoppingCartPayOrderItemCell.swift; sourceTree = "<group>"; };
 		BD7AB837228420310030646A /* ShoppingCartPayOrderHeader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShoppingCartPayOrderHeader.swift; sourceTree = "<group>"; };
@@ -2229,6 +2231,7 @@
 				BDE3045E228554CA001D050F /* ProductCartAmountModel.swift */,
 				A71738AC228AB7B2000AEA6A /* ProductCommentListModel.swift */,
 				BDDF3B27228EBB72003A7D16 /* ProductRefundReasonModel.swift */,
+				BD29A92D228F99780018CFC3 /* OrderCommentParameterModel.swift */,
 			);
 			path = ProductModel;
 			sourceTree = "<group>";
@@ -3583,6 +3586,7 @@
 				BD7AB838228420310030646A /* ShoppingCartPayOrderHeader.swift in Sources */,
 				A7824B002271F0DD00ABA381 /* EditSelfMentionContactsViewController.swift in Sources */,
 				A7CC751F227190C5003C4F38 /* AccountSecurityViewController.swift in Sources */,
+				BD29A92E228F99780018CFC3 /* OrderCommentParameterModel.swift in Sources */,
 				A7284440224DFACD00F82F30 /* InfoModel.swift in Sources */,
 				A72A72B522321DE000B21995 /* Extension+UITextView.swift in Sources */,
 				BDF47D822282B3D100941AB9 /* ShoppingCartHotSaleTableViewCell.swift in Sources */,

RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderComment/View/OrderCommentTableViewCell.swift

@@ -94,8 +94,8 @@ class OrderCommentTableViewCell: UITableViewCell {
         starView.snp.makeConstraints { (make) in
             make.left.equalTo(titleLabel.snp_right).offset(12)
             make.centerY.equalTo(iconImageView)
-//            make.width.equalTo(122)
-//            make.height.equalTo(20)
+            make.width.equalTo(122)
+            make.height.equalTo(20)
         }
         
         cmtTextView.snp.makeConstraints { (make) in
@@ -136,7 +136,11 @@ class OrderCommentTableViewCell: UITableViewCell {
     
     private lazy var starView: SwiftyStarRatingView = {
         let starView = SwiftyStarRatingView()
-        return starView
+        starView.emptyStarImage = kImage(name: "star_rating_empty")
+        starView.halfStarImage = kImage(name: "star_rating_half")
+        starView.filledStarImage = kImage(name: "star_rating_filled")
+        starView.allowsHalfStars = false
+        return starView        
     }()
     
     private lazy var cmtTextView: IQTextView = {

RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderComment/ViewController/OrderCommentController.swift

@@ -11,7 +11,10 @@ import RxSwift
 
 class OrderCommentController: BaseViewController {
     
+    // 上传图片数组
     var goodsImageArr = Array<UIImage>()
+    // 提交评论参数Model
+    var paraMdl = OrderCommentParameterModel()
     
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -31,6 +34,8 @@ class OrderCommentController: BaseViewController {
         self.view.addSubview(commitButton)
         commitButton.rx.tap.subscribe(onNext: { [weak self] (data) in
             print("点击了--提交评价")
+            self?.uploadMultiImgUrl(imageArr: self!.goodsImageArr)
+//            self?.uploadSingleImgUrl(imageArr: self!.goodsImageArr)
             
         }).disposed(by: disposeBag)
         commitButton.snp.makeConstraints { (make) in
@@ -144,10 +149,16 @@ extension OrderCommentController : UITableViewDelegate, UITableViewDataSource {
 //MARK: - 逻辑处理
 extension OrderCommentController {
     
-    /// 上传图片
+    /// 单图上传
     ///
     /// - Parameter goodsImageArr: 图片数组
-    func uploadFaceUrl(image:UIImage) -> Void {
+    func uploadSingleImgUrl(imageArr:[UIImage]) -> Void {
+        
+        SwiftMoyaNetWorkServiceConfig.shared().configUploadSingleImgApi(imageArray: imageArr) { [weak self] (data) -> (Void) in
+            print(data)
+        }
+        
+        
 //        SwiftMoyaNetWorkService.shared.commonUploadpicSingleApi(imageArray:goodsImageArr) { [weak self] (data) -> (Void) in
 //
 //            SwiftMoyaNetWorkService.shared.minePersonalUploadFaceUrlApi(faceUrl: data as! String , completion: { [weak self] (data) -> (Void) in
@@ -156,4 +167,24 @@ extension OrderCommentController {
 //            })
 //        }
     }
+    
+    /// 多图上传
+    ///
+    /// - Parameter goodsImageArr: 图片数组
+    func uploadMultiImgUrl(imageArr:[UIImage]) -> Void {
+        
+        SwiftMoyaNetWorkServiceConfig.shared().configUploadMultiImgApi(imageArray: imageArr) { [weak self] (data) -> (Void) in
+            print(data)
+        }
+        
+        
+        //        SwiftMoyaNetWorkService.shared.commonUploadpicSingleApi(imageArray:goodsImageArr) { [weak self] (data) -> (Void) in
+        //
+        //            SwiftMoyaNetWorkService.shared.minePersonalUploadFaceUrlApi(faceUrl: data as! String , completion: { [weak self] (data) -> (Void) in
+        //                self?.personalPortraitView.isReloadData = true
+        //                NotificationCenter.default.post(name: kMineUserQueryModelTokenModelChangeNotificationName, object: nil,userInfo: nil)
+        //            })
+        //        }
+    }
+    
 }

RainbowPlanet/RainbowPlanet/Service/Model/ProductModel/OrderCommentParameterModel.swift

@@ -0,0 +1,38 @@
+//
+//  OrderCommentParameterModel.swift
+//  RainbowPlanet
+//
+//  Created by Christopher on 2019/5/18.
+//  Copyright © 2019 RainbowPlanet. All rights reserved.
+//  新增商品评价参数Model
+
+import UIKit
+
+class OrderCommentParameterModel : NSObject{
+    
+    var purchase_id : Int?
+    var username : String?
+    var avatar : String?
+    var purchase_no : String?
+    var shop_id : Int?
+    var shop_name : String?
+    
+    var cmtProductArr : Array<CommentProductModel>?
+}
+
+
+class CommentProductModel : NSObject{
+    
+    var purchase_detail_id : Int?
+    var imgs : Array<String>?
+    var content : String?
+    var star : Int?
+    var sku_id : Int?
+    var sku_name : String?
+    var product_id : Int?
+    var product_name : String?
+    var sale_name : String?
+    var category_name1 : Int?
+    var category_name2 : Int?
+    var category_name3 : Int?        
+}

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

@@ -72,31 +72,47 @@ class SwiftMoyaNetWorkServiceConfig: NSObject {
     /// - Parameters:
     ///   - imageArray: 图片数据
     ///   - completion: null
-    func configUploadImgApi(imageArray:Array<UIImage>, completion: @escaping apiCallBack) {
+    func configUploadSingleImgApi(imageArray:Array<UIImage>, completion: @escaping apiCallBack) {
         
         var  multipartData = Array<Any>()
         let  parameters = Dictionary<String,Any>()
-        for (index,image) in imageArray.enumerated() {
+        for (_,image) in imageArray.enumerated() {
             let data = image.jpegData(compressionQuality: 0.5)
             let today = Date()
-//            let formData = MultipartFormData(provider: .data(data!), name: "file\(index)",fileName: "\(today).png", mimeType: "image/png")
             let formData = MultipartFormData(provider: .data(data!), name: "image",fileName: "\(today).png", mimeType: "image/png")
 
             multipartData.append(formData)
         }
         SwiftProgressHUD.shared().showWait()
-        SwiftMoyaNetWorkManager.shared().request(target: MultiTarget(SwiftMoyaServiceConfigApi.configUploadImg(parameters: parameters, dataArray: multipartData))) { (data) in
+        SwiftMoyaNetWorkManager.shared().request(target: MultiTarget(SwiftMoyaServiceConfigApi.configUploadSingleImg(parameters: parameters, dataArray: multipartData))) { (data) in
+            SwiftProgressHUD.shared().hide()
+            let rootModel = data as! RootModel
+            print(rootModel)
+        }
+    }
+    
+    // MARK: 多图上传
+    /// 多图上传
+    ///
+    /// - Parameters:
+    ///   - imageArray: 图片数据
+    ///   - completion: null
+    func configUploadMultiImgApi(imageArray:Array<UIImage>, completion: @escaping apiCallBack) {
+        
+        var  multipartData = Array<Any>()
+        let  parameters = Dictionary<String,Any>()
+        for (_,image) in imageArray.enumerated() {
+            let data = image.jpegData(compressionQuality: 0.5)
+            let today = Date()
+            let formData = MultipartFormData(provider: .data(data!), name: "image[]",fileName: "\(today).png", mimeType: "image/png")
+            
+            multipartData.append(formData)
+        }
+        SwiftProgressHUD.shared().showWait()
+        SwiftMoyaNetWorkManager.shared().request(target: MultiTarget(SwiftMoyaServiceConfigApi.configUploadMultiImg(parameters: parameters, dataArray: multipartData))) { (data) in
+            SwiftProgressHUD.shared().hide()
             let rootModel = data as! RootModel
-//            if rootModel.code == "1" {
-//                SwiftProgressHUD.shared().showSuccess(rootModel.msg!, "success")
-//                let commonUploadpicSingleModel = CommonUploadpicSingleModel(JSONString: rootModel.data!)
-//                completion(commonUploadpicSingleModel!.url! as Any)
-//            }else if rootModel.code == "0" {
-//                SwiftProgressHUD.shared().showError(rootModel.msg!, "error")
-//            }else {
-                SwiftProgressHUD.shared().hide()
             print(rootModel)
-//            }
         }
     }
             

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

@@ -17,22 +17,26 @@ public let kConfigPickupNodeIndexApi = "/config/pickupNode/index"
 /// 已开通城市列表
 public let kConfigCityManagementIndexApi = "/config/cityManagement/index"
 
-// MARK: - 图片上传
-/// 图片上传
-public let kConfigUploadImgApi = "/config/upload"
+// MARK: - 单图上传
+/// 单图上传
+public let kConfigUploadSingleImgApi = "/config/upload"
+
+// MARK: - 多图上传
+/// 多图上传
+public let kConfigUploadMultiImgApi = "/config/multi_upload"
 
 
 /// 基础配置
 ///
 /// - configPickupNodeIndex: 自提点列表
 /// - configCityManagementIndex: 已开通城市列表
-/// - configUploadImg: 图片上传
+/// - configUploadSingleImg: 单图上传
+/// - configUploadMultiImg: 单图上传
 public enum SwiftMoyaServiceConfigApi {
     case configPickupNodeIndex(parameters:Dictionary<String, Any>)
     case configCityManagementIndex(parameters:Dictionary<String, Any>)
-    case configUploadImg(parameters:Dictionary<String, Any>,dataArray:Array<Any>)
-    
-    
+    case configUploadSingleImg(parameters:Dictionary<String, Any>,dataArray:Array<Any>)
+    case configUploadMultiImg(parameters:Dictionary<String, Any>,dataArray:Array<Any>)
 }
 
 extension SwiftMoyaServiceConfigApi: TargetType {
@@ -41,7 +45,8 @@ extension SwiftMoyaServiceConfigApi: TargetType {
         switch self {
         case .configPickupNodeIndex,
              .configCityManagementIndex,
-             .configUploadImg
+             .configUploadSingleImg,
+             .configUploadMultiImg
             :
             return URL(string: kApiDataPrefix())!
         }
@@ -53,8 +58,10 @@ extension SwiftMoyaServiceConfigApi: TargetType {
             return kConfigPickupNodeIndexApi
         case .configCityManagementIndex:
             return kConfigCityManagementIndexApi
-        case .configUploadImg:
-            return kConfigUploadImgApi
+        case .configUploadSingleImg:
+            return kConfigUploadSingleImgApi
+        case .configUploadMultiImg:
+            return kConfigUploadMultiImgApi
         }
     }
     
@@ -64,7 +71,8 @@ extension SwiftMoyaServiceConfigApi: TargetType {
              .configCityManagementIndex
             :
             return .get
-        case .configUploadImg
+        case .configUploadSingleImg,
+             .configUploadMultiImg
             :
             return .post
         }
@@ -80,7 +88,8 @@ extension SwiftMoyaServiceConfigApi: TargetType {
             parameters.updateValue(sign, forKey: "sign")
             return .requestParameters(parameters: parameters, encoding: URLEncoding.default)
             
-        case .configUploadImg(_,let dataArray)
+        case .configUploadSingleImg(_,let dataArray),
+             .configUploadMultiImg(_,let dataArray)
             :
             return .uploadMultipart(dataArray as! [MultipartFormData])
 
@@ -104,7 +113,8 @@ extension SwiftMoyaServiceConfigApi: TargetType {
         switch self {
         case .configPickupNodeIndex,
              .configCityManagementIndex,
-             .configUploadImg
+             .configUploadSingleImg,
+             .configUploadMultiImg
             :
             return (headerParameters(headerType: .tokenHeader) as! [String : String])
         }