Showing
6 changed files
with
13 additions
and
13 deletions
@@ -28,23 +28,19 @@ const saleModel = require(`${mRoot}/sale`); | @@ -28,23 +28,19 @@ const saleModel = require(`${mRoot}/sale`); | ||
28 | * @return {[type]} | 28 | * @return {[type]} |
29 | */ | 29 | */ |
30 | const _processPublicData = (req, title, page) => { | 30 | const _processPublicData = (req, title, page) => { |
31 | - let data = {}; | ||
32 | - let headerData = headerModel.setNav({ | ||
33 | - navTitle: title | ||
34 | - }); | ||
35 | - | ||
36 | - data = { | 31 | + return { |
37 | channel: req.yoho.channel, | 32 | channel: req.yoho.channel, |
38 | renderData: { | 33 | renderData: { |
39 | module: 'product', | 34 | module: 'product', |
40 | page: page, | 35 | page: page, |
41 | title: title, | 36 | title: title, |
42 | - pageHeader: headerData, | 37 | + pageHeader: headerModel.setNav({ |
38 | + navTitle: title, | ||
39 | + navBtn: false | ||
40 | + }), | ||
43 | pageFooter: true | 41 | pageFooter: true |
44 | } | 42 | } |
45 | }; | 43 | }; |
46 | - | ||
47 | - return data; | ||
48 | }; | 44 | }; |
49 | 45 | ||
50 | /** | 46 | /** |
@@ -47,6 +47,8 @@ | @@ -47,6 +47,8 @@ | ||
47 | <script src="//cdn.yoho.cn/m-yohobuy-node/{{version}}/libs.js"></script> | 47 | <script src="//cdn.yoho.cn/m-yohobuy-node/{{version}}/libs.js"></script> |
48 | <script src="//cdn.yoho.cn/m-yohobuy-node/{{version}}/{{module}}.{{page}}.js"></script> | 48 | <script src="//cdn.yoho.cn/m-yohobuy-node/{{version}}/{{module}}.{{page}}.js"></script> |
49 | {{/if}} | 49 | {{/if}} |
50 | + {{#unless devEnv}} | ||
50 | {{> analysis}} | 51 | {{> analysis}} |
52 | + {{/unless}} | ||
51 | </body> | 53 | </body> |
52 | </html> | 54 | </html> |
1 | {{#pageHeader}} | 1 | {{#pageHeader}} |
2 | -{{# ../pageChannel}} | 2 | +{{# @root.pageChannel}} |
3 | <header id="yoho-header" class="yoho-header{{#if boys}} boys{{/if}}{{#if girls}} girls{{/if}}{{#if kids}} kids{{/if}}{{#if lifeStyle}} life-style{{/if}}{{#if lifestyle}} life-style{{/if}}"> | 3 | <header id="yoho-header" class="yoho-header{{#if boys}} boys{{/if}}{{#if girls}} girls{{/if}}{{#if kids}} kids{{/if}}{{#if lifeStyle}} life-style{{/if}}{{#if lifestyle}} life-style{{/if}}"> |
4 | -{{/ ../pageChannel}} | 4 | +{{/ @root.pageChannel}} |
5 | {{#navBack}} | 5 | {{#navBack}} |
6 | <a href="{{#if backUrl}}{{backUrl}}{{^}}javascript:history.go(-1);{{/if}}" class="iconfont nav-back"></a> | 6 | <a href="{{#if backUrl}}{{backUrl}}{{^}}javascript:history.go(-1);{{/if}}" class="iconfont nav-back"></a> |
7 | {{/navBack}} | 7 | {{/navBack}} |
@@ -22,9 +22,9 @@ | @@ -22,9 +22,9 @@ | ||
22 | {{/navTitle}} | 22 | {{/navTitle}} |
23 | </header> | 23 | </header> |
24 | {{#navBtn}} | 24 | {{#navBtn}} |
25 | -{{# ../../pageChannel}} | 25 | +{{# @root.pageChannel}} |
26 | <div class="homebuttom hide {{#if boys}} boys{{/if}}{{#if girls}} girls{{/if}}{{#if kids}} kids{{/if}}{{#if lifeStyle}} life-style{{/if}}{{#if lifestyle}} life-style{{/if}}"> | 26 | <div class="homebuttom hide {{#if boys}} boys{{/if}}{{#if girls}} girls{{/if}}{{#if kids}} kids{{/if}}{{#if lifeStyle}} life-style{{/if}}{{#if lifestyle}} life-style{{/if}}"> |
27 | -{{/ ../../pageChannel}} | 27 | +{{/ @root.pageChannel}} |
28 | <ul> | 28 | <ul> |
29 | <li> | 29 | <li> |
30 | <a href="{{ indexUrl }}"> | 30 | <a href="{{ indexUrl }}"> |
@@ -143,6 +143,7 @@ a{ | @@ -143,6 +143,7 @@ a{ | ||
143 | bottom: 0; | 143 | bottom: 0; |
144 | left: 0; | 144 | left: 0; |
145 | background: rgba(0, 0, 0, 0.5); | 145 | background: rgba(0, 0, 0, 0.5); |
146 | + z-index: 9; | ||
146 | } | 147 | } |
147 | .loading-mask .loading{ | 148 | .loading-mask .loading{ |
148 | position: absolute; | 149 | position: absolute; |
This diff could not be displayed because it is too large.
-
Please register or login to post a comment