订单测试修改

RainbowPlanet/RainbowPlanet/Macro/Common.swift

@@ -231,3 +231,12 @@ func priceConversion(price:Int) -> String {
     let price = Float(price)/100    
     return String(format: "¥ %.2f", price)
 }
+
+/// 价格转换不带人民币符号的
+///
+/// - Parameter price: 价格分
+/// - Returns: string
+func priceConversionNone(price:Int) -> String {
+    let price = Float(price)/100
+    return String(format: "¥ %.2f", price)
+}

RainbowPlanet/RainbowPlanet/Manager/PayManager/PayManagerPay/PayManagerPay.swift

@@ -14,55 +14,53 @@ class PayManagerPay: NSObject {
     typealias ReloadClosure = () -> Void
     var reloadClosure : ReloadClosure?
     
-    func payAlertView(orderPayModel: OrderCreateBackModel,orderFinishPayVCType:OrderFinishPayVCType){
+    func payAlertView(orderPayModel: OrderCreateBackModel,orderFinishPayVCType:OrderFinishPayVCType,vc:UIViewController){
         // 弹出支付方式View
         AlertSheetView.payAlertSheetView(paymentAmount:orderPayModel.money ?? "",cancelClosure: {
             [weak self] in
-            self?.pushVC(payStatus: false,orderFinishPayVCType: orderFinishPayVCType)
+            self?.pushVC(payStatus: false,orderFinishPayVCType: orderFinishPayVCType, vc: vc)
             }, sureClosure: { [weak self] (payType) in
                 switch payType {
                 case .wechatPay:
-                    self?.payWeixinpayApi(orderPayModel: orderPayModel,orderFinishPayVCType: orderFinishPayVCType)
+                    self?.payWeixinpayApi(orderPayModel: orderPayModel,orderFinishPayVCType: orderFinishPayVCType, vc: vc)
                 case .aliPay:
-                    self?.payAlipayApi(orderPayModel: orderPayModel,orderFinishPayVCType: orderFinishPayVCType)
+                    self?.payAlipayApi(orderPayModel: orderPayModel,orderFinishPayVCType: orderFinishPayVCType, vc: vc)
                 }
         })
     }
     // 微信支付
-    func payWeixinpayApi(orderPayModel: OrderCreateBackModel,orderFinishPayVCType:OrderFinishPayVCType) {
+    func payWeixinpayApi(orderPayModel: OrderCreateBackModel,orderFinishPayVCType:OrderFinishPayVCType,vc:UIViewController) {
         SwiftMoyaNetWorkServicePay.shared().payWeixinpayApi(paraMdl: orderPayModel) { [weak self] (weChatpayOrderModel) -> (Void) in
             PayManager.shared().weixinpay(wechatpayOrderModel: weChatpayOrderModel as! WeChatpayOrderModel, successPayBlock: {
-                self?.pushVC(payStatus: true,orderFinishPayVCType: orderFinishPayVCType)
+                self?.pushVC(payStatus: true,orderFinishPayVCType: orderFinishPayVCType, vc: vc)
             }, failPayBlock: {
-                self?.pushVC(payStatus: false,orderFinishPayVCType: orderFinishPayVCType)
+                self?.pushVC(payStatus: false,orderFinishPayVCType: orderFinishPayVCType, vc: vc)
             })
         }
     }
     
     // 支付宝支付
-    func payAlipayApi(orderPayModel: OrderCreateBackModel,orderFinishPayVCType:OrderFinishPayVCType) {
+    func payAlipayApi(orderPayModel: OrderCreateBackModel,orderFinishPayVCType:OrderFinishPayVCType,vc:UIViewController) {
         SwiftMoyaNetWorkServicePay.shared().payAlipayApi(paraMdl: orderPayModel) { [weak self] (orderString) -> (Void) in
             PayManager.shared().alipay(orderString: orderString as? String ?? "" , successPayBlock: {
-                self?.pushVC(payStatus: true,orderFinishPayVCType: orderFinishPayVCType)
+                self?.pushVC(payStatus: true,orderFinishPayVCType: orderFinishPayVCType, vc: vc)
             }, failPayBlock: {
-                self?.pushVC(payStatus: false,orderFinishPayVCType: orderFinishPayVCType)
+                self?.pushVC(payStatus: false,orderFinishPayVCType: orderFinishPayVCType, vc: vc)
             })
         }
     }
     
     //跳转到字符失败,跟支付成功页面
-    func pushVC(payStatus: Bool,orderFinishPayVCType:OrderFinishPayVCType){
-        let vc = OrderFinishPayController()
-        vc.payStatus = payStatus
-        vc.orderFinishPayVCType = orderFinishPayVCType
-        vc.reloadClosure = {
+    func pushVC(payStatus: Bool,orderFinishPayVCType:OrderFinishPayVCType,vc:UIViewController){
+        let orderFinishPayVC = OrderFinishPayController()
+        orderFinishPayVC.payStatus = payStatus
+        orderFinishPayVC.orderFinishPayVCType = orderFinishPayVCType
+        orderFinishPayVC.reloadClosure = {
             [weak self] in
             if let reloadClosure = self?.reloadClosure {
                 reloadClosure()
             }
         }
-        getCurrentVC().navigationController?.pushViewController(vc, animated: true)
+        vc.navigationController?.pushViewController(orderFinishPayVC, animated: true)
     }
-
-    
 }

RainbowPlanet/RainbowPlanet/Manager/PayManager/PayManagerView/CommonPayHeader.swift

@@ -14,10 +14,9 @@ class CommonPayHeader: BaseView {
     
     typealias DismissBlock = () -> Void
     var dismissBlock : DismissBlock?
-    
     var payAmount: String? {
         didSet {
-            titleLabel.text = "支付金额 ¥\(payAmount ?? "")"
+            titleLabel.text = "支付金额 \(priceConversion(price: Int(payAmount ?? "0")!))"
         }
     }
     

RainbowPlanet/RainbowPlanet/Modules/MineModule/SelfMentionContactsList/View/SelfMentionContactsListView.swift

@@ -55,7 +55,7 @@ extension SelfMentionContactsListView: UITableViewDelegate,UITableViewDataSource
     }
     
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        return selfMentionContactsModels?.isEmpty ?? true ? 0 : (selfMentionContactsModels?.count)!
+        return selfMentionContactsModels?.isEmpty ?? true ? 0 : selfMentionContactsModels?.count ?? 0
         
     }
     

RainbowPlanet/RainbowPlanet/Modules/OrderModule/Order/View/OrderButtonTableViewCell.swift

@@ -71,6 +71,7 @@ class OrderButtonTableViewCell: UITableViewCell {
         oneButton.cornerRadius = 14
         oneButton.masksToBounds = true
         oneButton.titleLabel?.font = kRegularFont14
+        oneButton.isHidden = true
         oneButton.rx.tap.subscribe(onNext: {
             [weak self] (data) in
             if let setButtonBlock = self?.setButtonBlock {
@@ -86,6 +87,7 @@ class OrderButtonTableViewCell: UITableViewCell {
         twoButton.cornerRadius = 14
         twoButton.masksToBounds = true
         twoButton.titleLabel?.font = kRegularFont14
+        twoButton.isHidden = true
         twoButton.rx.tap.subscribe(onNext: {
             [weak self] (data) in
             if let setButtonBlock = self?.setButtonBlock {
@@ -97,63 +99,59 @@ class OrderButtonTableViewCell: UITableViewCell {
 
     var orderModel: OrderModel? {
         didSet {
-            if orderModel?.deliverType == 2 { //快递
-                if orderModel?.feedbackStatus == 0 { //未维权
-                    switch orderModel?.status {
-                    case 0: //待付款
-                        oneButton.setTitle("去付款", for: UIControl.State.normal)
-                        oneButton.setTitleColor(kffffffColor, for: UIControl.State.normal)
-                        oneButton.backgroundColor = kFFA42FColor
-                        
-                        twoButton.setTitle("取消订单", for: UIControl.State.normal)
-                        twoButton.setTitleColor(k333333Color, for: UIControl.State.normal)
-                        twoButton.backgroundColor = UIColor.white
-                        twoButton.layer.borderColor = kbfbfbfColor.cgColor
-                        twoButton.layer.borderWidth = 1
-                    case 2: //收货
-                        oneButton.setTitle("查看物流", for: UIControl.State.normal)
-                        oneButton.setTitleColor(kffffffColor, for: UIControl.State.normal)
-                        oneButton.backgroundColor = kFFA42FColor
-                        
-                        twoButton.setTitle("确认收货", for: UIControl.State.normal)
-                        twoButton.setTitleColor(k333333Color, for: UIControl.State.normal)
-                        twoButton.backgroundColor = UIColor.white
-                        twoButton.layer.borderColor = kbfbfbfColor.cgColor
-                        twoButton.layer.borderWidth = 1
-                    case 6: //已完成
-                        oneButton.setTitle("去评价", for: UIControl.State.normal)
-                        oneButton.setTitleColor(kffffffColor, for: UIControl.State.normal)
-                        oneButton.backgroundColor = kFFA42FColor
-                        twoButton.setTitle("查看物流", for: UIControl.State.normal)
-                        twoButton.setTitleColor(k333333Color, for: UIControl.State.normal)
-                        twoButton.backgroundColor = UIColor.white
-                        twoButton.layer.borderColor = kbfbfbfColor.cgColor
-                        twoButton.layer.borderWidth = 1
+            switch orderModel?.status {
+            case 0: //待付款
+                setButton(isHidden: false, button: oneButton, title: "去付款", titleColor: kffffffColor, backgroundColor: kFFA42FColor, borderColor: kFFA42FColor)
+                setButton(isHidden: false, button: twoButton, title: "取消订单", titleColor: k333333Color, backgroundColor: UIColor.white, borderColor: kbfbfbfColor)
+                 break
+            case 1://待发货
+               
+                if orderModel?.feedbackStatus == 0 {
+                    oneButton.isHidden = true
+                    twoButton.isHidden = true
+                }else {
+                    setButton(isHidden: false, button: oneButton, title: "退款详情", titleColor: kffffffColor, backgroundColor: kFFA42FColor, borderColor: kFFA42FColor)
+                }
+                
+                break
+            case 2: //待收货
+                if orderModel?.feedbackStatus == 0 {//没有维权
+                    setButton(isHidden: false, button: oneButton, title: "确认收货", titleColor: kffffffColor, backgroundColor: kFFA42FColor, borderColor: kFFA42FColor)
+                    setButton(isHidden: false, button: twoButton, title: "查看物流", titleColor: k333333Color, backgroundColor: UIColor.white, borderColor: kbfbfbfColor)
+                }else {//维权
+                    setButton(isHidden: false, button: oneButton, title: "退款详情", titleColor: kffffffColor, backgroundColor: kFFA42FColor, borderColor: kFFA42FColor)
+                    setButton(isHidden: false, button: twoButton, title: "查看物流", titleColor: k333333Color, backgroundColor: UIColor.white, borderColor: kbfbfbfColor)
+                }
+                break
+
+            case 6: //已完成
+                
+                if orderModel?.feedbackStatus == 0 { //没有维权
+                    if orderModel?.isComment == 0 { // 评价
+                        setButton(isHidden: false, button: oneButton, title: "去评价", titleColor: kffffffColor, backgroundColor: kFFA42FColor, borderColor: kFFA42FColor)
+                        setButton(isHidden: false, button: twoButton, title: "查看物流", titleColor: k333333Color, backgroundColor: UIColor.white, borderColor: kbfbfbfColor)
                         
-                    default: 
-                        break
-                    }
-                }else {//1-退款处理中/2-退款完成/3-拒绝退款
-                    switch orderModel?.feedbackStatus {
-                    case 1,2: //1-退款处理中 2-退款完成
-                        oneButton.setTitle("退款详情", for: UIControl.State.normal)
-                        oneButton.setTitleColor(kffffffColor, for: UIControl.State.normal)
-                        oneButton.backgroundColor = kFFA42FColor
-                        twoButton.isHidden = true
-                    case 3: //3-拒绝退款
-                        oneButton.setTitle("退款详情", for: UIControl.State.normal)
-                        oneButton.setTitleColor(kffffffColor, for: UIControl.State.normal)
-                        oneButton.backgroundColor = kFFA42FColor
-                        twoButton.setTitle("查看物流", for: UIControl.State.normal)
-                        twoButton.setTitleColor(k333333Color, for: UIControl.State.normal)
-                        twoButton.backgroundColor = UIColor.white
-                        twoButton.layer.borderColor = kbfbfbfColor.cgColor
-                        twoButton.layer.borderWidth = 1
-                    default:
-                        break
+                    }else {
+                        setButton(isHidden: false, button: oneButton, title: "查看物流", titleColor: k333333Color, backgroundColor: UIColor.white, borderColor: kbfbfbfColor)
                     }
+                }else {//维权
+                    setButton(isHidden: false, button: oneButton, title: "退款详情", titleColor: kffffffColor, backgroundColor: kFFA42FColor, borderColor: kFFA42FColor)
+                    setButton(isHidden: false, button: twoButton, title: "查看物流", titleColor: k333333Color, backgroundColor: UIColor.white, borderColor: kbfbfbfColor)
                 }
+                break
+            default:
+                break
             }
+
         }
     }
+    
+    func setButton(isHidden:Bool,button:UIButton,title:String,titleColor:UIColor,backgroundColor:UIColor,borderColor:UIColor) {
+        button.isHidden = isHidden
+        button.setTitle(title, for: UIControl.State.normal)
+        button.setTitleColor(titleColor, for: UIControl.State.normal)
+        button.backgroundColor = backgroundColor
+        button.layer.borderColor = borderColor.cgColor
+        button.layer.borderWidth = 1
+    }
 }

RainbowPlanet/RainbowPlanet/Modules/OrderModule/Order/View/OrderDeliveryModeAndButtonTableViewCell.swift

@@ -107,52 +107,65 @@ class OrderDeliveryModeAndButtonTableViewCell: UITableViewCell {
     
     var orderModel: OrderModel? {
         didSet {
-            if orderModel?.deliverType == 1 { //自提
-                addressLabel.text = "自提地址：\(orderModel?.address ?? "")"
-
-                if orderModel?.feedbackStatus == 0 { //未维权
-                    switch orderModel?.status {
-                    case 0: //待付款/已自提/已完成
-                        oneButton.setTitle("去付款", for: UIControl.State.normal)
-                        oneButton.setTitleColor(kffffffColor, for: UIControl.State.normal)
-                        oneButton.backgroundColor = kFFA42FColor
-
-                        twoButton.setTitle("取消订单", for: UIControl.State.normal)
-                        twoButton.setTitleColor(k333333Color, for: UIControl.State.normal)
-                        twoButton.backgroundColor = UIColor.white
-                        twoButton.layer.borderColor = k333333Color.cgColor
-                        twoButton.layer.borderWidth = 1
-                    case 5: //已自提
-                        oneButton.setTitle("确认收货", for: UIControl.State.normal)
-                        oneButton.setTitleColor(kffffffColor, for: UIControl.State.normal)
-                        oneButton.backgroundColor = kFFA42FColor
+            switch orderModel?.status {
+            case 0: //待付款
+                setButton(isHidden: false, button: oneButton, title: "去付款", titleColor: kffffffColor, backgroundColor: kFFA42FColor, borderColor: kFFA42FColor)
+                setButton(isHidden: false, button: twoButton, title: "取消订单", titleColor: k333333Color, backgroundColor: UIColor.white, borderColor: kbfbfbfColor)
+            case 1://待发货
+                if orderModel?.feedbackStatus == 0 { //没有维权
+                    oneButton.isHidden = true
+                    twoButton.isHidden = true
+                }else {//维权
+                    setButton(isHidden: false, button: oneButton, title: "退款详情", titleColor: kffffffColor, backgroundColor: kFFA42FColor, borderColor: kFFA42FColor)
+                    twoButton.isHidden = true
+                }
+                break
+            case 3: //配送中
+                if orderModel?.feedbackStatus == 0 { //没有维权
+                    oneButton.isHidden = true
+                    twoButton.isHidden = true
+                }else {//维权
+                    setButton(isHidden: false, button: oneButton, title: "退款详情", titleColor: kffffffColor, backgroundColor: kFFA42FColor, borderColor: kFFA42FColor)
+                    twoButton.isHidden = true
+                }
+            case 4://待自提
+                
+                if orderModel?.feedbackStatus == 0 { //没有维权
+                    oneButton.isHidden = true
+                    twoButton.isHidden = true
+                }else {//维权
+                    setButton(isHidden: false, button: oneButton, title: "退款详情", titleColor: kffffffColor, backgroundColor: kFFA42FColor, borderColor: kFFA42FColor)
+                    twoButton.isHidden = true
+                }
+                
+            case 5: //已自提
+                
+                if orderModel?.feedbackStatus == 0 { //没有维权
+                    if orderModel?.isComment == 0 {
+                        setButton(isHidden: false, button: oneButton, title: "去评价", titleColor: kffffffColor, backgroundColor: kFFA42FColor, borderColor: kFFA42FColor)
                         twoButton.isHidden = true
-                        
-                    default: //待发货/待收货/配送中/待自提/已关闭
-                        break
-                    }
-                }else {//1-退款处理中/2-退款完成/3-拒绝退款
-                    switch orderModel?.feedbackStatus {
-                    case 1,2: //1-退款处理中 2-退款完成
-                        oneButton.setTitle("退款详情", for: UIControl.State.normal)
-                        oneButton.setTitleColor(kffffffColor, for: UIControl.State.normal)
-                        oneButton.backgroundColor = kFFA42FColor
+                    }else {
+                        oneButton.isHidden = true
                         twoButton.isHidden = true
-                    case 3: //3-拒绝退款
-                        oneButton.setTitle("退款详情", for: UIControl.State.normal)
-                        oneButton.setTitleColor(kffffffColor, for: UIControl.State.normal)
-                        oneButton.backgroundColor = kFFA42FColor
-                        twoButton.setTitle("查看物流", for: UIControl.State.normal)
-                        twoButton.setTitleColor(k333333Color, for: UIControl.State.normal)
-                        twoButton.backgroundColor = UIColor.white
-                        twoButton.layer.borderColor = k333333Color.cgColor
-                        twoButton.layer.borderWidth = 1
-                    default:
-                        break
                     }
+                }else {//维权
+                    setButton(isHidden: false, button: oneButton, title: "退款详情", titleColor: kffffffColor, backgroundColor: kFFA42FColor, borderColor: kFFA42FColor)
+                    twoButton.isHidden = true
                 }
+
+            default:
+                break
             }
         }
     }
+    
+    func setButton(isHidden:Bool,button:UIButton,title:String,titleColor:UIColor,backgroundColor:UIColor,borderColor:UIColor) {
+        button.isHidden = isHidden
+        button.setTitle(title, for: UIControl.State.normal)
+        button.setTitleColor(titleColor, for: UIControl.State.normal)
+        button.backgroundColor = backgroundColor
+        button.layer.borderColor = borderColor.cgColor
+        button.layer.borderWidth = 1
+    }
 
 }

RainbowPlanet/RainbowPlanet/Modules/OrderModule/Order/View/OrderProductTableViewCell.swift

@@ -138,7 +138,7 @@ class OrderProductTableViewCell: UITableViewCell {
             titleLabel.text = orderModelDetailModel?.productName
             timeLabel.text = "预计配送时间：\(orderModelDetailModel?.receiveTime ?? "")"
             skuLabel.text = "规格：\(orderModelDetailModel?.skuName ?? "")"
-            priceLabel.text = "￥\(orderModelDetailModel?.productPrice ?? 0)"
+            priceLabel.text = "\(priceConversion(price: orderModelDetailModel?.productPrice ?? 0))"
             numberLabel.text = "x\(orderModelDetailModel?.amount ?? 0)"
         }
     }

RainbowPlanet/RainbowPlanet/Modules/OrderModule/Order/View/OrderTotalAmountTableViewCell.swift

@@ -81,7 +81,7 @@ class OrderTotalAmountTableViewCell: UITableViewCell {
     
     var orderModel: OrderModel? {
         didSet {
-            moneyLabel.text = "￥\(orderModel?.realPrice ?? 0)"
+            moneyLabel.text = "\(priceConversion(price: orderModel?.realPrice ?? 0))"
             let str = "共\(orderModel?.amount ?? 0)件商品，合计"
             let attributedString = str.changeTextColor(rangStr: "\(orderModel?.amount ?? 0)", rangColor: k333333Color)
             numberLabel.attributedText = attributedString

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

@@ -119,33 +119,19 @@ extension OrderListViewController : UITableViewDelegate, UITableViewDataSource {
                         return 5 + (orderModel.detail?.count ?? 0)
                     case 1: //待发货
                         return 5 + (orderModel.detail?.count ?? 0)
-                    case 2: //已发货/待收货
-                        return 5 + (orderModel.detail?.count ?? 0)
                     case 3: //配送中
                         return 5 + (orderModel.detail?.count ?? 0)
                     case 4: //待自提
                         return 5 + (orderModel.detail?.count ?? 0)
                     case 5: //已自提
                         return 5 + (orderModel.detail?.count ?? 0)
-                    case 6: //已完成
-                        return 5 + (orderModel.detail?.count ?? 0)
                     case 7: //已关闭
                         return 5 + (orderModel.detail?.count ?? 0)
-                        
                     default:
                         return 0
                     }
                 }else {
-                    switch orderModel.feedbackStatus {
-                    case 1: //1-退款处理中
-                        return 5 + (orderModel.detail?.count ?? 0)
-                    case 2: //2-退款完成
-                        return 5 + (orderModel.detail?.count ?? 0)
-                    case 3: //3-拒绝退款
-                        return 5 + (orderModel.detail?.count ?? 0)
-                    default:
-                        return 0
-                    }
+                    return 5 + (orderModel.detail?.count ?? 0)
                 }
                
             case 2: //快递
@@ -157,12 +143,6 @@ extension OrderListViewController : UITableViewDelegate, UITableViewDataSource {
                         return 4 + (orderModel.detail?.count ?? 0)
                     case 2: //已发货/待收货
                         return 5 + (orderModel.detail?.count ?? 0)
-                    case 3: //配送中
-                        return 5 + (orderModel.detail?.count ?? 0)
-                    case 4: //待自提
-                        return 5 + (orderModel.detail?.count ?? 0)
-                    case 5: //已自提
-                        return 5 + (orderModel.detail?.count ?? 0)
                     case 6: //已完成
                         return 5 + (orderModel.detail?.count ?? 0)
                     case 7: //已关闭
@@ -171,16 +151,7 @@ extension OrderListViewController : UITableViewDelegate, UITableViewDataSource {
                         return 0
                     }
                 }else {
-                    switch orderModel.feedbackStatus {
-                    case 1: //1-退款处理中
-                        return 5 + (orderModel.detail?.count ?? 0)
-                    case 2: //2-退款完成
-                        return 5 + (orderModel.detail?.count ?? 0)
-                    case 3: //3-拒绝退款
-                        return 5 + (orderModel.detail?.count ?? 0)
-                    default:
-                        return 0
-                    }
+                    return 5 + (orderModel.detail?.count ?? 0)
                 }
             default:
                 return 0
@@ -212,79 +183,72 @@ extension OrderListViewController : UITableViewDelegate, UITableViewDataSource {
             return cell
         case details!.count + 4:
             let orderModel = orderModel
-            switch orderModel.deliverType {
-            case 1: //自提
-                if orderModel.feedbackStatus == 0 { //未维权
-                    switch orderModel.status {
-                    case 0,5: //待付款/已自提
-                        let cell = OrderDeliveryModeAndButtonTableViewCell.cellWith(tableView: tableView, indexPath: indexPath)
-                        cell.orderModel = orderModel
-                        cell.setButtonBlock = {
-                           [weak self] (button,orderModel) in
-                            self?.setButton(button: button,orderModel:orderModel)
+            if  orderModel.deliverType == 1 {
+                switch orderModel.status {
+                case 0,5:
+                    let cell = OrderDeliveryModeAndButtonTableViewCell.cellWith(tableView: tableView, indexPath: indexPath)
+                    cell.orderModel = orderModel
+                    cell.setButtonBlock = {
+                    [weak self] (button,orderModel) in
+                    self?.setButton(button: button,orderModel:orderModel)
 
-                        }
-                        return cell
-                    case 1,4,7: //待发货/待自提/已关闭
-                        let cell = OrderDeliveryModeTableViewCell.cellWith(tableView: tableView, indexPath: indexPath)
-                        cell.orderModel = orderModel
-                        return cell
-                    case 3: //配送中
-                        let cell = OrderButtonTableViewCell.cellWith(tableView: tableView, indexPath: indexPath)
-                        cell.orderModel = orderModel
-                        cell.setButtonBlock = {
-                            [weak self] (button,orderModel) in
-                            self?.setButton(button: button,orderModel:orderModel)
-                            
-                        }
-                        return cell
-                    default:
-                        return UITableViewCell()
                     }
+                    return cell
+                case 1,3,4:
+                if orderModel.feedbackStatus == 0 {
+                    let cell = OrderDeliveryModeTableViewCell.cellWith(tableView: tableView, indexPath: indexPath)
+                    cell.orderModel = orderModel
+                    return cell
                 }else {
                     let cell = OrderDeliveryModeAndButtonTableViewCell.cellWith(tableView: tableView, indexPath: indexPath)
                     cell.orderModel = orderModel
                     cell.setButtonBlock = {
                         [weak self] (button,orderModel) in
                         self?.setButton(button: button,orderModel:orderModel)
-                        
                     }
                     return cell
                 }
-                
-            case 2: //快递
-                if orderModel.feedbackStatus == 0 { //未维权
-                    switch orderModel.status {
-                    case 0,2,6: //待付款/待收货/
+                case 7:
+                    let cell = OrderDeliveryModeTableViewCell.cellWith(tableView: tableView, indexPath: indexPath)
+                    cell.orderModel = orderModel
+                    return cell
+                default:
+                    return UITableViewCell()
+                }
+
+            }else if orderModel.deliverType == 2 {
+                switch orderModel.status {
+                case 0,2,6:
+                    let cell = OrderButtonTableViewCell.cellWith(tableView: tableView, indexPath: indexPath)
+                    cell.orderModel = orderModel
+                    cell.setButtonBlock = {
+                        [weak self] (button,orderModel) in
+                        self?.setButton(button: button,orderModel:orderModel)
+
+                    }
+                    return cell
+                case 1:
+                    if orderModel.feedbackStatus != 0 {
                         let cell = OrderButtonTableViewCell.cellWith(tableView: tableView, indexPath: indexPath)
                         cell.orderModel = orderModel
                         cell.setButtonBlock = {
                             [weak self] (button,orderModel) in
                             self?.setButton(button: button,orderModel:orderModel)
-                            
                         }
                         return cell
-                    default:
-                        return UITableViewCell()
                     }
-                }else {
-                    let cell = OrderButtonTableViewCell.cellWith(tableView: tableView, indexPath: indexPath)
-                    cell.orderModel = orderModel
-
-                    return cell
+                default:
+                    return UITableViewCell()
                 }
-            default:
-                return UITableViewCell()
             }
+            return UITableViewCell()
         default:
             let cell = OrderProductTableViewCell.cellWith(tableView: tableView, indexPath: indexPath)
             cell.orderModelDetailModel = details?[indexPath.row - 2]
             return cell
-            
         }
     }
     
-    
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
         let orderModel = orderModelArray[indexPath.section]
         let details = orderModel.detail
@@ -309,21 +273,11 @@ extension OrderListViewController : UITableViewDelegate, UITableViewDataSource {
         let orderModel = orderModelArray[indexPath.section]
         let details = orderModel.detail
         switch indexPath.row {
-        case 0:
-            if let didSelectBlock = didSelectBlock {
-                didSelectBlock(orderModel)
-            }
-        case 1:
-            break
-        case details!.count + 2:
-            break
-        case details!.count + 3:
-            break
         case details!.count + 4:
             break
         default:
-            if let productDidSelectBlock = productDidSelectBlock {
-                productDidSelectBlock(orderModel,(orderModel.detail?[indexPath.row-2])!)
+            if let didSelectBlock = didSelectBlock {
+                didSelectBlock(orderModel)
             }
             break
         }

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

@@ -190,7 +190,7 @@ extension OrderViewController :JXSegmentedListContainerViewDataSource {
             let orderPayModel = OrderCreateBackModel()
             orderPayModel.money = "\(orderModel.realPrice ?? 0)"
             orderPayModel.patchNum = orderModel.patchNum
-            PayManagerPay.shared.payAlertView(orderPayModel: orderPayModel, orderFinishPayVCType: .order)
+            PayManagerPay.shared.payAlertView(orderPayModel: orderPayModel, orderFinishPayVCType: .order, vc: self)
             PayManagerPay.shared.reloadClosure = {
                 vc.orderPurchaseOrderListApi(page: 1)
             }
@@ -237,7 +237,7 @@ extension OrderViewController :JXSegmentedListContainerViewDataSource {
     
     /// 确认收货
     func orderPurchaseConfirmApi(orderModel:OrderModel,vc: OrderListViewController) {
-        SwiftMoyaNetWorkServiceOrder.shared().orderPurchaseConfirmApi(purchaseId: orderModel.purchaseNo!) { (data) -> (Void) in
+        SwiftMoyaNetWorkServiceOrder.shared().orderPurchaseConfirmApi(purchaseId: orderModel.id ?? 0) { (data) -> (Void) in
             vc.orderPurchaseOrderListApi(page: 1)
         }
     }

RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderApplyRefund/View/OrderApplyRefundAccountCell.swift

@@ -24,13 +24,6 @@ class OrderApplyRefundAccountCell: UITableViewCell {
         }
     }
     
-    // 退款金额
-    var refundPrice: Int? {
-        didSet {
-            priceLabel.text = "退款金额¥\(self.refundPrice ?? 0)"
-        }
-    }
-    
     class func cellWith(tableView:UITableView,indexPath:IndexPath) -> OrderApplyRefundAccountCell {
         let ID = "OrderApplyRefundAccountCell"
         tableView.register(OrderApplyRefundAccountCell.self, forCellReuseIdentifier: ID)
@@ -101,15 +94,24 @@ class OrderApplyRefundAccountCell: UITableViewCell {
         let priceLabel = UILabel()
         priceLabel.textColor = k333333Color
         priceLabel.font = kRegularFont14
-        priceLabel.text = "退款金额¥0"
-//        let str = "退款金额 ￥xx"
-//        let attributedString = NSMutableAttributedString.init(string: str)
-//        let range = str.range(of: "￥xx")
-//        attributedString.changeForegroundColor(kfe352bColor, range: NSRange(range!, in: "￥xx"))
-//        attributedString.changeSystemFont(kBoldFont14, range: NSRange(range!, in: "￥xx"))
-//        priceLabel.attributedText = attributedString
         return priceLabel
     }()
     
+    // 退款金额
+    var refundPrice: Int? {
+        didSet {
+            
+            let str = "退款金额 \(priceConversion(price: refundPrice ?? 0))"
+            if refundPrice != nil {
+                let attributedString = NSMutableAttributedString.init(string: str)
+                
+                attributedString.changeForegroundColor(kFE352BColor, range: NSRange(location: 4, length: str.count-4))
+                
+                attributedString.changeSystemFont(kBoldFont16, range: NSRange(location: 4, length: str.count-4))
+                priceLabel.attributedText = attributedString
+            }
+        }
+    }
+    
 }
 

RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderApplyRefund/View/OrderApplyRefundProductCell.swift

@@ -172,7 +172,7 @@ class OrderApplyRefundProductCell: UITableViewCell {
             titleLabel.text = orderModelDetailModel?.productName
             timeLabel.text = "预计配送时间：\(orderModelDetailModel?.receiveTime ?? "")"
             skuLabel.text = "规格：\(orderModelDetailModel?.skuName ?? "")"
-            priceLabel.text = "￥\(orderModelDetailModel?.productPrice ?? 0)"
+            priceLabel.text = "￥\(priceConversion(price: orderModelDetailModel?.productPrice ?? 0))"
             numberLabel.text = "x\(orderModelDetailModel?.amount ?? 0)"
         }
     }

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

@@ -296,18 +296,18 @@ extension OrderApplyRefundController {
         let detailJsonStr = JSON(subIdArr).description
         
         if goodsImageArr.isEmpty {
-            self.orderPurchaseRefundApi(purchaseId: self.orderDetailModel!.purchaseNo!, mobile: self.orderDetailModel!.mobile!, refundReason: self.selRefundReason!, refund_remark: self.refundNote, detail: detailJsonStr, imgs: "")
+            self.orderPurchaseRefundApi(purchaseId: self.orderDetailModel?.id ?? 0, mobile: self.orderDetailModel?.mobile ?? "", refundReason: self.selRefundReason ?? "", refund_remark: self.refundNote, detail: detailJsonStr, imgs: "[]")
         } else {
             // 多图上传
             SwiftMoyaNetWorkServiceConfig.shared().configUploadMultiImgApi(imageArray: goodsImageArr) { [weak self] (imgUrlArr) -> (Void) in
                 let imgJsonStr = JSON(imgUrlArr).description
                 
-                self?.orderPurchaseRefundApi(purchaseId: (self?.orderDetailModel!.purchaseNo)!, mobile: (self?.orderDetailModel!.mobile!)!, refundReason: (self?.selRefundReason!)!, refund_remark: self!.refundNote, detail: detailJsonStr, imgs: imgJsonStr)
+                self?.orderPurchaseRefundApi(purchaseId: self?.orderDetailModel?.id ?? 0, mobile: self?.orderDetailModel?.mobile ?? "", refundReason: self?.selRefundReason ?? "", refund_remark: self?.refundNote ?? "", detail: detailJsonStr, imgs: imgJsonStr)
             }
         }
     }
     
-    func orderPurchaseRefundApi(purchaseId:String = "",mobile:String = "",refundReason:String = "",refund_remark:String = "",detail:String = "",imgs:String = "") {
+    func orderPurchaseRefundApi(purchaseId:Int ,mobile:String = "",refundReason:String = "",refund_remark:String = "",detail:String = "",imgs:String = "") {
         SwiftMoyaNetWorkServiceOrder.shared().orderPurchaseRefundApi(purchaseId: purchaseId, mobile: mobile, refundReason: refundReason, refund_remark: refund_remark, detail: detail, imgs: imgs) { (orderApplyRefundModel) -> (Void) in
             let applyRefundMdl = orderApplyRefundModel as! OrderApplyRefundModel
             

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

@@ -87,83 +87,111 @@ class OrderDetailBottomView: BaseView {
     var orderModel: OrderModel? {
         didSet {
             switch orderModel?.status {
-            case 0: //待付款
-                leftButton.isHidden = false
-                leftButton.setTitle("取消订单", for: UIControl.State.normal)
-                leftButton.setTitleColor(k333333Color, for: UIControl.State.normal)
-                
-                oneButton.isHidden = false
-                oneButton.setTitle("去付款", for: UIControl.State.normal)
-                oneButton.setTitleColor(kffffffColor, for: UIControl.State.normal)
-                oneButton.backgroundColor = kFFA42FColor
-            case 1,3,4: //待发货/配送中/待自提
-                leftButton.isHidden = false
-                leftButton.setTitle("申请退款", for: UIControl.State.normal)
-                leftButton.setTitleColor(k333333Color, for: UIControl.State.normal)
-                
-                oneButton.isHidden = false
-                oneButton.setTitle("再次购买", for: UIControl.State.normal)
-                oneButton.setTitleColor(k333333Color, for: UIControl.State.normal)
-                oneButton.backgroundColor = UIColor.white
-                oneButton.layer.borderColor = k333333Color.cgColor
-                oneButton.layer.borderWidth = 1
-            case 2: //待收货
-                leftButton.isHidden = false
-                leftButton.setTitle("申请退款", for: UIControl.State.normal)
-                leftButton.setTitleColor(k333333Color, for: UIControl.State.normal)
-                
-                oneButton.isHidden = false
-                oneButton.setTitle("确认收货", for: UIControl.State.normal)
-                oneButton.setTitleColor(kffffffColor, for: UIControl.State.normal)
-                oneButton.backgroundColor = kFFA42FColor
-                
-                twoButton.isHidden = false
-                twoButton.setTitle("查看物流", for: UIControl.State.normal)
-                twoButton.setTitleColor(k333333Color, for: UIControl.State.normal)
-                twoButton.backgroundColor = UIColor.white
-                twoButton.layer.borderColor = k333333Color.cgColor
-                twoButton.layer.borderWidth = 1
-            case 5: //已自提
-                leftButton.isHidden = false
-                leftButton.setTitle("申请退款", for: UIControl.State.normal)
-                leftButton.setTitleColor(k333333Color, for: UIControl.State.normal)
-                
-                oneButton.isHidden = false
-                oneButton.setTitle("确认收货", for: UIControl.State.normal)
-                oneButton.setTitleColor(kffffffColor, for: UIControl.State.normal)
-                oneButton.backgroundColor = kFFA42FColor
-                
-                twoButton.isHidden = false
-                twoButton.setTitle("再次购买", for: UIControl.State.normal)
-                twoButton.setTitleColor(k333333Color, for: UIControl.State.normal)
-                twoButton.backgroundColor = UIColor.white
-                twoButton.layer.borderColor = k333333Color.cgColor
-                twoButton.layer.borderWidth = 1
-            case 6: //已完成
+                case 0: //待付款
+                    leftButton.isHidden = false
+                    leftButton.setTitle("取消订单", for: UIControl.State.normal)
+                    leftButton.setTitleColor(k333333Color, for: UIControl.State.normal)
+                    
+                    setButton(isHidden: false, button: oneButton, title: "去付款", titleColor: kffffffColor, backgroundColor: kFFA42FColor, borderColor: kFFA42FColor)
 
-                oneButton.isHidden = false
-                oneButton.setTitle("去评价", for: UIControl.State.normal)
-                oneButton.setTitleColor(kffffffColor, for: UIControl.State.normal)
-                oneButton.backgroundColor = kFFA42FColor
-                
-                twoButton.isHidden = false
-                twoButton.setTitle("再次购买", for: UIControl.State.normal)
-                twoButton.setTitleColor(k333333Color, for: UIControl.State.normal)
-                twoButton.backgroundColor = UIColor.white
-                twoButton.layer.borderColor = k333333Color.cgColor
-                twoButton.layer.borderWidth = 1
-            case 7: //已关闭
-                oneButton.isHidden = false
-                oneButton.setTitle("再次购买", for: UIControl.State.normal)
-                oneButton.setTitleColor(k333333Color, for: UIControl.State.normal)
-                oneButton.backgroundColor = UIColor.white
-                oneButton.layer.borderColor = k333333Color.cgColor
-                oneButton.layer.borderWidth = 1
-            default:
-                break
+                case 1://待发货
+                    if orderModel?.feedbackStatus == 0 {
+                        leftButton.isHidden = false
+                        leftButton.setTitle("申请退款", for: UIControl.State.normal)
+                        leftButton.setTitleColor(k333333Color, for: UIControl.State.normal)
+                        setButton(isHidden: false, button: oneButton, title: "再次购买", titleColor: k333333Color, backgroundColor: UIColor.white, borderColor: kbfbfbfColor)
+
+                    }else {
+                        setButton(isHidden: false, button: oneButton, title: "退款详情", titleColor: kffffffColor, backgroundColor: kFFA42FColor, borderColor: kFFA42FColor)
+                        setButton(isHidden: false, button: twoButton, title: "再次购买", titleColor: k333333Color, backgroundColor: UIColor.white, borderColor: kbfbfbfColor)
+                    }
+
+                    break
+                case 2: //待收货
+                    
+                if orderModel?.feedbackStatus == 0 {
+                    leftButton.isHidden = false
+                    leftButton.setTitle("申请退款", for: UIControl.State.normal)
+                    leftButton.setTitleColor(k333333Color, for: UIControl.State.normal)
+                    setButton(isHidden: false, button: oneButton, title: "确认收货", titleColor: kffffffColor, backgroundColor: kFFA42FColor, borderColor: kFFA42FColor)
+                    setButton(isHidden: false, button: twoButton, title: "查看物流", titleColor: k333333Color, backgroundColor: UIColor.white, borderColor: kbfbfbfColor)
+                }else {
+                    setButton(isHidden: false, button: oneButton, title: "确认收货", titleColor: kffffffColor, backgroundColor: kFFA42FColor, borderColor: kFFA42FColor)
+                    setButton(isHidden: false, button: twoButton, title: "退款详情", titleColor: kffffffColor, backgroundColor: kFFA42FColor, borderColor: kFFA42FColor)
+                    setButton(isHidden: false, button: threeButton, title: "查看物流", titleColor: k333333Color, backgroundColor: UIColor.white, borderColor: kbfbfbfColor)
+                                    
+                }
+
+                case 3: //配送中
+                    
+                if orderModel?.feedbackStatus == 0 {
+                    leftButton.isHidden = false
+                    leftButton.setTitle("申请退款", for: UIControl.State.normal)
+                    leftButton.setTitleColor(k333333Color, for: UIControl.State.normal)
+                    setButton(isHidden: false, button: oneButton, title: "再次购买", titleColor: kffffffColor, backgroundColor: kFFA42FColor, borderColor: kFFA42FColor)
+                }else {
+                    setButton(isHidden: false, button: oneButton, title: "退款详情", titleColor: kffffffColor, backgroundColor: kFFA42FColor, borderColor: kFFA42FColor)
+                    setButton(isHidden: false, button: twoButton, title: "再次购买", titleColor: k333333Color, backgroundColor: UIColor.white, borderColor: kbfbfbfColor)
+                }
+                case 4://待自提
+                if orderModel?.feedbackStatus == 0 {
+                    leftButton.isHidden = false
+                    leftButton.setTitle("申请退款", for: UIControl.State.normal)
+                    leftButton.setTitleColor(k333333Color, for: UIControl.State.normal)
+                    setButton(isHidden: false, button: oneButton, title: "再次购买", titleColor: k333333Color, backgroundColor: UIColor.white, borderColor: kbfbfbfColor)
+                    
+                }else {
+                    setButton(isHidden: false, button: oneButton, title: "退款详情", titleColor: kffffffColor, backgroundColor: kFFA42FColor, borderColor: kFFA42FColor)
+                    setButton(isHidden: false, button: threeButton, title: "再次购买", titleColor: k333333Color, backgroundColor: UIColor.white, borderColor: kbfbfbfColor)
+                }
+                case 5: //已自提
+                    
+                    if orderModel?.feedbackStatus == 0 {
+                        leftButton.isHidden = false
+                        leftButton.setTitle("申请退款", for: UIControl.State.normal)
+                        leftButton.setTitleColor(k333333Color, for: UIControl.State.normal)
+                        
+                        if orderModel?.isComment == 0 {
+                            setButton(isHidden: false, button: oneButton, title: "去评价", titleColor: kffffffColor, backgroundColor: kFFA42FColor, borderColor: kFFA42FColor)
+                            setButton(isHidden: false, button: twoButton, title: "再次购买", titleColor: k333333Color, backgroundColor: UIColor.white, borderColor: kbfbfbfColor)
+                        }else {
+                            setButton(isHidden: false, button: oneButton, title: "再次购买", titleColor: k333333Color, backgroundColor: UIColor.white, borderColor: kbfbfbfColor)
+                        }
+                    }else {
+                        if orderModel?.isComment == 0 {
+                            setButton(isHidden: false, button: oneButton, title: "去评价", titleColor: kffffffColor, backgroundColor: kFFA42FColor, borderColor: kFFA42FColor)
+                            setButton(isHidden: false, button: twoButton, title: "退款详情", titleColor: kffffffColor, backgroundColor: kFFA42FColor, borderColor: kFFA42FColor)
+                            setButton(isHidden: false, button: threeButton, title: "再次购买", titleColor: k333333Color, backgroundColor: UIColor.white, borderColor: kbfbfbfColor)
+                        }else {
+                            setButton(isHidden: false, button: oneButton, title: "退款详情", titleColor: kffffffColor, backgroundColor: kFFA42FColor, borderColor: kFFA42FColor)
+                            setButton(isHidden: false, button: twoButton, title: "再次购买", titleColor: k333333Color, backgroundColor: UIColor.white, borderColor: kbfbfbfColor)
+                        }
+                        
+                    }
+                case 6: //已完成
+                if orderModel?.isComment == 0 {
+                    setButton(isHidden: false, button: oneButton, title: "去评价", titleColor: kffffffColor, backgroundColor: kFFA42FColor, borderColor: kFFA42FColor)
+                    setButton(isHidden: false, button: twoButton, title: "再次购买", titleColor: k333333Color, backgroundColor: UIColor.white, borderColor: kbfbfbfColor)
+                    setButton(isHidden: false, button: threeButton, title: "查看物流", titleColor: k333333Color, backgroundColor: UIColor.white, borderColor: kbfbfbfColor)
+                }else {
+                    setButton(isHidden: false, button: oneButton, title: "再次购买", titleColor: kffffffColor, backgroundColor: kFFA42FColor, borderColor: kFFA42FColor)
+                    setButton(isHidden: false, button: twoButton, title: "查看物流", titleColor: k333333Color, backgroundColor: UIColor.white, borderColor: kbfbfbfColor)
+                }
+                case 7: //已关闭
+                    setButton(isHidden: false, button: oneButton, title: "再次购买", titleColor: k333333Color, backgroundColor: UIColor.white, borderColor: k333333Color)
+                default:
+                    break
             }
         }
     }
-
+    
+    func setButton(isHidden:Bool,button:UIButton,title:String,titleColor:UIColor,backgroundColor:UIColor,borderColor:UIColor) {
+        button.isHidden = isHidden
+        button.setTitle(title, for: UIControl.State.normal)
+        button.setTitleColor(titleColor, for: UIControl.State.normal)
+        button.backgroundColor = backgroundColor
+        button.layer.borderColor = borderColor.cgColor
+        button.layer.borderWidth = 1
+    }
 
 }

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

@@ -20,6 +20,8 @@ class OrderDetailViewController: BaseViewController {
     var titles = ["订单编码","下单时间","支付时间","支付方式","订单备注"]
     
     var contents = ["","","","",""]
+    
+    var isChange : Bool = false
 
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -30,6 +32,15 @@ class OrderDetailViewController: BaseViewController {
     
     override func setupViews() {
         navigationBar.title = "订单详情"
+        navigationBar.onClickLeftButton = {
+            [weak self] in
+            if self?.isChange ?? false {
+                if let cancelOrderClosure = self?.cancelOrderClosure {
+                    cancelOrderClosure()
+                }
+            }
+            self?.navigationController?.popViewController(animated: true)
+        }
         view.addSubview(orderDetailBottomView)
         view.addSubview(tableView)
         
@@ -76,10 +87,14 @@ class OrderDetailViewController: BaseViewController {
         SwiftMoyaNetWorkServiceOrder.shared().orderPurchaseDetailApi(purchaseNo:orderModel?.purchaseNo ?? "") {
             [weak self] (orderDetailModel) -> (Void) in
             self?.orderDetailModel = orderDetailModel as? OrderModel
-            self?.contents[0] = self?.orderDetailModel?.createdAt ?? ""
+            self?.contents[0] = self?.orderDetailModel?.purchaseNo ?? ""
             self?.contents[1] = self?.orderDetailModel?.createdAt ?? ""
-            self?.contents[2] = self?.orderDetailModel?.purchaseNo ?? ""
-            self?.contents[3] = self?.orderDetailModel?.payType ?? ""
+            self?.contents[2] = self?.orderDetailModel?.paidAt ?? ""
+            if self?.orderDetailModel?.payType == "weixin" {
+                self?.contents[3] = "微信"
+            }else if self?.orderDetailModel?.payType == "ali" {
+                self?.contents[3] = "支付宝"
+            }
             self?.contents[4] = self?.orderDetailModel?.remark ?? ""
             self?.orderDetailBottomView.orderModel =  self?.orderDetailModel
             self?.tableView.reloadData()
@@ -92,24 +107,19 @@ class OrderDetailViewController: BaseViewController {
             let orderPayModel = OrderCreateBackModel()
             orderPayModel.money = "\(self.orderDetailModel?.realPrice ?? 0)"
             orderPayModel.patchNum = self.orderDetailModel?.patchNum
-            PayManagerPay.shared.payAlertView(orderPayModel: orderPayModel, orderFinishPayVCType: .orderDetail)
+            PayManagerPay.shared.payAlertView(orderPayModel: orderPayModel, orderFinishPayVCType: .orderDetail,vc: self)
         }
         if button.titleLabel?.text == "取消订单" {
             SwiftMoyaNetWorkServiceOrder.shared().orderPurchaseCloseApi(patchNum: self.orderDetailModel?.patchNum ?? "") {
                 [weak self] (data) -> (Void) in
-                if let cancelOrderClosure = self?.cancelOrderClosure {
-                    cancelOrderClosure()
-                }
-                self?.navigationController?.popViewController(animated: true)
+                self?.isChange = true
+                self?.orderPurchaseDetailApi()
             }
         }
         if button.titleLabel?.text == "确认收货" {
-            SwiftMoyaNetWorkServiceOrder.shared().orderPurchaseConfirmApi(purchaseId: self.orderDetailModel?.purchaseNo ?? "") {
+            SwiftMoyaNetWorkServiceOrder.shared().orderPurchaseConfirmApi(purchaseId: self.orderDetailModel?.id ?? 0) {
                  [weak self] (data) -> (Void) in
-                if let cancelOrderClosure = self?.cancelOrderClosure {
-                    cancelOrderClosure()
-                }
-                self?.navigationController?.popViewController(animated: true)
+                self?.orderPurchaseDetailApi()
             }
         }
         if button.titleLabel?.text == "查看物流" {

RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderFinishPay/ViewController/OrderFinishPayController.swift

@@ -91,9 +91,10 @@ class OrderFinishPayController: BaseViewController {
             case .orderDetail?:
                 if self?.payStatus ?? true {
                     NotificationCenter.default.post(name: NSNotification.Name(rawValue: "OrderFinishPayVCOrderDetail"), object: nil)
+                    self?.navigationController?.popToClass(type: OrderViewController.self)
+                }else {
+                    self?.navigationController?.popViewController(animated: true)
                 }
-                self?.navigationController?.popToClass(type: OrderViewController.self)
-
                 break
             default:
                 break
@@ -119,7 +120,7 @@ class OrderFinishPayController: BaseViewController {
                 self?.navigationController?.popToRootViewController(animated: false)
             case PayJumpDes.checkOrder:
                 let vc = OrderViewController()
-                vc.orderVCType = .toBeReceived
+                vc.orderVCType = .toBeShipped
                 self?.navigationController?.pushViewController(vc, animated: true)
             }
         }

RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderPayOrder/ViewController/ShoppingCartPayOrderController.swift

@@ -126,9 +126,9 @@ class ShoppingCartPayOrderController: BaseViewController {
             [weak self] (orderBackModel) -> (Void) in
             // 弹出支付方式View
             if self?.shoppingCartPayOrderVCType == .cart {
-                 PayManagerPay.shared.payAlertView(orderPayModel: orderBackModel as! OrderCreateBackModel, orderFinishPayVCType: .cart)
+                PayManagerPay.shared.payAlertView(orderPayModel: orderBackModel as! OrderCreateBackModel, orderFinishPayVCType: .cart, vc: self!)
             }else  if self?.shoppingCartPayOrderVCType == .productDetail {
-                PayManagerPay.shared.payAlertView(orderPayModel: orderBackModel as! OrderCreateBackModel, orderFinishPayVCType: .productDetail)
+                PayManagerPay.shared.payAlertView(orderPayModel: orderBackModel as! OrderCreateBackModel, orderFinishPayVCType: .productDetail, vc: self!)
             }
            
         }

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

@@ -64,12 +64,6 @@ class OrderRefunddetailsStatusTableViewCell: UITableViewCell {
         let moneyLabel = UILabel()
         moneyLabel.textColor = k999999Color
         moneyLabel.font = kRegularFont16
-        let str = "退款金额 ￥50"
-        let attributedString = NSMutableAttributedString.init(string: str)
-        let range = str.range(of: "￥50")
-        attributedString.changeForegroundColor(kfe352bColor, range: NSRange(range!, in: "￥50"))
-        attributedString.changeSystemFont(kBoldFont16, range: NSRange(range!, in: "￥50"))
-        moneyLabel.attributedText = attributedString
         return moneyLabel
     }()
     
@@ -77,27 +71,31 @@ class OrderRefunddetailsStatusTableViewCell: UITableViewCell {
     var orderRefundDetailModel : OrderRefundDetailModel? {
         didSet {
             if orderRefundDetailModel?.status == 0 {
-                statusButton.setImage(kImage(name: "order_no"), for: UIControl.State.normal)
-                statusButton.setTitle("待处理", for: UIControl.State.normal)
+                statusButton.setImage(kImage(name: "order_win"), for: UIControl.State.normal)
+                statusButton.setTitle("退款中", for: UIControl.State.normal)
             }
             if orderRefundDetailModel?.status == 1 {
-                statusButton.setImage(kImage(name: "order_no"), for: UIControl.State.normal)
+                statusButton.setImage(kImage(name: "order_win"), for: UIControl.State.normal)
                 statusButton.setTitle("退款中", for: UIControl.State.normal)
             }
             if orderRefundDetailModel?.status == 2 {
-                statusButton.setImage(kImage(name: "order_no"), for: UIControl.State.normal)
+                statusButton.setImage(kImage(name: "order_win"), for: UIControl.State.normal)
                 statusButton.setTitle("退款完成", for: UIControl.State.normal)
             }
             if orderRefundDetailModel?.status == 3 {
-                statusButton.setImage(kImage(name: "order_win"), for: UIControl.State.normal)
+                statusButton.setImage(kImage(name: "order_no"), for: UIControl.State.normal)
                 statusButton.setTitle("拒绝退款", for: UIControl.State.normal)
             }
-            let str = "退款金额 ￥\(orderRefundDetailModel?.showRefundPrice ?? 0)"
-            let attributedString = NSMutableAttributedString.init(string: str)
-            let range = str.range(of: "￥\(orderRefundDetailModel?.showRefundPrice ?? 0)")
-            attributedString.changeForegroundColor(kfe352bColor, range: NSRange(range!, in: "￥\(orderRefundDetailModel?.showRefundPrice ?? 0)"))
-            attributedString.changeSystemFont(kBoldFont16, range: NSRange(range!, in: "￥\(orderRefundDetailModel?.showRefundPrice ?? 0)"))
-            moneyLabel.attributedText = attributedString
+            let str = "退款金额 \(priceConversion(price: orderRefundDetailModel?.showRefundPrice ?? 0))"
+            if orderRefundDetailModel?.showRefundPrice != nil {
+                let attributedString = NSMutableAttributedString.init(string: str)
+                
+                attributedString.changeForegroundColor(kFE352BColor, range: NSRange(location: 4, length: str.count-4))
+
+                attributedString.changeSystemFont(kBoldFont16, range: NSRange(location: 4, length: str.count-4))
+                moneyLabel.attributedText = attributedString
+            }
+           
         }
     }
 

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

@@ -24,6 +24,7 @@ class OrderRefunddetailsViewController: BaseViewController {
     }
     
     override func setupViews() {
+        navigationBar.title = "退款详情"
         view.addSubview(tableView)
     }
     
@@ -71,7 +72,7 @@ class OrderRefunddetailsViewController: BaseViewController {
                 self?.contents[2] = "拒绝退款"
             }
             self?.contents[3] = self?.orderRefundDetailModel?.refundReason ?? ""
-            self?.contents[4] = self?.orderRefundDetailModel?.refundRemark ?? ""
+            self?.contents[4] = "\(priceConversionNone(price: self?.orderRefundDetailModel?.showRefundPrice ?? 0))元"
             self?.tableView.reloadData()
         }
     }
@@ -86,6 +87,9 @@ extension OrderRefunddetailsViewController : UITableViewDelegate, UITableViewDat
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         switch section {
         case 0:
+            if orderRefundDetailModel?.status == 3 {
+                return 1
+            }
             return 2
         default:
             return titles.count

RainbowPlanet/RainbowPlanet/Service/Model/OrderModel/OrderListModel.swift

@@ -52,6 +52,7 @@ class OrderModel : NSObject, Mappable{
     var shopName : String?
     var status : Int?
     var transPrice : Int?
+    var isComment : Int? //是否评价 0-否 1-是否
     
     
     class func newInstance(map: Map) -> Mappable?{
@@ -86,6 +87,7 @@ class OrderModel : NSObject, Mappable{
         shopName <- map["shop_name"]
         status <- map["status"]
         transPrice <- map["trans_price"]
+        isComment <- map["is_comment"]
         
     }
 }

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServiceOrder/SwiftMoyaNetWorkServiceOrder.swift

@@ -139,7 +139,7 @@ class SwiftMoyaNetWorkServiceOrder: NSObject {
     ///   - detail: 子订单id（json字符串
     ///   - imgs: 图库（json字符串）
     ///   - completion: 回调
-    func orderPurchaseRefundApi(purchaseId:String = "",mobile:String = "",refundReason:String = "",refund_remark:String = "",detail:String = "",imgs:String = "",completion: @escaping apiCallBack) {
+    func orderPurchaseRefundApi(purchaseId:Int = 0,mobile:String = "",refundReason:String = "",refund_remark:String = "",detail:String = "",imgs:String = "",completion: @escaping apiCallBack) {
         var parameters = Dictionary<String,Any>()
         parameters.updateValue(purchaseId, forKey: "purchase_id")
         parameters.updateValue(mobile, forKey: "mobile")
@@ -160,7 +160,7 @@ class SwiftMoyaNetWorkServiceOrder: NSObject {
     /// - Parameters:
     ///   - purchaseId: 订单编号
     ///   - completion: 回调
-    func orderPurchaseConfirmApi(purchaseId:String = "",completion: @escaping apiCallBack) {
+    func orderPurchaseConfirmApi(purchaseId:Int = 0,completion: @escaping apiCallBack) {
         var parameters = Dictionary<String,Any>()
         parameters.updateValue(purchaseId, forKey: "purchase_id")
         SwiftProgressHUD.shared().showWait()