完善订单详情

GeliBusinessPlatform/Model/OrderManageModel/OrderDetailModel.swift

@@ -163,8 +163,8 @@ class OrderDetailSaleResModel: Mappable {
     
     var dj_pay_status_cn : String?    //定金支付状态(中文)
     var wk_pay_status_cn : String?   //尾款支付状态(中文)
-//    var wk_amount : String?   //尾款金额
-//    var wk_amount : String?   //尾款金额
+    var dj_pay_type_cn : String?   //定金支付方式(中文)
+    var wk_pay_type_cn : String?   //尾款支付方式(中文)
 
 
     required init?( map: Map) {
@@ -189,6 +189,9 @@ class OrderDetailSaleResModel: Mappable {
         wk_pay_status <- map["wk_pay_status"]
         dj_pay_status_cn <- map["dj_pay_status_cn"]
         wk_pay_status_cn <- map["wk_pay_status_cn"]
+        
+        dj_pay_type_cn <- map["dj_pay_type_cn"]
+        wk_pay_type_cn <- map["wk_pay_type_cn"]
      }
     
 }

GeliBusinessPlatform/SceneDelegate.swift

@@ -94,7 +94,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate, UITabBarControllerDeleg
         // Create the SwiftUI view that provides the window contents.
         
         tabBarController.viewControllers = [v1, v2, v3, v4, v5]
-        tabBarController.selectedIndex = 1
+//        tabBarController.selectedIndex = 1
         
         
         let contentView = tabBarController

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

@@ -14,9 +14,9 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
     var keyword: String = ""
     var startTime : Int = 0
     var endTime : Int = 0
-    var payStatus : String = ""
+    var payStatus : String = "100"
     var orderSource : Int = 0
-    var shippingStatus : String = ""
+    var shippingStatus : String = "100"
     var orderStatus : Int = 100
     var page : Int = 0
     var isUpData = false
@@ -175,9 +175,15 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
         
         if rowModel.from == 3 {
             cell.formLbl.isHidden = false
+            cell.typeLbl.isHidden = true
+
         }else{
             cell.formLbl.isHidden = true
         }
+        if rowModel.order_type == 4 {
+            cell.formLbl.isHidden = true
+            cell.typeLbl.isHidden = false
+        }
         
         cell.dateLbl.text = dayByDouble(sender: rowModel.add_time!)
         cell.countLbl.text = "商品数量：\(rowModel.goods_number!)"

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

@@ -230,14 +230,17 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
     func changeGoodsPriByData(sender: Array<OrderDetailGoodsModel>) {
         print("修改价格（普通商品返回数据）\(sender)")
         self.dataMdoel?.order_goods = sender
-        listView.reloadData()
+//        listView.reloadData()
+        loadData()
+
     }
     //MARK:--修改价格（预售返回数据）
     func changeYuShouGoodsByData(sender: EditOGPAdDataModel) {
         print("修改价格（预售返回数据）--只更新datamodel，不请求网络\(sender)")
         self.dataMdoel?.order_res?.sale_res?.dj_amount = sender.dj_amount
         self.dataMdoel?.order_res?.sale_res?.wk_amount = sender.wk_amount
-        listView.reloadData()
+//        listView.reloadData()
+        loadData()
         
     }
     
@@ -479,7 +482,8 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
                 case 6:
                     if isYuShou {
 //                        dj_payWay = (self.dataMdoel?.order_res?.sale_res?.dj_pay_type!)!
-                        cell.contentLbl.text = zhiFuFangShiArr[dj_payWay]
+                        cell.contentLbl.text = self.dataMdoel?.order_res?.sale_res?.dj_pay_type_cn
+                        
                     }else{
                         cell.contentLbl.text = self.dataMdoel?.order_res?.pay_type_cn
                         
@@ -498,7 +502,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
                 case 8:
                     if isYuShou {
 //                        wk_payWay = (self.dataMdoel?.order_res?.sale_res?.wk_pay_type!)!
-                        cell.contentLbl.text = zhiFuFangShiArr[wk_payWay]
+                        cell.contentLbl.text = self.dataMdoel?.order_res?.sale_res?.wk_pay_type_cn
                     }else{
                         cell.contentLbl.text = StringByInt(number: (self.dataMdoel?.order_res?.sale_res?.wk_pay_type!)!)
                     }
@@ -662,9 +666,6 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
                 view.delegate = self
                 view.dataArr = zhiFuFangShiArr
                 view.selectNum = dj_payWay
-                if dj_payWay != 0 {
-                    view.deSelectArr = [0]
-                }
                 view.tempNum = view.selectNum
                 self.view.addSubview(view)
                 glSelectView = view
@@ -680,9 +681,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
                 view.delegate = self
                 view.dataArr = zhiFuFangShiArr
                 view.selectNum = wk_payWay
-                if wk_payWay != 0 {
-                    view.deSelectArr = [0]
-                }
+     
                 view.tempNum = view.selectNum
                 self.view.addSubview(view)
                 glSelectView = view
@@ -707,7 +706,13 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
                 let dataM = data as! UpDataModel
                 if dataM.code == 1 {
                     self.dj_payWay = selectNum
-                    //                    self.dataMdoel?.order_res?.pay_type_cn = self.zhiFuFangShiArr[selectNum]
+                    self.dataMdoel?.order_res?.sale_res?.dj_pay_type_cn = self.zhiFuFangShiArr[selectNum]
+                    if selectNum == 0 {
+                        self.dataMdoel?.order_res?.sale_res?.dj_pay_status_cn = "未付款"
+                    }else{
+                        self.dataMdoel?.order_res?.sale_res?.dj_pay_status_cn = "已付款"
+
+                    }
                     self.listView.reloadData()
                     
                 }
@@ -729,7 +734,14 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
                 let dataM = data as! UpDataModel
                 if dataM.code == 1 {
                     self.wk_payWay = selectNum
-//                    self.dataMdoel?.order_res?.pay_type_cn = self.zhiFuFangShiArr[selectNum]
+                    self.dataMdoel?.order_res?.sale_res?.wk_pay_type_cn = self.zhiFuFangShiArr[selectNum]
+                    if selectNum == 0 {
+                        self.dataMdoel?.order_res?.sale_res?.wk_pay_status_cn = "未付款"
+                    }else{
+                        self.dataMdoel?.order_res?.sale_res?.wk_pay_status_cn = "已付款"
+
+                    }
+                    
                     self.listView.reloadData()
                     
                 }
@@ -754,9 +766,9 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
                     self.zhiFuSelect = selectNum
                     self.dataMdoel?.order_res?.pay_type_cn = self.zhiFuFangShiArr[selectNum]
                     if selectNum == 0 {
-                        self.dataMdoel?.order_res?.pay_status_cn = "未支付"
+                        self.dataMdoel?.order_res?.pay_status_cn = "未付款"
                     }else{
-                        self.dataMdoel?.order_res?.pay_status_cn = "已支付"
+                        self.dataMdoel?.order_res?.pay_status_cn = "已付款"
 
                     }