From 117f96b4de283cd6f1896d17d8027094113435a2 Mon Sep 17 00:00:00 2001
From: younger_times <841720330@qq.com>
Date: 星期四, 27 四月 2023 18:28:25 +0800
Subject: [PATCH] 新增
---
BrokerDriver/Home/VC/HomePageVC.swift | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/BrokerDriver/Home/VC/HomePageVC.swift b/BrokerDriver/Home/VC/HomePageVC.swift
index 5a072d3..220526d 100644
--- a/BrokerDriver/Home/VC/HomePageVC.swift
+++ b/BrokerDriver/Home/VC/HomePageVC.swift
@@ -21,6 +21,10 @@
private var page = 1
private var datas = [OrderModel]()
+ var box:JQBox<(String?,Date?)>?
+ private var containerNo:String?
+ private var date:String?
+
lazy private var tableView:BaseTableView = {
let tableView = BaseTableView(frame: .zero, style: .plain)
tableView.delegate = self
@@ -49,15 +53,29 @@
self?.getData(false)
}).disposed(by: disposeBag)
tableView.jq_setEmptyView("Not data", image: UIImage(named: "empty"), foregroundColor: .gray, clouse: nil)
- refreshStatus.onNext(.beingHeaderRefresh)
+ DispatchQueue.main.asyncAfter(deadline: .now()+1) {
+ self.refreshStatus.onNext(.beingHeaderRefresh)
+ }
+
+ box?.bind { [weak self] str,date in
+ self?.containerNo = str
+ self?.date = date?.jq_format("yyyy-MM-dd")
+ self?.refreshStatus.onNext(.beingHeaderRefresh)
+ }
}
private func getData(_ isHeader:Bool = true){
- Services.getList(type: style, pageNumber: page).subscribe(onNext: { data in
+
+ if isHeader{
+ page = 1
+ }else{
+ page += 1
+ }
+
+ Services.getList(type: style, pageNumber: page,containerNo: containerNo,date: date).subscribe(onNext: { data in
if let models = data.data{
if isHeader{
self.datas.removeAll()
- self.page = 1
self.refreshStatus.onNext(.endHeaderRefresh)
self.refreshStatus.onNext(.resetNoMoreData)
}else{
@@ -71,7 +89,9 @@
self.tableView.reloadData()
}
}) { error in
-
+ alert(msg: error.localizedDescription)
+ self.refreshStatus.onNext(.endFooterRefresh)
+ self.refreshStatus.onNext(.endHeaderRefresh)
}.disposed(by: disposeBag)
}
@@ -88,16 +108,17 @@
extension HomePageVC:UITableViewDelegate{
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
- let vc = HomeDetailVC()
+ let data = datas[indexPath.row]
+ let vc = HomeDetailVC(orderId: data.orderId, style: style)
push(vc: vc)
}
-
}
extension HomePageVC:UITableViewDataSource{
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let cell = tableView.dequeueReusableCell(withIdentifier: "_HomeItemTCell") as! HomeItemTCell
cell.backgroundColor = .clear
+ cell.orderModel = datas[indexPath.row]
return cell
}
--
Gitblit v1.7.1