Merge branch 'dev_店铺券筛选' into gray

@@ -27,6 +27,8 @@ module.exports=function(app) {
     app.post("/ShopsRest/queryAllShops","select_queryAllShops");
     /*查询通过审核店铺列表接口*/
     app.post("/ShopsRest/selectCheckPassShopsByName","select_selectCheckPassShopsByName");
+    /*查询优惠券店铺列表接口*/
+    app.post("/ShopsRest/selectAllCouponShops","select_selectAllCouponShops");
     /* 店铺创建、店铺信息管理、店铺审核管理页面，下拉选择店铺名称，列表筛选 */
     app.post("/ShopsRest/selectShopsByName","select_selectShopsByName");
     /*根据品牌查询店铺*/

@@ -100,6 +100,13 @@ module.exports={
                 {name: 'idName', type: 'String'}
             ]
         },
+        selectAllCouponShops:{
+            title:'查询优惠券店铺列表接口',
+            url: '/ShopsRest/selectAllCouponShops',
+            params: [
+                {name: 'idName', type: 'String'}
+            ]
+        },
         selectShopsByName:{
             title: '店铺创建、店铺信息管理、店铺审核管理页面，下拉选择店铺名称，列表筛选',
             url: '/ShopsRest/selectShopsByName',

@@ -15,6 +15,7 @@ var urlObj = {
     'queryShopNames': '/ShopsRest/selectShopsByName', // 店铺创建、店铺信息管理、店铺审核管理页面，下拉选择店铺名称，列表筛选
     'maxSort': '/product/queryMaxSortByName', //查询一级类目列表接口
     'shopsRest': '/ShopsRest/selectCheckPassShopsByName', // 店铺列表
+    'couponShops': '/ShopsRest/selectAllCouponShops', // 优惠券店铺列表
     'xiangouID': '/DrawlineActivityRest/selectActivityListForSelect', //限购ID
     'sortsize2': '/product/querySizeListBySortId4Html', //尺码
     'sortsize3':'/product/querySizeListBySkn',//尺码

@@ -515,7 +515,7 @@ var initShop = function () {//初始化店铺弹框
     });
     new common.dropDown({
         el: '.shop',
-        ajax: 'shopsRest'
+        ajax: 'couponShops'
     });
 };
 
@@ -535,7 +535,7 @@ $(document).on('click', "#addShop", function () {
                 $shopGroup.appendTo($('.shop-wrap'));
                 new common.dropDown({
                     el: '.shop',
-                    ajax: 'shopsRest'
+                    ajax: 'couponShops'
                 });
             });
         }
@@ -545,7 +545,7 @@ $(document).on('click', "#addShop", function () {
     }
     new common.dropDown({
         el: '.shop',
-        ajax: 'shopsRest'
+        ajax: 'couponShops'
     });
 });
 
@@ -557,7 +557,7 @@ $(document).on('click', '.add-shop-btn', function () {
     $shopGroup.appendTo($('.shop-wrap'));
     new common.dropDown({
         el: '.shop',
-        ajax: 'shopsRest'
+        ajax: 'couponShops'
     });
 });
 //删除一个店铺

@@ -19,7 +19,7 @@ new common.dropDown({
 });
 new common.dropDown({
     el: "#sel-shopName",
-    ajax: 'shopsRest'
+    ajax: 'couponShops'
 
 });
 
@@ -143,7 +143,7 @@ var Bll = {
         edit.init();
         new common.dropDown({
             el: "#shopId",
-            ajax: 'shopsRest'
+            ajax: 'couponShops'
         });
     }
 };