Merge branch 'release/new-product-detail-api' into release/5.1
# Conflicts: # doraemon/views/partial/product/latest-walk-tpl.hbs
Showing
3 changed files
with
5 additions
and
9 deletions
@@ -665,7 +665,7 @@ | @@ -665,7 +665,7 @@ | ||
665 | <span class="title cur">最近浏览 RECENT REVIEW</span> | 665 | <span class="title cur">最近浏览 RECENT REVIEW</span> |
666 | </p> | 666 | </p> |
667 | <div id="latest-walk-goods" class="goods clearfix"></div> | 667 | <div id="latest-walk-goods" class="goods clearfix"></div> |
668 | - {{> product/latest-walk}} | 668 | + {{> product/latest-walk-tpl}} |
669 | </div> | 669 | </div> |
670 | {{/if}} | 670 | {{/if}} |
671 | </div> | 671 | </div> |
@@ -13,7 +13,7 @@ | @@ -13,7 +13,7 @@ | ||
13 | \{{/ latestWalk}} | 13 | \{{/ latestWalk}} |
14 | </script> | 14 | </script> |
15 | <div class="lazy-load-object"> | 15 | <div class="lazy-load-object"> |
16 | - <textarea class="datalazyload" style="visibility: hidden;"> | ||
17 | - <script>fetchLatestWalk();</script> | ||
18 | - </textarea> | 16 | + <textarea class="latest-walk-datalazyload" style="visibility: hidden;"> |
17 | + <script> fetchLatestWalk(); </script> | ||
18 | + </textarea> | ||
19 | </div> | 19 | </div> |
@@ -4,10 +4,6 @@ | @@ -4,10 +4,6 @@ | ||
4 | <h2>最近浏览的商品</h2> | 4 | <h2>最近浏览的商品</h2> |
5 | <div id="latest-walk-goods" class="goods clearfix"></div> | 5 | <div id="latest-walk-goods" class="goods clearfix"></div> |
6 | </div> | 6 | </div> |
7 | - <div class="lazy-load-object"> | ||
8 | - <textarea class="latest-walk-datalazyload" style="visibility: hidden;"> | ||
9 | - <script> fetchLatestWalk(); </script> | ||
10 | - </textarea> | ||
11 | - </div> | 7 | + |
12 | {{> product/latest-walk-tpl}} | 8 | {{> product/latest-walk-tpl}} |
13 | {{/if}} | 9 | {{/if}} |
-
Please register or login to post a comment