搜索词完善接口配置

@@ -4,7 +4,7 @@
 module.exports = function (app) {
     /***********************************品牌优惠券*************************************/
     //列表页
-    app.get("/marketing/brandCoupon/index", "marketing.BrandCoupon.Index",function(){
+    app.get("/brandCoupons/index", "marketing.BrandCoupon.Index",function(){
         this.$extend={
             moduleName:'营销管理',
             pageName:'品牌优惠券'
@@ -12,15 +12,15 @@ module.exports = function (app) {
     });
 
     //列表数据
-    app.post("/marketing/brandCoupon", "BrandCoupon_queryList");
+    app.post("/brandCoupon/queryList", "BrandCoupon_queryList");
 
     //新增
-    app.post("/marketing/brandCoupon/add", "BrandCoupon_add");
+    app.post("/brandCoupon/add", "BrandCoupon_add");
 
     //编辑
-    app.post("/marketing/brandCoupon/update", "BrandCoupon_update");
+    app.post("/brandCoupon/update", "BrandCoupon_update");
 
     //删除
-    app.post("/marketing/brandCoupon/delete", "BrandCoupon_delete");
+    app.post("/brandCoupon/delete", "BrandCoupon_delete");
     
 };
\ No newline at end of file

@@ -4,6 +4,34 @@
 module.exports = function (app) {
   
     /*************************************商品池管理*************************************/
+    //列表页
+    app.get("/market/productPool/index", "marketing.ProductPool.Index",function(){
+        this.$extend={
+            moduleName:'营销管理',
+            pageName:'商品池管理'
+        }
+    });
+
+    //列表数据
+    app.post("/market/productPool/queryProductPoolPage", "ProductPool_queryProductPoolPage");
+
+    //新增
+    app.post("/market/productPool/addProductPoolBo", "ProductPool_addProductPoolBo");
+
+    //编辑
+    app.post("/market/productPool/updateProductPool", "ProductPool_updateProductPool");
+
+    //删除
+    app.post("/market/productPool/clearProductPool", "ProductPool_clearProductPool");
+
+    //详情列表
+    app.post("/market/productPool/queryProductPoolDetailPage", "ProductPool_queryProductPoolDetailPage");
+
+    //详情删除SKN
+    app.post("/market/productPool/deleteProductPoolDetailBo", "ProductPool_deleteProductPoolDetailBo");
+
+    //详情添加SKN
+    app.post("/market/productPool/addProductPoolDetailBo", "ProductPool_addProductPoolDetailBo");
 
 
 };
\ No newline at end of file

@@ -9,7 +9,6 @@ module.exports = {
 
         queryCouponList: {
             title: "优惠券列表",
-            domain: "{domain}",
             url: "/coupon/queryCouponList",
             params: {
                 page: {type: Number},
@@ -23,7 +22,6 @@ module.exports = {
 
         addOrUpdate: {
             title: "优惠券新增、修改",
-            domain: "{domain}",
             url: "/coupon/addOrUpdate",
             params: {
                 id: {type: Number},
@@ -45,7 +43,6 @@ module.exports = {
         },
         reject: {
             title: "驳回",
-            domain: "{domain}",
             url: "/coupon/reject",
             params: {
                 couponsId: {type: Number},
@@ -54,7 +51,6 @@ module.exports = {
         },
         approve: {
             title: "通过",
-            domain: "{domain}",
             url: "/coupon/approve",
             params: {
                 couponsId: {type: Number}
@@ -62,7 +58,6 @@ module.exports = {
         },
         invalid: {
             title: "作废",
-            domain: "{domain}",
             url: "/coupon/invalid",
             params: {
                 couponsId: {type: Number},

@@ -5,10 +5,8 @@ module.exports = {
     namespace: "CouponSend",
     apis: {
         /**************************************发券管理*************************************/
-
         querySendCouponList: {
             title: "发券管理列表",
-            domain: "{domain}",
             url: "/coupon/querySendCouponList",
             params: {
                 couponType: {type: Number},
@@ -24,7 +22,6 @@ module.exports = {
 
         getCouponDetailById: {
             title: "单个券详情",
-            domain: "{domain}",
             url: "/coupon/getCouponDetailById",
             params: {
                 couponsId: {type: Number}
@@ -32,7 +29,6 @@ module.exports = {
         },
         getListByCouponId: {
             title: "单个券的发券详情",
-            domain: "{domain}",
             url: "/coupon/getCouponDetailById",
             params: {
                 couponsId: {type: Number}
@@ -40,7 +36,6 @@ module.exports = {
         },
         sendCoupon: {
             title: "手工发券",
-            domain: "{domain}",
             url: "/coupon/sendCoupon",
             params: {
                 couponsId: {type: Number},
@@ -49,7 +44,6 @@ module.exports = {
         },
         sendAgainById: {
             title: "文件上传重发",
-            domain: "{domain}",
             url: "/couponSendInfo/sendAgainById",
             params: {
                 id: {type: Number}
@@ -57,7 +51,6 @@ module.exports = {
         },
         queryUserCouponLogsList: {
             title: "券记录列表",
-            domain: "{domain}",
             url: "/couponLogs/queryUserCouponLogsList",
             params: {
                 page: {type: Number},
@@ -72,7 +65,6 @@ module.exports = {
         },
         queryCouponSnList: {
             title: "公开券列表",
-            domain: "{domain}",
             url: "/pCouponSn/queryCouponSnList",
             params: {
                 page: {type: Number},

@@ -7,7 +7,6 @@ module.exports = {
         /*************************************限购码管理*************************************/
         getLimitCodeList: {
             title: " 限购码列表",
-            domain: "{domain}",
             url: "/limitCode/getLimitCodeList",
             params: {
                 page: {type: Number},
@@ -23,7 +22,6 @@ module.exports = {
 
         addLimitCode: {
             title: "添加限购码",
-            domain: "{domain}",
             url: '/limitCode/addLimitCode',
             params: {
                 name: {type: String},
@@ -46,7 +44,6 @@ module.exports = {
 
         checkSknValidity: {
             title: "检查SKN的合法性并且获得其下的所有SKU",
-            domain: "{domain}",
             url: "/limitCode/checkSknValidity",
             params: {
                 skn: {type: String},
@@ -56,7 +53,6 @@ module.exports = {
 
         getLimitCode: {
             title: "获取某个限购码",
-            domain: "{domain}",
             url: "/limitCode/getLimitCode",
             params: {
                 id: {type: String}
@@ -64,7 +60,6 @@ module.exports = {
         },
         updateLimitCode: {
             title: "编辑限购码",
-            domain: "{domain}",
             url: '/limitCode/updateLimitCode',
             params: {
                 name: {type: String},
@@ -89,7 +84,6 @@ module.exports = {
 
         auditLimitCode: {
             title: " 通过、驳回、作废限购码接口",
-            domain: "{domain}",
             url: "/limitCode/auditLimitCode",
             params: {
                 id: {type: Number},
@@ -100,7 +94,6 @@ module.exports = {
 
         getLimitCodeCountByStatus: {
             title: "tab卡数据",
-            domain: "{domain}",
             url: '/limitCode/getLimitCodeCountByStatus',
             params: {
                 reqDepartment: {type: String},

@@ -4,6 +4,79 @@
 module.exports = {
     namespace: "ProductPool",
     apis: {
+        /************************************品牌优惠券*************************************/
+        queryProductPoolPage: {
+            title: "商品池列表",
+            url: '/pool/queryProductPoolPage',
+            params: {
+                id: {type: Number},
+                poolName: {type: String},
+                page: {type: Number},
+                size: {type: Number}
+            }
+        },
+        addProductPoolBo: {
+            title: "添加商品池",
+            url: '/pool/addProductPoolBo',
+            params: {
+                activityid: {type: Number},
+                poolName: {type: String},
+                comment: {type: String},
+                producttype: {type: String},
+                productSkns: {type: String}
+            }
+        },
+        updateProductPool: {
+            title: "编辑商品池",
+            url: '/pool/updateProductPool',
+            params: {
+                id: {type: Number},
+                poolName: {type: String},
+                comment: {type: String},
+                producttype: {type: String},
+                productSkns: {type: String}
+            }
+        },
+        clearProductPool: {
+            title: "清空商品池",
+            url: '/pool/clearProductPool',
+            params: {
+                id: {type: Number}
+            }
+        },
+        deleteProductPool: {
+            title: "删除商品池",
+            url: '/pool/deleteProductPool',
+            params: {
+                id: {type: Number}
+            }
+        },
+        queryProductPoolDetailPage: {
+            title: "详情列表",
+            url: '/pool/queryProductPoolDetailPage',
+            params: {
+                id: {type: Number},
+                page: {type: Number},
+                size: {type: Number}
+            }
+        },
+        deleteProductPoolDetailBo: {
+            title: "详情删除SKN",
+            url: '/pool/deleteProductPoolDetailBo',
+            params: {
+                id: {type: Number}
+            }
+        },
+        addProductPoolDetailBo: {
+            title: "详情添加SKN",
+            url: '/pool/addProductPoolDetailBo',
+            params: {
+                activityid: {type: Number},
+                poolId: {type: Number},
+                productskn: {type: Number},
+                producttype: {type: Number}
+            }
+        }
 
     }
 };
\ No newline at end of file

@@ -7,7 +7,6 @@ module.exports = {
         /*************************************优惠码管理*************************************/
         getPromotionCodeList: {
             title: " 优惠码列表",
-            domain: "{domain}",
             url: '/promotioncode/getPromotionCodeList',
             params: {
                 page: {type: Number},
@@ -21,7 +20,6 @@ module.exports = {
 
         auditPromotionCode: {
             title: "操作单个优惠码",
-            domain: "{domain}",
             url: '/promotioncode/auditPromotionCode',
             params: {
                 id: {type: String},
@@ -32,7 +30,6 @@ module.exports = {
 
         getPromotionCodeSendList: {
             title: "优惠码发放列表",
-            domain: "{domain}",
             url: '/promotioncode/getPromotionCodeSendList', params: {
                 skn: {type: String},
                 id: {type: String}
@@ -40,7 +37,6 @@ module.exports = {
         },
         getPromotionCodeCountByStatus: {
             title: "优惠码tab卡数据",
-            domain: "{domain}",
             url: '/promotioncode/getPromotionCodeCountByStatus',
             params: {
                 batchNo: {type: String},
@@ -50,7 +46,6 @@ module.exports = {
         },
         addPromotionCode: {
             title: "添加优惠码",
-            domain: "{domain}",
             url: '/promotioncode/addPromotionCode',
             params: {
                 name: {type: String},
@@ -71,7 +66,6 @@ module.exports = {
         },
         updatePromotionCode: {
             title: "编辑优惠码",
-            domain: "{domain}",
             url: '/promotioncode/updatePromotionCode',
             params: {
                 id: {type: Number},
@@ -92,7 +86,6 @@ module.exports = {
         },
         checkPromotionCode: {
             title: "验证优惠码",
-            domain: "{domain}",
             url: '/promotioncode/checkPromotionCode',
             params: {
                 code: {type: String}

@@ -7,7 +7,6 @@ module.exports = {
         /************************************优惠券查询管理*************************************/
         delayUserCoupon: {
             title: "延长优惠券有效期",
-            domain: "{domain}",
             url: "/couponLogs/delayUserCoupon",
             params: {
                 id: {type: Number},
@@ -16,7 +15,6 @@ module.exports = {
         },
         cancelCouponUse: {
             title: "手工退券",
-            domain: "{domain}",
             url: "/couponLogs/cancelCouponUse",
             params: {
                 id: {type: Number}

@@ -7,7 +7,6 @@ module.exports = {
         /*************************************vip累计金额翻倍*************************************/
         vipList: {
             title: "vip列表",
-            domain: "{domain}",
             url: '/activity/queryActivityList',
             params: {
                 id: {type: Number},
@@ -17,7 +16,6 @@ module.exports = {
         },
         activityList: {
             title: "活动列表",
-            domain: "{domain}",
             url: '/activity/queryActivityList',
             params: {
                 status: {type: Number}
@@ -25,7 +23,6 @@ module.exports = {
         },
         saveActivity: {
             title: "保存、编辑活动",
-            domain: "{domain}",
             url: '/activity/saveActivity',
             params: {
                 id: {type: Number},

@@ -8,7 +8,6 @@ module.exports = {
         /************************************品牌优惠券*************************************/
         queryList: {
             title: "品牌优惠券数据",
-            domain: "{domain}",
             url: '/brandCoupon/queryList',
             params: {
                 brandId: {type: String},
@@ -20,7 +19,6 @@ module.exports = {
         },
         queryByParam: {
             title: "单个优惠券",
-            domain: "{domain}",
             url: '/brandCoupon/queryByParam',
             params: {
                 id: {type: Number}
@@ -28,7 +26,6 @@ module.exports = {
         },
         add: {
             title: "新增品牌优惠券",
-            domain: "{domain}",
             url: '/brandCoupon/add',
             params: {
                 brandName: {type: String},
@@ -39,7 +36,6 @@ module.exports = {
         },
         delete: {
             title: "删除品牌优惠券",
-            domain: "{domain}",
             url: '/brandCoupon/delete',
             params: {
                 id: {type: Number}
@@ -47,7 +43,6 @@ module.exports = {
         },
         update: {
             title: "编辑品牌优惠券",
-            domain: "{domain}",
             url: '/brandCoupon/update',
             params: {
                 brandName: {type: String},

+<%include '../../../common/views/__ui/header'%>
+
+<%include '../../../common/views/__partail/ListHeader'%>
+
+<div class="contentpanel">
+    <div class="panel panel-default" style="margin-bottom:10px;">
+        <div class="panel-body" style="padding-bottom: 0">
+            <a class="btn btn-success " id="addPool"><i class="fa fa-plus"></i> 添加商品池</a>
+        </div>
+        <div class="panel-body">
+            <div class="row">
+                <div class="panel-col">
+                    <input type="text" class="form-control" id="search-id" placeholder="输入编号" onkeyup="this.value=this.value.replace(/\D/gi,'')" />
+                </div>
+                <div class="panel-col">
+                    <input type="text" class="form-control" id="search-name" placeholder="输入名称" />
+                </div>
+                <div class="panel-col">
+                    <a id="filter-btn" href="javascript:;" class="btn btn-info">筛选</a>
+                    <a id="filter-all" href="/market/productPool/index" class="btn btn-info">全部</a>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="panel">
+        <div class="panel-body nopadding">
+            <div id="product-pool"></div>
+        </div>
+    </div>
+</div>
+
+<script type="text/template" id="template">
+    <div class="form-horizontal" id="productEdit">
+        <input type="hidden" value="[[id]]" id="id" />
+
+        <div class="form-group">
+            <label for="poolName" class="col-sm-3 control-label">商品池名称：</label>
+            <div class="col-sm-5">
+                <input type="text" id="poolName" value="[[poolName]]" class="form-control" />
+            </div>
+            <div class="col-sm-2"><label style="color: #ff0000; line-height: 40px"> * 必填</label></div>
+        </div>
+
+        <div class="form-group">
+            <label for="comment" class="col-sm-3 control-label">说明：</label>
+            <div class="col-sm-5">
+                <input type="text" id="comment" value="[[comment]]" class="form-control" />
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label for="producttype" class="col-sm-3 control-label">商品：</label>
+            <div class="col-sm-5">
+                <select id="producttype" class="form-control" >
+                    <option value="-1">-- 请选择添加商品类型 --</option>
+                    <option value="1">SKN</option>
+                    <option value="2" disabled>SKU（暂不支持）</option>
+                    <option value="3" disabled>SKC（暂不支持）</option>
+                </select>
+            </div>
+            <div class="col-sm-4"><label style="color: #ff0000; line-height: 40px"> * 必选（当前只支持SKN）</label></div>
+        </div>
+
+        <div class="form-group">
+            <label class="col-sm-3 control-label">上传：</label>
+            <div class="col-sm-9">
+                <div class="row">
+                    <div class="col-sm-7">
+                        <input id="path" class="form-control" type="text" disabled="disabled" style="cursor:default; width: 218px">
+                    </div>
+                    <div class="col-sm-4" style="position: relative; padding-left: 0;">
+                        <input id="productSkn" name="productSkn" class="btn btn-default excel-upload" type="file" style="position: absolute; top: 0;left: 10px; height:37px">
+                        <div class="file-name btn btn-info">请选择文件</div>
+                        <input type="hidden" id="sknVal" />
+                    </div>
+                </div>
+                <div style="margin: 10px 0 0; color:#f0ad4e">
+                    * 要导入的数据类型必须和所选类型相同。<br>
+                    &nbsp;&nbsp;EXCEL文件只有一列。
+                </div>
+            </div>
+        </div>
+    </div>
+</script>
\ No newline at end of file

@@ -7,24 +7,24 @@ module.exports = function (app) {
 
     /*************************************搜索词管理*************************************/
     //列表页
-    app.get("/searchWords/searchWords", "searchWords.SearchWords.Index",function(){
+    app.get("/operations/terms/index", "searchWords.SearchWords.Index",function(){
         this.$extend={
             filter: true
         }
     });
 
     //获取所有搜索词
-    app.post("/searchWords/querySearchWords", "searchWords_querySearchWords");
+    app.post("/operation/terms/searchWordsList", "searchWords_querySearchWords");
 
     //添加搜索词信息
-    app.post("/searchWords/addSearchWords", "searchWords_addSearchWords");
+    app.post("/operations/terms/add", "searchWords_addSearchWords");
 
     //编辑搜索词信息
-    app.post("/searchWords/updateSearchWords", "searchWords_updateSearchWords");
+    app.post("/operations/terms/modify", "searchWords_updateSearchWords");
 
     /*************************************品牌热搜词*************************************/
     //列表页
-    app.get("/searchWords/hotBrand", "searchWords.HotBrand.Index",function(){
+    app.get("/hotSearchBrand/index", "searchWords.HotBrand.Index",function(){
         this.$extend={
             moduleName:'搜索词管理',
             pageName:'品牌热搜词',
@@ -33,18 +33,18 @@ module.exports = function (app) {
     });
 
     //获取所有搜索词
-    app.post("/searchWords/queryHotBrandList", "searchWords_queryHotBrandList");
+    app.post("/hotSearchBrand/queryHotBrandList", "searchWords_queryHotBrandList");
 
     //添加搜索词信息
-    app.post("/searchWords/addHotBrand", "searchWords_addHotBrand");
+    app.post("/hotSearchBrand/addHotBrand", "searchWords_addHotBrand");
 
     //编辑搜索词信息
-    app.post("/searchWords/updateHotBrand", "searchWords_updateHotBrand");
+    app.post("/hotSearchBrand/updateHotBrand", "searchWords_updateHotBrand");
 
     //删除搜索词信息
-    app.post("/searchWords/delHotBrand", "searchWords_delHotBrand");
+    app.post("/hotSearchBrand/delHotBrand", "searchWords_delHotBrand");
     
     //查询单个搜索词信息
-    app.post("/searchWords/queryHotBrand", "searchWords_queryHotBrand");
+    app.post("/hotSearchBrand/queryHotBrand", "searchWords_queryHotBrand");
 
 };
\ No newline at end of file

@@ -7,9 +7,8 @@ module.exports = {
     namespace: "searchWords",
     apis: {
         /*************************************搜索词管理*************************************/
-        searchWordsList: {
+        querySearchWords: {
             title: "获取所有搜索词数据",
-            domain: "{domain}",
             url: '/searchWords/querySearchWords',
             params: {
                 type: {type: Number},
@@ -25,7 +24,6 @@ module.exports = {
 
         addSearchWords: {
             title: "新增搜索词",
-            domain: "{domain}",
             url: '/searchWords/addSearchWords',
             params: {
                 type: {type: Number},
@@ -41,7 +39,6 @@ module.exports = {
 
         updateSearchWords: {
             title: "编辑搜索词",
-            domain: "{domain}",
             url: '/searchWords/updateSearchWords',
             params: {
                 id: {type: Number},
@@ -57,11 +54,10 @@ module.exports = {
             }
         },
 
-        /*************************************p品牌热搜词管理*************************************/
+        /*************************************品牌热搜词管理*************************************/
 
         queryHotBrandList: {
             title: "获取所有品牌热搜词数据",
-            domain: "{domain}",
             url: '/hotSearchBrand/queryHotBrandList',
             params: {
                 page: {type: Number},
@@ -73,7 +69,6 @@ module.exports = {
 
         addHotBrand: {
             title: "添加品牌热搜词",
-            domain: "{domain}",
             url: '/hotSearchBrand/addHotBrand',
             params: {
                 brandName: {type: String},
@@ -84,7 +79,6 @@ module.exports = {
 
         updateHotBrand: {
             title: "编辑品牌热搜词",
-            domain: "{domain}",
             url: '/hotSearchBrand/updateHotBrand',
             params: {
                 id: {type: Number},
@@ -96,7 +90,6 @@ module.exports = {
 
         delHotBrand: {
             title: "删除品牌热搜词",
-            domain: "{domain}",
             url: '/hotSearchBrand/delHotBrand',
             params: {
                 id: {type: Number}
@@ -105,7 +98,6 @@ module.exports = {
 
         queryHotBrand: {
             title: "查询单个品牌热搜词",
-            domain: "{domain}",
             url: '/hotSearchBrand/queryHotBrand',
             params: {
                 id: {type: Number}

@@ -107,3 +107,5 @@
     </div>
     <input type="hidden" id="id" value="[[id]]"/>
 </script>
+
+<%include '../../../common/views/__ui/footer'%>
\ No newline at end of file

+<%include '../../../common/views/__ui/header'%>
 <div class="pageheader">
     <div class="media">
         <div class="pageicon pull-left">
@@ -207,6 +208,7 @@
         <i class="red" id="i-tips">[[tips]]</i>
     </div>
 </script>
+<%include '../../../common/views/__ui/footer'%>
 
 
 

@@ -3,8 +3,8 @@
  * 反馈管理
  */
 var $ = require('jquery');
-common = require('../common/common');
-datepicker = require('../util/datepicker');
+common = require('../../../common/common');
+datepicker = require('../../../common/util/datepicker');
 /**
  * 下拉框
  */

@@ -2,7 +2,7 @@
  * Created by wangqianjun on 16/2/23.
  */
 var $ = require('jquery'),
-    common = require('../common/common');
+    common = require('../../../common/common');
 
 // 热搜词状态
 var StatusEnum = {
@@ -102,14 +102,9 @@ var Bll = {
                             common.util.__ajax({
                                 url: url,
                                 data: Bll.module
-                            }, function (res) {
-                                if (res.code == '200') {
-                                    g.reload();
-                                    d.close();
-                                }
-                                else {
-                                    common.util.__tip(res.message, "warning");
-                                }
+                            }, function () {
+                                g.reload();
+                                d.close();
                             });
                         }
                         return false;