Authored by xuqi

Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop

... ... @@ -345,7 +345,6 @@ class AbstractAction extends Controller_Abstract
}
// 未登录
else {
$footer = array();
$footer['loginUrl'] = '/signin.html'; // 登录链接
$footer['signupUrl'] = '/reg.html'; // 注册链接
}
... ... @@ -365,18 +364,6 @@ class AbstractAction extends Controller_Abstract
}
/**
* 返回顶部软件下载有关数据
* @return array 下载有关数据
*/
protected function getHeaderDownload()
{
return array(
'img' => 'http://img11.static.yhbimg.com/adpic/2015/02/28/18/01d83bfad41c8fca8fd1ad334216d7d733.jpg?imageView/2/w/640/h/480',
'url' => 'http://www.baidu.com'
);
}
/**
* 设置首页以及频道页顶部信息
*
* @return void
... ... @@ -388,18 +375,4 @@ class AbstractAction extends Controller_Abstract
$this->_view->assign('homeHeader', $header);
}
/**
* 返回顶部软件下载有关数据
* @return array 下载有关数据
*/
protected function setHeaderDownload()
{
$download = array(
'img' => 'http://img11.static.yhbimg.com/adpic/2015/02/28/18/01d83bfad41c8fca8fd1ad334216d7d733.jpg?imageView/2/w/640/h/480',
'url' => 'http://www.baidu.com'
);
$this->_view->assign('headerDownload', $download);
}
}
... ...
... ... @@ -14,7 +14,7 @@ swiper = new Swiper('.swiper-container', {
lazyLoading: true,
loop: true,
autoplay: 3000,
pagination: '.swiper-pagination'
pagination: '.swiper-pagination .pagination-inner'
});
lazyLoad($('img.lazy'));
... ...
... ... @@ -61,7 +61,7 @@
background: #eeeeee;
color: #999999;
font-weight: bold;
// font-weight: bold;
position: relative;
h2 {
// width: 100%;
... ... @@ -87,10 +87,22 @@
border-bottom: 1px solid #f3f3f3;
border-top: 1px solid #f9f9f9;
i {
position: relative;
top: 1px;
color: #ff0000;
padding-left: 32rem / $pxConvertRem;
display: inline-block;
margin-left: 24rem / $pxConvertRem;
width: 40rem / $pxConvertRem;
height: 40rem / $pxConvertRem;
text-align: center;
vertical-align: middle;
font-size: 28rem / $pxConvertRem;
line-height: 40rem / $pxConvertRem;
color: #fff;
border-radius: 50%;
}
.icon-hot {
background: #ff0000;
}
.icon-new {
background: #86c048;
}
}
}
... ...
... ... @@ -6,6 +6,7 @@
right: 0;
bottom: 20rem / $pxConvertRem;
text-align: center;
z-index: 1;
.pagination-inner {
display: inline-block;
span {
... ...
... ... @@ -4,15 +4,15 @@
color: #fff;
width: 100%;
overflow: hidden;
height: 44px;
line-height: 44px;
height: 88rem / $pxConvertRem;
line-height: 88rem / $pxConvertRem;
.nav-back {
position: absolute;
left: 17px;
top: 14px;
width: 9px;
height: 16px;
left: 34rem / $pxConvertRem;
top: 28rem / $pxConvertRem;
width: 18rem / $pxConvertRem;
height: 32rem / $pxConvertRem;
background: image-url('layout/back.png') no-repeat;
background-size: 100% 100%;
outline: none;
... ... @@ -20,8 +20,8 @@
.nav-home {
position: absolute;
top: 14px;
right: 17px;
top: 28rem / $pxConvertRem;
right: 34rem / $pxConvertRem;
width: 20px;
height: 20px;
background: image-url('layout/home.png') no-repeat;
... ... @@ -31,10 +31,10 @@
.nav-title {
position: absolute;
margin-left: 26px;
margin-right: 32px;
margin-left: 52rem / $pxConvertRem;
margin-right: 64rem / $pxConvertRem;
height: 100%;
font-size: 18px;
font-size: 36rem / $pxConvertRem;
color: #fff;
font-weight: bold;
top: 0;
... ...
... ... @@ -39,13 +39,11 @@
{{# list}}
<p>
<a href="{{url}}">{{name}}
<i class="icon-hot">
</i>
{{# isHot}}
<i class="icon-hot"></i>
<i class="icon-hot">H</i>
{{/ isHot}}
{{# isNew}}
<i class="icon-new"></i>
<i class="icon-new">N</i>
{{/ isNew}}
</a>
</p>
... ...
... ... @@ -26,6 +26,7 @@ class BoysController extends AbstractAction
// 渲染模板并输出
$this->_view->display('index', array(
'boysHomePage' => true,
'showDownloadApp'=>true,
'maybeLike' => true,
'content' => Index\HomeModel::getBoysFloor()
));
... ...
... ... @@ -26,6 +26,7 @@ class GirlsController extends AbstractAction
// 渲染模板并输出
$this->_view->display('index', array(
'grilsHomePage' => true,
'showDownloadApp'=>true,
'maybeLike' => true,
'content' => Index\HomeModel::getGirlsFloor()
));
... ...
... ... @@ -18,7 +18,9 @@ class IndexController extends AbstractAction
// 渲染模板
$this->_view->display('index', array(
'background' => Index\HomeModel::getBgImage()
'background' => Index\HomeModel::getBgImage(),
'channelPage' => true,
'showDownloadApp'=>true
));
}
... ...
... ... @@ -26,6 +26,7 @@ class KidsController extends AbstractAction
// 渲染模板并输出
$this->_view->display('index', array(
'kidsHomePage' => true,
'showDownloadApp'=>true,
'maybeLike' => true,
'content' => Index\HomeModel::getKidsFloor()
));
... ...
... ... @@ -26,6 +26,7 @@ class LifestyleController extends AbstractAction
// 渲染模板并输出
$this->_view->display('index', array(
'lifestyleHomePage' => true,
'showDownloadApp'=>true,
'maybeLike' => true,
'content' => Index\HomeModel::getLifestyleFloor()
));
... ...