diff --git a/.gitattributes b/.gitattributes index c24dbd1f..7411d218 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,12 +1,10 @@ *.eot filter=lfs diff=lfs merge=lfs -text -*.ttf filter=lfs diff=lfs merge=lfs -text *.woff filter=lfs diff=lfs merge=lfs -text *.woff2 filter=lfs diff=lfs merge=lfs -text -*.svg filter=lfs diff=lfs merge=lfs -text -*.tff filter=lfs diff=lfs merge=lfs -text *.zip filter=lfs diff=lfs merge=lfs -text *.rar filter=lfs diff=lfs merge=lfs -text *.pdf filter=lfs diff=lfs merge=lfs -text *.gz filter=lfs diff=lfs merge=lfs -text *.gzip filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text *.otf filter=lfs diff=lfs merge=lfs -text diff --git a/app/index/controller/TopicPowerProdline.php b/app/index/controller/TopicPowerProdline.php index df2fa564..df9ce549 100644 --- a/app/index/controller/TopicPowerProdline.php +++ b/app/index/controller/TopicPowerProdline.php @@ -12,43 +12,6 @@ use think\Request; */ class TopicPowerProdline extends Common { - /** - * 重写控制器初始化 - */ - public function initialize() - { - // 获取国家/语言列表 - $languages = $this->getLanguages(); - // 输出国家/语言列表 - if (get_platform() == 'mobile') { - View::assign('header_languages', $languages); - } - - // 获取当前语言 - $current_language = $this->getCurrentLanguage($languages); - if (!empty($current_language)) { - $this->lang_id = $current_language['id']; - } - - // 获取产品分类 - $categorys = $this->getProductCategory($this->lang_id); - // 输出产品分类 - View::assign('header_categorys', $categorys); - - // 获取系统配置 - $configs = $this->getSysConfig($this->lang_id, ['basic', 'contact', 'media']); - $this->basic_config = $configs['basic']; - // 输出系统配置 - View::assign('basic_config', $configs['basic']); - View::assign('contact_config', $configs['contact']); - View::assign('media_config', $configs['media']); - - // 获取底部导航 - $footer_navigation = $this->getNavigation('NAV_67f60be43df8d', $this->lang_id); - // 输出底部导航 - View::assign('footer_navigation', $footer_navigation); - } - /** * 专题 - 电力品线首页 */ diff --git a/app/index/view/pc/public/header.html b/app/index/view/pc/public/header.html index 8608cd51..934ff36f 100644 --- a/app/index/view/pc/public/header.html +++ b/app/index/view/pc/public/header.html @@ -125,6 +125,43 @@ +