Merge branch 'feature/liuxuqing' into develop

RainbowPlanet/RainbowPlanet/Modules/OrderModule/Order/ViewController/OrderViewController.swift

@@ -213,6 +213,10 @@ extension OrderViewController :JXSegmentedListContainerViewDataSource {
         if button.titleLabel?.text == "去评价" {            
             let vc = OrderCommentController()
             vc.orderDetailModel = orderModel
+            vc.commentSuccessedBlock = {
+                [weak self] in
+                
+            }
             self.navigationController?.pushViewController(vc, animated: true)
         }
         if button.titleLabel?.text == "再次购买" {

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

@@ -47,8 +47,6 @@ class OrderCommentAddImgCollectionCell: UICollectionViewCell {
     override init(frame: CGRect) {
         super.init(frame: frame)
         backgroundColor = UIColor.white
-        cornerRadius = 4
-        masksToBounds = true
         setupViews()
         setupLayouts()
         
@@ -87,6 +85,8 @@ class OrderCommentAddImgCollectionCell: UICollectionViewCell {
         
     private lazy var picImageView: UIImageView = {
         let picImageView = UIImageView()
+        picImageView.cornerRadius = 4
+        picImageView.masksToBounds = true
         return picImageView
     }()
     

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

@@ -137,8 +137,8 @@ extension OrderCommentController : UITableViewDelegate, UITableViewDataSource {
             }
         }
         commentCell.delPicTransBlock = {
-            [weak self] (idxRow) in
-            self?.productArr![idxRow!].imageArr.remove(at: idxRow!)
+            [weak self] (picIdx) in
+            self?.productArr![indexPath.row].imageArr.remove(at: picIdx!)
             self?.tableView.reloadData()
         }
         return commentCell

RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderDetail/ViewController/OrderDetailViewController.swift

@@ -134,6 +134,10 @@ class OrderDetailViewController: BaseViewController {
         if button.titleLabel?.text == "去评价" {
             let vc = OrderCommentController()
             vc.orderDetailModel = self.orderDetailModel
+            vc.commentSuccessedBlock = {
+                [weak self] in
+                self?.orderPurchaseDetailApi()
+            }
             self.navigationController?.pushViewController(vc, animated: true)
         }
         if button.titleLabel?.text == "再次购买" {