Authored by biao

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

/**
* 新人专享
* @author: wsl<shuiling.wang@yoho.cn>
* @date: 2016/3/3
*/
var $ = require('jquery'),
lazyLoad = require('yoho.lazyload');
lazyLoad($('img.lazy'));
\ No newline at end of file
... ...
... ... @@ -109,3 +109,9 @@
}
}
}
.fresh-list{
position: relative;
min-height: 440px;
padding-left: 14px;
}
\ No newline at end of file
... ...
... ... @@ -29,6 +29,7 @@
微信分享至朋友圈
</p>
</div>
<div class="tip-wrap hide">
<div class="tip hide fail">
<div class="title">
领取失败<br>
... ... @@ -42,6 +43,9 @@
刷新
</a>
</div>
</div>
<div class="tip-wrap hide">
<div class="tip hide geted">
<div class="title">
你已领取过优惠券
... ... @@ -54,6 +58,8 @@
返回
</a>
</div>
</div>
{{#if isApp}}
<input type="hidden" value="{{getCouponUrl}}" id="getCouponUrl">
{{/if}}
... ...
... ... @@ -340,3 +340,10 @@
seajs.use('js/me/currency-new');
</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.4';
const STATIC_FILE = 'http://cdn.yoho.cn/huodong/2016xinshili/1.0.4';
// const STATIC_FILE = 'http://localhost:2222/1.0.5';
const STATIC_FILE = 'http://cdn.yoho.cn/huodong/2016xinshili/1.0.5';
/**
* 检测登录状态
... ...