身份续签指引 我的续签方案

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

@@ -316,8 +316,6 @@ extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource {
                     printLog("身份续签指引")
                     if let param = YHLoginManager.shared.userModel?.token,param.count>5 {
                         var url = YHBaseUrlManager.shared.curH5URL() + "superAppBridge.html#/guide/identity"
-//                        var url = "http://192.168.23.35:10300/" + "superAppBridge.html#/guide/identity" //贤宇的本地IP
-                        //superAppBridge.html#/report/program?token=&batchID=1&order_id=151190
                         url = url + "?param=" + YHLoginManager.shared.h5Token
                         let vc = YHH5WebViewVC()
                         vc.navTitle = "身份续签指引"
@@ -332,10 +330,7 @@ extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource {
                     if let param = YHLoginManager.shared.userModel?.token,param.count>5 {
                         printLog(param)
                         var url = YHBaseUrlManager.shared.curH5URL() + "superAppBridge.html#/report/program"
-//                        var url = "http://192.168.23.75:10300/" + "superAppBridge.html#/report/program" //贤宇的本地IP
-                        //superAppBridge.html#/report/program?token=&batchID=1&order_id=151190
                         url = url + "?param=" + YHLoginManager.shared.h5Token + "&batchID=\(stepID)" + "&order_id=\(orderID)"
-                        
                         let vc = YHH5WebViewVC()
                         vc.navTitle = "我的续签方案"
                         vc.url = url

galaxy/galaxy/Classes/Modules/Message(消息)/C/YHMessageDetailListVC.swift

@@ -537,10 +537,29 @@ extension YHMessageDetailListVC: UITableViewDelegate, UITableViewDataSource {
                 }
                 
            } else if msg.redirectPage == YHRedirectPage.renewalGuide.rawValue { // 身份续签指引 H5
-               YHHUD.flash(message: "跳转至 身份续签指引")
-             
+               printLog("身份续签指引")
+               if let param = YHLoginManager.shared.userModel?.token,param.count>5 {
+                   var url = YHBaseUrlManager.shared.curH5URL() + "superAppBridge.html#/guide/identity"
+                   url = url + "?param=" + YHLoginManager.shared.h5Token
+                   let vc = YHH5WebViewVC()
+                   vc.navTitle = "身份续签指引"
+                   vc.url = url
+                   vc.isFullScreenFlag = false
+                   UIViewController.current?.navigationController?.pushViewController(vc)
+               }
            } else if msg.redirectPage == YHRedirectPage.renewalPlan.rawValue { // 我的续签方案 H5
-               YHHUD.flash(message: "跳转至 我的续签方案")
+               printLog("续签方案")
+               if let param = YHLoginManager.shared.userModel?.token,param.count>5,let orderId = Int(msg.orderId) {
+                   
+                   let stepID = 0 //for test hjl  //TODO: 杜宇完善下
+                   var url = YHBaseUrlManager.shared.curH5URL() + "superAppBridge.html#/report/program"
+                   url = url + "?param=" + YHLoginManager.shared.h5Token + "&batchID=\(stepID)" + "&order_id=\(orderId)"
+                   let vc = YHH5WebViewVC()
+                   vc.navTitle = "我的续签方案"
+                   vc.url = url
+                   vc.isSupportWebviewInterBackFlag = true
+                   UIViewController.current?.navigationController?.pushViewController(vc)
+               }
 
            } else if msg.redirectPage == YHRedirectPage.stayInHKRecord.rawValue { // 添加在港记录
                if let orderId = Int(msg.orderId) {