Merge remote-tracking branch 'origin/test6.0' into test6.0

@@ -104,13 +104,13 @@
         <div class="form-group">
             <label class="col-sm-2 control-label">品牌过滤</label>
             <div class="col-sm-10">
-                <input id="brandIds" class="form-control observe" placeholder="请输入品牌ID，多个品牌ID用“,”隔开" data-field="brandIds">
+                <input id="brandIds" class="form-control observe" value="[[brandIds]]" placeholder="请输入品牌ID，多个品牌ID用“,”隔开" data-field="brandIds">
             </div>
         </div>
         <div class="form-group">
             <label class="col-sm-2 control-label">商品过滤</label>
             <div class="col-sm-10">
-                <input type="text" id="productSkns" class="form-control observe" placeholder="请输入skn，多个skn用“,”隔开" data-field="productSkns">
+                <input type="text" id="productSkns" class="form-control observe" value="[[productSkns]]" placeholder="请输入skn，多个skn用“,”隔开" data-field="productSkns">
             </div>
         </div>
     </div>

@@ -1371,6 +1371,14 @@
                 <label class="col-sm-2 control-label">高度:</label>
                 <input type="text" placeholder="330" class="observe  number" data-field="imageHeight" value="[[contentData.data.imageHeight]]" style="width:100px;" >
             </div>
+            <div class="col-sm-8">
+                <label class="col-sm-2 control-label">显示分割线:</label>
+            <select class="observe" name="showSplitLine" value="[[contentData.data.showSplitLine]]" data-field="showSplitLine">
+                <option value="">请选择</option>
+                <option value="1">是</option>
+                <option value="0">否</option>
+            </select>
+            </div>
         </div>
     </div>
     <ul class="draggable" data-array="data.list">

@@ -92,6 +92,7 @@ var g = new common.grid({
         display: '商品名称',
         render: function (item) {
             var goods = item.goods;
+            var productHref = "";
             if (goods != null) {
                 productHref = "http://item.yohobuy.com/product/pro_" + item.productId + "_" + goods.goodsId + "/" + goods.cnAlphabet + ".html";
             }
@@ -133,6 +134,9 @@ var g = new common.grid({
 
                 return "<p>" + ENUM.AuditEnum[item.status] ? ENUM.AuditEnum[item.status] : "" + "</p>";
             }
+        }, {
+            display: '自动审核状态',
+            name: "checkStatusStr"
         },
         { display: '审核人', name: 'auditorName' },
         {

@@ -1690,6 +1690,7 @@ var Button = [
                     "src": ""
                 }
             ],
+            "showSplitLine":"",
             "imageHeight":"330",
             "imageWidth":"330",
         },

@@ -932,7 +932,11 @@ $(document).on("change", '#focus-select', function () {
     Bll.renderDialog("focus-template");
 });
 $(document).on("change", '#isNewFocus', function () {
-    Bll.module.contentData.isNewFocus = 1 - Bll.module.contentData.isNewFocus;
+    if ($(this).is(':checked')) {
+        Bll.module.contentData.isNewFocus = 1;
+    }else{
+        Bll.module.contentData.isNewFocus = 0;
+    }
     Bll.renderDialog("focus-template");
 });
 //*****************************************************************//