和 H5 联调 30

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/OrderList(服务订单)/C/YHServiceCenterViewController.swift

@@ -116,6 +116,28 @@ class YHServiceCenterViewController: YHBaseViewController {
         NotificationCenter.default.addObserver(self, selector: #selector(leaveTopOp), name:Notification.Name(rawValue: "leaveTop0"), object: nil)
         NotificationCenter.default.addObserver(self, selector: #selector(beginDragging), name:Notification.Name(rawValue: "scrollViewWillBeginDragging0"), object: nil)
         NotificationCenter.default.addObserver(self, selector: #selector(endDragging), name:Notification.Name(rawValue: "scrollViewDidEndDragging0"), object: nil)
+        
+        
+        NotificationCenter.default.addObserver(self, selector: #selector(didJumpToServiceProgess), name: YhConstant.YhNotification.didJumpToServiceProgressNotification, object: nil)
+    }
+    
+    
+    private func goToServiceProgressVC() {
+        let vc = YHOrderDetailViewController()
+        vc.model = oldModel
+        vc.backDate = { [weak self] model in
+            guard let self = self else { return }
+            self.model = model
+            self.state = 0
+            self.headIndex = 0
+            self.isCanSelectStep = false
+        }
+        self.navigationController?.pushViewController(vc)
+    }
+    
+    @objc func didJumpToServiceProgess() {
+        /// 服务进度
+        goToServiceProgressVC()
     }
     
     @objc func logoutSuccess() {
@@ -245,16 +267,7 @@ extension YHServiceCenterViewController {
         YHServiceMoreAlertView.show(flag) {[weak self] index in
             guard let self = self else { return }
             if index == 1 {
-                let vc = YHOrderDetailViewController()
-                vc.model = oldModel
-                vc.backDate = { [weak self] model in
-                    guard let self = self else { return }
-                    self.model = model
-                    self.state = 0
-                    self.headIndex = 0
-                    self.isCanSelectStep = false
-                }
-                self.navigationController?.pushViewController(vc)
+                self.goToServiceProgressVC()
             } else {
                 if self.state == 1 {
                     let view = YHServiceOrderGuideTipsView.sheetView(serviceCenterMainReqVM.hasTTPS, model.product_type)

galaxy/galaxy/Classes/Modules/InteractionH5(与H5交互)/YHJsApi.swift

@@ -19,8 +19,18 @@ class YHJsApi: NSObject {
 
 extension YHJsApi {
     
-    // 返回tab服务页
     
+    // 30、跳转到APP底部的服务Tab-再推出服务进度页面
+    @objc func goServiceProgressPage(_ tag : Any) {
+        
+        DispatchQueue.main.async {
+            UIViewController.current?.navigationController?.popToRootViewController(animated: false)
+            goTabBarBy(tabType: .service)
+            NotificationCenter.default.post(name: YhConstant.YhNotification.didJumpToServiceProgressNotification, object: nil)
+        }
+    }
+    
+    // 29、返回tab服务页
     @objc func goAppTab(_ tag : Any) {
         DispatchQueue.main.async {
             if let tag = tag as? String {

galaxy/galaxy/Classes/Tools/Helper/YhConstant.swift

@@ -406,5 +406,9 @@ extension YhConstant {
         
         //关闭直播间弹出的分享界面
         public static let closeShareUIInLiveRoomNotifiction = Notification.Name(rawValue: "com.yinhe.app.close.share.ui")
+        
+        
+        // 跳转到服务Tab 中的 服务进度
+        public static let didJumpToServiceProgressNotification = Notification.Name(rawValue: "com.yinhe.service.tab.serviceprogress")
     }
 }