商品评价页面

RainbowPlanet/RainbowPlanet.xcodeproj/project.pbxproj

@@ -316,8 +316,6 @@
 		BD20F1D52283D15500677D8E /* ShoppingCartPayFailureCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD20F1D42283D15500677D8E /* ShoppingCartPayFailureCell.swift */; };
 		BD20F1D82283D2AA00677D8E /* ShoppingCartModule.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = BD20F1D72283D2AA00677D8E /* ShoppingCartModule.xcassets */; };
 		BD3474F522857B85000908C5 /* CommonPayHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD3474F422857B85000908C5 /* CommonPayHeader.swift */; };
-		BD77BE1F228D8D960060E23C /* OrderLogisticsController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD77BE1E228D8D960060E23C /* OrderLogisticsController.swift */; };
-		BD77BE23228D90840060E23C /* OrderLogisticsInfoCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD77BE22228D90840060E23C /* OrderLogisticsInfoCell.swift */; };
 		BD7AB83622841A8B0030646A /* ShoppingCartPayOrderItemCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD7AB83522841A8B0030646A /* ShoppingCartPayOrderItemCell.swift */; };
 		BD7AB838228420310030646A /* ShoppingCartPayOrderHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD7AB837228420310030646A /* ShoppingCartPayOrderHeader.swift */; };
 		BD7AB83A2284288D0030646A /* ShoppingCartPayOrderFooter.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD7AB8392284288D0030646A /* ShoppingCartPayOrderFooter.swift */; };
@@ -340,6 +338,13 @@
 		BDF47D822282B3D100941AB9 /* ShoppingCartHotSaleTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDF47D812282B3D100941AB9 /* ShoppingCartHotSaleTableViewCell.swift */; };
 		BDF47D852282C59F00941AB9 /* ShoppingCartListTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDF47D842282C59F00941AB9 /* ShoppingCartListTableViewCell.swift */; };
 		BDF47D872282C92200941AB9 /* ShoppingCartListTableViewHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDF47D862282C92200941AB9 /* ShoppingCartListTableViewHeader.swift */; };
+		BDF8629C228E4125000DEF84 /* OrderCommentController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDF8629B228E4125000DEF84 /* OrderCommentController.swift */; };
+		BDF862A1228E41CC000DEF84 /* OrderLogisticsController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDF8629E228E41CC000DEF84 /* OrderLogisticsController.swift */; };
+		BDF862A2228E41CC000DEF84 /* OrderLogisticsInfoCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDF862A0228E41CC000DEF84 /* OrderLogisticsInfoCell.swift */; };
+		BDF862A7228E42FA000DEF84 /* OrderApplyRefundController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDF862A6228E42FA000DEF84 /* OrderApplyRefundController.swift */; };
+		BDF862AA228E43A4000DEF84 /* OrderCommentTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDF862A9228E43A4000DEF84 /* OrderCommentTableViewCell.swift */; };
+		BDF862AC228E5112000DEF84 /* OrderCommentAddImgCollectionCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDF862AB228E5112000DEF84 /* OrderCommentAddImgCollectionCell.swift */; };
+		BDF862AE228E57E1000DEF84 /* OrderCommentDefaultCollectionCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDF862AD228E57E1000DEF84 /* OrderCommentDefaultCollectionCell.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -684,8 +689,6 @@
 		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>"; };
 		BD3474F422857B85000908C5 /* CommonPayHeader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommonPayHeader.swift; sourceTree = "<group>"; };
-		BD77BE1E228D8D960060E23C /* OrderLogisticsController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrderLogisticsController.swift; sourceTree = "<group>"; };
-		BD77BE22228D90840060E23C /* OrderLogisticsInfoCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrderLogisticsInfoCell.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>"; };
 		BD7AB8392284288D0030646A /* ShoppingCartPayOrderFooter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShoppingCartPayOrderFooter.swift; sourceTree = "<group>"; };
@@ -709,6 +712,13 @@
 		BDF47D812282B3D100941AB9 /* ShoppingCartHotSaleTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShoppingCartHotSaleTableViewCell.swift; sourceTree = "<group>"; };
 		BDF47D842282C59F00941AB9 /* ShoppingCartListTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShoppingCartListTableViewCell.swift; sourceTree = "<group>"; };
 		BDF47D862282C92200941AB9 /* ShoppingCartListTableViewHeader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShoppingCartListTableViewHeader.swift; sourceTree = "<group>"; };
+		BDF8629B228E4125000DEF84 /* OrderCommentController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrderCommentController.swift; sourceTree = "<group>"; };
+		BDF8629E228E41CC000DEF84 /* OrderLogisticsController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OrderLogisticsController.swift; sourceTree = "<group>"; };
+		BDF862A0228E41CC000DEF84 /* OrderLogisticsInfoCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OrderLogisticsInfoCell.swift; sourceTree = "<group>"; };
+		BDF862A6228E42FA000DEF84 /* OrderApplyRefundController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrderApplyRefundController.swift; sourceTree = "<group>"; };
+		BDF862A9228E43A4000DEF84 /* OrderCommentTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrderCommentTableViewCell.swift; sourceTree = "<group>"; };
+		BDF862AB228E5112000DEF84 /* OrderCommentAddImgCollectionCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrderCommentAddImgCollectionCell.swift; sourceTree = "<group>"; };
+		BDF862AD228E57E1000DEF84 /* OrderCommentDefaultCollectionCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrderCommentDefaultCollectionCell.swift; sourceTree = "<group>"; };
 		D469F6C3768252BCB7001EDD /* Pods_RainbowPlanet.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RainbowPlanet.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
@@ -2607,6 +2617,7 @@
 				A7FF158A228C910600A85748 /* OrderRefunddetails */,
 				BD77BE1B228D8D320060E23C /* OrderLogistics */,
 				BD77BE18228D8C2E0060E23C /* OrderComment */,
+				BDF862A3228E4266000DEF84 /* OrderApplyRefund */,
 			);
 			path = OrderModule;
 			sourceTree = "<group>";
@@ -2781,22 +2792,16 @@
 		BD77BE18228D8C2E0060E23C /* OrderComment */ = {
 			isa = PBXGroup;
 			children = (
-				BD77BE19228D8C4C0060E23C /* View */,
+				BDF862A8228E438E000DEF84 /* View */,
 				BD77BE1A228D8C570060E23C /* ViewController */,
 			);
 			path = OrderComment;
 			sourceTree = "<group>";
 		};
-		BD77BE19228D8C4C0060E23C /* View */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			path = View;
-			sourceTree = "<group>";
-		};
 		BD77BE1A228D8C570060E23C /* ViewController */ = {
 			isa = PBXGroup;
 			children = (
+				BDF8629B228E4125000DEF84 /* OrderCommentController.swift */,
 			);
 			path = ViewController;
 			sourceTree = "<group>";
@@ -2804,30 +2809,12 @@
 		BD77BE1B228D8D320060E23C /* OrderLogistics */ = {
 			isa = PBXGroup;
 			children = (
-				BD77BE1D228D8D6D0060E23C /* View */,
-				BD77BE1C228D8D6D0060E23C /* ViewController */,
+				BDF8629F228E41CC000DEF84 /* View */,
+				BDF8629D228E41CC000DEF84 /* ViewController */,
 			);
 			path = OrderLogistics;
 			sourceTree = "<group>";
 		};
-		BD77BE1C228D8D6D0060E23C /* ViewController */ = {
-			isa = PBXGroup;
-			children = (
-				BD77BE1E228D8D960060E23C /* OrderLogisticsController.swift */,
-			);
-			name = ViewController;
-			path = RainbowPlanet/Modules/OrderModule/OrderComment/ViewController;
-			sourceTree = SOURCE_ROOT;
-		};
-		BD77BE1D228D8D6D0060E23C /* View */ = {
-			isa = PBXGroup;
-			children = (
-				BD77BE22228D90840060E23C /* OrderLogisticsInfoCell.swift */,
-			);
-			name = View;
-			path = RainbowPlanet/Modules/OrderModule/OrderComment/View;
-			sourceTree = SOURCE_ROOT;
-		};
 		BD7AB83B228437940030646A /* AdressCell */ = {
 			isa = PBXGroup;
 			children = (
@@ -2879,6 +2866,48 @@
 			path = ShoppingCartList;
 			sourceTree = "<group>";
 		};
+		BDF8629D228E41CC000DEF84 /* ViewController */ = {
+			isa = PBXGroup;
+			children = (
+				BDF8629E228E41CC000DEF84 /* OrderLogisticsController.swift */,
+			);
+			path = ViewController;
+			sourceTree = "<group>";
+		};
+		BDF8629F228E41CC000DEF84 /* View */ = {
+			isa = PBXGroup;
+			children = (
+				BDF862A0228E41CC000DEF84 /* OrderLogisticsInfoCell.swift */,
+			);
+			path = View;
+			sourceTree = "<group>";
+		};
+		BDF862A3228E4266000DEF84 /* OrderApplyRefund */ = {
+			isa = PBXGroup;
+			children = (
+				BDF862A4228E42CA000DEF84 /* ViewController */,
+			);
+			path = OrderApplyRefund;
+			sourceTree = "<group>";
+		};
+		BDF862A4228E42CA000DEF84 /* ViewController */ = {
+			isa = PBXGroup;
+			children = (
+				BDF862A6228E42FA000DEF84 /* OrderApplyRefundController.swift */,
+			);
+			path = ViewController;
+			sourceTree = "<group>";
+		};
+		BDF862A8228E438E000DEF84 /* View */ = {
+			isa = PBXGroup;
+			children = (
+				BDF862A9228E43A4000DEF84 /* OrderCommentTableViewCell.swift */,
+				BDF862AB228E5112000DEF84 /* OrderCommentAddImgCollectionCell.swift */,
+				BDF862AD228E57E1000DEF84 /* OrderCommentDefaultCollectionCell.swift */,
+			);
+			path = View;
+			sourceTree = "<group>";
+		};
 		FA8AAFBADE8BD144A5C36FDB /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
@@ -3204,6 +3233,7 @@
 				A7778CA72243A05400C7C47A /* IQKeyboardManagerSwiftManager.swift in Sources */,
 				A7B4E738228191CC0012914A /* CommondModel.swift in Sources */,
 				BD7AB841228438C80030646A /* OrderPaySelfPickAddressCell.swift in Sources */,
+				BDF862AC228E5112000DEF84 /* OrderCommentAddImgCollectionCell.swift in Sources */,
 				A7CC74D4226FF1AA003C4F38 /* MineView.swift in Sources */,
 				A71AA5152272160A008FF1A5 /* ExpressAddressListTableViewCell.swift in Sources */,
 				A72A72B722321DE000B21995 /* Extension+NSMutableAttributedString.swift in Sources */,
@@ -3228,7 +3258,7 @@
 				A72C01222275404A0065E0C3 /* ProvinceCityAreaModel.swift in Sources */,
 				A7FF1579228C82CE00A85748 /* OrderDetailViewController.swift in Sources */,
 				A7C3DD1C226422D200FA262E /* SwiftMoyaNetWorkServiceSMS.swift in Sources */,
-				BD77BE23228D90840060E23C /* OrderLogisticsInfoCell.swift in Sources */,
+				BDF862A2228E41CC000DEF84 /* OrderLogisticsInfoCell.swift in Sources */,
 				A72A7386223396CB00B21995 /* SwiftMoyaNetWorkManager.swift in Sources */,
 				A70B2C252286C03800B2449F /* NXLPageControl.swift in Sources */,
 				A7A98E12227ECA11005306E9 /* ProductSearchModel.swift in Sources */,
@@ -3288,6 +3318,7 @@
 				A7824B042271F10300ABA381 /* EditSelfMentionContactsView.swift in Sources */,
 				A7FF1566228C6DF200A85748 /* OrderShopAndStatusTableViewCell.swift in Sources */,
 				A7A98E332280272A005306E9 /* ShoppingMallBannerTableViewCell.swift in Sources */,
+				BDF862AA228E43A4000DEF84 /* OrderCommentTableViewCell.swift in Sources */,
 				A7B4E754228278320012914A /* ShoppingMallFloorTableViewCell.swift in Sources */,
 				BD3474F522857B85000908C5 /* CommonPayHeader.swift in Sources */,
 				A71AF0B6226EF99A001730FE /* SearchResultViewController.swift in Sources */,
@@ -3364,6 +3395,7 @@
 				A7CC752F2271A1F2003C4F38 /* SetPasswordView.swift in Sources */,
 				A7A98E09227EB8DD005306E9 /* CategoryView.swift in Sources */,
 				A7CC75362271AC14003C4F38 /* AddressManagerView.swift in Sources */,
+				BDF8629C228E4125000DEF84 /* OrderCommentController.swift in Sources */,
 				A7B4E75A228289BB0012914A /* ProductFloorCenterHeaderCollectionReusableView.swift in Sources */,
 				A71901752275F71F00104A50 /* BaiduToCityModel.swift in Sources */,
 				A7BB685922696B9200AB07A2 /* SelfRecommendationCollectionViewCell.swift in Sources */,
@@ -3381,6 +3413,7 @@
 				A7CC74E0227042A4003C4F38 /* MineServiceTableViewCell.swift in Sources */,
 				A72A72BC22321DE000B21995 /* Extension+UIAlertController.swift in Sources */,
 				A7BB68662269B1DD00AB07A2 /* AddressPOIView.swift in Sources */,
+				BDF862A7228E42FA000DEF84 /* OrderApplyRefundController.swift in Sources */,
 				A72A72C322321DE000B21995 /* Extension+Date.swift in Sources */,
 				A70B2C5522885AF500B2449F /* ShareCollectionViewCell.swift in Sources */,
 				A7A98E3A2280312C005306E9 /* ShoppingMallCategoryTableViewCell.swift in Sources */,
@@ -3392,6 +3425,7 @@
 				A7B4E73A228192D20012914A /* CMSTemplateModel.swift in Sources */,
 				A72A72C622321DE000B21995 /* WebView.swift in Sources */,
 				A72A72D122321E2700B21995 /* HTMLURLMacro.swift in Sources */,
+				BDF862A1228E41CC000DEF84 /* OrderLogisticsController.swift in Sources */,
 				A72A73162232481600B21995 /* WeChatpayManager.swift in Sources */,
 				A7CC750F22715AAC003C4F38 /* MessageDetailesTableViewCell.swift in Sources */,
 				A7B4E72D228176060012914A /* ProductMallBarChartCollectionViewCell.swift in Sources */,
@@ -3411,7 +3445,6 @@
 				A7B4E72F2281773F0012914A /* ProductFloorCenterTitleView.swift in Sources */,
 				A7284A542252FB5C000BAEC4 /* PaginationModel.swift in Sources */,
 				A72A72D022321E2700B21995 /* FontMacro.swift in Sources */,
-				BD77BE1F228D8D960060E23C /* OrderLogisticsController.swift in Sources */,
 				BD1DC6C9228D005000B89C57 /* OrderCreateParameterModel.swift in Sources */,
 				A71AA52622732068008FF1A5 /* SwiftMoyaServiceConfigApi.swift in Sources */,
 				A77F2C982231FD25001BD3F6 /* BaseNavigationViewController.swift in Sources */,
@@ -3426,6 +3459,7 @@
 				A7CC750A22715755003C4F38 /* MessageDetailesViewController.swift in Sources */,
 				A71AF0B8226EF9EC001730FE /* SearchResultNavigationbarView.swift in Sources */,
 				A70B2C5A22886ADF00B2449F /* ShopViewController.swift in Sources */,
+				BDF862AE228E57E1000DEF84 /* OrderCommentDefaultCollectionCell.swift in Sources */,
 				A70B2C3E228825B100B2449F /* ProductDetailEvaluationTableViewCell.swift in Sources */,
 				A7FF1590228C914600A85748 /* OrderRefunddetailsView.swift in Sources */,
 				A79057022276C9770037F823 /* SetPasswordModel.swift in Sources */,

RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderApplyRefund/ViewController/OrderApplyRefundController.swift

@@ -0,0 +1,97 @@
+//
+//  OrderApplyRefundController.swift
+//  RainbowPlanet
+//
+//  Created by Christopher on 2019/5/17.
+//  Copyright © 2019 RainbowPlanet. All rights reserved.
+//  订单--申请退款Vc
+
+import UIKit
+import RxSwift
+
+class OrderApplyRefundController: BaseViewController {
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        setupViews()
+        setupData()
+        
+    }
+    
+    override func setupViews() {
+        navigationBar.title = "申请退款"
+        
+        self.view.backgroundColor = kf7f8faColor
+        
+        
+        self.view.addSubview(tableView)
+        let emptyView =  EmptyView.shared.diyCustomEmptyViewStyle2(iconStr: "page04", titleStr: "当前暂无数据")
+        emptyView.contentViewY = kScaleValue(value: 182)
+        tableView.ly_emptyView = emptyView
+        tableView.ly_startLoading()
+        tableView.snp.makeConstraints { (make) in
+//            make.top.equalTo(serialNumView.snp_bottom).offset(10)
+            make.left.right.bottom.equalToSuperview()
+        }
+        
+    }
+    
+    override func setupData() {
+        
+    }
+    
+    lazy var tableView: UITableView = {
+        let tableView = UITableView(frame: CGRect.zero, style: UITableView.Style.grouped)
+        tableView.separatorStyle = .none
+        tableView.backgroundColor = kffffffColor
+        tableView.dataSource = self
+        tableView.delegate = self
+        tableView.estimatedRowHeight = 0.000001
+        tableView.estimatedSectionFooterHeight = 0.000001
+        tableView.estimatedSectionHeaderHeight = 0.000001
+        return tableView
+    }()
+    
+}
+
+// MARK: - tableView dataSource && delegate
+extension OrderApplyRefundController : UITableViewDelegate, UITableViewDataSource {
+    
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return 5
+    }
+    
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        let infoCell = OrderLogisticsInfoCell.cellWith(tableView: tableView, indexPath: indexPath)
+        if indexPath.row == 0 {
+            infoCell.isFirstCell = true
+        }
+        if indexPath.row == 4 {
+            infoCell.isLastCell = true
+        }
+        return infoCell
+    }
+    
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        return  UITableView.automaticDimension
+    }
+    
+    func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
+        return 0.000001
+    }
+    
+    func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
+        return nil
+    }
+    
+    func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
+        return 0.000001
+    }
+    
+    func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
+        return nil
+    }
+    
+}
+
+

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

@@ -0,0 +1,99 @@
+//
+//  OrderCommentAddImgCollectionCell.swift
+//  RainbowPlanet
+//
+//  Created by Christopher on 2019/5/17.
+//  Copyright © 2019 RainbowPlanet. All rights reserved.
+//  添加照片のCell(有图)（85*85）
+
+import UIKit
+import RxSwift
+
+class OrderCommentAddImgCollectionCell: UICollectionViewCell {
+    
+    let disposeBag = DisposeBag()
+    
+    var productSearchModel: ProductSearchModel? {
+        didSet {
+            picImageView.kf.setImage(with: kURLImage(name: productSearchModel?.img ?? "pic_preload"), placeholder: kImage(name: "pic_preload"))            
+        }
+    }
+    
+    typealias DelPicBlock = (_ productSearchModel: ProductSearchModel?,_ indexPath:IndexPath?) -> Void
+    var delPicBlock : DelPicBlock?
+    
+    class func cellWith(collectionView:UICollectionView,indexPath:IndexPath) -> OrderCommentAddImgCollectionCell {
+        let ID = "OrderCommentAddImgCollectionCell"
+        collectionView.register(OrderCommentAddImgCollectionCell.self, forCellWithReuseIdentifier: ID)
+        let cell : OrderCommentAddImgCollectionCell = collectionView.dequeueReusableCell(withReuseIdentifier: ID, for: indexPath) as! OrderCommentAddImgCollectionCell
+        cell.indexPath = indexPath
+        return cell
+    }
+    //MARK: - indexPath
+    var indexPath: IndexPath?{
+        didSet {
+            
+        }
+    }
+    //MARK: - 初始化
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        backgroundColor = UIColor.white
+        cornerRadius = 4
+        masksToBounds = true
+        setupViews()
+        setupLayouts()
+        
+    }
+    
+    required init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    //MRAK: - 设置View
+    private func setupViews() {
+        addSubview(imgBackView)
+        imgBackView.addSubview(picImageView)
+        
+        addSubview(delButton)
+    }
+    
+    private func setupLayouts() {
+        imgBackView.snp.makeConstraints { (make) in
+            make.left.bottom.equalToSuperview()
+            make.size.equalTo(76)
+        }
+        picImageView.snp.makeConstraints { (make) in
+            make.edges.equalToSuperview()
+        }
+        delButton.snp.makeConstraints { (make) in
+            make.top.right.equalToSuperview()
+            make.size.equalTo(18)
+        }
+    }
+    
+    private lazy var imgBackView: UIView = {
+        let imgBackView = UIView()
+        return imgBackView
+    }()
+        
+    private lazy var picImageView: UIImageView = {
+        let picImageView = UIImageView()
+        return picImageView
+    }()
+    
+    private lazy var delButton: UIButton = {
+        let delButton = UIButton(type: UIButton.ButtonType.custom)
+        delButton.setImage(kImage(name: "common_sku_cancel"), for: UIControl.State.normal)
+        delButton.rx.tap.subscribe(onNext: {
+            [weak self] (data) in
+//            if let delPicBlock = self?.delPicBlock {
+//                delPicBlock(self?.productSearchModel,self?.indexPath)
+//            }
+            print("点击删除图片")
+            
+        }).disposed(by: disposeBag)
+        return delButton
+    }()
+    
+}

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

@@ -0,0 +1,106 @@
+//
+//  OrderCommentDefaultCollectionCell.swift
+//  RainbowPlanet
+//
+//  Created by Christopher on 2019/5/17.
+//  Copyright © 2019 RainbowPlanet. All rights reserved.
+//  添加照片のCell(默认，无图)
+
+import UIKit
+import RxSwift
+
+class OrderCommentDefaultCollectionCell: UICollectionViewCell {
+    
+    let disposeBag = DisposeBag()
+    
+    var productSearchModel: ProductSearchModel? {
+        didSet {
+            titleLabel.text = productSearchModel?.saleName
+        }
+    }
+    
+    class func cellWith(collectionView:UICollectionView,indexPath:IndexPath) -> OrderCommentDefaultCollectionCell {
+        let ID = "OrderCommentDefaultCollectionCell.swift"
+        collectionView.register(OrderCommentDefaultCollectionCell.self, forCellWithReuseIdentifier: ID)
+        let cell : OrderCommentDefaultCollectionCell = collectionView.dequeueReusableCell(withReuseIdentifier: ID, for: indexPath) as! OrderCommentDefaultCollectionCell
+        cell.indexPath = indexPath
+        return cell
+    }
+    //MARK: - indexPath
+    var indexPath: IndexPath?{
+        didSet {
+            
+        }
+    }
+    //MARK: - 初始化
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        backgroundColor = UIColor.white
+        cornerRadius = 4
+        masksToBounds = true
+        setupViews()
+        setupLayouts()        
+    }
+    
+    required init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    //MRAK: - 设置View
+    private func setupViews() {
+        addSubview(imgBackView)
+        imgBackView.addSubview(picImageView)
+        imgBackView.addSubview(cameraImgView)
+        imgBackView.addSubview(titleLabel)
+    }
+        
+    private func setupLayouts() {
+        imgBackView.snp.makeConstraints { (make) in
+            make.left.bottom.equalToSuperview()
+            make.size.equalTo(76)
+        }
+        picImageView.snp.makeConstraints { (make) in
+            make.edges.equalToSuperview()
+        }
+        cameraImgView.snp.makeConstraints { (make) in
+            make.top.equalToSuperview().offset(16)
+            make.centerX.equalToSuperview()
+            make.width.equalTo(23)
+            make.height.equalTo(20)
+        }
+        titleLabel.snp.makeConstraints { (make) in
+            make.top.equalTo(cameraImgView.snp_bottom).offset(12)
+            make.centerX.equalToSuperview()
+            make.height.equalTo(17)
+        }
+    }
+    
+    private lazy var imgBackView: UIView = {
+        let imgBackView = UIView()
+        return imgBackView
+    }()
+    
+    private lazy var picImageView: UIImageView = {
+        let picImageView = UIImageView()
+        picImageView.image = kImage(name: "order_image_empty")
+        return picImageView
+    }()
+    
+    private lazy var cameraImgView: UIImageView = {
+        let cameraImgView = UIImageView()
+        cameraImgView.image = kImage(name: "order_photo")
+        return cameraImgView
+    }()
+    
+    private lazy var titleLabel: UILabel = {
+        let titleLabel = UILabel()
+        titleLabel.text = "添加照片"
+        titleLabel.textColor = k666666Color
+        titleLabel.font = kRegularFont12
+        titleLabel.textAlignment = .center
+        titleLabel.numberOfLines = 1
+        return titleLabel
+    }()
+     
+}
+

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

@@ -0,0 +1,195 @@
+//
+//  OrderCommentTableViewCell.swift
+//  RainbowPlanet
+//
+//  Created by Christopher on 2019/5/17.
+//  Copyright © 2019 RainbowPlanet. All rights reserved.
+//
+
+import UIKit
+import IQKeyboardManagerSwift
+
+class OrderCommentTableViewCell: UITableViewCell {
+    
+    var productMdl : ProductModel? {
+        didSet {
+            // 商品图片
+            iconImageView.kf.setImage(with: kURLImage(name: productMdl?.productImg ?? ""), placeholder: kImage(name: "pic_preload"))
+            // 商品名称
+            titleLabel.text = productMdl?.productName
+            // 价格
+            cmtTextView.text = "¥\(productMdl?.skuPrice ?? 0)"
+        }
+    }
+    
+    class func cellWith(tableView:UITableView,indexPath:IndexPath) -> OrderCommentTableViewCell {
+        let ID = "OrderCommentTableViewCell"
+        tableView.register(OrderCommentTableViewCell.self, forCellReuseIdentifier: ID)
+        let cell : OrderCommentTableViewCell = tableView.dequeueReusableCell(withIdentifier: ID, for: indexPath) as! OrderCommentTableViewCell
+        cell.indexPath = indexPath
+        return cell
+    }
+    
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        setupViews()
+        setupLayouts()
+    }
+    
+    required init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    var indexPath: IndexPath? {
+        didSet {
+            
+        }
+    }
+    
+    //MRAK: - 设置View
+    private func setupViews() {
+        self.selectionStyle = .none
+        
+        addSubview(cmtBackView)
+        cmtBackView.addSubview(iconImageView)
+        cmtBackView.addSubview(titleLabel)
+        cmtBackView.addSubview(starView)
+        
+        addSubview(cmtTextView)
+        addSubview(collectionView)
+    }
+    
+    private func setupLayouts() {
+        cmtBackView.snp.makeConstraints { (make) in
+            make.top.left.right.equalToSuperview()
+            make.height.equalTo(91)
+        }
+        iconImageView.snp.makeConstraints { (make) in
+            make.top.equalToSuperview().offset(16)
+            make.left.equalToSuperview().offset(14)
+            make.size.equalTo(55)
+        }
+        titleLabel.snp.makeConstraints { (make) in
+            make.left.equalTo(iconImageView.snp_right).offset(10)
+            make.centerY.equalTo(iconImageView)
+            make.width.equalTo(56)
+            make.height.equalTo(20)
+        }
+        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)
+        }
+        
+        cmtTextView.snp.makeConstraints { (make) in
+            make.top.equalTo(cmtBackView.snp_bottom)
+            make.left.equalTo(14)
+            make.right.equalTo(-14)
+            make.height.equalTo(100)
+        }
+        
+        collectionView.snp.makeConstraints { (make) in
+            make.top.equalTo(16)
+            make.left.right.equalToSuperview()
+            make.height.equalTo(200)
+        }
+        
+    }    
+    
+    private lazy var cmtBackView: UIView = {
+        let cmtBackView = UIView()
+        return cmtBackView
+    }()
+    
+    private lazy var iconImageView: UIImageView = {
+        let iconImageView = UIImageView()
+        return iconImageView
+    }()
+    
+    private lazy var titleLabel: UILabel = {
+        let titleLabel = UILabel()
+        titleLabel.text = "商品评分"
+        titleLabel.textColor = k333333Color
+        titleLabel.font = kBoldFont14
+        titleLabel.textAlignment = .left
+        titleLabel.numberOfLines = 1
+        return titleLabel
+    }()
+    
+    private lazy var starView: SwiftyStarRatingView = {
+        let starView = SwiftyStarRatingView()
+        return starView
+    }()
+    
+    private lazy var cmtTextView: IQTextView = {
+        let cmtTextView = IQTextView()
+        cmtTextView.textColor = k333333Color
+        cmtTextView.font = kRegularFont14
+        cmtTextView.placeholder = "输入商品评价..."
+        cmtTextView.placeholderTextColor = k999999Color
+        return cmtTextView
+    }()
+    
+    private lazy var collectionView: UICollectionView = {
+        let collectionView = UICollectionView.init(frame: CGRect.zero, collectionViewLayout: collectionViewLayout)
+        collectionView.backgroundColor = kf7f8faColor
+        collectionView.delegate = self;
+        collectionView.dataSource = self;
+        collectionView.showsVerticalScrollIndicator = false
+        collectionView.showsHorizontalScrollIndicator = false
+        return collectionView
+    }()
+    
+    private lazy var collectionViewLayout: UICollectionViewFlowLayout = {
+        let collectionViewLayout = UICollectionViewFlowLayout.init()
+        collectionViewLayout.minimumLineSpacing = 10
+        collectionViewLayout.minimumInteritemSpacing = 0
+        return collectionViewLayout
+    }()
+    
+    //加载数据
+    func reloadData() {
+        //collectionView重新加载数据
+        self.collectionView.reloadData()
+        //更新collectionView的高度约束
+        let contentSize = self.collectionView.collectionViewLayout.collectionViewContentSize
+        collectionView.snp.remakeConstraints { (make) in
+            make.top.equalTo(16)
+            make.left.right.equalToSuperview()
+            make.height.equalTo(contentSize.height)
+            make.bottom.equalToSuperview()
+        }
+        self.collectionView.collectionViewLayout.invalidateLayout()
+    }
+    
+}
+
+extension OrderCommentTableViewCell: UICollectionViewDelegateFlowLayout,UICollectionViewDataSource {
+    func numberOfSections(in collectionView: UICollectionView) -> Int {
+        return 1
+    }
+    
+    func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
+        return 3+1
+    }
+    
+    func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
+        if indexPath.row < 4 {
+            let cell = OrderCommentAddImgCollectionCell.cellWith(collectionView: collectionView, indexPath: indexPath)
+            return cell
+        } else {
+            let cell = OrderCommentDefaultCollectionCell.cellWith(collectionView: collectionView, indexPath: indexPath)
+            return cell            
+        }        
+    }
+    
+    func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize {
+        return CGSize(width:85, height: 85)
+    }
+    
+    func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, insetForSectionAt section: Int) -> UIEdgeInsets {
+        return UIEdgeInsets(top: 10, left: 0, bottom: 20, right: 0)
+    }
+    
+}

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

@@ -0,0 +1,105 @@
+//
+//  OrderCommentController.swift
+//  RainbowPlanet
+//
+//  Created by Christopher on 2019/5/17.
+//  Copyright © 2019 RainbowPlanet. All rights reserved.
+//  订单--评价Vc
+
+import UIKit
+import RxSwift
+
+class OrderCommentController: BaseViewController {
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        setupViews()
+        setupData()
+        
+    }
+    
+    override func setupViews() {
+        navigationBar.title = "评价"
+        
+        let commitButton = UIButton(type: UIButton.ButtonType.custom)
+        commitButton.setTitleColor(kffffffColor, for: UIControl.State.normal)
+        commitButton.titleLabel?.font = kRegularFont16
+        commitButton.backgroundColor = kFFA42FColor
+        self.view.addSubview(commitButton)
+        commitButton.rx.tap.subscribe(onNext: { [weak self] (data) in
+            print("点击了--提交评价")
+            
+        }).disposed(by: disposeBag)
+        commitButton.snp.makeConstraints { (make) in
+            make.left.right.equalToSuperview()
+            make.bottom.equalToSuperview().offset(-kSafeTabBarHeight)
+            make.height.equalTo(50)
+        }
+        
+        self.view.addSubview(tableView)
+        let emptyView =  EmptyView.shared.diyCustomEmptyViewStyle2(iconStr: "page04", titleStr: "当前暂无数据")
+        emptyView.contentViewY = kScaleValue(value: 182)
+        tableView.ly_emptyView = emptyView
+        tableView.ly_startLoading()
+        tableView.snp.makeConstraints { (make) in
+            make.top.equalToSuperview().offset(kSafeStatusBarHeight+40)
+            make.bottom.equalTo(commitButton.snp_top)
+            make.left.right.equalToSuperview()
+        }
+        
+    }
+    
+    override func setupData() {
+        
+    }
+    
+    lazy var tableView: UITableView = {
+        let tableView = UITableView(frame: CGRect.zero, style: UITableView.Style.grouped)
+        tableView.separatorStyle = .none
+        tableView.backgroundColor = kffffffColor
+        tableView.dataSource = self
+        tableView.delegate = self
+        tableView.estimatedRowHeight = 0.000001
+        tableView.estimatedSectionFooterHeight = 0.000001
+        tableView.estimatedSectionHeaderHeight = 0.000001
+        return tableView
+    }()
+    
+}
+
+// MARK: - tableView dataSource && delegate
+extension OrderCommentController : UITableViewDelegate, UITableViewDataSource {
+    
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return 2
+    }
+    
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        let commentCell = OrderCommentTableViewCell.cellWith(tableView: tableView, indexPath: indexPath)
+        return commentCell
+    }
+    
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        return  UITableView.automaticDimension
+    }
+    
+    func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
+        return 10
+    }
+    
+    func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
+        let headerSepView = UIView(frame: CGRect(x: 0, y: 0, width: kScreenWidth, height: 10))
+        headerSepView.backgroundColor = kf7f8faColor
+        return headerSepView
+    }
+    
+    func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
+        return 0.000001
+    }
+    
+    func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
+        return nil
+    }
+    
+}
+

RainbowPlanet/RainbowPlanet/Supporting Files/OrderModule.xcassets/order_image_empty.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "order_image_empty@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "order_image_empty@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

RainbowPlanet/RainbowPlanet/Supporting Files/OrderModule.xcassets/order_photo.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "order_photo@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "order_photo@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}