代码合并

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

@@ -139,16 +139,16 @@ extension YHHomeBannerView: FSPagerViewDataSource, FSPagerViewDelegate {
                 //var url = "http://192.168.23.66:10300/superAppBridge.html#/schoolEvaluation"
                 
                 //for test hjl 梁辉机器IP
-//                model.skip_url = "http://192.168.23.75:10300/superAppBridge.html#/double11-home"
+                //                model.skip_url = "http://192.168.23.75:10300/superAppBridge.html#/double11-home"
                 
                 //for test hjl steve机器IP
-//                model.skip_url = "http://192.168.52.158:10300/superAppBridge.html#/double11-home"
+                //                model.skip_url = "http://192.168.52.158:10300/superAppBridge.html#/double11-home"
                 
                 //for test hjl 测试环境
-//                model.skip_url = "https://test-hkdiy-h5.galaxy-immi.com/superAppBridge.html#/double11-home"
+                //                model.skip_url = "https://test-hkdiy-h5.galaxy-immi.com/superAppBridge.html#/double11-home"
                 
                 //for test hjl
-//                model.skip_url = "http://192.168.23.35:10300/signatureQrcode/EcqtQYs%2Bxey7t6jLbn6JkQ%3D%3D"
+                //                model.skip_url = "http://192.168.23.35:10300/signatureQrcode/EcqtQYs%2Bxey7t6jLbn6JkQ%3D%3D"
                 
                 //1.增加app  token
                 var url = ""
@@ -174,12 +174,10 @@ extension YHHomeBannerView: FSPagerViewDataSource, FSPagerViewDelegate {
                 
                 let vc = YHH5WebViewVC()
                 vc.url = tUrl
-                if model.is_double_11_flag {
-                    vc.isHideNavigationBar = false//确认了不隐藏导航栏
                 if model.is_double_11_flag {
                     vc.isHideNavigationBar = false
                 }
-
+                
                 
                 if model.is_share_h5_flag {
                     if let tModel = model.addtition_param {
@@ -205,7 +203,8 @@ extension YHHomeBannerView: FSPagerViewDataSource, FSPagerViewDelegate {
                 YHHUD.flash(message: "不需要处理的类型")
                 break
             }
-        } else {
+        }
+        else {
             YHHUD.flash(message: "error:skip_url不能为空")
         }
         YHAnalytics.track("homeBannerClick", properties: ["url": model.img_url, "index": index])