fe / YOHOBUYPC · Commits

Go to a project

Authored by xiaowei
Commit f9466e37586fdfb19a20aea0de0d318ad8f0a626 2 parents 73c1298f 4eb3c6fc

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

Inline Side-by-side
Showing 21 changed files with 576 additions and 481 deletions
... ... @@ -249,7 +249,7 @@ class SearchData extends \LibModels\Wap\Product\SearchData
if (!isset($condition['order'])) {
$param['order'] = $orderMaps['s_t_desc'];
} else {
$param['order'] = $orderMaps[$condition['order']];
$param['order'] = isset($orderMaps[$condition['order']]) ? $orderMaps[$condition['order']] : '';
}
if (!isset($condition['page'])) {
$param['page'] = 1;
... ...
... ... @@ -32,17 +32,16 @@ class HelperSearch
{
$options = self::$options;
$channel = HomeModel::getSwitchChannel();
$uri = '/'.$channel;
$channelName = '/'.$channel;
if (isset($options['brandName']) && !empty($options['brandName'])) {
$brandNav = $options['brandNameEn'] . $options['brandNameCn'];
$brandNav = $options['brandNameEn'] . ' ' . $options['brandNameCn'];
self::$listNav = array(
array(
'href' => Helpers::url($uri),
'name' => strtoupper($channel).'首页'
'href' => Helpers::url($channelName),
'name' => strtoupper($channel) . '首页'
),
array(
'href' => '',
'href' => Helpers::url('/brands/brands'),
'name' => '品牌一览'
),
array(
... ... @@ -52,13 +51,16 @@ class HelperSearch
);
}else{
self::$listNav[0] = array(
'href' => Helpers::url($uri),
'href' => Helpers::url($channelName),
'name' => strtoupper($channel).'首页'
);
self::$listNav[1] = array(
if ($options['action'] == 'new') {
self::$listNav[1] = array(
'href' => '',
'name' => $options['action'] == 'new' ? '新品到着' : '列表'
);
'name' => '新品到着'
);
}
}
}
/**
... ... @@ -77,15 +79,19 @@ class HelperSearch
//产品列表
$result['goods'] = isset($data['product']['product_list']) ? self::getProductList($data['product']['product_list'], $options['imgSize']) : array();
//总页数
$result['page_total'] = isset($data['product']['page_total']) ? $data['product']['page_total'] : '';
self::$pageTotal = $result['page_total'];
self::$total = $data['product']['total'];
if (isset($data['product']['page_total'])) {
$result['page_total'] = $data['product']['page_total'];
self::$pageTotal = $result['page_total'];
}
if (isset($data['product']['total'])) {
self::$total = $data['product']['total'];
}
//当前页
self::$page = $result['page'] = isset($data['product']['page']) ? $data['product']['page'] : '';
//筛选条件
$result['filters'] = isset($data['product']['filter']) ? self::filter() : array();
//排序方式、显示数量等其他选项
$result['opts'] = isset($data['product']['filter']) ? self::getOpts() : array();
$result['opts'] = self::getOpts();
//下一页
if (isset($data['product']['page_total'])) {
$result['hasNextPage'] = self::next($data['product']['page_total']);
... ... @@ -621,7 +627,7 @@ class HelperSearch
//设置已选中价格
if (!empty($priceId)) {
$price = explode(',' ,$priceId);
$customName = self::$params['price'] == '2000,99999' ? '￥2000以上' : '￥' . (int)$price[0] . '-' . (int)$price[1];
$customName = isset($price[1]) && $price[1] == 99999 ? '￥'.$price[0].'以上' : '￥' . intval($price[0]-1) . '-' . intval($price[1]);
$name = isset($filter['price'][$priceId]) ? $filter['price'][$priceId] : $customName;
self::$selected['price'] = array(
'name' => $name,
... ... @@ -1076,7 +1082,6 @@ class HelperSearch
public static function current()
{
$url = explode('?', 'http://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']);
self::$listNav[0]['href'] = $url[0];
return $url[0];
}
/**
... ...
... ... @@ -304,9 +304,7 @@
</script>
<script type="text/html" id="tmpl-my-login-new">
<div class="myyoho-info-header clearfix">
\{\{# head_ico \}\}
<div class="myyoho-photo" ><img src="" alt="" data-url ="\{\{it.head_ico\}\}"></div>
\{\{/ head_ico\}\}
<div class="myyoho-photo" ><img src="\{\{headerimg it.head_ico\}\}" alt="" data-url =""></div>
<h3 class="user-email"><a href="http://www.yohobuy.com/home?t=\{\{random\}\}">\{\{profile_name\}\}</a></h3>
<h3 class="user-level">
VIP:
... ...
... ... @@ -3,15 +3,22 @@
{{#each pathNav}}
{{#if href}}
<a href="{{href}}">
{{name}}
{{#if @last}}
<b>{{name}}</b>
{{else}}
{{name}}
{{/if}}
{{#unless @last}}
<span class="iconfont">&#xe601;</span>
{{/unless}}
</a>
{{^}}
{{{name}}}
{{#if @last}}
<b>{{name}}</b>
{{else}}
{{name}}
{{/if}}
{{#unless @last}}
<span>
... ... @@ -22,4 +29,4 @@
{{/if}}
{{/each}}
</p>
{{/if}}
\ No newline at end of file
{{/if}}
... ...
... ... @@ -623,6 +623,22 @@ handlebars.registerHelper('timestamp', function() {
return new Date().getTime();
});
/**
* 头像
* @param {[type]} v1 [description]
* @param {[type]} options) { if (v1 [description]
* @return {[type]} [description]
*/
handlebars.registerHelper('headerimg', function(headerimg) {
if (headerimg === '') {
return 'http://img10.static.yhbimg.com/headimg/2013/11/28/09/01cae078abe5fe320c88cdf4c220212688.gif' +
'?imageView/2/w/100/h/100';
} else {
return headerimg;
}
});
/**
* 判断等级为3的helper
* @param {[type]} v1 [description]
* @param {[type]} options) { if (v1 [description]
... ... @@ -1542,7 +1558,7 @@ function actionGetBannerAndNotice() {
if (url.indexOf('kids') !== -1) {
code = bannerMap[INDEXKIDS];
}
if (url.indexOf('woman') !== -1) {
if (url.indexOf('woman') !== -1 || url.indexOf('girls') !== -1) {
code = bannerMap[INDEXWOMAN];
}
if (url.indexOf('lifestyle') !== -1) {
... ... @@ -1808,8 +1824,7 @@ function init() {
actionCover(); //初次登录弹框
actionAddKeyWords(); //增加关键字
}
init();
init();
});
define("js/simple-header", ["jquery"], function(require, exports, module){
var $ = require("jquery");
... ... @@ -2577,18 +2592,14 @@ $goodInfoMain.on('click', '.col-btn', function() {
if (res.code === 200) {
$this.toggleClass('coled');
} else if (res.code === 403) {
location.href = '/signin.html?refer=' + encodeURIComponent(location.href);
location.href = 'http://www.yohobuy.com/signin.html?refer=' + encodeURIComponent(location.href);
}
});
});
// 左侧导航
$productListNav.click(function(event) {
var $this = $(this);
if (!$this.hasClass('product-list-nav')) {
return;
}
$productListNav.find('h3').click(function(event) {
var $this = $(this).closest('.product-list-nav');
if ($this.hasClass('active')) {
... ... @@ -2746,7 +2757,7 @@ $('#brand-favor').on('click', function() {
$this.find('i').removeClass('coled');
}
} else if (res.code === 403) {
location.href = '/signin.html?refer=' + encodeURIComponent(location.href);
location.href = 'http://www.yohobuy.com/signin.html?refer=' + encodeURIComponent(location.href);
}
});
});
... ...
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
... ... @@ -288,6 +288,22 @@ handlebars.registerHelper('timestamp', function() {
return new Date().getTime();
});
/**
* 头像
* @param {[type]} v1 [description]
* @param {[type]} options) { if (v1 [description]
* @return {[type]} [description]
*/
handlebars.registerHelper('headerimg', function(headerimg) {
if (headerimg === '') {
return 'http://img10.static.yhbimg.com/headimg/2013/11/28/09/01cae078abe5fe320c88cdf4c220212688.gif' +
'?imageView/2/w/100/h/100';
} else {
return headerimg;
}
});
/**
* 判断等级为3的helper
* @param {[type]} v1 [description]
* @param {[type]} options) { if (v1 [description]
... ... @@ -1207,7 +1223,7 @@ function actionGetBannerAndNotice() {
if (url.indexOf('kids') !== -1) {
code = bannerMap[INDEXKIDS];
}
if (url.indexOf('woman') !== -1) {
if (url.indexOf('woman') !== -1 || url.indexOf('girls') !== -1) {
code = bannerMap[INDEXWOMAN];
}
if (url.indexOf('lifestyle') !== -1) {
... ... @@ -1473,4 +1489,4 @@ function init() {
actionCover(); //初次登录弹框
actionAddKeyWords(); //增加关键字
}
init();
init();
\ No newline at end of file
... ...
... ... @@ -25,7 +25,7 @@ $('#brand-favor').on('click', function() {
$this.find('i').removeClass('coled');
}
} else if (res.code === 403) {
location.href = '/signin.html?refer=' + encodeURIComponent(location.href);
location.href = 'http://www.yohobuy.com/signin.html?refer=' + encodeURIComponent(location.href);
}
});
});
... ...
... ... @@ -180,18 +180,14 @@ $goodInfoMain.on('click', '.col-btn', function() {
if (res.code === 200) {
$this.toggleClass('coled');
} else if (res.code === 403) {
location.href = '/signin.html?refer=' + encodeURIComponent(location.href);
location.href = 'http://www.yohobuy.com/signin.html?refer=' + encodeURIComponent(location.href);
}
});
});
// 左侧导航
$productListNav.click(function(event) {
var $this = $(this);
if (!$this.hasClass('product-list-nav')) {
return;
}
$productListNav.find('h3').click(function(event) {
var $this = $(this).closest('.product-list-nav');
if ($this.hasClass('active')) {
... ...
/*男首1150 女首/儿童/创意生活990*/
/*首页990*/
.min-screen {
.home-page {
width: 990px;
margin: 10px auto 0;
// overflow: hidden;
/*大banner*/
.slide-container {
position: absolute;
left: 0;
right: 0;
height: 387px;
&.slide-thumb-container {
... ... @@ -22,7 +19,6 @@
.slide-container-placeholder {
height: 387px;
width: 100%;
&.slide-thumb-container-placeholder {
height: 440px;
... ... @@ -31,43 +27,11 @@
/*大banner大图*/
.slide-wrapper {
position: relative;
height: 387px;
overflow: hidden;
ul {
position: relative;
height: 100%;
}
&:hover {
.slide-switch.show {
display: block;
}
}
li {
display: none;
position: absolute;
top: 0;
right: 0;
width: 100%;
height: 100%;
a {
display: block;
height: 100%;
width: 990px;
margin: 0 auto;
}
&:first-child {
display: block;
}
img {
width: 100%;
height: 100%;
}
}
}
... ... @@ -80,35 +44,17 @@
@include transition-duration(.2s);
@include transition-timing-function(ease-in); */
a {
position: absolute;
top: 50%;
margin: -30px 0 0;
width: 60px;
height: 60px;
line-height: 56px;
text-align: center;
z-index: 2;
background: #fff;
@include opacity(0.55);
&.prev {
left: 50%;
margin-left: -495px;
}
&.next {
right: 50%;
margin-right: -495px;
}
&:hover{
@include opacity(0.9);
}
.iconfont {
font-size: 32px;
color: #59585a;
}
}
}
... ... @@ -116,109 +62,19 @@
.thumb-pagination {
width: 990px;
margin: 7px auto 0;
padding: 0;
li {
position: relative;
float: left;
margin: 0 0 0 6px;
width: 118px;
height: 46px;
&:first-child {
margin: 0;
}
&.focus {
a {
@include opacity(0);
}
}
a {
position: absolute;
left: 0;
right: 0;
bottom: 0;
top: 0;
background: #000;
@include opacity(0.3);
}
img {
width: 100%;
height: 100%;
}
}
}
/*大banner圆点*/
.slide-pagination {
position: absolute;
left: 0;
right: 0;
bottom: 12px;
text-align: center;
font-size: 0;
.slide-pagination-inner {
position: relative;
padding: 7px;
@include inline-block;
}
.slide-shade {
position: absolute;
left: 0;
right: 0;
top: 0;
bottom: 0;
background: #000;
@include opacity(0.3);
@include border-radius(13px);
}
span {
position: relative;
@include inline-block;
margin: 0 7px;
width: 12px;
height: 12px;
background: #fff;
cursor: pointer;
@include opacity(0.6);
@include border-radius(6px);
z-index: 2;
&.focus {
@include opacity(1);
}
}
}
/*女首碎片banner*/
.debris-slider {
height: 440px;
width: 100%;
.col {
float: left;
a {
display: block;
}
}
.left-col a,
.right-col a {
margin-bottom: 10px;
&:last-child {
margin-bottom: 0;
}
}
.right-col img,
.left-col img {
height: 100%;
width: 100%;
}
.left-col {
margin-right: 9px;
... ... @@ -234,43 +90,8 @@
}
.center-col {
position: relative;
width: 492px;
height: 100%;
margin-right: 9px;
font-size: 0;
&:hover {
.slide-switch.show {
display: block;
}
}
.slide-wrapper {
height: 100%;
li {
a {
width: 100%;
}
}
}
.slide-switch {
a.prev {
left: 0;
margin-left: 0;
}
a.next {
right: 0;
margin-right: 0;
}
}
img {
max-width: 100%;
max-height: 100%;
}
}
.right-col a {
... ... @@ -280,28 +101,18 @@
.right-col a:first-child {
height: 326px;
margin-bottom: 11px;
margin-bottom: 10px;
}
}
/*男首最新速报*/
.new-report {
img {
display: block;
width: 100%;
height: 100%;
}
.report-list {
float: left;
width: 748px;
li {
float: left;
margin: 0 8px 8px 0;
width: 158px;
height: 212px;
overflow: hidden;
&:first-child {
margin-right: 7px;
width: 242px;
height: 432px;
}
... ... @@ -310,163 +121,57 @@
}
.last-item {
float: left;
width: 242px;
height: 432px;
overflow: hidden;
}
}
/*优选品牌*/
.preference-brand {
overflow: hidden;
}
.preference-brand-list {
margin-top: 8px;
width: 998px;
}
.preference-brand-item {
float: left;
margin-right: 7px;
margin-bottom: 8px;
a {
display: table-cell;
width: 159px;
height: 74px;
text-align: center;
vertical-align: middle;
}
img {
display: block;
max-width: 100%;
max-height: 100%;
margin: 0 auto;
}
}
.preference-more {
float: left;
width: 159px;
height: 74px;
line-height: 90px;
text-align: center;
color: black;
font-size: 16px;
}
.img-slider-wrapper {
position: relative;
width: 100%;
height: 480px;
background: #8ae6e0;
.img-brand-switch {
display: block;
a {
position: absolute;
top: 50%;
font-size: 36px;
color: #fff;
&.next {
right: 30px;
}
&.prev {
left: 30px;
}
}
}
}
.img-container-landscape {
margin: 73px auto 0;
box-sizing: border-box;
width: 844px;
height: 370px;
overflow: hidden;
.img-list {
width: 1000px;
height: 100%;
}
.img-item {
float: left;
box-sizing: border-box;
width: 275px;
height: 100%;
margin-right: 9px;
img {
width: 100%;
height: 100%;
}
}
}
/*男首优选品牌 图片品牌*/
.img-brand {
position: relative;
width: 100%;
height: 150px;
overflow: hidden;
&:hover {
.img-brand-switch {
display: block;
}
}
ul {
width: 998px;
}
li {
float: left;
margin: 0 8px 0 0;
width: 325px;
height: 150px;
line-height: 150px;
overflow: hidden;
font-size: 0;
text-align: center;
img {
max-width: 100%;
max-height: 100%;
vertical-align: middle;
}
}
/*图片品牌左右切换按钮*/
.img-brand-switch {
display: none;
a {
position: absolute;
top: 50%;
margin: -20px 0 0;
width: 40px;
height: 40px;
line-height: 40px;
text-align: center;
z-index: 2;
background: #fff;
@include opacity(0.55);
&.prev {
left: 0;
}
&.next {
right: 0;
}
&:hover {
@include opacity(0.9);
}
}
}
}
... ... @@ -474,9 +179,7 @@
/*男首优选品牌 logo品牌*/
.logo-brand {
width: 100%;
height: 246px;
overflow: hidden;
&.logos-10 {
height: 164px;
... ... @@ -486,44 +189,10 @@
width: 998px;
}
li {
float: left;
margin: 8px 8px 0 0;
width: 158px;
height: 74px;
line-height: 74px;
font-size: 0;
text-align: center;
img {
max-width: 100%;
max-height: 100%;
vertical-align: middle;
}
}
.logo-brand-switch {
position: relative;
background: image-url('index/logo-brand-line.png') no-repeat center center;
line-height: normal;
.iconfont {
position: absolute;
left: 50%;
font-size: 32px;
&.prev {
top: 10px;
margin: 0 0 0 -48px;
}
&.next {
bottom: 12px;
margin: 0 0 0 20px;
}
}
}
.brand-more {
font-size: 16px;
&:hover {
text-decoration: underline;
}
}
}
... ... @@ -533,7 +202,6 @@
width: 1004px;
}
li {
float: left;
margin: 0 7px 7px 0;
width: 161px;
height: 214px;
... ... @@ -546,58 +214,22 @@
width: 326px;
height: 435px;
}
img {
display: block;
width: 100%;
height: 100%;
}
}
}
.floor-header {
position: relative;
margin: 50px 0 30px;
.floor-title {
margin: 0 auto;
width: 298px;
height: 31px;
line-height: 31px;
border: 1px solid #000;
font-size: 16px;
text-align: center;
}
.header-navs {
position: absolute;
padding: 10px 0;
top: 0;
right: 0;
font-size: 14px;
li {
float: left;
padding: 1px 10px;
border-left: 1px solid #ccc;
&:first-child {
border-left: none;
}
&:hover {
text-decoration: underline;
}
a {
color: #333;
}
}
}
}
}
}
}
@import "index1150","_index-pliffy";
... ...
@media screen and (min-width: 1150px) {
.home-page {
width: 1150px;
margin: 10px auto 0;
.slide-container{
position: absolute;
left: 0;
right: 0;
height: 450px;
&.slide-thumb-container {
... ... @@ -13,17 +15,50 @@
.slide-wrapper {
position: relative;
height: 450px;
overflow: hidden;
ul {
position: relative;
height: 100%;
}
&:hover {
.slide-switch.show {
display: block;
}
}
li {
display: none;
position: absolute;
top: 0;
right: 0;
width: 100%;
height: 100%;
a {
display: block;
height: 100%;
width: 1150px;
margin: 0 auto;
}
&:first-child {
display: block;
}
img {
width: 100%;
height: 100%;
}
}
}
.slide-container-placeholder {
height: 450px;
width: 100%;
&.slide-thumb-container-placeholder {
height: 510px;
... ... @@ -33,14 +68,38 @@
.slide-switch {
display: block;
a {
position: absolute;
top: 50%;
margin: -30px 0 0;
width: 60px;
height: 60px;
line-height: 56px;
text-align: center;
z-index: 2;
background: #fff;
@include opacity(0.55);
&.prev {
left: 50%;
margin-left: -575px;
}
&.next {
right: 50%;
margin-right: -575px;
}
&:hover{
@include opacity(0.9);
}
.iconfont {
font-size: 32px;
color: #59585a;
}
}
}
... ... @@ -50,14 +109,108 @@
padding: 0 0 0 2px;
li {
position: relative;
float: left;
margin: 0 0 0 6px;
width: 138px;
height: 54px;
&:first-child {
margin: 0;
}
&.focus {
a {
@include opacity(0);
}
}
a {
position: absolute;
left: 0;
right: 0;
bottom: 0;
top: 0;
background: #000;
@include opacity(0.3);
}
img {
width: 100%;
height: 100%;
}
}
}
/*大banner圆点*/
.slide-pagination {
position: absolute;
left: 0;
right: 0;
bottom: 12px;
text-align: center;
font-size: 0;
.slide-pagination-inner {
position: relative;
padding: 7px;
@include inline-block;
}
.slide-shade {
position: absolute;
left: 0;
right: 0;
top: 0;
bottom: 0;
background: #000;
@include opacity(0.3);
@include border-radius(13px);
}
span {
position: relative;
@include inline-block;
margin: 0 7px;
width: 12px;
height: 12px;
background: #fff;
cursor: pointer;
@include opacity(0.6);
@include border-radius(6px);
z-index: 2;
&.focus {
@include opacity(1);
}
}
}
.debris-slider {
height: 510px;
width: 100%;
.col {
float: left;
a {
display: block;
}
}
.left-col a,
.right-col a {
margin-bottom: 10px;
&:last-child {
margin-bottom: 0;
}
}
.right-col img,
.left-col img {
height: 100%;
width: 100%;
}
.left-col {
margin-right: 10px;
... ... @@ -72,31 +225,74 @@
}
.center-col {
position: relative;
width: 570px;
height: 100%;
margin-right: 10px;
}
font-size: 0;
.right-col {
a {
width: 280px;
height: 120px;
&:hover {
.slide-switch.show {
display: block;
}
}
.slide-wrapper {
height: 100%;
a:first-child {
height: 380px;
li {
a {
width: 100%;
}
}
}
.slide-switch {
a.prev {
left: 0;
margin-left: 0;
}
a.next {
right: 0;
margin-right: 0;
}
}
img {
max-width: 100%;
max-height: 100%;
}
}
.right-col a {
width: 280px;
height: 120px;
}
.right-col a:first-child {
height: 380px;
margin-bottom: 11px;
}
}
.new-report {
img {
display: block;
width: 100%;
height: 100%;
}
.report-list {
float: left;
width: 868px;
li {
float: left;
margin: 0 8px 8px 0;
width: 185px;
height: 248px;
overflow: hidden;
&:first-child {
width: 282px;
margin-right: 7px;
width: 282px;
height: 504px;
}
... ... @@ -104,60 +300,173 @@
}
.last-item {
float: left;
width: 282px;
height: 504px;
overflow: hidden;
}
}
.img-slider-wrapper {
height: 558px;
}
.img-container-landscape {
margin: 86px auto 0;
width: 982px;
height: 433px;
.img-item {
width: 320px;
margin-right: 10px;
}
/*优选品牌*/
.preference-brand {
overflow: hidden;
}
.preference-brand-list {
margin-top: 8px;
width: 1158px;
}
.preference-brand-item {
float: left;
margin-right: 8px;
margin-bottom: 8px;
a {
display: table-cell;
width: 185px;
height: 86px;
text-align: center;
vertical-align: middle;
}
img {
display: block;
max-width: 100%;
max-height: 100%;
margin: 0 auto;
}
}
.preference-more {
float: left;
width: 185px;
height: 86px;
line-height: 100px;
text-align: center;
color: black;
font-size: 16px;
}
.img-slider-wrapper {
position: relative;
width: 100%;
height: 558px;
background: #8ae6e0;
.img-brand-switch {
display: block;
a {
position: absolute;
top: 50%;
font-size: 36px;
color: #fff;
&.next {
right: 30px;
}
&.prev {
left: 30px;
}
}
}
}
.img-container-landscape {
box-sizing: border-box;
margin: 86px auto 0;
width: 982px;
height: 433px;
overflow: hidden;
.img-list {
width: 1000px;
height: 100%;
}
.img-item {
float: left;
box-sizing: border-box;
width: 320px;
height: 100%;
margin-right: 10px;
img {
width: 100%;
height: 100%;
}
}
}
/*男首优选品牌 图片品牌*/
.img-brand {
position: relative;
width: 100%;
height: 175px;
overflow: hidden;
&:hover {
.img-brand-switch {
display: block;
}
}
ul {
width: 1158px;
}
li {
float: left;
margin: 0 8px 0 0;
width: 378px;
height: 175px;
line-height: 175px;
overflow: hidden;
font-size: 0;
text-align: center;
img {
max-width: 100%;
max-height: 100%;
vertical-align: middle;
}
}
/*图片品牌左右切换按钮*/
.img-brand-switch {
display: none;
a {
position: absolute;
top: 50%;
margin: -20px 0 0;
width: 40px;
height: 40px;
line-height: 40px;
text-align: center;
z-index: 2;
background: #fff;
@include opacity(0.55);
&.prev {
left: 0;
}
&.next {
right: 0;
}
&:hover {
@include opacity(0.9);
}
}
}
}
/*男首优选品牌 logo品牌*/
.logo-brand {
width: 100%;
height: 282px;
overflow: hidden;
&.logos-10 {
height: 188px;
... ... @@ -167,16 +476,54 @@
width: 1158px;
}
li {
float: left;
margin: 8px 8px 0 0;
width: 185px;
height: 86px;
line-height: 86px;
font-size: 0;
text-align: center;
img {
max-width: 100%;
max-height: 100%;
vertical-align: middle;
}
}
.logo-brand-switch {
position: relative;
background: image-url('index/logo-brand-line.png') no-repeat center center;
line-height: normal;
.iconfont {
position: absolute;
left: 50%;
font-size: 32px;
&.prev {
top: 10px;
margin: 0 0 0 -48px;
}
&.next {
bottom: 12px;
margin: 0 0 0 20px;
}
}
}
.brand-more {
font-size: 16px;
&:hover {
text-decoration: underline;
}
}
}
/*创意生活商品分类*/
.categorys-list {
ul {
width: 1158px;
}
li {
float: left;
margin: 0 8px 8px 0;
width: 185px;
height: 248px;
... ... @@ -189,16 +536,52 @@
width: 377px;
height: 504px;
}
img {
display: block;
width: 100%;
height: 100%;
}
}
}
.floor-header {
position: relative;
margin: 80px 0 40px;
.floor-title {
margin: 0 auto;
width: 298px;
height: 31px;
line-height: 31px;
border: 1px solid #000;
font-size: 16px;
text-align: center;
}
.header-navs {
position: absolute;
padding: 10px 0;
top: 0;
right: 0;
font-size: 14px;
li {
float: left;
padding: 1px 15px;
border-left: 1px solid #ccc;
&:first-child {
border-left: none;
}
&:hover {
text-decoration: underline;
}
a {
color: #333;
}
}
}
}
}
}
\ No newline at end of file
... ...
... ... @@ -8,6 +8,10 @@
"plugin/slider",
"pager";
b {
font-weight: bold;
}
body {
font-family: arial,"Microsoft YaHei";
}
... ...
.hotrank-page {
width: 990px;
width: 1150px;
margin: 0 auto;
.popular-list {
width: 1160px;
li {
position: relative;
float: left;
width: 324px;
height: 521px;
width: 378px;
height: 596px;
overflow: hidden;
list-style: none;
margin: 0 8px 0 0;
.item-img {
width: 100%;
height: 434px;
line-height: 434px;
height: 506px;
line-height: 506px;
text-align: center;
overflow: hidden;
}
... ... @@ -82,14 +84,14 @@
.popular-item7,
.popular-item8,
.popular-item9 {
width: 240px;
height: 408px;
width: 280px;
height: 464px;
margin: 0 10px 0 0;
overflow: hidden;
.item-img {
height: 320px;
line-height: 320px;
height: 374px;
line-height: 374px;
}
}
... ... @@ -116,7 +118,6 @@
padding: 0 26px;
font-size: 14px;
color: #777;
line-height: 20px;
border-left: 1px solid #999;
}
}
... ... @@ -135,21 +136,23 @@
}
}
.hot-week-list {
width: 1160px;
.good-info {
width: 240px;
height: 408px;
width: 280px;
height: 464px;
margin: 10px 10px 0 0;
.tag-container {
display: none;
}
.good-detail-img {
height: 320px;
line-height: 320px;
.good-detail-img {
height: 374px;
line-height: 374px;
text-align: center;
font-size: 0;
... ... @@ -243,17 +246,17 @@
}
}
@media screen and (min-width: 1150px) {
.min-screen {
.hotrank-page {
width: 1150px;
width: 990px;
.popular-list {
li {
width: 378px;
height: 596px;
width: 324px;
height: 521px;
.item-img {
height: 506px;
line-height: 506px;
height: 434px;
line-height: 434px;
}
}
... ... @@ -261,12 +264,12 @@
.popular-item7,
.popular-item8,
.popular-item9 {
width: 280px;
height: 464px;
width: 240px;
height: 408px;
.item-img {
height: 374px;
line-height: 374px;
height: 320px;
line-height: 320px;
}
}
... ... @@ -274,12 +277,12 @@
.hot-week-list {
.good-info {
width: 280px;
height: 464px;
width: 240px;
height: 408px;
.good-detail-img {
height: 374px;
line-height: 374px;
height: 320px;
line-height: 320px;
}
}
}
... ...
... ... @@ -36,14 +36,15 @@ class IndexModel
$misort = isset($searchCondition['condition']['misort']) ? $searchCondition['condition']['misort'] : false;
$positionId = isset($searchCondition['options']['positionId']) ? $searchCondition['options']['positionId'] : '';
$gender = $searchCondition['condition']['gender'] == '2,3' ? 2 : 1;
if ($msort && $misort) {//TODO
$banner = array();
if ($msort && $misort) {
$bannerData = Yohobuy::yarClient(Yohobuy::SERVICE_URL . self::URI_INDEX_TBANNER, 'get', array($positionId,$msort,$misort,$gender,0,0,0,0,0));
if (isset($bannerData['code']) && $bannerData['code'] == '200') {
$banner = self::formatBanner($bannerData['data']);
}
}
//插入banner数据
if (!empty($banner)) {
if (isset($banner)) {
$data['sortIntro'] = $banner;
}
... ...
... ... @@ -31,6 +31,7 @@ class SearchModel
/* 过滤请求参数 */
$condition = filter_input_array(INPUT_GET, array(
'query' => FILTER_SANITIZE_STRING,
'keyword' => FILTER_SANITIZE_STRING,
'brand' => FILTER_SANITIZE_STRING,
'sort' => FILTER_VALIDATE_INT,
'msort' => FILTER_SANITIZE_STRING,
... ... @@ -49,6 +50,10 @@ class SearchModel
'viewNum' => FILTER_VALIDATE_INT,
'rowNum' => FILTER_VALIDATE_INT,
'page' => FILTER_VALIDATE_INT), false);
//keyword=>query关键字
if (isset($condition['keyword']) && !empty($condition['keyword'])) {
$condition['query'] = rawurldecode($condition['keyword']);
}
//关键字
if (isset($condition['query']) && !empty($condition['query'])) {
$condition['query'] = rawurldecode($condition['query']);
... ...
... ... @@ -115,7 +115,7 @@ class IndexController extends WebAction
return;
}
$result = array(
'code' => '400',
'code' => 400,
'message' => 'operation failed'
);
$uid = $this->getUid();
... ... @@ -123,7 +123,7 @@ class IndexController extends WebAction
do{
if (!$uid) {
$result = array(
'code' => '403',
'code' => 403,
'message' => 'uid is null'
);
break;
... ...
... ... @@ -158,7 +158,7 @@ class ListController extends WebAction
do {
if (!$uid) {
$result = array(
'code' => '403',
'code' => 403,
'message' => 'uid is null'
);
break;
... ...
... ... @@ -16,6 +16,9 @@ class SearchController extends WebAction
'searchListPage' => true,
'search' => $searchData
);
$this->setTitle('潮流商品搜索 | YOHO!有货');
$this->setKeywords('Yoho! 有货,潮流,时尚,流行,购物,B2C,正品,购物网站,网上购物,货到付款,品牌服饰,男士护肤,黑框眼镜,匡威,板鞋,i.t,izzue,5cm,eastpak,vans,lylescott,g-shock,new balance,lacoste,melissa,casio,卡西欧手表,舒雅,jasonwood,odm,AAAA,香港购物,日本潮流');
$this->setDescription('潮流商品搜索,上衣,衬衫，TEE，卫衣，冲锋衣，风衣，羽绒服，裤子,休闲鞋,板鞋,配饰，复古眼镜');
$this->setWebNavHeader();
$this->_view->display('search', $data);
}
... ... @@ -53,4 +56,35 @@ class SearchController extends WebAction
$this->echoJson($size);
}
}
/**
* 搜索错误页
*/
public function errorAction()
{
$keyword = $this->get('query');
$data = array(
//初始化js
'searchListPage' => true,
'search' => array(
'keyWord' => $keyword,
'searchActionUrl' => 'http:://search.yohobuy.com',
'latestWalk' => 7,
'pathNav' => Array(
'0'=>array(
'href' => '/',
'name' => '首页'
),
'1'=>array(
'name' => '搜索“<span id="nav_keyword">'.$keyword.'</span>”共<span id="nav_keyword_count">0</span>个结果'
)
)
)
);
$this->setTitle('潮流商品搜索 | YOHO!有货');
$this->setKeywords('Yoho! 有货,潮流,时尚,流行,购物,B2C,正品,购物网站,网上购物,货到付款,品牌服饰,男士护肤,黑框眼镜,匡威,板鞋,i.t,izzue,5cm,eastpak,vans,lylescott,g-shock,new balance,lacoste,melissa,casio,卡西欧手表,舒雅,jasonwood,odm,AAAA,香港购物,日本潮流');
$this->setDescription('潮流商品搜索,上衣,衬衫，TEE，卫衣，冲锋衣，风衣，羽绒服，裤子,休闲鞋,板鞋,配饰，复古眼镜');
$this->setWebNavHeader();
$this->_view->display('search', $data);
}
}
\ No newline at end of file
... ...
... ... @@ -32,4 +32,4 @@ routes.brandabout.type = "rewrite"
routes.brandabout.match = "/about"
routes.brandabout.route.module = Product
routes.brandabout.route.controller = Index
routes.brandabout.route.action = brandIntro
\ No newline at end of file
routes.brandabout.route.action = about
\ No newline at end of file
... ...