Merge branch 'double11' into develop

* double11:
  添加 一张图片
  H5 相关优化及几个方法支持
  删除 测试代码
  添加 steve 的本机IP
  代码优化
  代码优化
  1、 支持隐藏导航栏 2、支持登录带token刷新
  添加 我的订单 入口
  一处代码优化
  添加 测试代码
  提交 测试代码
  代码同步
  代码同步
  分支代码同步
  h5 UI 代码 分支同步
  修改版本号

# Conflicts:
#	galaxy/galaxy.xcodeproj/project.pbxproj
#	galaxy/galaxy/Classes/Modules/Home(首页)/M/YHBannerModel.swift
#	galaxy/galaxy/Classes/Modules/Home(首页)/V/YHHomeBannerView.swift
#	galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService(客服段)/Certificate(办证段)/VisaPayment(4电子签字缴费)/V/YHVisaPayTypeCell.swift
#	galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHServiceBannerView.swift
#	galaxy/galaxy/Classes/Modules/InteractionH5(与H5交互)/YHH5WebViewVC.swift
#	galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMyViewController.swift

galaxy/fastlane/Fastfile

@@ -30,9 +30,10 @@ platform :ios do
   uat = "uat"
   davidhuang_branch = "davidhuang"
   alex_branch = "main-bugfix-alex"
+  double11 = "double11"
   
   #打包正使用的分支
-  myPack_branch = develop_branch
+  myPack_branch = double11
 
   # 打adhoc包 执行命令 fastlane galaxyTest
   lane :galaxyTest do 

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -6283,9 +6283,11 @@
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxyTestEnv.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
-				CODE_SIGN_STYLE = Automatic;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = RXHYW88XR7;
+				DEVELOPMENT_TEAM = "";
+				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -6314,6 +6316,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = com.dev.profile;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = TESTENV;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "$(SRCROOT)/$(TARGET_NAME)/Res/galaxy-Bridge-Header.h";
@@ -6425,9 +6428,11 @@
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
-				CODE_SIGN_STYLE = Automatic;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = RXHYW88XR7;
+				DEVELOPMENT_TEAM = "";
+				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -6456,6 +6461,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = com.dev.profile;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = UATENV;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "$(SRCROOT)/$(TARGET_NAME)/Res/galaxy-Bridge-Header.h";
@@ -6630,9 +6636,11 @@
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxyDebug.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
-				CODE_SIGN_STYLE = Automatic;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = RXHYW88XR7;
+				DEVELOPMENT_TEAM = "";
+				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -6661,6 +6669,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = com.dev.profile;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "$(SRCROOT)/$(TARGET_NAME)/Res/galaxy-Bridge-Header.h";
 				SWIFT_VERSION = 5.0;
@@ -6677,9 +6686,11 @@
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
-				CODE_SIGN_STYLE = Automatic;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = RXHYW88XR7;
+				DEVELOPMENT_TEAM = "";
+				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -6708,6 +6719,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = com.dev.profile;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "$(SRCROOT)/$(TARGET_NAME)/Res/galaxy-Bridge-Header.h";
 				SWIFT_VERSION = 5.0;

galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHKEventWebViewController.swift

@@ -39,11 +39,23 @@ class YHHKEventWebViewController: YHBaseViewController {
 extension YHHKEventWebViewController {
     func loadData() {
         guard let urlString = model.list.first else { return }
-        let url = NSURL(string: urlString)
-        // 创建请求
-        let request = NSURLRequest(url: url! as URL)
-        // 加载请求
-        self.webview.load(request as URLRequest)
+//        let url = NSURL(string: urlString)
+//        // 创建请求
+//        let request = NSURLRequest(url: url! as URL)
+//        // 加载请求
+//        self.webview.load(request as URLRequest)
+        if let url = URL(string: urlString) {
+            let request = NSURLRequest(url: url)
+            webview.load(request as URLRequest)
+        } else {
+            let tmpUrl = YHURLEncodeHelper.urlEncodedString(urlString)
+            if let url = URL(string: tmpUrl) {
+                let request = URLRequest(url: url)
+                webview.load(request)
+            } else {
+                printLog("url: 有问题")
+            }
+        }
         
         if model.tag.contains("日历") {
             picUrl = urlString

galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHomeWebViewController.swift

@@ -113,12 +113,18 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
         api.delegate = self
         webview.addJavascriptObject(api, namespace: nil)
         
-        // 创建网址
-        let url = NSURL(string: url)
-        // 创建请求
-        let request = NSURLRequest(url: url! as URL)
-        // 加载请求
-        webview.load(request as URLRequest)
+        if let url = URL(string: url) {
+            let request = URLRequest(url: url)
+            webview.load(request)
+        } else {
+            let tmpUrl = YHURLEncodeHelper.urlEncodedString(url)
+            if let url = URL(string: tmpUrl) {
+                let request = URLRequest(url: url)
+                webview.load(request)
+            } else {
+                printLog("url: 有问题")
+            }
+        }
         // 添加wkwebview
         self.view.addSubview(webview)
         

galaxy/galaxy/Classes/Modules/Home(首页)/C/YHStatusAdvantageVC.swift

@@ -102,11 +102,26 @@ private extension YHStatusAdvantageVC {
     }
     
     func reloadWebUrl() {
-        let url = NSURL(string: url)
-        // 创建请求
-        let request = NSURLRequest(url: url! as URL)
+//        let url = NSURL(string: url)
+//        // 创建请求
+//        let request = NSURLRequest(url: url! as URL)
+        
         // 加载请求
-        webview.load(request as URLRequest)
+//        webview.load(request as URLRequest)
+        
+        
+        if let url = URL(string: url) {
+            let request = URLRequest(url: url)
+            webview.load(request)
+        } else {
+            let tmpUrl = YHURLEncodeHelper.urlEncodedString(url)
+            if let url = URL(string: tmpUrl) {
+                let request = URLRequest(url: url)
+                webview.load(request)
+            } else {
+                printLog("url: 有问题")
+            }
+        }
     }
     
     func setupUI() {

galaxy/galaxy/Classes/Modules/Home(首页)/M/YHBannerModel.swift

@@ -25,7 +25,8 @@ class YHBannerModel: SmartCodable {
     //分享相关参数
     var is_share_h5_flag : Bool = false
     var addtition_param : YHBannerAdditionModel?
-    
+    //是否为双11活动
+    var is_double_11_flag : Bool = false
     required init() {
     }
     

galaxy/galaxy/Classes/Modules/Home(首页)/M/YHConfigModel.swift

@@ -22,6 +22,7 @@ class YHConfigModel : SmartCodable {
     var suggest_updating_msg: String = ""
     
     var is_integral_open : Bool = false //条件控制哈
+    var is_recharge_order_open : Bool = false //双十一banner开关 //`is_recharge_order_open` int NOT NULL DEFAULT '0' COMMENT '1 开启 0关闭',
     
     required init() {
     }

galaxy/galaxy/Classes/Modules/Home(首页)/V/YHHomeBannerView.swift

@@ -135,7 +135,7 @@ extension YHHomeBannerView: FSPagerViewDataSource, FSPagerViewDelegate {
         if model.skip_url.isEmpty == false {
             switch model.skip_type {
             case 1: //跳转H5
-//                var url = "http://192.168.23.66:10300/superAppBridge.html#/schoolEvaluation"//建明的本机IP
+
                 var url = ""
                 if YHLoginManager.shared.isLogin() {
                     let token = YHLoginManager.shared.h5Token
@@ -151,6 +151,11 @@ extension YHHomeBannerView: FSPagerViewDataSource, FSPagerViewDelegate {
                 let vc = YHH5WebViewVC()
                 vc.url = url
                 vc.isFullScreenFlag = false
+
+                if model.is_double_11_flag {
+                    vc.isHideNavigationBar = true
+                }
+
                 
                 if model.is_share_h5_flag {
                     if let tModel = model.addtition_param {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService(客服段)/PrincipleBatch(原则批)/VM/YHPrincleViewModel.swift

@@ -32,8 +32,11 @@ extension YHPrincleViewModel {
     
     //获取获批信列表
     func getApprovalLetter(param:[String : Any],callback:((_ success: Bool,_ error:YHErrorModel?)->())?) {
+        YHHUD.show(.progress(message: ""))
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Principle.getApprovalLetterApi
         let _ = YHNetRequest.getRequest(url: strUrl,params: param) { [weak self] json, code in
+            
+            YHHUD.hide()
             //1. json字符串 转 对象
             guard let self = self else { return }
             printLog("model 是 ==> \(json)")

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

@@ -17,11 +17,14 @@ import Photos
 class YHH5WebViewVC: YHBaseViewController, WKUIDelegate, WKNavigationDelegate {
     
     lazy var webview : DWKWebView = {
-        let webview = DWKWebView(frame: .zero)
+        let config = WKWebViewConfiguration()
+        config.applicationNameForUserAgent = "YinHeApp"
+        let webview = DWKWebView(frame: .zero, configuration: config)
         webview.scrollView.contentInsetAdjustmentBehavior = .never
         webview.navigationDelegate = self
         webview.scrollView.delegate = self
         webview.setDebugMode(false)
+        
         return webview
     }()
     
@@ -73,7 +76,6 @@ class YHH5WebViewVC: YHBaseViewController, WKUIDelegate, WKNavigationDelegate {
     //分享到H5的情况
     var shareH5Title : String = "20秒极速测分"
     var shareH5Describe : String = "您的朋友邀请您进行香港优才测评，来试试吧"
-    
     //外部传进来的分享链接
     var shareUrlFromOutside : String?
     
@@ -88,16 +90,12 @@ class YHH5WebViewVC: YHBaseViewController, WKUIDelegate, WKNavigationDelegate {
     
     //UI元素的控制变量 如下
     
-    //1、底部分享view
-//    var isWithBottomViewFlag : Bool = false
-//    lazy var shareView: YHShareViewOnTablebarView = {
-//        let view = YHShareViewOnTablebarView()
-//        return view
-//    }()
-    
     //2、是否通屏展示- 默认通屏(导航栏透明)
     var isFullScreenFlag : Bool = true
     
+    //2.1、是否隐藏导航栏
+    var isHideNavigationBar : Bool = false
+    
     //3、右上角分享按钮
     var isShowRightShareItemFlag : Bool = false
     
@@ -123,12 +121,42 @@ class YHH5WebViewVC: YHBaseViewController, WKUIDelegate, WKNavigationDelegate {
 
 // MARK: - 内部方法
 private extension YHH5WebViewVC {
+    func reloadWebViewWithToken() {
+        if YHLoginManager.shared.isLogin() {
+            if !url.contains("param=") {
+                
+                let token = YHLoginManager.shared.h5Token
+                
+                var tUrl = url + "?param=" + token
+                let urlHasParam = String.hasQueryParameters(urlString: url)
+                if urlHasParam {
+                    tUrl = url + "&param=" + token
+                }
+                
+                if let url = NSURL(string: tUrl) as? URL {
+                    let request = NSURLRequest(url: url)
+                    webview.load(request as URLRequest)
+                }
+                return
+            } else {
+                printLog("理论上不存在的情况,暂时不处理")
+            }
+        }
+        
+        
+        //最后兜底 刷新
+        if let url = NSURL(string: url) as? URL {
+            let request = NSURLRequest(url: url)
+            webview.load(request as URLRequest)
+        }
+    }
     
     func reloadUI() {
         if isNeedRefreshDataFlag {
-            let url = NSURL(string: url)
-            let request = NSURLRequest(url: url! as URL)
-            webview.load(request as URLRequest)
+            if let url = NSURL(string: url) as? URL {
+                let request = NSURLRequest(url: url)
+                webview.load(request as URLRequest)
+            }
         }
     }
     
@@ -155,49 +183,43 @@ private extension YHH5WebViewVC {
         //默认白色返回按钮
         gk_backImage = myDefaultBackImage
         
+        if isHideNavigationBar {
+//            gk_navBarAlpha = 0.0
+            isFullScreenFlag = true //导航栏隐藏的情况下强制通屏
+        } else {
+            
+        }
+        gk_navigationBar.isHidden = isHideNavigationBar
+        
+        
         if isFullScreenFlag {
             gk_navBarAlpha = 0.0
         } else {
             gk_navTitle = navTitle
             gk_navBarAlpha = 1.0
         }
-                
-        NotificationCenter.default.addObserver(self, selector: #selector(updateNetWorkUI), name: .reachabilityChanged, object: nil)
         
+        NotificationCenter.default.addObserver(self, selector: #selector(updateNetWorkUI), name: .reachabilityChanged, object: nil)
         view.backgroundColor = .white
         
-//        if isWithBottomViewFlag {
-//            loadQrInfo()
-//            view.addSubview(shareView)
-//            
-//            shareView.block = { tag in
-//                if tag == 0 {
-//                    //分享
-//                    self.share()
-//                } else {
-//                    //预约咨询
-//                    if self.arrQrInfo.count > 1 {
-//                        let codeUrl = self.arrQrInfo[0]
-//                        let downloadUrl = self.arrQrInfo[1]
-//                        YHConsultantQRCodeView.codeView(codeUrl, downloadUrl: downloadUrl).show()
-//                    }
-//                }
-//            }
-//        }
-        
-        
-        
-        
         // 创建wkwebview
-        
-        
         let api = YHJsApi()
         api.delegate = self
         webview.addJavascriptObject(api, namespace: nil)
         
-        let url = NSURL(string: url)
-        let request = NSURLRequest(url: url! as URL)
-        webview.load(request as URLRequest)
+        if let url = URL(string: url) {
+            let request = URLRequest(url: url)
+            webview.load(request)
+        } else {
+            let tmpUrl = YHURLEncodeHelper.urlEncodedString(url)
+            if let url = URL(string: tmpUrl) {
+                let request = URLRequest(url: url)
+                webview.load(request)
+            } else {
+                printLog("url: 有问题")
+            }
+        }
+        
         view.addSubview(webview)
         
         if isFullScreenFlag {
@@ -343,17 +365,52 @@ extension YHH5WebViewVC {
 
 // MARK: - h5实现的接口
 extension YHH5WebViewVC {
+    //H5调用 App的分享
+    func shareH5Syn(title : String ,desc : String ,url : String) {
+        shareUrlFromOutside = url
+        shareH5Title = title
+        shareH5Describe = desc
+        share()
+    }
+    
+    //登录带token刷新
+    func loginAndRefeshWithTokenSyn(_ tag : String) {
+        //判断登录状态
+        if !YHLoginManager.shared.isLogin() {
+            if tag.contains("1") {
+                YHLoginManager.shared.loginSuccessActionBlock = {[weak self] in
+                    YHLoginManager.shared.loginSuccessActionBlock = nil
+                    guard let self = self else { return }
+                    self.reloadWebViewWithToken()
+                }
+            }
+            YHOneKeyLoginManager.shared.oneKeyLogin()
+        } else {
+            printLog("当前已是登录状态")
+        }
+    }
+    
+    //是否隐藏导航栏
+    func hideNavigationBarSyn(_ tag : String) {
+        if tag.contains("1") {
+            //隐藏
+            isHideNavigationBar = true
+            supportFullScreenSyn("1")//强制通屏
+        } else {
+            //不隐藏
+            isHideNavigationBar = false
+        }
+        gk_navigationBar.isHidden = isHideNavigationBar
+    }
     
     //是否支持通屏
     func supportFullScreenSyn(_ tag : String) {
         if tag.contains("1") {
             //支持
             isFullScreenFlag = true
-            
         } else {
             //不支持
             isFullScreenFlag = false
-            
         }
         
         webview.snp.removeConstraints()

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

@@ -8,6 +8,7 @@
 
 import Foundation
 import UIKit
+import SafariServices
 
 typealias JSCallback = (String, Bool)->Void
 typealias JSDicCallback = ([String : Any],Bool)->Void
@@ -17,6 +18,84 @@ class YHJsApi: NSObject {
 }
 
 extension YHJsApi {
+    //17、 H5调用app的分享
+    @objc func shareH5Syn(_ dicData: String) {
+        DispatchQueue.main.async {
+            if let data = dicData.data(using: .utf8) {
+                do {
+                    if let jsonObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
+                        // 转换成功，jsonObject 是一个字典
+                        print("JSON字符串转换为字典成功: \(jsonObject)")
+                        /*
+                         
+                         {
+                             ShareH5Title : "分享标题"
+                             ShareH5Describe : "分享描述"
+                             ShareH5Url : "分享链接"
+                         }
+                         */
+                        if !jsonObject.isEmpty,jsonObject.keys.count == 3 {
+                            let shareH5Title : String = jsonObject["ShareH5Title"] as? String ?? ""
+                            let shareH5Describe : String = jsonObject["ShareH5Describe"] as? String ?? ""
+                            let shareH5Url : String = jsonObject["ShareH5Url"] as? String ?? ""
+                            
+                            if !shareH5Title.isEmpty,!shareH5Describe.isEmpty,!shareH5Url.isEmpty {
+                                if let delegate = self.delegate as? YHH5WebViewVC {
+                                    delegate.shareH5Syn(title: shareH5Title, desc: shareH5Describe, url: shareH5Url)
+                                }
+                            } else {
+                                printLog("参数不合法...")
+                            }
+                        } else {
+                            printLog("ddddd")
+                        }
+                    } else {
+                        printLog("JSON字符串不是有效的字典格式")
+                    }
+                } catch {
+                    printLog("JSON解析错误: \(error)")
+                }
+            }
+        }
+    }
+    
+    //16、招行聚合支付
+    @objc func cmbPaySyn(_ payUrl : String) {
+        DispatchQueue.main.async {
+//            let tUrl = "https://test-sign.galaxy-immi.com/webPayConfirm?id=dXlHS3RRQUV4QmZ2KzRwM0phRTVyMXdWUnVjUjJvRHdmQmNWVDV0UW1Zbz0="//测试环境
+//            let tUrl = "https://beta-sign.galaxy-immi.com/webPayConfirm?id=Qk9sbUlzenp0OGFOdVZ4ekphQXJGWnJ0ODdBS3gxdWNJcURrOHBLbm4xND0%3D"//正式环境
+            if !payUrl.isEmpty,let url = URL(string: payUrl) {
+                let safariViewController = SFSafariViewController(url: url)
+                safariViewController.dismissButtonStyle = .close
+                safariViewController.modalPresentationStyle = .fullScreen
+                UIViewController.current?.present(safariViewController, animated: true, completion: nil)
+            } else {
+                printLog("hjl : 这个url不合法 -- " + payUrl)
+            }
+        }
+    }
+    
+    //15、登录带token刷新
+    @objc func loginAndRefeshWithTokenSyn(_ tag : Any) {
+        DispatchQueue.main.async {
+            if let tag = tag as? String, tag.count == 1 {
+                if let delegate = self.delegate as? YHH5WebViewVC {
+                    delegate.loginAndRefeshWithTokenSyn(tag)
+                }
+            }
+        }
+    }
+    
+    //14、是否隐藏导航栏  "0"-默认不隐藏  “1”-隐藏
+    @objc func hideNavigationBarSyn(_ tag : Any) {
+        DispatchQueue.main.async {
+            if let tag = tag as? String, tag.count == 1 {
+                if let delegate = self.delegate as? YHH5WebViewVC {
+                    delegate.hideNavigationBarSyn(tag)
+                }
+            }
+        }
+    }
     
     //13、是否支持通屏
     @objc func supportFullScreenSyn(_ tag : Any) {

galaxy/galaxy/Classes/Modules/Login(登录)/C/YHWebViewViewController.swift

@@ -7,7 +7,7 @@
 //
 
 import UIKit
-import WebKit
+@preconcurrency import WebKit
 
 class YHWebViewViewController: YHBaseViewController, WKUIDelegate, WKNavigationDelegate {
     
@@ -29,12 +29,26 @@ class YHWebViewViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
         webview = WKWebView(frame: CGRect(x: 0, y: statusHeight + navHeight!, width: self.view.frame.width, height: self.view.frame.height - k_Height_NavigationtBarAndStatuBar))
                 
         webview.navigationDelegate = self
-        // 创建网址
-        let url = NSURL(string: url)
-        // 创建请求
-        let request = NSURLRequest(url: url! as URL)
-        // 加载请求
-        webview.load(request as URLRequest)
+//        // 创建网址
+//        let url = NSURL(string: url)
+//        // 创建请求
+//        let request = NSURLRequest(url: url! as URL)
+//        // 加载请求
+//        webview.load(request as URLRequest)
+        
+        if let url = URL(string: url) {
+            let request = URLRequest(url: url)
+            webview.load(request)
+        } else {
+            let tmpUrl = YHURLEncodeHelper.urlEncodedString(url)
+            if let url = URL(string: tmpUrl) {
+                let request = URLRequest(url: url)
+                webview.load(request)
+            } else {
+                printLog("url: 有问题")
+            }
+        }
+        
         // 添加wkwebview
         self.view.addSubview(webview)
         

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

@@ -33,6 +33,7 @@ enum YHPersonalModuleItemType: Int {
     case version
     case userItems//用户条款
     case privaceAgreement//隐私协议
+    case myOrder //我的订单 双十一订单入口
 }
 
 class PersonalModuleItem {
@@ -280,6 +281,11 @@ class YHMyViewController: YHBaseViewController, ConstraintRelatableTarget {
             items.append(item)
         }
         
+        if let configModel = YHConfigManager.shared.reqVM.configModel,configModel.is_recharge_order_open {
+            let item = PersonalModuleItem(icon: "mine_item_myOrder", title: "我的订单".local, type:.myOrder)
+            items.append(item)
+        }
+        
         do {
             let item = PersonalModuleItem(icon: "mine_item_msg", title: "我的消息".local, type:.myMessage)
             items.append(item)
@@ -292,6 +298,8 @@ class YHMyViewController: YHBaseViewController, ConstraintRelatableTarget {
             }
         }
         
+        
+        
         if YHUatHelper.shared.getUatModuleStatusBy(module: .Mine_EvaluationCode) == 1 {
             let item = PersonalModuleItem(icon: "mine_item_code", title: "我的测评码".local, type:.myTestCode)
             items.append(item)
@@ -399,32 +407,19 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
         case .aboutUs:
             let vc = YHAboutGalaxyViewController()
             self.navigationController?.pushViewController(vc)
-            
-//            let view = YHRangeDatePickerSheetView.sheetView()
-//            view.block = {
-//                [weak self] (startDate,endDate) in
-//                guard let self = self else { return }
-//                
-//                printLog(startDate)
-//                printLog(endDate)
-//            }
-//            view.show() //for test hjl
-            
-            
-//            SFSafariViewController
-//            let vc = YHH5WebViewVC()
-//            vc.url = "https://beta-sign.galaxy-immi.com/webPayConfirm?id=Qk9sbUlzenp0OGFOdVZ4ekphQXJGWnJ0ODdBS3gxdWNJcURrOHBLbm4xND0%3D"
-//            vc.isFullScreenFlag = false
-//            vc.isSupportWebviewInterBackFlag = true
-//            UIViewController.current?.navigationController?.pushViewController(vc)//for test hjl
-            
-//            if let url = URL(string: "https://beta-sign.galaxy-immi.com/webPayConfirm?id=Qk9sbUlzenp0OGFOdVZ4ekphQXJGWnJ0ODdBS3gxdWNJcURrOHBLbm4xND0%3D") {
-//                let safariViewController = SFSafariViewController(url: url)
-//                safariViewController.dismissButtonStyle = .close
-//                safariViewController.modalPresentationStyle = .fullScreen
-//                UIViewController.current?.present(safariViewController, animated: true, completion: nil)
-//            }//for test hjl
-            
+        case .myOrder:
+            //我的订单
+            if let token = YHLoginManager.shared.userModel?.token,token.count > 5 {
+                var url = YHBaseUrlManager.shared.curH5URL() + "superAppBridge.html#/order/my"
+                url = "?param=" + YHLoginManager.shared.h5Token
+                printLog("URL: \(url)")
+                let vc = YHH5WebViewVC()
+                vc.url = url
+                vc.isFullScreenFlag = false
+                vc.navTitle = "我的订单"
+                vc.isSupportWebviewInterBackFlag = true
+                UIViewController.current?.navigationController?.pushViewController(vc)
+            }
         default:
             printLog("不需要响应")
         }

galaxy/galaxy/Res/Assets.xcassets/Mine/mine_item_myOrder.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "wode_dingdan@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "wode_dingdan@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}