Authored by 李奇

Merge branch 'release/4.0' into gray

... ... @@ -15,7 +15,7 @@
<div class="top-filter clearfix">
<div class="filter-content">
<ul class="filter-type">
<li class="type-item">推荐<i class="icon down icon-sort-down"></i></li>
<li class="type-item">新品<i class="icon down icon-sort-down"></i></li>
<li class="type-item">筛选<i class="icon down icon-sort-down"></i></li>
</ul>
</div>
... ...
... ... @@ -38,7 +38,7 @@
// query
url: '/product/list.json',
order: '',
order: 's_t_desc',
filter: {},
page: 0, // 未搜索 page=0; 全部加载完 page = totalPage; 无数据: page !=0 && productList.length=0
totalPage: null,
... ...
... ... @@ -28,7 +28,7 @@
data: function() {
return {
url: '/product/search.json',
order: '',
order: 's_t_desc',
orderType: 0,
query: qs.query ? decodeURIComponent(qs.query) : '',
page: 0, // 未搜索 page=0; 全部加载完 page = totalPage; 无数据: page !=0 && productList.length=0
... ...