Merge branch 'feature/baseAct' into 'release/5.7'

错别字，隐藏优惠券楼层，商品名称显示bug



See merge request !574

@@ -4,9 +4,10 @@
         <img src="{{image2 src w=750 h=280 q=60}}" />
         <img src="{{image2 src w=750 h=280 q=60}}" />
     </a>
     </a>
     {{/ bigPic}}
     {{/ bigPic}}
-    <div class="big-title">领取优惠卷
+    {{#if couponList}}
+    <div class="big-title">领取优惠券
         <a class="more" href='//m.yohobuy.com/coupon/floor?title=领券中心&share_id=1037&code=b78b32ed81b18dde8ac84fd33602b88b&type=5&openby:yohobuy={"action":"go.couponCenter", "params":{"share":"/operations/api/v5/webshare/getShare","share_id":"1037","title":"领券中心"}}'>
         <a class="more" href='//m.yohobuy.com/coupon/floor?title=领券中心&share_id=1037&code=b78b32ed81b18dde8ac84fd33602b88b&type=5&openby:yohobuy={"action":"go.couponCenter", "params":{"share":"/operations/api/v5/webshare/getShare","share_id":"1037","title":"领券中心"}}'>
-            更多优惠卷
+            更多优惠券
             <span class="iconfont">&#xe604;</span>
             <span class="iconfont">&#xe604;</span>
         </a>
         </a>
     </div>
     </div>
@@ -22,6 +23,7 @@
         </a>
         </a>
         {{/ couponList}}
         {{/ couponList}}
     </div>
     </div>
+    {{/if}}
     <div class="big-title">潮流优选</div>
     <div class="big-title">潮流优选</div>
     <div class="goods clearfix">
     <div class="goods clearfix">
         {{# goodList}}
         {{# goodList}}

@@ -9,6 +9,7 @@
 
 
     .tip-bg {
     .tip-bg {
         background-color: #292929;
         background-color: #292929;
+        padding: 15px 0;
     }
     }
 
 
     .big-pic {
     .big-pic {
@@ -143,7 +144,6 @@
         .tip {
         .tip {
             height: 65px;
             height: 65px;
             color: #fff;
             color: #fff;
-            margin: 15px 0;
             padding: 0 60px 0 10px;
             padding: 0 60px 0 10px;
             font-size: 24px;
             font-size: 24px;
             position: relative;
             position: relative;