fe / YOHOBUYWAP · Commits

Go to a project

Authored by 王水玲
Commit d169c3355fa9e0d86730c1592481f8ea54b5f2a7 2 parents 2a28d254 4ebcb87c

Merge branch 'release/4.8' of git.yoho.cn:fe/YOHOBUYWAP into release/4.8

Inline Side-by-side
Showing 8 changed files with 50 additions and 40 deletions
... ... @@ -9283,7 +9283,6 @@ var winH = $(window).height(),
var defaultOpt = require("js/product/query-param");
var $listNav = $('#list-nav'),
$posList = $('#pos-list'),
//导航数据信息
navInfo = {
... ... @@ -9853,10 +9852,6 @@ $listNav.bind('contextmenu', function(e) {
return false;
});
$posList.bind('contextmenu', function(e) {
return false;
});
$subNav.on('touchend touchcancel', function(e) {
var $this = $(e.target).closest('li'),
cname,
... ... @@ -10024,12 +10019,11 @@ $listNav.on('touchstart', 'li', function(e) {
myScroll.refresh();
});
$posList.on('touchstart', 'li', function(e) {
$nav2.on('touchstart', 'li', function(e) {
$(this).addClass('bytouch');
}).on('touchend touchcancel', function() {
$posList.find('li').removeClass('bytouch');
$listNav.find('li').removeClass('bytouch');
myScroll.refresh();
myScroll.scrollTo(0, -(imgH + nav1H + main1oH + 5));
});
//底部导航点击
... ... @@ -14650,7 +14644,6 @@ $('.address-item').on('touchend', function() {
orderInfo('addressId', addressId);
orderInfo('address', address);
orderInfo('receiverMobile', null);
console.log($this.data('href') + (orderInfo('limitUrlSufix') || ''));
window.location.href = $this.data('href') + (orderInfo('limitUrlSufix') || '');
}).on('touchend', '.edit', function() {
... ...
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.
... ... @@ -42,7 +42,6 @@ var winH = $(window).height(),
var defaultOpt = require('./query-param');
var $listNav = $('#list-nav'),
$posList = $('#pos-list'),
//导航数据信息
navInfo = {
... ... @@ -612,10 +611,6 @@ $listNav.bind('contextmenu', function(e) {
return false;
});
$posList.bind('contextmenu', function(e) {
return false;
});
$subNav.on('touchend touchcancel', function(e) {
var $this = $(e.target).closest('li'),
cname,
... ... @@ -783,12 +778,11 @@ $listNav.on('touchstart', 'li', function(e) {
myScroll.refresh();
});
$posList.on('touchstart', 'li', function(e) {
$nav2.on('touchstart', 'li', function(e) {
$(this).addClass('bytouch');
}).on('touchend touchcancel', function() {
$posList.find('li').removeClass('bytouch');
$listNav.find('li').removeClass('bytouch');
myScroll.refresh();
myScroll.scrollTo(0, -(imgH + nav1H + main1oH + 5));
});
//底部导航点击
... ...
... ... @@ -84,7 +84,7 @@
height: 28px;
float: left;
line-height: 28px;
width: 24%;
width: 24.7%;
text-align: center;
border-left: 1px solid #e1e1e1;
margin-top: 30px;
... ... @@ -305,23 +305,39 @@
width: 24.8%;
text-align: center;
border-sizing: border-box;
position: relative;
span {
padding-top: 0;
font-size: 28px;
}
}
&:first-child {
border-left: none;
.new:after {
height: 28px;
content: '';
border-left: 1px solid #e1e1e1;
position: absolute;
top: 25px;
left: 163px;
}
b {
border-right: 1px solid #e1e1e1;
display: block;
width: 1px;
.price:after {
height: 28px;
float: right;
margin-top: 25px;
content: '';
border-left: 1px solid #e1e1e1;
position: absolute;
top: 25px;
left: 163px;
}
.discount:after {
height: 28px;
content: '';
border-left: 1px solid #e1e1e1;
position: absolute;
top: 25px;
left: 163px;
}
.active {
... ... @@ -330,13 +346,12 @@
}
}
.list-nav .icon .up {
top: -28px;
}
.list-nav .icon .down {
top: -16px;
top: -14px;
}
.goods-container {
... ... @@ -446,12 +461,15 @@
.pos-list {
@extend .discount-page;
background: #fff;
width: 100%;
overflow: hidden;
li {
display: block;
height: 28px;
height: 78px;
float: left;
line-height: 28px;
line-height: 78px;
width: 24.8%;
text-align: center;
border-sizing: border-box;
... ... @@ -460,10 +478,6 @@
font-size: 28px;
}
&:first-child {
border-left: none;
}
a {
display: block;
box-sizing: border-box;
... ... @@ -471,17 +485,15 @@
width: 100%;
height: 100%;
color: #999;
}
b {
border-right: 1px solid #e1e1e1;
display: block;
width: 1px;
height: 28px;
border-left: 1px solid #e1e1e1;
float: right;
margin-top: 25px;
}
}
}
.active .cur {
color: #000;
... ... @@ -512,6 +524,14 @@
}
}
.pos-list .icon .up {
top: -28px;
}
.pos-list .icon .down {
top: -14px;
}
.category-list-top-board {
border-top: 1px solid #e0e0e0;
}
... ...
... ... @@ -130,11 +130,12 @@
</li>
</ul>
<ul id="pos-list" class="home-sub-nav pos-list nav hide">
<ul id="pos-list" class="home-sub-nav pos-list hide">
<li class="new active buriedpoint" data-bp-id="shop_poslist_new_1">
<a href="javascript:void(0);">
<span class="spanTest">最新</span>
<span class="iconfont cur">&#xe616;</span>
<b></b>
</a>
</li>
<li class="price buriedpoint" data-bp-id="shop_poslist_price_1">
... ... @@ -144,6 +145,7 @@
<i class="iconfont up cur">&#xe615;</i>
<i class="iconfont down">&#xe616;</i>
</span>
<b></b>
</a>
</li>
<li class="discount buriedpoint" data-bp-id="shop_poslist_discount_1">
... ... @@ -153,6 +155,7 @@
<i class="iconfont up cur">&#xe615;</i>
<i class="iconfont down">&#xe616;</i>
</span>
<b></b>
</a>
</li>
<li class="filter buriedpoint" data-bp-id="shop_poslist_filter_1">
... ...
... ... @@ -350,7 +350,7 @@ class SearchController extends AbstractAction
// $data = Product\ListModel::getClassData($condition);
// 产品吴婷要求这么做，目的是保持性别中的所有性别和当前频道性别一致
if (isset($condition['gender']) && isset($condition['gender']) && $condition['gender'] === '1,2,3') {
if (isset($condition['gender']) && isset($condition['channel']) && $condition['gender'] === '1,2,3') {
switch ($condition['channel']) {
case 1:
$condition['gender'] = '1,3';
... ...