fe / YOHOBUYPC · Commits

Go to a project

Authored by yyq
Commit 5a5a2d7e82641a0fd9b36318a1763962687638e6 2 parents 7a7099c6 b5f34fb2

merge feature/outlets

Inline Side-by-side
Showing 9 changed files with 120 additions and 13 deletions
... ... @@ -581,7 +581,9 @@ class WebAction extends Controller_Abstract
else if(empty($uid) && $sysUserSession >= 20) {
$this->setSession('_SYS_USER_SESSION', 0);
}
if ($channel === 'outlets') {
$header['outlets'] = true;
}
$this->_view->assign('headerdata', $header);
}
... ...
{{#headerdata}}
<div class="yoho-header">
<div class="yoho-header {{#if outlets}} outlets{{/if}}">
<div class="header-topwrapper clearfix">
<div class="header-top">
<div class="leftpart float-left">
... ... @@ -74,13 +74,17 @@
<div class="header-navcontent">
<ul class="first-nav-list float-left">
{{# navbars}}
<li class="first-nav-item {{classname}}">
<h3 class="name-cn">
<a href="{{link}}">{{name_cn}}</a>
</h3>
<h3 class="name-en">
<a href="{{link}}">{{name_en}}</a>
</h3>
<li class="first-nav-item {{classname}}" {{#if showIcon}} style="background: url({{icon}}) no-repeat center center"{{/if}}>
{{#if showIcon}}
<a href="{{link}}" class="menu-ico"></a>
{{^}}
<h3 class="name-cn">
<a href="{{link}}">{{name_cn}}</a>
</h3>
<h3 class="name-en">
<a href="{{link}}">{{name_en}}</a>
</h3>
{{/if}}
<div class='sub-nav-wrapper'>
<ul class="sub-nav-list">
{{# subnav}}
... ... @@ -125,6 +129,7 @@
</li>
{{/ navbars}}
</ul>
<div class="outlets-logo"></div>
<div class="icon-logo"><a href="http://www.yohobuy.com/" class="main-link"></a></div>
<div class="header-tool float-right">
<div class="search float-left {{searchcate}}" >
... ...

2.73 KB | W: | H:

2.84 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
... ... @@ -389,6 +389,12 @@
.first-nav-item {
float: left;
padding: 8px 23px 0;
.menu-ico {
width: 84px;
height: 32px;
display: block;
}
}
.all a,
... ... @@ -464,6 +470,9 @@
.gobuylifestyle {
background: url(/header/cart/lifestyle.png) no-repeat;
}
.gobuyoutlets {
background: url(/header/cart/outlets.png) no-repeat;
}
.searchcatelifestyle {
.searchinput {
border: 1px solid #5e4b3c !important
... ... @@ -524,6 +533,10 @@
}
}
.outlets > .sub-nav-wrapper {
display: block !important;
}
.name-cn {
text-align: center;
line-height: 16px !important;
... ... @@ -743,6 +756,16 @@
margin-top: -2px;
}
.outlets-logo {
background: resolve(header/outlets.png) no-repeat center center;
width: 200px;
height: 34px;
left: 42%;
margin-top: 28px;
position: absolute;
display: none;
}
.icon-logo {
background: resolve(/header/logo.png) no-repeat center center;
width: 182px;
... ... @@ -1116,6 +1139,62 @@
}
}
.yoho-header.outlets {
.header-navwrapper {
background-color: #3a3a3a;
.sub-nav-wrapper {
background-color: #e6e6e6;
margin-top: 37px;
}
.third-nav-wrapper {
border-top: 0;
}
}
.outlets-logo {
display: block;
}
.icon-logo {
display: none;
}
.first-nav-item.cure {
background: none;
}
.first-nav-item > h3 {
display: none;
}
.header-tool > .search {
display: none;
}
.sub-nav-list {
padding-left: 15%;
.sub-nav-item {
width: 14%;
text-align: center;
& > a {
color: #222!important;
}
}
.sub-nav-item:hover a {
border-color: #555;
}
.third-nav {
text-align: left;
}
}
}
.simple-header {
height: 66px;
margin: 0 0 20px 0;
... ...
... ... @@ -91,6 +91,13 @@ class HomeModel
'is_new' => $val['is_new'] == 'Y' ? true : false,
// 'subnav' => array()
);
// 奥莱头部显示配置图标
if (strtolower($val['sort_name_en']) === 'outlets' &&
$channel !== 'outlets') {
$item['showIcon'] = true;
};
$indexSub = 0;
foreach ($val['sub'] as $sub) { // 二级
$subnav = array(
... ...
... ... @@ -63,6 +63,11 @@ class ItemModel
if (!empty($baseInfo['salesPhrase'])) {
$goodsInfo['saleTip'] = $baseInfo['salesPhrase'];
}
//奥莱商品
if (!empty($baseInfo['isOutlets'])) {
$goodsInfo['isOutlets'] = $baseInfo['isOutlets'] == 'Y' ? 'outlets' : '';
}
// 商品价格
if (isset($baseInfo['productPriceBo'])) {
... ...
... ... @@ -8,8 +8,6 @@ class ItemController extends WebAction
{
public function indexAction()
{
$this->setWebNavHeader();
$productId = $this->param('productId','');
if (!is_numeric($productId)) {
$this->error();
... ... @@ -53,12 +51,23 @@ class ItemController extends WebAction
array('fullSortName'=> implode('-', $sortNames)),
$productInfo['statGoodsInfo']),
);
//设置头部
$this->setWebNavHeader($productInfo['goodsInfo']['isOutlets']);
//导航
$data['detail']['pathNav'] = array_merge(
array(HomeModel::getHomeChannelNav()),
if ($productInfo['goodsInfo']['isOutlets'] === 'outlets') {
$data['detail']['pathNav'] = array(
array('href' => '/', 'name' => 'OUTLETS', 'pathTitle' => 'OUTLETS'),// TODO 首页地址
//array('href' => '/', 'name' => 'OUTLETS', 'pathTitle' => 'OUTLETS'), TODO 奥莱频道
array('href' => '/', 'name' => $productInfo['goodsInfo']['name'], 'pathTitle' => $productInfo['goodsInfo']['name']),
);
} else {
$data['detail']['pathNav'] = array_merge(
array(HomeModel::getHomeChannelNav()),
$navs,
array(array('name' => $productInfo['goodsInfo']['name']))
);
}
$data['detail']['latestWalk'] = 5;
$data['detail'] += $productInfo + $sizeInfo;
$this->_view->display('index', $data);
... ...