我的订单-全部订单列表页缺少刷新功能

商品详情页商品评价为0时也应展示评价数量
商户详情页商品信息列表应按照商品添加时间倒序排列
退款详情页，退款订单不同状态页面展示不正确

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

@@ -209,6 +209,7 @@ extension OrderViewController :JXSegmentedListContainerViewDataSource {
             let vc = OrderRefunddetailsViewController()
             vc.refundNo = orderModel.refundNo
             vc.orderRefunddetailsVCType = .order
+            vc.orderStatus = orderModel.status
             self.navigationController?.pushViewController(vc, animated: true)
         }
         if button.titleLabel?.text == "去评价" {            
@@ -252,6 +253,5 @@ extension OrderViewController :JXSegmentedListContainerViewDataSource {
                 vc.orderPurchaseOrderListApi(page: 1)
             }
         }
-        
     }
 }

RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderDetail/View/OrderDetailBottomView.swift

@@ -169,13 +169,11 @@ class OrderDetailBottomView: BaseView {
                     }else {
                         if orderModel?.isComment == 0 {
                             setButton( button: oneButton, title: "去评价", titleColor: kffffffColor, backgroundColor: kFFA42FColor, borderColor: kFFA42FColor)
-                            setButton( button: twoButton, title: "退款详情", titleColor: kffffffColor, backgroundColor: kFFA42FColor, borderColor: kFFA42FColor)
-                            setButton(button: threeButton, title: "再次购买", titleColor: k333333Color, backgroundColor: UIColor.white, borderColor: kbfbfbfColor)
+                            setButton(button: twoButton, title: "再次购买", titleColor: k333333Color, backgroundColor: UIColor.white, borderColor: kbfbfbfColor)
                             setIsButtonHidden(leftHidden: true, oneHidden: false, twoHidden: false, threeHidden: false)
 
                         }else {
-                            setButton(button: oneButton, title: "退款详情", titleColor: kffffffColor, backgroundColor: kFFA42FColor, borderColor: kFFA42FColor)
-                            setButton(button: twoButton, title: "再次购买", titleColor: k333333Color, backgroundColor: UIColor.white, borderColor: kbfbfbfColor)
+                            setButton(button: oneButton, title: "再次购买", titleColor: k333333Color, backgroundColor: UIColor.white, borderColor: kbfbfbfColor)
                             setIsButtonHidden(leftHidden: true, oneHidden: false, twoHidden: false, threeHidden: true)
 
                         }

RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderDetail/View/OrderDetailInfoTableViewCell.swift

@@ -114,4 +114,11 @@ class OrderDetailInfoTableViewCell: UITableViewCell {
         }
     }
     
+    var refundContents : [String]? {
+        didSet {
+            copyButton.isHidden = true
+            contentLabel.text = refundContents?[(indexPath?.row)!]
+        }
+    }
+    
 }

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

@@ -149,6 +149,7 @@ class OrderDetailViewController: BaseViewController {
             let vc = OrderRefunddetailsViewController()
             vc.refundNo = self.orderDetailModel?.refundNo
             vc.orderRefunddetailsVCType = .orderDetail
+            vc.orderStatus = self.orderDetailModel?.status
             self.navigationController?.pushViewController(vc, animated: true)
         }
         if button.titleLabel?.text == "去评价" {

RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderRefunddetails/View/OrderRefunddetailsStatusTableViewCell.swift

@@ -84,7 +84,7 @@ class OrderRefunddetailsStatusTableViewCell: UITableViewCell {
             }
             if orderRefundDetailModel?.status == 3 {
                 statusButton.setImage(kImage(name: "order_no"), for: UIControl.State.normal)
-                statusButton.setTitle("拒绝退款", for: UIControl.State.normal)
+                statusButton.setTitle("退款失败", for: UIControl.State.normal)
             }
             let str = "退款金额 \(priceConversion(price: orderRefundDetailModel?.showRefundPrice ?? 0))"
             if orderRefundDetailModel?.showRefundPrice != nil {

RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderRefunddetails/ViewController/OrderRefunddetailsViewController.swift

@@ -20,6 +20,7 @@ class OrderRefunddetailsViewController: BaseViewController {
     var contents = ["","","","",""]
     
     var refundNo : String?
+    var orderStatus : Int?
     var orderRefundDetailModel : OrderRefundDetailModel?
     var orderRefunddetailsVCType : OrderRefunddetailsVCType?
     
@@ -72,29 +73,32 @@ class OrderRefunddetailsViewController: BaseViewController {
     }()
     
     override func setupData() {
+        if self.orderStatus == 1 {
+            self.contents[2] = "待发货"
+        }
+        if self.orderStatus == 2 {
+            self.contents[2] = "待收货"
+        }
+        if self.orderStatus == 3 {
+            self.contents[2] = "配送中"
+        }
+        if self.orderStatus == 4 {
+            self.contents[2] = "待自提"
+        }
+       
         tableView.addHeaderWithHeader(withBeginRefresh: true, animation: false) {
             [weak self] (page) in
             self?.orderPurchaseRefundDetail()
         }
+        
     }
     
     func orderPurchaseRefundDetail() {
         SwiftMoyaNetWorkServiceOrder.shared().orderPurchaseRefundDetailApi(refundNo: refundNo ?? "") { [weak self] (orderRefundDetailModel) -> (Void) in
             self?.orderRefundDetailModel = orderRefundDetailModel as? OrderRefundDetailModel
+            
             self?.contents[0] = self?.orderRefundDetailModel?.refundNo ?? ""
             self?.contents[1] = self?.orderRefundDetailModel?.createdAt ?? ""
-            if self?.orderRefundDetailModel?.status == 0 {
-                 self?.contents[2] = "待处理"
-            }
-            if self?.orderRefundDetailModel?.status == 1 {
-                self?.contents[2] = "退款中"
-            }
-            if self?.orderRefundDetailModel?.status == 2 {
-                self?.contents[2] = "退款完成"
-            }
-            if self?.orderRefundDetailModel?.status == 3 {
-                self?.contents[2] = "拒绝退款"
-            }
             self?.contents[3] = self?.orderRefundDetailModel?.refundReason ?? ""
             self?.contents[4] = "\(priceConversionNone(price: self?.orderRefundDetailModel?.showRefundPrice ?? 0))元"
             self?.tableView.reloadData()
@@ -135,7 +139,7 @@ extension OrderRefunddetailsViewController : UITableViewDelegate, UITableViewDat
         default:
             let cell = OrderDetailInfoTableViewCell.cellWith(tableView: tableView, indexPath: indexPath)
             cell.titles = titles
-            cell.contents = contents
+            cell.refundContents = contents
             return cell
         }
     }

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

@@ -56,6 +56,8 @@ class ProductDetailView: BaseView {
                 if productDetailModel?.commentNumber != 0 && productDetailModel?.commentNumber != nil {
                     titles[2] = "商品评价" + "(" + "\(productDetailModel?.commentNumber ?? 0)" + ")"
                     
+                }else {
+                    titles[2] = "商品评价" + "(" + "0" + ")"
                 }
                 if productDetailModel?.imgs?.isEmpty ?? true {
                     tableView.tableHeaderView = nil