Commit 0a7adeff authored by David黄金龙's avatar David黄金龙

Merge branch 'double11' into develop

* double11:
  双 十一 启动页

# Conflicts:
#	galaxy/galaxy/Classes/Modules/Home(首页)/V/YHHomeBannerView.swift
parents 1f3665e3 36faa573
...@@ -174,10 +174,10 @@ extension YHHomeBannerView: FSPagerViewDataSource, FSPagerViewDelegate { ...@@ -174,10 +174,10 @@ extension YHHomeBannerView: FSPagerViewDataSource, FSPagerViewDelegate {
let vc = YHH5WebViewVC() let vc = YHH5WebViewVC()
vc.url = tUrl vc.url = tUrl
// vc.isFullScreenFlag = false
if model.is_double_11_flag { if model.is_double_11_flag {
vc.isHideNavigationBar = false//确认了不隐藏导航栏 vc.isHideNavigationBar = false//确认了不隐藏导航栏
if model.is_double_11_flag {
vc.isHideNavigationBar = false
} }
......
...@@ -162,9 +162,8 @@ extension YHServiceBannerView: FSPagerViewDataSource, FSPagerViewDelegate { ...@@ -162,9 +162,8 @@ extension YHServiceBannerView: FSPagerViewDataSource, FSPagerViewDelegate {
let vc = YHH5WebViewVC() let vc = YHH5WebViewVC()
vc.url = tUrl vc.url = tUrl
vc.isFullScreenFlag = false
if model.is_double_11_flag { if model.is_double_11_flag {
vc.isHideNavigationBar = true vc.isHideNavigationBar = false
} }
if model.is_share_h5_flag { if model.is_share_h5_flag {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment