1、增加一处 和 h5的交互

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

@@ -21,7 +21,7 @@ class YHConfigModel : SmartCodable {
     var suggest_updating: Bool = false
     var suggest_updating_msg: String = ""
     
-    var is_integral_open : Bool = false //条件控制哈
+    var is_integral_open : Bool = false //条件控制哈  pingguo shenhe
     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/IntelligentService(服务中心)/Resign(续签)/ResignHKAppoint(在港递交预约)/V/RangeDatePicker2/YHRangeDatePickerSheetView2.swift

@@ -95,7 +95,6 @@ class YHRangeDatePickerSheetView2: UIView {
     
     lazy var timeHoldView : YHPickTimeHoldView = {
         let imageV  = YHPickTimeHoldView()
-//        imageV.backgroundColor = .yellow //for test hjl
         return imageV
     }()
     

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignHKAppoint(在港递交预约)/V/RangeDatePicker2/YHRangeDatePickerView2.swift

@@ -216,8 +216,6 @@ private extension YHRangeDatePickerView2 {
             make.left.right.equalToSuperview()
             make.height.equalTo(YHRangeDatePickerView2.viewH2)
         }
-        
-//        calendar.backgroundColor = .red //for test hjl
     }
     
     func tapOneDate(_ date : Date) {

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

@@ -112,6 +112,9 @@ class YHH5WebViewVC: YHBaseViewController, WKUIDelegate, WKNavigationDelegate {
     //6、是否展示 导航栏上的title
     var showNavigationTitleFlag : Bool = true
     
+    //22、禁用全局手势
+    private var disableFullScreenGestureFlag : Bool = false
+    
     //默认的返回按钮图片
     private var myDefaultBackImage : UIImage = UIImage(named: "back_icon") ?? UIImage()
     
@@ -371,6 +374,7 @@ private extension YHH5WebViewVC {
     
     
     @objc func share() {
+        
         if self.isShareToMiniProgramFlag {
             if let path = self.shareMiniPath,!path.isEmpty {
                 YHShareManager.shared.shareToMiniProgram(path:path, shareTitle: shareMiniTitle)
@@ -421,6 +425,11 @@ private extension YHH5WebViewVC {
             }
         }
     }
+    
+    //是否启用全局返回手势
+     func navigationShouldPopOnGesture() -> Bool {
+        return !disableFullScreenGestureFlag
+    }
 }
 
 
@@ -485,6 +494,20 @@ extension YHH5WebViewVC {
 
 // MARK: - h5实现的接口
 extension YHH5WebViewVC {
+    //22、禁用全局手势返回
+    func disableFullScreenGestureSyn(_ tag : String) {
+        if tag.contains("0") {
+            //启用
+            self.disableFullScreenGestureFlag = false
+            
+        } else if tag.contains("1") {
+            //禁用
+            self.disableFullScreenGestureFlag = true
+        }
+    }
+    
+    
+    
     //20、导航栏上是否展示title
     func hideNavigationTitleSyn(_ tag : String) {
         if tag.contains("0") {

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

@@ -18,6 +18,17 @@ class YHJsApi: NSObject {
 }
 
 extension YHJsApi {
+    //禁用全局手势返回
+    @objc func disableFullScreenGestureSyn(_ tag : Any) {
+        DispatchQueue.main.async {
+            if let tag = tag as? String, tag.count == 1 {
+                if let delegate = self.delegate as? YHH5WebViewVC {
+                    delegate.disableFullScreenGestureSyn(tag)
+                }
+            }
+        }
+    }
+    
     //21、使用safari WebView打开Url
     @objc func openUrlWithSafariSyn(_ payUrl: String) {
         DispatchQueue.main.async {