Authored by 姜枫

fix 我的订单列表查询问题

@@ -26,8 +26,8 @@ exports.order = (req, res, next) => { @@ -26,8 +26,8 @@ exports.order = (req, res, next) => {
26 26
27 // 获取第一页数据做服务端渲染 27 // 获取第一页数据做服务端渲染
28 let initialData = { 28 let initialData = {
29 - type: 1,  
30 - page: 1, 29 + type: req.query.type || 1,
  30 + page: req.query.page || 1,
31 gender: req.query.gender || '1,3', 31 gender: req.query.gender || '1,3',
32 yh_channel: req.query.channel || 1, 32 yh_channel: req.query.channel || 1,
33 uid: req.user.uid 33 uid: req.user.uid
@@ -46,6 +46,7 @@ exports.order = (req, res, next) => { @@ -46,6 +46,7 @@ exports.order = (req, res, next) => {
46 title: 'Yoho!Buy 有货', 46 title: 'Yoho!Buy 有货',
47 pageFooter: true, 47 pageFooter: true,
48 order: result[0] || [], 48 order: result[0] || [],
  49 + walkwayUrl: result[1] && result[1].length ? '' : '//m.yohobuy.com/product/new',
49 firstPageOrdersList: result[1] || [] 50 firstPageOrdersList: result[1] || []
50 }); 51 });
51 }).catch(next); 52 }).catch(next);
@@ -9,11 +9,11 @@ @@ -9,11 +9,11 @@
9 </ul> 9 </ul>
10 10
11 <div id="order-container" class="order-container"> 11 <div id="order-container" class="order-container">
12 - {{#if walkwayUrl}} 12 + {{#if @root.walkwayUrl}}
13 <div class="no-order"> 13 <div class="no-order">
14 <div class="icon"></div> 14 <div class="icon"></div>
15 <span>你还没有订单!</span> 15 <span>你还没有订单!</span>
16 - <a class="walk-way" href="{{walkwayUrl}}">随便逛逛</a> 16 + <a class="walk-way" href="{{@root.walkwayUrl}}">随便逛逛</a>
17 </div> 17 </div>
18 {{^}} 18 {{^}}
19 <div class="firstscreen-orders"> 19 <div class="firstscreen-orders">
1 <div class="order-good" data-id="{{id}}"> 1 <div class="order-good" data-id="{{id}}">
2 <div class="thumb-wrap"> 2 <div class="thumb-wrap">
3 {{#if link}} 3 {{#if link}}
4 - <a href="{{link}}"><img class="thumb lazy" data-original="{{image thumb 90 120}}"></a> 4 + <a href="{{link}}"><img class="thumb" src="{{image thumb 90 120}}"></a>
5 {{else}} 5 {{else}}
6 - <img class="thumb lazy" data-original="{{image thumb 90 120}}"> 6 + <img class="thumb" src="{{image thumb 90 120}}">
7 {{/if}} 7 {{/if}}
8 <p class="tag{{#if gift}} gift-tag{{/if}}{{#if advanceBuy}} advance-buy-tag{{/if}}"></p> 8 <p class="tag{{#if gift}} gift-tag{{/if}}{{#if advanceBuy}} advance-buy-tag{{/if}}"></p>
9 </div> 9 </div>