Commit 868f5299 authored by David黄金龙's avatar David黄金龙

点击 完成订单 跳转对应的 预览界面

parent 4e2dbeb7
...@@ -145,13 +145,20 @@ extension YHInformationPerfectListVC { ...@@ -145,13 +145,20 @@ extension YHInformationPerfectListVC {
} }
@objc func goInfoListVC() { @objc func goInfoListVC( ) {
//个人信息表 //个人信息表预览
goInfoListVCOp()
}
private func goInfoListVCOp(index : Int = 0) {
let vc = YHPreviewMainViewController() let vc = YHPreviewMainViewController()
vc.orderId = orderId vc.orderId = orderId
vc.myDefaultIndex = index
navigationController?.pushViewController(vc) navigationController?.pushViewController(vc)
} }
@objc func clickSubmitBtn() { @objc func clickSubmitBtn() {
...@@ -347,8 +354,11 @@ extension YHInformationPerfectListVC : UITableViewDelegate,UITableViewDataSource ...@@ -347,8 +354,11 @@ extension YHInformationPerfectListVC : UITableViewDelegate,UITableViewDataSource
tableView.deselectRow(at: indexPath, animated: true) tableView.deselectRow(at: indexPath, animated: true)
printLog("点击了 \(indexPath.section)section --- \(indexPath.row)row") printLog("点击了 \(indexPath.section)section --- \(indexPath.row)row")
if self.serviceCenterMainReqVM.myInfoFillStep > 6 {
goInfoListVCOp(index:indexPath.row)
return
}
let model = serviceCenterMainReqVM.arrInfoFillStep[indexPath.row]
if indexPath.row == 0 { if indexPath.row == 0 {
//主申请人信息 //主申请人信息
......
...@@ -19,6 +19,12 @@ class YHPreviewControllerHoldViewController: UIViewController { ...@@ -19,6 +19,12 @@ class YHPreviewControllerHoldViewController: UIViewController {
} }
} }
var myDefaultNavItemIndex : Int = 0 {
didSet {
self.segmentedView.selectItemAt(index: myDefaultNavItemIndex)
}
}
let arrItemTitles = ["主申请人信息","家庭成员信息","基本资料","学历/专业资格","工作经验","其他信息"] let arrItemTitles = ["主申请人信息","家庭成员信息","基本资料","学历/专业资格","工作经验","其他信息"]
var arrItemVCs : [YHPreviewBaseViewController] = [] var arrItemVCs : [YHPreviewBaseViewController] = []
var segmentedView : JXSegmentedView = JXSegmentedView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: 55)) var segmentedView : JXSegmentedView = JXSegmentedView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: 55))
...@@ -79,12 +85,6 @@ class YHPreviewControllerHoldViewController: UIViewController { ...@@ -79,12 +85,6 @@ class YHPreviewControllerHoldViewController: UIViewController {
} }
//segmentedViewDataSource一定要通过属性强持有!!!!!!!!! //segmentedViewDataSource一定要通过属性强持有!!!!!!!!!
segmentedView.dataSource = segmentedDataSource segmentedView.dataSource = segmentedDataSource
segmentedView.delegate = self segmentedView.delegate = self
......
...@@ -19,6 +19,14 @@ class YHPreviewMainViewController: YHBaseViewController { ...@@ -19,6 +19,14 @@ class YHPreviewMainViewController: YHBaseViewController {
} }
} }
var myDefaultIndex : Int = 0 {
didSet {
DispatchQueue.main.asyncAfter(wallDeadline: .now() + 0.25) {[weak self] in
self?.cellView.myDefaultNavItemIndex = self?.myDefaultIndex ?? 0
}
}
}
let cellView: YHPreviewControllerHoldViewController = YHPreviewControllerHoldViewController() let cellView: YHPreviewControllerHoldViewController = YHPreviewControllerHoldViewController()
var homeTableView: YHGestureTableView = { var homeTableView: YHGestureTableView = {
...@@ -86,10 +94,6 @@ class YHPreviewMainViewController: YHBaseViewController { ...@@ -86,10 +94,6 @@ class YHPreviewMainViewController: YHBaseViewController {
} }
override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
}
override func viewDidLayoutSubviews() { override func viewDidLayoutSubviews() {
super.viewDidLayoutSubviews() super.viewDidLayoutSubviews()
cellView.view.frame = CGRect(x: 0, y: 0, width: KScreenWidth, height: myCellHeight) cellView.view.frame = CGRect(x: 0, y: 0, width: KScreenWidth, height: myCellHeight)
...@@ -247,8 +251,6 @@ extension YHPreviewMainViewController : UITableViewDelegate,UITableViewDataSourc ...@@ -247,8 +251,6 @@ extension YHPreviewMainViewController : UITableViewDelegate,UITableViewDataSourc
let cell = UITableViewCell() let cell = UITableViewCell()
cellView.view.frame = CGRect(x: 0, y: 0, width: cell.contentView.bounds.size.width, height: myCellHeight) cellView.view.frame = CGRect(x: 0, y: 0, width: cell.contentView.bounds.size.width, height: myCellHeight)
cell.contentView.addSubview(cellView.view) cell.contentView.addSubview(cellView.view)
cellView.view.backgroundColor = .orange//for test hjl
return cell return cell
} }
......
...@@ -95,7 +95,7 @@ class YHNetRequest: NSObject { ...@@ -95,7 +95,7 @@ class YHNetRequest: NSObject {
requestHeader.add(name:"sign",value:sign) requestHeader.add(name:"sign",value:sign)
requestHeader.add(name: "token", value: YHLoginManager.shared.userModel?.token ?? "-") requestHeader.add(name: "token", value: YHLoginManager.shared.userModel?.token ?? "-")
testToken(&requestHeader) //for test hjl 使用固定token // testToken(&requestHeader) //for test hjl 使用固定token
headers = requestHeader headers = requestHeader
} }
......
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