Commit af5c1f03 authored by David黄金龙's avatar David黄金龙

几处 bug修改

parent 44fb163a
...@@ -306,7 +306,7 @@ extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource { ...@@ -306,7 +306,7 @@ extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource {
} else if model.type == 26 { } else if model.type == 26 {
//旅行证件准备 //旅行证件准备
let vc = YHTravelDocsPreparationListViewController() let vc = YHTravelDocsPreparationListViewController()
vc.orderID = orderID vc.orderId = orderID
navigationController?.pushViewController(vc) navigationController?.pushViewController(vc)
} else if model.type == 27 { } else if model.type == 27 {
//上传过关证件 //上传过关证件
......
...@@ -13,7 +13,7 @@ import UIKit ...@@ -13,7 +13,7 @@ import UIKit
*/ */
class YHTravelDocsPreparationListViewController: YHBaseViewController { class YHTravelDocsPreparationListViewController: YHBaseViewController {
var orderID: Int = 0 var orderId: Int = 0
lazy var viewModel: YHTravelDocsPreparationViewModel = { lazy var viewModel: YHTravelDocsPreparationViewModel = {
let vm = YHTravelDocsPreparationViewModel() let vm = YHTravelDocsPreparationViewModel()
return vm return vm
...@@ -52,7 +52,7 @@ class YHTravelDocsPreparationListViewController: YHBaseViewController { ...@@ -52,7 +52,7 @@ class YHTravelDocsPreparationListViewController: YHBaseViewController {
private extension YHTravelDocsPreparationListViewController { private extension YHTravelDocsPreparationListViewController {
func loadData() { func loadData() {
let params: [String : Any] = ["order_id": orderID] let params: [String : Any] = ["order_id": orderId]
viewModel.getTravelDocsList(param: params){ success, error in viewModel.getTravelDocsList(param: params){ success, error in
if success { if success {
...@@ -72,9 +72,9 @@ private extension YHTravelDocsPreparationListViewController { ...@@ -72,9 +72,9 @@ private extension YHTravelDocsPreparationListViewController {
gk_navBackgroundColor = .white gk_navBackgroundColor = .white
view.backgroundColor = UIColor.contentBkgColor view.backgroundColor = UIColor.contentBkgColor
if orderID == 0 { if orderId == 0 {
if let id = UserDefaults.standard.value(forKey: "orderIdForPreview") { if let id = UserDefaults.standard.value(forKey: "orderIdForPreview") {
self.orderID = (id as? Int) ?? 0 self.orderId = (id as? Int) ?? 0
} }
} }
......
...@@ -227,9 +227,7 @@ private extension YHUploadCertificateDetailVC { ...@@ -227,9 +227,7 @@ private extension YHUploadCertificateDetailVC {
viewModel.submitSmallWhiteBar(params) { success, error in viewModel.submitSmallWhiteBar(params) { success, error in
if success { if success {
YHHUD.flash(message: "保存成功") YHHUD.flash(message: "保存成功")
DispatchQueue.main.asyncAfter(deadline: .now() + 1.5) { self.navigationController?.popViewController()
self.navigationController?.popViewController()
}
} else { } else {
let msg = error?.errorMsg ?? "保存失败,请重试" let msg = error?.errorMsg ?? "保存失败,请重试"
YHHUD.flash(message: msg) YHHUD.flash(message: msg)
...@@ -247,9 +245,7 @@ private extension YHUploadCertificateDetailVC { ...@@ -247,9 +245,7 @@ private extension YHUploadCertificateDetailVC {
viewModel.submitIDCardInfo(params) { success, error in viewModel.submitIDCardInfo(params) { success, error in
if success { if success {
YHHUD.flash(message: "保存成功") YHHUD.flash(message: "保存成功")
DispatchQueue.main.asyncAfter(deadline: .now() + 1.5) { self.navigationController?.popViewController()
self.navigationController?.popViewController()
}
} else { } else {
let msg = error?.errorMsg ?? "保存失败,请重试" let msg = error?.errorMsg ?? "保存失败,请重试"
......
...@@ -152,9 +152,9 @@ private extension YHVisaPaymentVC { ...@@ -152,9 +152,9 @@ private extension YHVisaPaymentVC {
@objc func clickNextBtn() { @objc func clickNextBtn() {
if self.viewModel.isAllMemberPay() { if self.viewModel.isAllMemberPay() {
//跳转 //跳转
let vc = YHUploadCertificateVC() let vc = YHTravelDocsPreparationListViewController()
vc.orderId = orderID vc.orderId = orderID
self.navigationController?.push(vc, removeClass: YHVisaPaymentVC.self) self.navigationController?.push(vc, removeClass: YHTravelDocsPreparationListViewController.self)
} else { } else {
postPaymentResult() postPaymentResult()
} }
......
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