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

@@ -620,7 +620,7 @@ class Helpers
 		    foreach ($value['goods_list'] as $single) {
 		    foreach ($value['goods_list'] as $single) {
 			    $oneGoods['id'] = $single['product_skn'];
 			    $oneGoods['id'] = $single['product_skn'];
 			    $oneGoods['name'] = $single['product_name'];
 			    $oneGoods['name'] = $single['product_name'];
-			    $oneGoods['thumb'] = !empty($single['goods_images']) ? Images::getImageUrl($single['goods_images'], 120, 120) : '';
+			    $oneGoods['thumb'] = !empty($single['goods_images']) ? Images::getImageUrl($single['goods_images'], 120, 160) : '';
 			    $oneGoods['appearDate'] = '12月'; // 目前app接口没有返回该数据
 			    $oneGoods['appearDate'] = '12月'; // 目前app接口没有返回该数据
 			    $oneGoods['price'] = $single['last_price'];
 			    $oneGoods['price'] = $single['last_price'];
 			    $oneGoods['marketPrice'] = $single['market_price'];
 			    $oneGoods['marketPrice'] = $single['market_price'];

@@ -44,6 +44,10 @@
 
 
         &:before {
         &:before {
             content: '赠品';
             content: '赠品';
+            display: block;
+            font-size: 12px;
+            line-height: 25rem / $pxConvertRem;
+            transform: scale(0.833);
         }
         }
     }
     }
 
 
@@ -52,6 +56,7 @@
     }
     }
 
 
     .name {
     .name {
+        width: 440rem / $pxConvertRem;
         font-size: 28rem / $pxConvertRem;
         font-size: 28rem / $pxConvertRem;
     }
     }
 
 
@@ -74,8 +79,14 @@
     }
     }
 
 
     .price {
     .price {
+        margin-left: 10rem / $pxConvertRem;
         font-size: 24rem / $pxConvertRem;
         font-size: 24rem / $pxConvertRem;
-        color: #000;
+        color: #f1545b;
+
+        &.market-price {
+            color: #999;
+            text-decoration: line-through;
+        }
     }
     }
 
 
     .count {
     .count {
@@ -96,9 +107,9 @@
     }
     }
 
 
     .title {
     .title {
-        height: 50rem / $pxConvertRem;
-        line-height: 50rem / $pxConvertRem;
-        padding-left: 20rem / $pxConvertRem;
+        height: 60rem / $pxConvertRem;
+        line-height: 60rem / $pxConvertRem;
+        padding: 0 20rem / $pxConvertRem;
         font-size: 24rem / $pxConvertRem;
         font-size: 24rem / $pxConvertRem;
         background: #f8f8f8;
         background: #f8f8f8;
     }
     }

@@ -158,5 +158,5 @@ a {
 @import "category/index";
 @import "category/index";
 @import "product/index";
 @import "product/index";
 @import "index/index";
 @import "index/index";
-@import "shopping-cart/index";
+@import "cart/index";
 @import "me/index"; //个人中心
 @import "me/index"; //个人中心

@@ -22,7 +22,7 @@
             <span class="price">
             <span class="price">
                 ¥{{price}}
                 ¥{{price}}
             </span>
             </span>
-             <span class="price">
+            <span class="price market-price">
                 ¥{{marketPrice}}
                 ¥{{marketPrice}}
             </span>
             </span>
             <span class="count">
             <span class="count">