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

@@ -36,13 +36,15 @@
     }
 
     .price {
+        position: relative;
         margin-top: pxToRem(20px);
         font-size: pxToRem(20px);
         line-height: 1;
 
         span {
-            // chrome  最小支持12px
-            transform: scale(0.875);
+            // chrome  最小支持12px, 设计图是 10px ,用CSS3变换
+            font-size: pxToRem(20px);
+            @include transform(scale(0.5));
         }
 
         .sale-price {
@@ -50,7 +52,9 @@
         }
 
         .old-price {
-            float: right;
+            position: absolute;
+            top: 0;
+            right: 0;
             color: #ededed;
         }
 

@@ -7,8 +7,8 @@
                 <li class="swiper-slider">
                     <img class="img-box" src="{{thumb}}">
                     <div class="price">
-                        <span class="sale-price">¥{{salePrice}}</span>
-                        <span class="old-price">¥{{price}}</span>
+                        <span class="sale-price {{^price}}no-price{{/price}}">¥{{salePrice}}</span>
+                        {{#price}}<span class="old-price">¥{{.}}</span>{{/price}}
                     </div>
                 </li>
                 {{/recommendList}}