Authored by Rock Zhang

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

... ... @@ -17,7 +17,6 @@
@import "hot-category";
@import "home-header";
@import "thumb-row";
@import "fresh-only";
.mobile-container{
width: 100%;
... ...
... ... @@ -39,10 +39,6 @@
{{# goodsCategory}}
{{> home/goods_category}}
{{/ goodsCategory}}
{{! 新人专享}}
{{# freshOnly}}
{{> home/fresh_only}}
{{/ freshOnly}}
{{! 新入住品牌/品味生活/创意生活}}
{{# creativeLife}}
{{> home/creative_life}}
... ...
... ... @@ -341,9 +341,3 @@
</script>
{{/if}}
{{#if freshListPage}}
<script>
seajs.use('js/home/fresh-list');
</script>
{{/if}}
... ...
... ... @@ -9,8 +9,8 @@ use Plugin\Helpers;
*/
class XinshiliController extends HuodongAction
{
// const STATIC_FILE = 'http://localhost:2222/1.0.6';
const STATIC_FILE = 'http://cdn.yoho.cn/huodong/2016xinshili/1.0.6';
// const STATIC_FILE = 'http://localhost:2222/1.0.7';
const STATIC_FILE = 'http://cdn.yoho.cn/huodong/2016xinshili/1.0.7';
/**
* 检测登录状态
... ...