Merge branch 'release/5.7.1' of git.yoho.cn:fe/yohobuywap-node into release/5.7.1
Showing
3 changed files
with
18 additions
and
12 deletions
@@ -15,6 +15,10 @@ let configFile = ` | @@ -15,6 +15,10 @@ let configFile = ` | ||
15 | { | 15 | { |
16 | "appID": "EX33S4LRW7.com.yoho.buy", | 16 | "appID": "EX33S4LRW7.com.yoho.buy", |
17 | "paths": [ "*" ] | 17 | "paths": [ "*" ] |
18 | + }, | ||
19 | + { | ||
20 | + "appID": "FP8T8KM2NE.com.yoho.buy.c3", | ||
21 | + "paths": [ "*" ] | ||
18 | } | 22 | } |
19 | ] | 23 | ] |
20 | } | 24 | } |
@@ -16,14 +16,16 @@ | @@ -16,14 +16,16 @@ | ||
16 | {{/within}} | 16 | {{/within}} |
17 | {{/if}} | 17 | {{/if}} |
18 | </a> | 18 | </a> |
19 | - | ||
20 | - {{#ifor isGood four}} | ||
21 | - {{#unless parent.noShowProductInfo}} | ||
22 | - <div class="item-info"> | ||
23 | - <div class="text">{{text}}</div> | ||
24 | - <div class="name">{{name}}</div> | ||
25 | - <div class="price">{{salesPrice}}</div> | ||
26 | - </div> | ||
27 | - {{/unless}} | ||
28 | - {{/ifor}} | 19 | + |
20 | + {{#if showProductInfo}} | ||
21 | + {{#ifor isGood four}} | ||
22 | + {{#unless parent.noShowProductInfo}} | ||
23 | + <div class="item-info"> | ||
24 | + <div class="text">{{text}}</div> | ||
25 | + <div class="name">{{name}}</div> | ||
26 | + <div class="price">{{salesPrice}}</div> | ||
27 | + </div> | ||
28 | + {{/unless}} | ||
29 | + {{/ifor}} | ||
30 | + {{/if}} | ||
29 | </div> | 31 | </div> |
@@ -2,7 +2,7 @@ | @@ -2,7 +2,7 @@ | ||
2 | * @Author: Targaryen | 2 | * @Author: Targaryen |
3 | * @Date: 2017-03-23 11:02:31 | 3 | * @Date: 2017-03-23 11:02:31 |
4 | * @Last Modified by: Targaryen | 4 | * @Last Modified by: Targaryen |
5 | - * @Last Modified time: 2017-05-23 15:33:28 | 5 | + * @Last Modified time: 2017-05-26 16:42:29 |
6 | */ | 6 | */ |
7 | /* 红人店铺数据处理 */ | 7 | /* 红人店铺数据处理 */ |
8 | 8 | ||
@@ -57,7 +57,7 @@ const _picsHandle = (moduleData) => { | @@ -57,7 +57,7 @@ const _picsHandle = (moduleData) => { | ||
57 | let pics = []; | 57 | let pics = []; |
58 | 58 | ||
59 | _.forEach(_.get(moduleData, 'data', []), value => { | 59 | _.forEach(_.get(moduleData, 'data', []), value => { |
60 | - let showProductInfo = false; | 60 | + let showProductInfo = true; |
61 | 61 | ||
62 | if (_.has(value, 'showProductInfo')) { | 62 | if (_.has(value, 'showProductInfo')) { |
63 | showProductInfo = value.showProductInfo; | 63 | showProductInfo = value.showProductInfo; |
-
Please register or login to post a comment