状态bug修复

GeliBusinessPlatform/Model/OrderManageModel/OrderDetailModel.swift

@@ -123,7 +123,6 @@ func orderStatusStrByInt(statusNumber:Int,status_d:Int,isBfPay:Int,LmIdx:Int) ->
     //待付款
     case 1:
         str = "待付款"
- 
         break
     case 6:
         str = "待发货"

GeliBusinessPlatform/ViewController/订单列表/OrderListVC.swift

@@ -256,16 +256,15 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
             
             break
         case 7://待收货
-            btnStr = ["确认收货","退款"]
+            btnStr = ["退款"]
             if rowModel.pay_status == 0 {
-                btnStr = ["确认收款","取消订单","确认收货"]
+                btnStr = ["确认收款","取消订单"]
             }
             if rowModel.apply_cancel == 1 {
                 btnStr = ["拒绝取消订单","同意取消订单"]
             }
             break
         case 10://已收货
-            
             btnStr = ["查看订单"]
             if rowModel.pay_status == 0 {
                 btnStr = ["确认收款"]
@@ -273,9 +272,12 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
             break
         case 9:
             btnStr = ["查看订单"]
-            if rowModel.from == 3 || rowModel.from == 5 {
+            if rowModel.order_status_d == 91 {
                 btnStr = ["确认收到退款"]
             }
+            if rowModel.order_status_d == 93 {
+                btnStr = ["确认收到退货"]
+            }
             break
         case 11:
             btnStr = ["查看订单"]
@@ -390,7 +392,7 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
             alertView.rightBtn.setAttributedTitle(NSAttributedString(string: "确认"), for: .normal)
             alertView.rightBtn.tag = rowModel.order_id!
             self.view.window?.addSubview(alertView)
-        }else if sender.titleLabel?.text == "确认收货"{
+        }else if sender.titleLabel?.text == "确认收到退货"{
             isSrueOrder = 11
             let alertView = GeliAlertView(frame: self.view.window!.bounds)
             alertView.delegate = self;

GeliBusinessPlatform/ViewController/订单详情/OrderDViewController.swift

@@ -276,11 +276,11 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
             alertView.rightBtn.tag = 1011
             self.view.window?.addSubview(alertView)
             break
-            case "确认收货":
+            case "确认收到退货":
             let alertView = GeliAlertView(frame: self.view.window!.bounds)
             alertView.delegate = self;
             alertView.tishiLbl.text = ""
-            alertView.titileLbl.text = "是否确认收货？"
+            alertView.titileLbl.text = "是否确认收到退货？"
             alertView.rightBtn.setAttributedTitle(NSAttributedString(string: "确认"), for: .normal)
             alertView.rightBtn.tag = 1012
             self.view.window?.addSubview(alertView)
@@ -1173,9 +1173,9 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
             break
         case 7:
             //   str = "待收货"
-            titleArr = ["退款","确认收货"]
+            titleArr = ["退款"]
             if self.dataMdoel!.order_res?.pay_status == 0 {
-                titleArr = ["确认收款","取消订单","确认收货"]
+                titleArr = ["确认收款","取消订单"]
             }
             if self.dataMdoel?.order_res?.apply_cancel == 1 {
                 titleArr = ["拒绝取消订单","同意取消订单"]
@@ -1207,9 +1207,12 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
             break
         case 9:
             //       退款中
-            if self.dataMdoel!.order_res?.from == 3 || self.dataMdoel!.order_res?.from == 5 {
+            if self.dataMdoel!.order_res?.order_status_d == 91 {
                 titleArr = ["确认收到退款"]
             }
+            if self.dataMdoel!.order_res?.order_status_d == 93 {
+                titleArr = ["确认收到退货"]
+            }
             break
         //订单关闭
         case 8,2: