Merge branch 'portal_dev_4.9' into grey

@@ -471,6 +471,7 @@
         </div>
         <div class="col-sm-2">
             <a id="search" class="go-search btn btn-primary">搜索商品</a>
+            <a id="searchBLK" class="go-search btn btn-primary">搜BLK商品</a>
         </div>
 
     </div>
@@ -498,6 +499,7 @@
         </div>
         <p style="margin-top:40px;">
             <a class="go-search tag-goods btn btn-primary" id="search2">搜索商品</a>
+            <a id="searchBLK2" class="go-search btn btn-primary">搜BLK商品</a>
         </p>
     </div>
     <div class="goods-list form-group" style="display: none">
@@ -520,7 +522,7 @@
             </div>
         </div>
 
-        <div class="gird" id="goodsgird">
+        <div class="gird" id="goodsgird" appType="0">
         </div>
     </div>
 </script>

@@ -648,6 +648,8 @@ var goodsgird = new common.grid({
         if (common.util.__input('min-price') && common.util.__input('max-price')) {
             price = common.util.__input('min-price') + "," + common.util.__input('max-price');
         }
+        //加上是否搜索BLK的标识
+        var appType =  $("#goodsgird").attr("appType");
         return {
             status: 1,
             sales: "Y",
@@ -659,7 +661,8 @@ var goodsgird = new common.grid({
             style: Bll2.getIds(Bll.sorts[1].list),//风格先不管
             msort: Bll2.getIds(Bll.sorts[2].list),
             brand: Bll2.getIds(Bll.sorts[3].list),
-            gender: Bll2.getIds(Bll.sorts[4].list)
+            gender: Bll2.getIds(Bll.sorts[4].list),
+            app_type:appType
         };
     },
     columns: [
@@ -830,6 +833,20 @@ $(document).on("click", ".hand", function () {
  */
 $(document).on("click", "#search", function () {
     $(".goods-list").show();
+    $("#goodsgird").attr("appType","0");
+    if (goodsgird.grid) {
+        goodsgird.reload(1);
+    } else {
+        goodsgird.init('/yohosearch/search');
+    }
+});
+
+/**
+ * 手动输入中“搜索BLK商品”按钮
+ */
+$(document).on("click", "#searchBLK", function () {
+    $(".goods-list").show();
+    $("#goodsgird").attr("appType","1");
     if (goodsgird.grid) {
         goodsgird.reload(1);
     } else {
@@ -956,6 +973,15 @@ $(document).on("click", "#search-tag", function () {
  */
 $(document).on("click", "#search2", function () {
     $(".goods-list").show();
+    $("#goodsgird").attr("appType","0");
+    goodsgird.init('/yohosearch/search');
+});
+/**
+ * 标签搜索中 “搜索BLK商品”按钮
+ */
+$(document).on("click", "#searchBLK2", function () {
+    $(".goods-list").show();
+    $("#goodsgird").attr("appType","1");
     goodsgird.init('/yohosearch/search');
 });
 /**