Authored by liangxs

Merge branch 'feature/coupon' of http://git.dev.yoho.cn/web/yohobuywap into feature/coupon

# Conflicts:
#	template/m.yohobuy.com/actions/index/coupon/index.phtml
... ... @@ -52,9 +52,9 @@
<input id="shareImg" type="hidden" value="{{shareImg}}">
<input id="shareTitle" type="hidden" value="{{shareTitle}}">
{{/ share}}
{{#error}}
<input id="error" type="hidden">
{{/error}}
{{#if noData}}
<input id="noData" type="hidden">
{{/if}}
{{/ content}}
</div>
<div class="floor-mask"></div>
... ...