Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop

@@ -157,6 +157,9 @@ app端店铺模板css
     width: 100%;
     text-align: center;
     padding: 5px 0;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
 }
 
 /*------------------------人气单品--------------------------*/
@@ -212,6 +215,9 @@ app端店铺模板css
     display: block;
     font-size: 14px;
     color: #fff;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
 }
 .contentpanel-app .model-showDetail ul li b{
     display: block;

@@ -112,6 +112,9 @@ pc端店铺模板css
     line-height: 30px;
     color: #585858;
     font-size: 14px;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
 }
 .contentpanel-pc .typicRecommendDetail ul li img{
     display: block;
@@ -234,6 +237,9 @@ pc端店铺模板css
     line-height: 30px;
     font-size: 14px;
     font-weight: bold;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
 }
 .contentpanel-pc .model-showDetail ul li b{
     display: block;

@@ -318,7 +318,7 @@
         <div class="topListDetail">
             <ul>
                 [[each product_list as item _index]]
-                <li class="topAdd" data-productId="[[item.product_id]]" data-productName="[[item.product_name]]" data-productPrice="[[item.market_price]]">
+                <li class="topAdd" data-productId="[[item.product_id]]" data-productName="[[item.product_name]]" data-productPrice="[[item.sales_price]]">
                     <a href="javascript:"><img src="[[item.default_images]]"><b></b><span>top[[_index]]</span><i></i></a>
                 </li>
                 [[/each]]