Authored by happyhour7

Merge branch 'develop' into test

... ... @@ -5,27 +5,22 @@
{{# fashion}}
{{> script/channel}}
{{> script/fashion}}
{{/ fashion}}
{{# beauty}}
{{> script/channel}}
{{> script/beauty}}
{{/ beauty}}
{{# sport}}
{{> script/channel}}
{{> script/sport}}
{{/ sport}}
{{# lifestyle}}
{{> script/channel}}
{{> script/lifestyle}}
{{/ lifestyle}}
{{# video}}
{{> script/channel}}
{{> script/video}}
{{/ video}}
... ...
... ... @@ -23,7 +23,7 @@
<!--高的集团导航-->
<div class="enterprise" id="maxEnterprise">
<div class="menu-item logo {{# channel}} black_logo{{/ channel}}"><a href="{{defaultUrl}}"></a></div>
<div class="menu-item logo {{# channel}} black_logo{{/ channel}}"><a href="/index.html"></a></div>
<div class='menubar-header menubar-header-{{channel}}'>
<div class="menubar">
<div class="menu-item menu-item-fashion">
... ...