完成 调用逻辑

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServiceOrderListViewController.swift

@@ -256,12 +256,19 @@ extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource {
                 //赴港时间预约
             } else if model.type == 24 {
                 //电子签字缴费
+                let vc = YHVisaPaymentVC()
+                vc.orderID = orderID
+                navigationController?.pushViewController(vc)
+                
+                
             } else if model.type == 25 {
                 //赴港行程指引
             } else if model.type == 26 {
                 //旅行证件准备
             } else if model.type == 27 {
                 //上传过关证件
+                let vc = YHUploadCertificateVC()
+                navigationController?.pushViewController(vc)
             }
         }
     }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/UploadCertificate(7上传过关证件)/C/YHUploadCertificateVC.swift

@@ -10,7 +10,7 @@ import UIKit
 
 class YHUploadCertificateVC: YHBaseViewController {
 
-    var items: [String] = ["1", "1"] //for test hjl
+    var items: [String] = ["1", "1"]
 
     lazy var tableView: UITableView = {
         let tableView = UITableView(frame:.zero, style:.grouped)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/VisaPayment(4电子签字缴费)/C/YHVisaPaymentVC.swift

@@ -11,6 +11,9 @@ import UIKit
 class YHVisaPaymentVC: YHBaseViewController {
     let items : [String] = ["1","2","3"]
     
+    
+    var orderID: Int = 0
+    
     lazy var viewModel: YHVisaPaymentViewModel = {
         let vm = YHVisaPaymentViewModel()
         return vm
@@ -74,57 +77,43 @@ class YHVisaPaymentVC: YHBaseViewController {
 
 private extension YHVisaPaymentVC {
     func loadData() {
-        if let orderID = UserDefaults.standard.value(forKey: "orderIdForPreview") {
-//            let id = orderID
-            let id = 133874//for test hjl
-            let params: [String : Any] = ["order_id": id]
-            viewModel.getVisaPaymentList(params) { success, error in
-                if success {
-                    
-                } else {
-                    
-                }
-                self.tableView.reloadData()
+        let params: [String : Any] = ["order_id": orderID]
+        viewModel.getVisaPaymentList(params) { success, error in
+            if success {
+                
+            } else {
                 
-                self.getPayUpdateStatus()
             }
+            self.tableView.reloadData()
             
+            self.getPayUpdateStatus()
         }
         
         
     }
     
     func postPaymentResult() {
-        if let orderID = UserDefaults.standard.value(forKey: "orderIdForPreview") {
-            //            let id = orderID
-            let id = 133874//for test hjl
-            
-            let params: [String : Any] = ["order_id": id]//for test hjl
-            viewModel.postPaymentResult(params) { success, error in
-                if success {
-                    YHHUD.flash(message: "预计会在1个工作日内更新缴费结果")
-                } else {
-                    
-                }
-                self.getPayUpdateStatus()
+        let params: [String : Any] = ["order_id": orderID]
+        viewModel.postPaymentResult(params) { success, error in
+            if success {
+                YHHUD.flash(message: "预计会在1个工作日内更新缴费结果")
+            } else {
+                
             }
+            self.getPayUpdateStatus()
         }
     }
     
     
     func getPayUpdateStatus() {
-        if let orderID = UserDefaults.standard.value(forKey: "orderIdForPreview") {
-            //            let id = orderID
-            let id = 133874//for test hjl
-            let params: [String : Any] = ["order_id": id]//for test hjl
-            viewModel.getPaymentUpdateStatus(params) { success, error in
-                if success {
-                    
-                } else {
-                    
-                }
-                self.setButtonRightStatus()
+        let params: [String : Any] = ["order_id": orderID]
+        viewModel.getPaymentUpdateStatus(params) { success, error in
+            if success {
+                
+            } else {
+                
             }
+            self.setButtonRightStatus()
         }
         
     }
@@ -136,6 +125,14 @@ private extension YHVisaPaymentVC {
         gk_navBackgroundColor = .white
         view.backgroundColor = UIColor.contentBkgColor
         
+        if orderID == 0 {
+            if let id = UserDefaults.standard.value(forKey: "orderIdForPreview") {
+                self.orderID = (id as? Int) ?? 0
+            }
+        }
+        
+        orderID = 133874//for test hjl
+        
         view.addSubview(tableView)
         view.addSubview(bottomView)
         bottomView.snp.makeConstraints { make in

galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMyViewController.swift

@@ -120,44 +120,37 @@ class YHMyViewController: YHBaseViewController, ConstraintRelatableTarget {
         view.likeClick = {
             [weak self] in
             guard let self = self else { return }
-//            if !checkLogin() { return }
-//            let vc = YHMyLikeActivityViewController()
-//            vc.myDefaultNavItemIndex = 0
-//            self.navigationController?.pushViewController(vc)
-            print("点赞")
-            
-            let vc = YHVisaPaymentVC()
-            self.navigationController?.pushViewController(vc) //for test hjl
+            if !checkLogin() { return }
+            let vc = YHMyLikeActivityViewController()
+            vc.myDefaultNavItemIndex = 0
+            self.navigationController?.pushViewController(vc)
         }
         view.collectClick = {
             [weak self] in
             guard let self = self else { return }
-//            if !checkLogin() { return }
-//            let vc = YHMyLikeActivityViewController()
-//            vc.myDefaultNavItemIndex = 1
-//            self.navigationController?.pushViewController(vc)
-//            print("收藏")
-            
-            let vc = YHUploadCertificateVC()
-            self.navigationController?.pushViewController(vc) //for test hjl
+            if !checkLogin() { return }
+            let vc = YHMyLikeActivityViewController()
+            vc.myDefaultNavItemIndex = 1
+            self.navigationController?.pushViewController(vc)
+            print("收藏")
         }
         view.recentScanClick = {
             [weak self] in
             guard let self = self else { return }
-//            if !checkLogin() { return }
-//            let vc = YHMyLikeActivityViewController()
-//            vc.myDefaultNavItemIndex = 2
-//            self.navigationController?.pushViewController(vc)
-//            print("最近浏览")
+            if !checkLogin() { return }
+            let vc = YHMyLikeActivityViewController()
+            vc.myDefaultNavItemIndex = 2
+            self.navigationController?.pushViewController(vc)
+            print("最近浏览")
             
             
-            let view = YHRangeDatePickerSheetView.sheetView()
-            view.block = { (startDate,endDate) in
-                print("选择的日期是：")
-                print(startDate)
-                print(endDate)
-            }
-            view.show() //for test hjl
+//            let view = YHRangeDatePickerSheetView.sheetView()
+//            view.block = { (startDate,endDate) in
+//                print("选择的日期是：")
+//                print(startDate)
+//                print(endDate)
+//            }
+//            view.show() //for test hjl
             
         }
         return view