Showing
7 changed files
with
107 additions
and
108 deletions
@@ -8,7 +8,7 @@ module.exports = function (app) { | @@ -8,7 +8,7 @@ module.exports = function (app) { | ||
8 | app.get("/market/coupon/index", "marketing.PromotionCode.Index", function () { | 8 | app.get("/market/coupon/index", "marketing.PromotionCode.Index", function () { |
9 | this.$extend = { | 9 | this.$extend = { |
10 | moduleName: '营销管理', | 10 | moduleName: '营销管理', |
11 | - pageName: '优惠码码列表', | 11 | + pageName: '优惠码列表', |
12 | createUrl: '/market/coupon/add' | 12 | createUrl: '/market/coupon/add' |
13 | } | 13 | } |
14 | }); | 14 | }); |
@@ -4,8 +4,8 @@ | @@ -4,8 +4,8 @@ | ||
4 | 4 | ||
5 | <div class="contentpanel"> | 5 | <div class="contentpanel"> |
6 | <div class="panel panel-default" style="margin-bottom:10px;"> | 6 | <div class="panel panel-default" style="margin-bottom:10px;"> |
7 | - <div class="panel-body"> | ||
8 | - <a id="add-btn" href="javascript:;" class="btn btn-info">添加优惠券</a> | 7 | + <div class="panel-body" style="padding-bottom: 0"> |
8 | + <a id="add-btn" href="javascript:;" class="btn btn-success"><i class="fa fa-plus"></i> 添加品牌优惠券</a> | ||
9 | </div> | 9 | </div> |
10 | <div class="panel-body"> | 10 | <div class="panel-body"> |
11 | <div class="row"> | 11 | <div class="row"> |
@@ -4,14 +4,12 @@ | @@ -4,14 +4,12 @@ | ||
4 | 4 | ||
5 | <div class="contentpanel"> | 5 | <div class="contentpanel"> |
6 | <div class="panel panel-default" style="margin-bottom:10px;"> | 6 | <div class="panel panel-default" style="margin-bottom:10px;"> |
7 | - <div class="panel-heading"> | ||
8 | - <a id="add-btn" href="/market/couponList/add" class="btn btn-success "><i class="fa fa-plus"></i> 添加</a> | 7 | + <div class="panel-body" style="padding-bottom: 0"> |
8 | + <a id="add-btn" href="/market/couponList/add" class="btn btn-success "><i class="fa fa-plus"></i> 添加优惠券</a> | ||
9 | </div> | 9 | </div> |
10 | <div class="panel-body"> | 10 | <div class="panel-body"> |
11 | <div class="row"> | 11 | <div class="row"> |
12 | - <div class="panel-col" id="couponsIds"> | ||
13 | - | ||
14 | - </div> | 12 | + <div class="panel-col" id="couponsIds"></div> |
15 | <div class="panel-col"> | 13 | <div class="panel-col"> |
16 | <input id="filter-couponName" class="form-control panel-input" type="text" placeholder="名称"> | 14 | <input id="filter-couponName" class="form-control panel-input" type="text" placeholder="名称"> |
17 | </div> | 15 | </div> |
@@ -19,73 +17,73 @@ | @@ -19,73 +17,73 @@ | ||
19 | <select id="filter-dep" name="filter-dep" tabindex="-1" title="" | 17 | <select id="filter-dep" name="filter-dep" tabindex="-1" title="" |
20 | class="select2-offscreen brandBtn-group"> | 18 | class="select2-offscreen brandBtn-group"> |
21 | <option value="-1">申请部门</option> | 19 | <option value="-1">申请部门</option> |
22 | - <option value="20"> 资源发展部 </option> | ||
23 | - <option value="21"> 广告部 </option> | ||
24 | - <option value="22"> 招商部 </option> | ||
25 | - <option value="23"> 男生媒体部 </option> | ||
26 | - <option value="24"> 女生媒体部 </option> | ||
27 | - <option value="25"> 流程运营部 </option> | ||
28 | - <option value="26"> 发行设计部 </option> | ||
29 | - <option value="27"> 设计部 </option> | ||
30 | - <option value="28"> 商品一部(羊头+轻奢) </option> | ||
31 | - <option value="29"> 商品二部(男装) </option> | ||
32 | - <option value="30"> 商品三部(女装) </option> | ||
33 | - <option value="31"> 商品四部(户外运动) </option> | ||
34 | - <option value="32"> 商品五部(自主) </option> | ||
35 | - <option value="33"> 商品六部(明星/KOL) </option> | ||
36 | - <option value="34"> 商品七部(童装) </option> | ||
37 | - <option value="35"> 商品八部(创意生活+玩具) </option> | ||
38 | - <option value="36"> 商品九部(彩妆) </option> | ||
39 | - <option value="37"> 商品十部(全球购) </option> | ||
40 | - <option value="38"> 运营支持部 </option> | ||
41 | - <option value="39"> 类目及活动运营部 </option> | ||
42 | - <option value="40"> 内容运营部 </option> | ||
43 | - <option value="41"> 营销策划部 </option> | ||
44 | - <option value="42"> 设计部 </option> | ||
45 | - <option value="43"> 售后服务部 </option> | ||
46 | - <option value="44"> 客户关系部 </option> | ||
47 | - <option value="45"> 运营部 </option> | ||
48 | - <option value="46"> 泛渠道部 </option> | ||
49 | - <option value="47"> 运营统筹部 </option> | ||
50 | - <option value="48"> 南京艾尚店 </option> | ||
51 | - <option value="49"> 仓储部 </option> | ||
52 | - <option value="50"> 物流部 </option> | ||
53 | - <option value="51"> 运营部 </option> | ||
54 | - <option value="52"> 公关部 </option> | ||
55 | - <option value="53"> 运营部 </option> | ||
56 | - <option value="54"> 生产部 </option> | ||
57 | - <option value="55"> 商品部 </option> | ||
58 | - <option value="56"> 销售部 </option> | ||
59 | - <option value="57"> 市场部 </option> | ||
60 | - <option value="58"> 运营部 </option> | ||
61 | - <option value="59"> 人事部 </option> | ||
62 | - <option value="60"> 财务部 </option> | ||
63 | - <option value="61"> 陈列部 </option> | ||
64 | - <option value="62"> 会员数据部 </option> | ||
65 | - <option value="63"> 会员营销部 </option> | ||
66 | - <option value="64"> 会员运营部 </option> | ||
67 | - <option value="65"> 品牌营销部 </option> | ||
68 | - <option value="66"> 效果营销部 </option> | ||
69 | - <option value="67"> PR营销部 </option> | ||
70 | - <option value="68"> 设计部 </option> | ||
71 | - <option value="69"> 零售产品部 </option> | ||
72 | - <option value="70"> 媒体产品部 </option> | ||
73 | - <option value="71"> 设计部 </option> | ||
74 | - <option value="72"> 前端系统部 </option> | ||
75 | - <option value="73"> 核心系统部 </option> | ||
76 | - <option value="74"> 后台系统部 </option> | ||
77 | - <option value="75"> 测试部 </option> | ||
78 | - <option value="76"> 研究发展部 </option> | ||
79 | - <option value="77"> 大数据部 </option> | ||
80 | - <option value="78"> 运维部 </option> | ||
81 | - <option value="79"> 财务部 </option> | ||
82 | - <option value="80"> 内审部 </option> | ||
83 | - <option value="81"> 行政部 </option> | ||
84 | - <option value="82"> 数据部 </option> | ||
85 | - <option value="83"> 公共关系部 </option> | ||
86 | - <option value="84"> 人力资源部 </option> | ||
87 | - <option value="85"> 总裁办 </option> | ||
88 | - <option value="86"> 火星项目部 </option> | 20 | + <option value="20"> 资源发展部</option> |
21 | + <option value="21"> 广告部</option> | ||
22 | + <option value="22"> 招商部</option> | ||
23 | + <option value="23"> 男生媒体部</option> | ||
24 | + <option value="24"> 女生媒体部</option> | ||
25 | + <option value="25"> 流程运营部</option> | ||
26 | + <option value="26"> 发行设计部</option> | ||
27 | + <option value="27"> 设计部</option> | ||
28 | + <option value="28"> 商品一部(羊头+轻奢)</option> | ||
29 | + <option value="29"> 商品二部(男装)</option> | ||
30 | + <option value="30"> 商品三部(女装)</option> | ||
31 | + <option value="31"> 商品四部(户外运动)</option> | ||
32 | + <option value="32"> 商品五部(自主)</option> | ||
33 | + <option value="33"> 商品六部(明星/KOL)</option> | ||
34 | + <option value="34"> 商品七部(童装)</option> | ||
35 | + <option value="35"> 商品八部(创意生活+玩具)</option> | ||
36 | + <option value="36"> 商品九部(彩妆)</option> | ||
37 | + <option value="37"> 商品十部(全球购)</option> | ||
38 | + <option value="38"> 运营支持部</option> | ||
39 | + <option value="39"> 类目及活动运营部</option> | ||
40 | + <option value="40"> 内容运营部</option> | ||
41 | + <option value="41"> 营销策划部</option> | ||
42 | + <option value="42"> 设计部</option> | ||
43 | + <option value="43"> 售后服务部</option> | ||
44 | + <option value="44"> 客户关系部</option> | ||
45 | + <option value="45"> 运营部</option> | ||
46 | + <option value="46"> 泛渠道部</option> | ||
47 | + <option value="47"> 运营统筹部</option> | ||
48 | + <option value="48"> 南京艾尚店</option> | ||
49 | + <option value="49"> 仓储部</option> | ||
50 | + <option value="50"> 物流部</option> | ||
51 | + <option value="51"> 运营部</option> | ||
52 | + <option value="52"> 公关部</option> | ||
53 | + <option value="53"> 运营部</option> | ||
54 | + <option value="54"> 生产部</option> | ||
55 | + <option value="55"> 商品部</option> | ||
56 | + <option value="56"> 销售部</option> | ||
57 | + <option value="57"> 市场部</option> | ||
58 | + <option value="58"> 运营部</option> | ||
59 | + <option value="59"> 人事部</option> | ||
60 | + <option value="60"> 财务部</option> | ||
61 | + <option value="61"> 陈列部</option> | ||
62 | + <option value="62"> 会员数据部</option> | ||
63 | + <option value="63"> 会员营销部</option> | ||
64 | + <option value="64"> 会员运营部</option> | ||
65 | + <option value="65"> 品牌营销部</option> | ||
66 | + <option value="66"> 效果营销部</option> | ||
67 | + <option value="67"> PR营销部</option> | ||
68 | + <option value="68"> 设计部</option> | ||
69 | + <option value="69"> 零售产品部</option> | ||
70 | + <option value="70"> 媒体产品部</option> | ||
71 | + <option value="71"> 设计部</option> | ||
72 | + <option value="72"> 前端系统部</option> | ||
73 | + <option value="73"> 核心系统部</option> | ||
74 | + <option value="74"> 后台系统部</option> | ||
75 | + <option value="75"> 测试部</option> | ||
76 | + <option value="76"> 研究发展部</option> | ||
77 | + <option value="77"> 大数据部</option> | ||
78 | + <option value="78"> 运维部</option> | ||
79 | + <option value="79"> 财务部</option> | ||
80 | + <option value="80"> 内审部</option> | ||
81 | + <option value="81"> 行政部</option> | ||
82 | + <option value="82"> 数据部</option> | ||
83 | + <option value="83"> 公共关系部</option> | ||
84 | + <option value="84"> 人力资源部</option> | ||
85 | + <option value="85"> 总裁办</option> | ||
86 | + <option value="86"> 火星项目部</option> | ||
89 | 87 | ||
90 | <option value="1">渠道二部</option> | 88 | <option value="1">渠道二部</option> |
91 | <option value="2">渠道一部</option> | 89 | <option value="2">渠道一部</option> |
@@ -100,16 +98,16 @@ | @@ -100,16 +98,16 @@ | ||
100 | <option value="11">内容营销部</option> | 98 | <option value="11">内容营销部</option> |
101 | </select> | 99 | </select> |
102 | </div> | 100 | </div> |
103 | - <a id="filter-btn" href="javascript:;" class="btn btn-info">筛选</a> | ||
104 | - <a id="all-btn" href="/market/couponList/index" class="btn btn-info">全部</a> | 101 | + <div class="panel-col"> |
102 | + <a id="filter-btn" href="javascript:;" class="btn btn-info">筛选</a> | ||
103 | + <a id="all-btn" href="/market/couponList/index" class="btn btn-info">全部</a> | ||
104 | + </div> | ||
105 | </div> | 105 | </div> |
106 | </div> | 106 | </div> |
107 | </div> | 107 | </div> |
108 | <div class="panel panel-primary-head"> | 108 | <div class="panel panel-primary-head"> |
109 | - <div class="dataTab_wrapper" id="basicTab"> | ||
110 | - </div> | ||
111 | - <div class="basicTable_wrapper" id="basicTable"> | ||
112 | - </div> | 109 | + <div class="dataTab_wrapper" id="basicTab" style="margin-bottom: 10px"></div> |
110 | + <div class="basicTable_wrapper" id="basicTable"></div> | ||
113 | </div> | 111 | </div> |
114 | </div> | 112 | </div> |
115 | 113 |
@@ -112,8 +112,10 @@ | @@ -112,8 +112,10 @@ | ||
112 | <div class="panel-col"> | 112 | <div class="panel-col"> |
113 | <input id="filter-endTimeStr" class="form-control panel-input" type="text" placeholder="结束时间"> | 113 | <input id="filter-endTimeStr" class="form-control panel-input" type="text" placeholder="结束时间"> |
114 | </div> | 114 | </div> |
115 | + <div class="panel-col"> | ||
115 | <a id="filter-btn" href="javascript:;" class="btn btn-info">筛选</a> | 116 | <a id="filter-btn" href="javascript:;" class="btn btn-info">筛选</a> |
116 | <a id="all-btn" href="" class="btn btn-info">全部</a> | 117 | <a id="all-btn" href="" class="btn btn-info">全部</a> |
118 | + </div> | ||
117 | </div> | 119 | </div> |
118 | </div> | 120 | </div> |
119 | </div> | 121 | </div> |
@@ -4,8 +4,9 @@ | @@ -4,8 +4,9 @@ | ||
4 | 4 | ||
5 | <div class="contentpanel"> | 5 | <div class="contentpanel"> |
6 | <div class="panel panel-default" style="margin-bottom:10px;"> | 6 | <div class="panel panel-default" style="margin-bottom:10px;"> |
7 | - <div class="panel-heading"> | ||
8 | - <a href="/market/limitcode/add" id="add-btn" class="btn btn-success add-btn"><i class="fa fa-plus"></i> 添加</a> | 7 | + <div class="panel-body" style="padding-bottom: 0"> |
8 | + <a href="/market/limitcode/add" id="add-btn" class="btn btn-success add-btn"><i class="fa fa-plus"></i> | ||
9 | + 添加限购码</a> | ||
9 | </div> | 10 | </div> |
10 | 11 | ||
11 | <div class="panel-body"> | 12 | <div class="panel-body"> |
@@ -17,7 +18,8 @@ | @@ -17,7 +18,8 @@ | ||
17 | <input id="filter-name" class="form-control panel-input" type="text" placeholder="请输入名称"> | 18 | <input id="filter-name" class="form-control panel-input" type="text" placeholder="请输入名称"> |
18 | </div> | 19 | </div> |
19 | <div class="panel-col"> | 20 | <div class="panel-col"> |
20 | - <select id="filter-dep" name="filter-dep" tabindex="-1" title="" class="select2-offscreen brandBtn-group"> | 21 | + <select id="filter-dep" name="filter-dep" tabindex="-1" title="" |
22 | + class="select2-offscreen brandBtn-group"> | ||
21 | <option value="-1">全部</option> | 23 | <option value="-1">全部</option> |
22 | <option value="市场部">市场部</option> | 24 | <option value="市场部">市场部</option> |
23 | <option value="会员部">会员部</option> | 25 | <option value="会员部">会员部</option> |
@@ -33,16 +35,16 @@ | @@ -33,16 +35,16 @@ | ||
33 | <div class="panel-col"> | 35 | <div class="panel-col"> |
34 | <input id="filter-sku" class="form-control panel-input" type="text" placeholder="请输sku"> | 36 | <input id="filter-sku" class="form-control panel-input" type="text" placeholder="请输sku"> |
35 | </div> | 37 | </div> |
36 | - <a id="filter-btn" href="javascript:;" class="btn btn-info">筛选</a> | ||
37 | - <a id="all-btn" href="" class="btn btn-info">全部</a> | 38 | + <div class="panel-col"> |
39 | + <a id="filter-btn" href="javascript:;" class="btn btn-info">筛选</a> | ||
40 | + <a id="all-btn" href="" class="btn btn-info">全部</a> | ||
41 | + </div> | ||
38 | </div> | 42 | </div> |
39 | </div> | 43 | </div> |
40 | </div> | 44 | </div> |
41 | <div class="panel panel-primary-head"> | 45 | <div class="panel panel-primary-head"> |
42 | - <div class="dataTab_wrapper" id="basicTab"> | ||
43 | - </div> | ||
44 | - <div class="basicTable_wrapper" id="basicTable"> | ||
45 | - </div> | 46 | + <div class="dataTab_wrapper" id="basicTab" style="margin-bottom: 10px"></div> |
47 | + <div class="basicTable_wrapper" id="basicTable"></div> | ||
46 | </div> | 48 | </div> |
47 | </div> | 49 | </div> |
48 | 50 |
@@ -4,8 +4,8 @@ | @@ -4,8 +4,8 @@ | ||
4 | 4 | ||
5 | <div class="contentpanel"> | 5 | <div class="contentpanel"> |
6 | <div class="panel panel-default" style="margin-bottom:10px;"> | 6 | <div class="panel panel-default" style="margin-bottom:10px;"> |
7 | - <div class="panel-heading"> | ||
8 | - <a href="<%createUrl%>" id="add-btn" class="btn btn-success add-btn"><i class="fa fa-plus"></i> 添加</a> | 7 | + <div class="panel-body" style="padding-bottom: 0"> |
8 | + <a href="<%createUrl%>" id="add-btn" class="btn btn-success add-btn"><i class="fa fa-plus"></i> 添加优惠码</a> | ||
9 | </div> | 9 | </div> |
10 | <div class="panel-body"> | 10 | <div class="panel-body"> |
11 | <div class="row"> | 11 | <div class="row"> |
@@ -16,7 +16,8 @@ | @@ -16,7 +16,8 @@ | ||
16 | <input id="filter-name" class="form-control panel-input" type="text" placeholder="请输入名称"> | 16 | <input id="filter-name" class="form-control panel-input" type="text" placeholder="请输入名称"> |
17 | </div> | 17 | </div> |
18 | <div class="panel-col"> | 18 | <div class="panel-col"> |
19 | - <select id="filter-dep" name="filter-dep" tabindex="-1" title="" class="select2-offscreen brandBtn-group"> | 19 | + <select id="filter-dep" name="filter-dep" tabindex="-1" title="" |
20 | + class="select2-offscreen brandBtn-group"> | ||
20 | <option value="-1">全部</option> | 21 | <option value="-1">全部</option> |
21 | <option value="市场部">市场部</option> | 22 | <option value="市场部">市场部</option> |
22 | <option value="会员部">会员部</option> | 23 | <option value="会员部">会员部</option> |
@@ -26,16 +27,16 @@ | @@ -26,16 +27,16 @@ | ||
26 | <option value="其他">其他</option> | 27 | <option value="其他">其他</option> |
27 | </select> | 28 | </select> |
28 | </div> | 29 | </div> |
29 | - <a id="filter-btn" href="javascript:;" class="btn btn-info">筛选</a> | ||
30 | - <a id="all-btn" href="" class="btn btn-info">全部</a> | 30 | + <div class="panel-col"> |
31 | + <a id="filter-btn" href="javascript:;" class="btn btn-info">筛选</a> | ||
32 | + <a id="all-btn" href="" class="btn btn-info">全部</a> | ||
33 | + </div> | ||
31 | </div> | 34 | </div> |
32 | </div> | 35 | </div> |
33 | </div> | 36 | </div> |
34 | <div class="panel panel-primary-head"> | 37 | <div class="panel panel-primary-head"> |
35 | - <div class="dataTab_wrapper" id="basicTab"> | ||
36 | - </div> | ||
37 | - <div class="basicTable_wrapper" id="basicTable"> | ||
38 | - </div> | 38 | + <div class="dataTab_wrapper" id="basicTab" style="margin-bottom: 10px"></div> |
39 | + <div class="basicTable_wrapper" id="basicTable"></div> | ||
39 | </div> | 40 | </div> |
40 | </div> | 41 | </div> |
41 | 42 |
@@ -3,17 +3,13 @@ | @@ -3,17 +3,13 @@ | ||
3 | <%include '../../common/__partail/ListHeader'%> | 3 | <%include '../../common/__partail/ListHeader'%> |
4 | 4 | ||
5 | <div class="contentpanel"> | 5 | <div class="contentpanel"> |
6 | - <div class="panel panel-default" style="margin-bottom:10px;"> | ||
7 | - <div class="panel-heading"> | ||
8 | - <a href="/market/vipamount/add" id="add-btn" class="btn btn-success add-btn"> | ||
9 | - <i class="fa fa-plus"></i> 添加</a> | ||
10 | - </div> | 6 | + <div style="margin-bottom: 20px"> |
7 | + <a href="/market/vipamount/add" id="add-btn" class="btn btn-success add-btn"><i class="fa fa-plus"></i> 添加活动</a> | ||
11 | </div> | 8 | </div> |
9 | + | ||
12 | <div class="panel panel-primary-head"> | 10 | <div class="panel panel-primary-head"> |
13 | - <div class="dataTab_wrapper" id="basicTab"> | ||
14 | - </div> | ||
15 | - <div class="basicTable_wrapper" id="basicTable"> | ||
16 | - </div> | 11 | + <div class="dataTab_wrapper" id="basicTab"></div> |
12 | + <div class="basicTable_wrapper" id="basicTable"></div> | ||
17 | </div> | 13 | </div> |
18 | </div> | 14 | </div> |
19 | 15 |
-
Please register or login to post a comment