Commit 0a31f184 authored by 刘俊宏's avatar 刘俊宏

完善订单请求

parent 102eb481
...@@ -73,7 +73,11 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc ...@@ -73,7 +73,11 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
isUpData = true isUpData = true
page = 1 page = 1
let UserToken = UserDefaults.standard.value(forKey: "user_token") let UserToken = UserDefaults.standard.value(forKey: "user_token")
orderList(["user_token":UserToken as Any,"keyword":keyword,"page":page,"order_status":orderStatus,"pay_status":payStatus,"order_source":orderSource,"shipping_status":shippingStatus,"start_time":startTime,"end_time":endTime], success: { (data) in var dic = ["user_token":UserToken as Any,"keyword":keyword,"page":page,"order_status":orderStatus,"pay_status":payStatus,"order_source":orderSource,"shipping_status":shippingStatus,"start_time":startTime,"end_time":endTime]
if endTime == 0 {
dic.removeValue(forKey: "end_time")
}
orderList(dic, success: { (data) in
self.dataArr.removeAll() self.dataArr.removeAll()
let dataM = data as! OrderListModel let dataM = data as! OrderListModel
...@@ -101,7 +105,11 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc ...@@ -101,7 +105,11 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
print("加载更多数据") print("加载更多数据")
let UserToken = UserDefaults.standard.value(forKey: "user_token") let UserToken = UserDefaults.standard.value(forKey: "user_token")
orderList(["user_token":UserToken as Any,"keyword":keyword,"page":page,"order_status":orderStatus,"pay_status":payStatus,"order_source":orderSource,"shipping_status":shippingStatus,"start_time":startTime,"end_time":endTime], success: { (data) in var dic = ["user_token":UserToken as Any,"keyword":keyword,"page":page,"order_status":orderStatus,"pay_status":payStatus,"order_source":orderSource,"shipping_status":shippingStatus,"start_time":startTime,"end_time":endTime]
if endTime == 0 {
dic.removeValue(forKey: "end_time")
}
orderList(dic, success: { (data) in
self.page += 1 self.page += 1
let dataM = data as! OrderListModel let dataM = data as! OrderListModel
dataM.data?.forEach({ (model) in dataM.data?.forEach({ (model) in
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment