Merge branch 'release/4.4' of http://git.dev.yoho.cn/web/yohobuy into release/4.4

-{{# shopEntry}}
-    <div class="shop-entry clearfix">
-        <a class="pull-left" href="{{home}}">
-            <img class="logo" src="{{logo}}">
-        </a>
+<div class="shop-entry-area">
+    {{# shopEntry}}
+        <div class="shop-entry clearfix">
+            <a class="pull-left" href="{{home}}">
+                <img class="logo" src="{{logo}}">
+            </a>
 
 
-        <div class="name pull-left">
-            <a class="shop-name" href="{{home}}">{{shopName}}</a>
-            <p class="sorts">
-                {{#each sort}}
-                    <a href="{{href}}">{{name}}</a>
+            <div class="name pull-left">
+                <a class="shop-name" href="{{home}}">{{shopName}}</a>
+                <p class="sorts">
+                    {{#each sort}}
+                        <a href="{{href}}">{{name}}</a>
 
 
-                    {{#unless @last}}
-                        /
-                    {{/unless}}
-                {{/each}}
-            </p>
-        </div>
+                        {{#unless @last}}
+                            /
+                        {{/unless}}
+                    {{/each}}
+                </p>
+            </div>
 
 
-        <a class="entry-btn pull-right" href="{{home}}">
-            进入品牌店铺
-            <span class="iconfont">&#xe601;</span>
-        </a>
-    </div>
-{{/ shopEntry}}
+            <a class="entry-btn pull-right" href="{{home}}">
+                进入品牌店铺
+                <span class="iconfont">&#xe601;</span>
+            </a>
+        </div>
+    {{/ shopEntry}}
+</div>

@@ -15,15 +15,15 @@ var accMul = function(arg1, arg2) {
  s2 = arg2.toString();
  s2 = arg2.toString();
 
 
     try {
     try {
-        m += s1.split(".")[1].length
+        m += s1.split('.')[1].length;
     } catch (e) {
     } catch (e) {
     }
     }
     try {
     try {
-        m += s2.split(".")[1].length
+        m += s2.split('.')[1].length;
     } catch (e) {
     } catch (e) {
     }
     }
-    return Number(s1.replace(".", "")) * Number(s2.replace(".", "")) / Math.pow(10, m)
-}
+    return Number(s1.replace('.', '')) * Number(s2.replace('.', '')) / Math.pow(10, m);
+};
 
 
 var Order = {
 var Order = {
     /*业务数据(人民币)*/
     /*业务数据(人民币)*/
@@ -45,6 +45,7 @@ var Order = {
             $cancel: $('.cancel', '.btn-group'),
             $cancel: $('.cancel', '.btn-group'),
             $total: $('em', '.to-play'),
             $total: $('em', '.to-play'),
             $tbody: $('table tbody', '.pay-wapper'),
             $tbody: $('table tbody', '.pay-wapper'),
+
             //请填写并核对一下信息
             //请填写并核对一下信息
             $orderSelectionSave: $('.address-list h2 span'),
             $orderSelectionSave: $('.address-list h2 span'),
             $addAddress: $('.add-address'),
             $addAddress: $('.add-address'),
@@ -213,6 +214,7 @@ var Order = {
                 }
                 }
             });
             });
         },
         },
+
         //渲染价格明细
         //渲染价格明细
         render: function(data, tips) {
         render: function(data, tips) {
 
 
@@ -365,7 +367,7 @@ var Order = {
             function getSelectData(callback) {
             function getSelectData(callback) {
 
 
                 var $juangroupInput = $('.play-juan.is-select input[name="juangroup"]:checked');
                 var $juangroupInput = $('.play-juan.is-select input[name="juangroup"]:checked');
-                var expressVal = $('.express-list input[name="carriagegroup"]').val();
+                var expressVal = $('.express-list input[name="carriagegroup"]:checked').val();
                 var biVal = $('#biprice.is-select').val();
                 var biVal = $('#biprice.is-select').val();
                 var codeVal = $juangroupInput.val();
                 var codeVal = $juangroupInput.val();
                 var cartType = $('.address-manage').attr('cart-type');
                 var cartType = $('.address-manage').attr('cart-type');

@@ -24,6 +24,31 @@ lazyLoad($('img.lazy'));
  * @num 每列存放商品的个数
  * @num 每列存放商品的个数
  */
  */
 exports.init = function(num) {
 exports.init = function(num) {
+    var $shopEntry = $('.shop-entry'),
+        $shopEntryArea = $('.shop-entry-area'),
+        shopEntryLen = $shopEntry.length;
+
+    if (shopEntryLen > 0) {
+        if (shopEntryLen % 3 === 1) {
+            $shopEntry.eq(shopEntryLen - 1).css({
+                width: '100%'
+            });
+        } else if (shopEntryLen % 3 === 2) {
+            $shopEntry.eq(shopEntryLen - 1).css({
+                width: '49%'
+            });
+
+            $shopEntry.eq(shopEntryLen - 2).css({
+                width: '49%'
+            });
+        }
+
+        $('.shop-entry:nth-child(3n+1)').css({
+            marginLeft: 0
+        });
+
+        $shopEntryArea.show();
+    }
 
 
     productList = null;
     productList = null;
 
 

+.shop-entry-area {
+    width: 100%;
+    height: auto;
+    overflow: hidden;
+    display: none;
+
+    .shop-entry:first-child {
+        margin-left: 0;
+    }
+}
+
 .shop-entry {
 .shop-entry {
     position: relative;
     position: relative;
     background: #f5f7f6;
     background: #f5f7f6;
     border: 1px solid #eaeceb;
     border: 1px solid #eaeceb;
     padding: 12px 15px;
     padding: 12px 15px;
-    margin-bottom: 10px;
+    width: 32%;
+    box-sizing: border-box;
+    float: left;
+    margin: 0 0 10px 2%;
 
 
     .logo {
     .logo {
         width: 80px;
         width: 80px;

@@ -416,16 +416,18 @@
             }
             }
         }
         }
     }
     }
+    
+    .goods-wrap {
+        .goods-container {
+            .good-info {
+                width: 235px;
+                height: auto;
+                margin-bottom: 35px;
+            }
 
 
-    .goods-container {
-        .good-info {
-            width: 235px;
-            height: auto;
-            margin-bottom: 35px;
-        }
-
-        .good-detail-text {
-            text-align: left;
+            .good-detail-text {
+                text-align: left;
+            }
         }
         }
     }
     }