Merge branch 'feature/shoppingCart' of http://git.yoho.cn/fe/yohobuy-node into feature/shoppingCart

@@ -343,6 +343,33 @@ const getTogetherProduct = (req, res) => {
                     'alt': 'MY FUN \u7537\u58eb\u4e2d\u7b52\u889c',
                     'price': '15.00',
                     'marketPrice': '29.00'
+                }, {
+                    'id': 675874,
+                    'skn': 51485980,
+                    'href': '\/\/item.yohobuy.com\/product\/pro_675874_831218\/MYFUN caitiaowennanshizhangtongwa 1611DPA0043.html',
+                    'title': 'MY FUN \u5f69\u6761\u7eb9\u7537\u58eb\u957f\u7b52\u889c',
+                    'img': '\/\/img10.static.yhbimg.com\/goodsimg\/2017\/01\/12\/10\/01604804248080b4c8cd60dd623e569d24.jpg?imageMogr2\/thumbnail\/100x100\/extent\/100x100\/background\/d2hpdGU=\/position\/center\/quality\/80',
+                    'alt': 'MY FUN \u5f69\u6761\u7eb9\u7537\u58eb\u957f\u7b52\u889c',
+                    'price': '19.00',
+                    'marketPrice': '39.00'
+                }, {
+                    'id': 675872,
+                    'skn': 51485978,
+                    'href': '\/\/item.yohobuy.com\/product\/pro_675872_831216\/MYFUN ertiaogangnanshizhongtongwa 1611DPA0034.html',
+                    'title': 'MY FUN \u7537\u58eb\u4e2d\u7b52\u889c',
+                    'img': '\/\/img12.static.yhbimg.com\/goodsimg\/2017\/01\/12\/10\/02888bca5ef68cb669a0c47ae31232d87e.jpg?imageMogr2\/thumbnail\/100x100\/extent\/100x100\/background\/d2hpdGU=\/position\/center\/quality\/80',
+                    'alt': 'MY FUN \u7537\u58eb\u4e2d\u7b52\u889c',
+                    'price': '15.00',
+                    'marketPrice': '29.00'
+                }, {
+                    'id': 675870,
+                    'skn': 51485976,
+                    'href': '\/\/item.yohobuy.com\/product\/pro_675870_831214\/MYFUN ertiaogangnanshizhongtongwa 1611DPA0033.html',
+                    'title': 'MY FUN \u7537\u58eb\u4e2d\u7b52\u889c',
+                    'img': '\/\/img10.static.yhbimg.com\/goodsimg\/2017\/01\/12\/10\/015ef2fb172c81a128b8c6603f89671f03.jpg?imageMogr2\/thumbnail\/100x100\/extent\/100x100\/background\/d2hpdGU=\/position\/center\/quality\/80',
+                    'alt': 'MY FUN \u7537\u58eb\u4e2d\u7b52\u889c',
+                    'price': '15.00',
+                    'marketPrice': '29.00'
                 }]
             }
         });

@@ -341,7 +341,7 @@
             </textarea>
         </div>
 
-        <div class="bottom-tab bottom-tab-slide">
+        <div class="bottom-tab bottom-tab-slide {{#unless cart.isEmpty}}mt30{{/unless}}">
             {{!--<span class="bottom-title {{#if cart.deleteShop}}cur{{/if}}
                                 {{#unless cart.deleteShop}}none{{/unless}}">凑单商品</span>--}}
             <span class="bottom-title cur" data-type="fine">为您优选</span>

@@ -60,6 +60,10 @@
         margin-top: 40px;
     }
 
+    .mt30 {
+        margin-top: 30px;
+    }
+
     .mt40 {
         margin-top: 20px;
     }
@@ -632,8 +636,10 @@
                 width: 115px;
                 height: 150px;
                 border: 1px solid #eaeaea;
+                border-sizing: border-box;
                 img {
-                    width: 100%;
+                    width: 113px;
+                    height: 148px;
                 }
             }
             .choose-color{
@@ -658,7 +664,7 @@
                     height:18px;
                     line-height:18px;
                 }
-                .choose-size-detail {
+                .size-row {
                     float: left;
                     width: 128px;
                 }