Merge branch 'portal_dev_4.9' into grey

@@ -17,6 +17,7 @@ module.exports={
                 {name: 'orderBy', type: 'String'},
                 {name: 'startTime', type: 'String'},
                 {name: 'endTime', type: 'String'},
+                 {name: 'appType', type: 'Number'},
                 {name: 'page', type: 'Number'},
                 {name: 'size', type: 'Number'}
             ]

@@ -51,6 +51,14 @@
                 </div>
 
                 <div class="panel-col">
+                    <select id="appType" class="form-control">
+                        <option value="-1">是否BLK商品</option>
+                        <option value="1">是BLK</option>
+                        <option value="0">非BLK</option>
+                    </select>
+                </div>
+
+                <div class="panel-col">
                     <input type="text" id="starttime" class="form-control panel-input hasDatepicker" name="start_time"
                            placeholder="开始时间" value="" kl_vkbd_parsed="true">
                 </div>

@@ -16,6 +16,11 @@ var ENUM = {
         '-1': '已关闭',
         0: '未发布',
         1: '已发布'
+    },
+
+    BLKEnum: {
+        0: '否',
+        1: '是'
     }
 
 };
@@ -77,7 +82,8 @@ var g = new common.grid({
             status: $('#status').val(),//common.util.__input('status'),
             orderBy: common.util.__input('orderBy'),
             startTime: common.util.__input('starttime'),
-            endTime: common.util.__input('endtime')
+            endTime: common.util.__input('endtime'),
+            appType: common.util.__input('appType')
         };
     },
     columns: [{
@@ -148,6 +154,11 @@ var g = new common.grid({
             }
         }
     }, {
+        display: 'BLK',
+        render: function (item) {
+            return "<p>" + ENUM.BLKEnum[item.appType] + "</p>";
+        }
+    },{
         display: '操作',
         //}
         name: "status",