Merge branch 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into develop

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

@@ -318,6 +318,25 @@ extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource {
                     //身份续签指引
                 } else if tag == 2 {
                     //我的续签方案
+                    printLog("续签方案")
+                    if let param = YHLoginManager.shared.userModel?.token,param.count>5 {
+                        printLog(param)
+                        var token : String = param
+                        
+                        var url = YHBaseUrlManager.shared.curH5URL() + "superAppBridge.html#/report/program"
+                        let addtionString = String.randomAlphaNumericStringT(6)//随机6个字母或者数字
+                        let indexToInsert = token.index(token.startIndex, offsetBy: 6) //插入位置，这里以第六个字符后面为例
+                        token.insert(contentsOf: addtionString, at: indexToInsert)
+                        //superAppBridge.html#/report/program?token=&batchID=1&order_id=151190
+
+                        url = url + "?param=" + token + "&batchID=\(stepID)" + "&order_id=\(orderID)"
+                        
+                        let vc = YHH5WebViewVC()
+                        vc.navTitle = "我的续签方案"
+                        vc.url = url
+//                        vc.isFullScreenFlag = false
+                        UIViewController.current?.navigationController?.pushViewController(vc)
+                    }
                 } else if tag == 3 {
                     //添加在港记录
                     let vc = YHHKImmigrationRecordsVC(orderId: orderID)

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

@@ -45,7 +45,7 @@ class YHH5WebViewVC: YHBaseViewController, WKUIDelegate, WKNavigationDelegate {
     }
     
     deinit {
-        webview.removeObserver(self, forKeyPath: "estimatedProgress")
+//        webview.removeObserver(self, forKeyPath: "estimatedProgress")
         NotificationCenter.default.removeObserver(self)
     }
     
@@ -90,7 +90,7 @@ class YHH5WebViewVC: YHBaseViewController, WKUIDelegate, WKNavigationDelegate {
     var isNeedRefreshDataFlag : Bool = false
     
     //webView内部返回
-    var isSupportWebviewInterBackFlag : Bool = false
+    var isSupportWebviewInterBackFlag : Bool = true
     
     
     override func backItemClick(_ sender: Any) {
@@ -227,7 +227,7 @@ private extension YHH5WebViewVC {
         progBar.tintColor = UIColor.brandMainColor
         webview.addSubview(progBar)
         // 监听网页加载的进度
-        webview.addObserver(self, forKeyPath: "estimatedProgress", options: .new, context: nil)
+//        webview.addObserver(self, forKeyPath: "estimatedProgress", options: .new, context: nil)
         
         view.addSubview(noNetWorkTipsView)
         self.noNetWorkTipsView.snp.makeConstraints { make in

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

@@ -381,7 +381,6 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
                 let vc = YHH5WebViewVC()
                 vc.navTitle = "积分中心"
                 vc.url = url
-                vc.isSupportWebviewInterBackFlag = true
                 vc.isFullScreenFlag = false
                 self.navigationController?.pushViewController(vc)
             }