Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
Showing
3 changed files
with
10 additions
and
9 deletions
@@ -40,8 +40,8 @@ var $listNav = $('#list-nav'), | @@ -40,8 +40,8 @@ var $listNav = $('#list-nav'), | ||
40 | navInfo = { | 40 | navInfo = { |
41 | newest: { | 41 | newest: { |
42 | order: 1, | 42 | order: 1, |
43 | - reload: false, | ||
44 | - page: 1, | 43 | + reload: true, |
44 | + page: 0, | ||
45 | end: false | 45 | end: false |
46 | }, | 46 | }, |
47 | price: { | 47 | price: { |
@@ -356,3 +356,6 @@ $brandHeader.children('.btn-col').bind('tap', function() { | @@ -356,3 +356,6 @@ $brandHeader.children('.btn-col').bind('tap', function() { | ||
356 | } | 356 | } |
357 | }); | 357 | }); |
358 | }); | 358 | }); |
359 | + | ||
360 | +//初始请求最新第一页数据 | ||
361 | +search(); |
1 | -<div class="good-info" data-id="{{id}}"> | 1 | +{{#if .}} {{!-- 剔除值为false的项 --}} |
2 | + <div class="good-info" data-id="{{id}}"> | ||
2 | <div class="tag-container clearfix"> | 3 | <div class="tag-container clearfix"> |
3 | {{# tags}} | 4 | {{# tags}} |
4 | {{# is_new}} | 5 | {{# is_new}} |
@@ -37,4 +38,5 @@ | @@ -37,4 +38,5 @@ | ||
37 | {{/price}} | 38 | {{/price}} |
38 | </div> | 39 | </div> |
39 | </div> | 40 | </div> |
40 | -</div> | 41 | + </div> |
42 | +{{/if}} |
@@ -82,11 +82,7 @@ | @@ -82,11 +82,7 @@ | ||
82 | </li> | 82 | </li> |
83 | </ul> | 83 | </ul> |
84 | <div id="goods-container" class="goods-container"> | 84 | <div id="goods-container" class="goods-container"> |
85 | - <div class="new-goods container clearfix"> | ||
86 | - {{# new}} | ||
87 | - {{> good}} | ||
88 | - {{/ new}} | ||
89 | - </div> | 85 | + <div class="new-goods container clearfix"></div> |
90 | <div class="price-goods container clearfix hide"></div> | 86 | <div class="price-goods container clearfix hide"></div> |
91 | <div class="discount-goods container clearfix hide"></div> | 87 | <div class="discount-goods container clearfix hide"></div> |
92 | 88 |
-
Please register or login to post a comment