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

@@ -59,7 +59,6 @@ window.UMrecommender = UM.getEditor('edit-recommender');
 var recommender = [];
 common.util.__ajax({
     url: '/guang/article/queryArticlesBySKN',
-    async: false,
     data: {
         productSkn: NETSALEDATA.baseProductInfo.baseProduct.productSkn
     }
@@ -67,7 +66,7 @@ common.util.__ajax({
     if (res.data) {
         recommender = res.data;
     }
-});
+},true);
 /**
  * 点击小编推荐
  */

@@ -184,7 +184,7 @@ if (window.NETSALEDATA) {
                                 var refName = item1.referenceName ? item1.referenceName : "";//非空判断
                                 var a = refName.split(/[|/]/g);
                                 var refName1 = a[0] || "", refName2 = a[1] || "";
-                                return '<input class="col-sm-5 refInfo refInfo1" data-index="' + item1.__index + '"' + 'value="' + refName1 + '"/>' + '<div class="col-sm-1">' + '/</div>' + '<input class="col-sm-5 refInfo refInfo2" data-index="' + item1.__index + '"' + 'value="' + refName2 + '"/>';
+                                return '<div class="form-group"><div class="col-sm-3"><input class=" form-control" data-index="' + item1.__index + '"' + 'value="' + refName1 + '"/></div>' + '<div class="col-sm-1">' + '/</div>' + '<div class="col-sm-3"><input class=" form-control" data-index="' + item1.__index + '"' + 'value="' + refName2 + '"/></div></div>';
                             }
                         });
                         for (var i = 0; i < dataList.sizeRelationsList[0].prdSizeAttributeBoList.length; i++) {//尺码列
@@ -197,8 +197,8 @@ if (window.NETSALEDATA) {
                                     var prdList = item1.prdSizeAttributeBoList;
                                     if (j >= prdList.length) j = 0;//防止越界
                                     var sizeVal = prdList[j].sizeValue ? prdList[j].sizeValue : "";
-                                    return '<input class="form-control sizeInfo ' + prdList[j++].sizeAttributeId
-                                        + '" data-index="' + item1.__index + '"' + 'value="' + sizeVal + '"/>';
+                                    return '<div class="form-group"><input class="form-control sizeInfo ' + prdList[j++].sizeAttributeId
+                                        + '" data-index="' + item1.__index + '"' + 'value="' + sizeVal + '"/><div>';
                                 }
                             });
                         }
@@ -251,7 +251,7 @@ if (window.NETSALEDATA) {
                         return false;
                     });
                 }
-            });
+            },true);
         }
     }
     { //搜索优先级

@@ -94,6 +94,7 @@ var Button = [
         dialog:"icon-template",
         "data": [
             {
+                "column_num":4,
                 "url": {
                     "action": "",
                     "url": ""

 <!-- 添加图标、楼层 -->
 <script type="text/template" id="icon-template">
+    [[if contentData.template_name=='appIconList']]
+    <div class="panel-body">
+        <div class="form-group">
+            <label class="col-sm-2">每行显示张数</label>
+            <div class="col-sm-3">
+                <select class="form-control  observe" value="[[contentData.data.column_num]]" data-field="column_num">
+                    [[layout parm3_template]]
+                </select>
+            </div>
+        </div>
+    </div>
+    [[/if]]
     <div class="panel-body">
         <div>
             <table class="table table-hover table-bordered responsive dataTable no-footer">
@@ -271,6 +283,10 @@
     <option value="promotion">促销id</option>
     <option value="msort">大分类ID</option>
 </script>
+<script type="text/template" id="parm3_template">
+    <option value="4">一行4个</option>
+    <option value="5">一行5个</option>
+</script>
 <!-- 9-1 标题标签 -->
 <script type="text/template" id="title-template">
     <div class="rows">

@@ -8,7 +8,7 @@
 <div>
     <div class="row title">[[module.contentData.template_intro]]</div>
     <div class="app_icon_list">
-        <ul class="icon-list clearfix">
+        <ul class="icon-list clearfix li[[module.contentData.data.column_num]]">
             [[each module.contentData.data as item index]]
             <li style="width:75px; float:left;margin-left:5px;"><img src="[[item.src]]"></li>
             [[/each]]