fe / YOHOBUYPC · Commits

Go to a project

Authored by Rock Zhang
Commit 1d0b5bc08484dec1aec38c6115770f5770af95c0 2 parents b7ca8cde 196aa012

Merge branch 'develop/wap' of git.dev.yoho.cn:web/yohobuy into develop/wap

Inline Side-by-side
Showing 4 changed files with 2 additions and 13 deletions
@@ -17,7 +17,6 @@ @@ -17,7 +17,6 @@
17 @import "hot-category"; 17 @import "hot-category";
18 @import "home-header"; 18 @import "home-header";
19 @import "thumb-row"; 19 @import "thumb-row";
20 -@import "fresh-only";  
21 20
22 .mobile-container{ 21 .mobile-container{
23 width: 100%; 22 width: 100%;
@@ -39,10 +39,6 @@ @@ -39,10 +39,6 @@
39 {{# goodsCategory}} 39 {{# goodsCategory}}
40 {{> home/goods_category}} 40 {{> home/goods_category}}
41 {{/ goodsCategory}} 41 {{/ goodsCategory}}
42 - {{! 新人专享}}  
43 - {{# freshOnly}}  
44 - {{> home/fresh_only}}  
45 - {{/ freshOnly}}  
46 {{! 新入住品牌/品味生活/创意生活}} 42 {{! 新入住品牌/品味生活/创意生活}}
47 {{# creativeLife}} 43 {{# creativeLife}}
48 {{> home/creative_life}} 44 {{> home/creative_life}}
@@ -341,9 +341,3 @@ @@ -341,9 +341,3 @@
341 </script> 341 </script>
342 {{/if}} 342 {{/if}}
343 343
344 -{{#if freshListPage}}  
345 -<script>  
346 - seajs.use('js/home/fresh-list');  
347 -</script>  
348 -{{/if}}  
349 -  
@@ -9,8 +9,8 @@ use Plugin\Helpers; @@ -9,8 +9,8 @@ use Plugin\Helpers;
9 */ 9 */
10 class XinshiliController extends HuodongAction 10 class XinshiliController extends HuodongAction
11 { 11 {
12 - // const STATIC_FILE = 'http://localhost:2222/1.0.6';  
13 - const STATIC_FILE = 'http://cdn.yoho.cn/huodong/2016xinshili/1.0.6'; 12 + // const STATIC_FILE = 'http://localhost:2222/1.0.7';
  13 + const STATIC_FILE = 'http://cdn.yoho.cn/huodong/2016xinshili/1.0.7';
14 14
15 /** 15 /**
16 * 检测登录状态 16 * 检测登录状态