Merge branch 'hotfix_套餐支持店铺筛选' into gray

@@ -14,7 +14,8 @@ module.exports={
                 {name: 'brand', type: 'Number'},
                 {name: 'bundleName', type: 'String'},
                 {name: 'page', type: 'Number'},
-                {name: 'size', type: 'Number'}
+                {name: 'size', type: 'Number'},
+                {name: 'shopId', type : 'Number'}
             ]
         },
         productBundleSaveOrUpdate: {

@@ -23,8 +23,8 @@
                     <input name="productSkn" id="productSkn" type="text" value="" class="form-control" placeholder="SKN, 多条请用,隔开" />
                 </div>
                 <div class="panel-col2">
-                    <select name="time-sort" id="brand-name" tabindex="-1" title="" class="form-control">
-                        <option value="-1">选择品牌</option>
+                    <select name="time-sort" id="shop-name" tabindex="-1" title="" class="form-control">
+                        <option value="-1">选择店铺</option>
                     </select>
                 </div>
                 <div class="panel-col">

@@ -5,9 +5,16 @@
 var $ = require('jquery'), common = require('../../../common/common');
 require('../../../common/util/datepicker');
 
-new common.dropDown({el: "#brand-name", ajax: "brand"});
+//new common.dropDown({el: "#shop-name", ajax: "queryShopPass"});
 new common.dropDown({ el: "#time_status" });
 
+/*下拉选择*/
+new common.dropDown({
+    el: "#shop-name",
+    ajax: "queryShopPass",
+    hash: true
+});
+
 
 var tableGird = new common.grid({
     el: "#table-box",
@@ -18,7 +25,7 @@ var tableGird = new common.grid({
             "bundleName": common.util.__input('bundleName'),
             "productSkn": common.util.__input('productSkn'),
             "status": $("#time_status").val(),
-            "brand": common.util.__input("brand-name")
+            "shopId": common.util.__input("shop-name")
         };
     },
     columns: [