liuloulou / yohobuy-portal-fe2 · Commits

Go to a project

Authored by weiqingting
Commit c72844b5b161ae8a1e82d3673ee1109c9b18648b 1 parent c198baf6

提交

Inline Side-by-side
Showing 17 changed files with 61 additions and 67 deletions
@@ -3,6 +3,10 @@ @@ -3,6 +3,10 @@
3 3
4 <div class="contentpanel" id="form-base"> 4 <div class="contentpanel" id="form-base">
5 <div class="panel panel-default" style="margin-bottom:10px;"> 5 <div class="panel panel-default" style="margin-bottom:10px;">
  6 + <div class="panel-body" style="padding-bottom:0;">
  7 + <a id="add-btn" href="javascript:;" class="btn btn-success"><i class="fa fa-plus"></i> 添加品牌款型</a>
  8 + </div>
  9 +
6 <div class="panel-body"> 10 <div class="panel-body">
7 <div class="row"> 11 <div class="row">
8 <div class="panel-col"> 12 <div class="panel-col">
@@ -16,18 +20,13 @@ @@ -16,18 +20,13 @@
16 <option value="2">品牌系列</option> 20 <option value="2">品牌系列</option>
17 </select> 21 </select>
18 </div> 22 </div>
19 - <div class="panel-col2">  
20 - <select name="shop" id="shop" tabindex="-1" title="" class="form-control height40">  
21 - <option value="-1">请选择店铺</option>  
22 - </select>  
23 - </div> 23 +
24 <div class="panel-col"> 24 <div class="panel-col">
25 <select name="brand" id="brand" tabindex="-1" title="" class="form-control height40"> 25 <select name="brand" id="brand" tabindex="-1" title="" class="form-control height40">
26 <option value="-1">请选择品牌</option> 26 <option value="-1">请选择品牌</option>
27 </select> 27 </select>
28 </div> 28 </div>
29 29
30 -  
31 <div class="panel-col"> 30 <div class="panel-col">
32 <select name="status" id="status" tabindex="-1" title="" class="form-control height40"> 31 <select name="status" id="status" tabindex="-1" title="" class="form-control height40">
33 <option value="-1">状态</option> 32 <option value="-1">状态</option>
@@ -36,14 +35,16 @@ @@ -36,14 +35,16 @@
36 </select> 35 </select>
37 </div> 36 </div>
38 37
39 - <a id="filter-btn" href="javascript:;" class="btn btn-info">查询</a>  
40 - <a id="all-btn" href="" class="btn btn-info">全部</a>  
41 -  
42 -  
43 - </div> 38 + <div class="panel-col2">
  39 + <select name="shop" id="shop" tabindex="-1" title="" class="form-control height40">
  40 + <option value="-1">请选择店铺</option>
  41 + </select>
  42 + </div>
44 43
45 - <div class="row" style="margin-bottom:10px;">  
46 - <a id="add-btn" href="javascript:;" class="btn btn-info">添加</a> 44 + <div class="panel-col">
  45 + <a id="filter-btn" href="javascript:;" class="btn btn-info">查询</a>
  46 + <a id="all-btn" href="" class="btn btn-info">全部</a>
  47 + </div>
47 </div> 48 </div>
48 </div> 49 </div>
49 </div> 50 </div>
@@ -24,7 +24,7 @@ @@ -24,7 +24,7 @@
24 <div class="panel panel-default"> 24 <div class="panel panel-default">
25 <div class="panel-heading noborder"> 25 <div class="panel-heading noborder">
26 <button id="btn-add" class="btn btn-success model-attr-btn" disabled> 26 <button id="btn-add" class="btn btn-success model-attr-btn" disabled>
27 - <i class="glyphicon-plus"></i>添加尺码 27 + <i class="fa fa-plus"></i> 添加尺码
28 </button> 28 </button>
29 </div> 29 </div>
30 </div> 30 </div>
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
25 <div class="panel panel-default"> 25 <div class="panel panel-default">
26 <div class="panel-heading noborder"> 26 <div class="panel-heading noborder">
27 <button id="btn-add" class="btn btn-success model-attr-btn" disabled> 27 <button id="btn-add" class="btn btn-success model-attr-btn" disabled>
28 - <i class="glyphicon-plus"></i>尺码属性 28 + <i class="fa fa-plus"></i> 尺码属性
29 </button> 29 </button>
30 </div> 30 </div>
31 </div> 31 </div>
@@ -24,7 +24,7 @@ @@ -24,7 +24,7 @@
24 <div class="panel panel-default"> 24 <div class="panel panel-default">
25 <div class="panel-heading noborder"> 25 <div class="panel-heading noborder">
26 <button class="btn btn-success model-attr-btn" disabled data-toggle="modal" id="add-attri" data-target="#addAttr"> 26 <button class="btn btn-success model-attr-btn" disabled data-toggle="modal" id="add-attri" data-target="#addAttr">
27 - <i class="glyphicon-plus"></i>添加属性 27 + <i class="fa fa-plus"></i> 添加属性
28 </button> 28 </button>
29 </div> 29 </div>
30 </div> 30 </div>
1 <%include '../common/__ui/header'%> 1 <%include '../common/__ui/header'%>
2 <%include '../common/__partail/ListHeader'%> 2 <%include '../common/__partail/ListHeader'%>
3 <div class="contentpanel"> 3 <div class="contentpanel">
4 - <div class="panel panel-default" style="margin-bottom:10px;">  
5 - <div class="panel-body">  
6 - <div class="row">  
7 - <a class="btn btn-info" id="add">添加尺码属性</a>  
8 - </div>  
9 - </div>  
10 - <div id="size-property">  
11 4
  5 + <div style="margin-bottom: 20px">
  6 + <a class="btn btn-success" id="add"><i class="fa fa-plus"></i> 添加尺码属性</a>
  7 + </div>
  8 +
  9 + <div class="panel">
  10 + <div class="panel-body nopadding">
  11 + <div id="size-property"></div>
12 </div> 12 </div>
13 </div> 13 </div>
14 </div> 14 </div>
1 <%include '../common/__ui/header'%> 1 <%include '../common/__ui/header'%>
2 <%include '../common/__partail/ListHeader'%> 2 <%include '../common/__partail/ListHeader'%>
3 <div class="contentpanel"> 3 <div class="contentpanel">
4 - <div class="panel panel-default" style="margin-bottom:10px;">  
5 - <div class="panel-body">  
6 - <div class="row">  
7 - <a class="btn btn-info" id="add">添加尺码</a>  
8 - </div>  
9 - </div>  
10 - <div id="size-list"> 4 + <div style="margin-bottom: 20px">
  5 + <a class="btn btn-success" id="add"><i class="fa fa-plus"></i> 添加尺码</a>
  6 + </div>
11 7
  8 + <div class="panel">
  9 + <div class="panel-body nopadding">
  10 + <div id="size-list"></div>
12 </div> 11 </div>
13 </div> 12 </div>
14 </div> 13 </div>
1 <%include '../../common/__ui/header'%> 1 <%include '../../common/__ui/header'%>
2 <%include '../../common/__partail/ListHeader'%> 2 <%include '../../common/__partail/ListHeader'%>
3 <div class="contentpanel"> 3 <div class="contentpanel">
4 - <div class="panel panel-default" style="margin-bottom:10px;">  
5 - <div class="panel-body">  
6 - <div class="row">  
7 - <a class="btn btn-info" href="/erpproduct/product/addColor">添加颜色</a>  
8 - </div>  
9 - </div>  
10 - <input type="hidden" id="url" value="/erpproduct/product/colorList"/>  
11 - <div id="color-list" class="color">  
12 - 4 + <div style="margin-bottom: 20px">
  5 + <a class="btn btn-success" href="/erpproduct/product/addColor"><i class="fa fa-plus"></i> 添加颜色</a>
  6 + </div>
  7 + <div class="panel">
  8 + <div class="panel-body nopadding">
  9 + <input type="hidden" id="url" value="/erpproduct/product/colorList"/>
  10 + <div id="color-list" class="color"></div>
13 </div> 11 </div>
14 </div> 12 </div>
15 </div> 13 </div>
@@ -237,7 +237,7 @@ @@ -237,7 +237,7 @@
237 <div class="row"> 237 <div class="row">
238 <div class="col-sm-8 col-sm-offset-2"> 238 <div class="col-sm-8 col-sm-offset-2">
239 <a href="javascript:;" onclick="history.go(-1);" class="btn btn-default">取消</a> 239 <a href="javascript:;" onclick="history.go(-1);" class="btn btn-default">取消</a>
240 - <button id="save_brand" type="submit" data-loading-text="保存中..." class="btn btn-primary">保存</button> 240 + <button id="save_brand" type="submit" data-loading-text="保存中..." class="btn delay-btn btn-primary">保存</button>
241 </div> 241 </div>
242 </div> 242 </div>
243 </div> 243 </div>
@@ -79,7 +79,7 @@ @@ -79,7 +79,7 @@
79 </div> 79 </div>
80 </div> 80 </div>
81 <div class="panel panel-primary-head"> 81 <div class="panel panel-primary-head">
82 - <div class="dataTab_wrapper" id="basicTab"></div> 82 + <div class="dataTab_wrapper" id="basicTab" style="margin-bottom: 10px"></div>
83 <div class="dataTab_wrapper" id="basicTable" ></div> 83 <div class="dataTab_wrapper" id="basicTable" ></div>
84 </div> 84 </div>
85 </div> 85 </div>
@@ -99,7 +99,7 @@ @@ -99,7 +99,7 @@
99 <td>说明：</td> 99 <td>说明：</td>
100 <td colspan="2"> 100 <td colspan="2">
101 1、上传文件必须是<span style="color:red;">.xlsx</span>文件<br> 101 1、上传文件必须是<span style="color:red;">.xlsx</span>文件<br>
102 - 2、第一行标题栏：<span style="color: #67D267;">货品名称、厂家编号、一级分类、二级分类、三级分类、四级分类、性别、货品年、货品季、吊牌价、销售价、色系、厂家颜色、款型、尺码、条码、能否补货、SKN计数,年龄层（成人，大童，小童），重点款，预计上架时间,UPM条码,厂家编号</span><br> 102 + 2、第一行标题栏：<span style="color: #67D267;">货品名称、厂家编号、一级分类、二级分类、三级分类、四级分类、性别、货品年、货品季、吊牌价、销售价、色系、厂家颜色、款型、尺码、条码、能否补货、SKN计数,年龄层（成人，大童，小童），重点款，预计上架时间,UPM条码</span><br>
103 3、<a href="/ajax/link/baseproduct">下载样例</a> 103 3、<a href="/ajax/link/baseproduct">下载样例</a>
104 </td> 104 </td>
105 </tr> 105 </tr>
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 3
4 <div class="contentpanel"> 4 <div class="contentpanel">
5 <div class="panel panel-default" style="margin-bottom:10px;"> 5 <div class="panel panel-default" style="margin-bottom:10px;">
6 - <div class="panel-heading"> 6 + <div class="panel-body" style="padding-bottom:0">
7 <a href="/base/goods/add" class="btn btn-success"><i class="fa fa-plus"></i> 添加基础商品</a> 7 <a href="/base/goods/add" class="btn btn-success"><i class="fa fa-plus"></i> 添加基础商品</a>
8 </div> 8 </div>
9 <div class="panel-body"> 9 <div class="panel-body">
@@ -90,7 +90,7 @@ @@ -90,7 +90,7 @@
90 </div> 90 </div>
91 </div> 91 </div>
92 <div class="panel panel-primary-head"> 92 <div class="panel panel-primary-head">
93 - <div class="dataTab_wrapper" id="basicTab"></div> 93 + <div class="dataTab_wrapper" id="basicTab" style="margin-bottom: 10px"></div>
94 <div class="dataTab_wrapper" id="basicTable"></div> 94 <div class="dataTab_wrapper" id="basicTable"></div>
95 </div> 95 </div>
96 </div> 96 </div>
@@ -2,12 +2,12 @@ @@ -2,12 +2,12 @@
2 <%include '../../common/__partail/ListHeader'%> 2 <%include '../../common/__partail/ListHeader'%>
3 <div class="contentpanel"> 3 <div class="contentpanel">
4 <div> 4 <div>
5 - <ul class="nav nav-pills"> 5 + <ul class="nav nav-pills" style="margin-bottom: 10px">
6 <li> 6 <li>
7 - <a class="tag" href="/goods/special/index" style="font-size: 14px;padding:20px;color: black">特殊商品</a> 7 + <a class="tag" href="/goods/special/index" style="font-size: 14px;padding:10px">特殊商品</a>
8 </li> 8 </li>
9 - <li>  
10 - <a class="hand active" href="javascript:void(0)" style="font-size: 14px;padding:20px;color: #428bca">货到付款</a> 9 + <li class="active">
  10 + <a class="hand" href="javascript:void(0)" style="font-size: 14px;padding:10px">货到付款</a>
11 </li> 11 </li>
12 </ul> 12 </ul>
13 </div> 13 </div>
@@ -36,20 +36,16 @@ @@ -36,20 +36,16 @@
36 </select> 36 </select>
37 </div> 37 </div>
38 38
39 -  
40 <div class="panel-col-3"> 39 <div class="panel-col-3">
41 <a id="filter-btn" href="javascript:;" class="btn btn-info">筛选</a> 40 <a id="filter-btn" href="javascript:;" class="btn btn-info">筛选</a>
42 <a id="export-btn" href="" class="btn btn-info">导出</a> 41 <a id="export-btn" href="" class="btn btn-info">导出</a>
43 <a id="btn-input" href="/goods/cod/upload" class="btn btn-info">批量导入</a> 42 <a id="btn-input" href="/goods/cod/upload" class="btn btn-info">批量导入</a>
44 -  
45 </div> 43 </div>
46 -  
47 -  
48 </div> 44 </div>
49 </div> 45 </div>
50 </div> 46 </div>
51 <div class="panel panel-primary-head"> 47 <div class="panel panel-primary-head">
52 - <div class="dataTab_wrapper" id="basicTab"></div> 48 + <div class="dataTab_wrapper" id="basicTab" style="margin-bottom: 10px"></div>
53 <div class="dataTab_wrapper" id="basicTable" ></div> 49 <div class="dataTab_wrapper" id="basicTable" ></div>
54 </div> 50 </div>
55 </div> 51 </div>
@@ -123,7 +123,7 @@ @@ -123,7 +123,7 @@
123 </div> 123 </div>
124 <div class="panel"> 124 <div class="panel">
125 <div class="panel-body nopadding"> 125 <div class="panel-body nopadding">
126 - <div class="dataTab_wrapper" id="basicTab"></div> 126 + <div class="dataTab_wrapper" id="basicTab" style="margin-bottom: 10px"></div>
127 <div class="dataTables_wrapper no-footer" id="basicTable"></div> 127 <div class="dataTables_wrapper no-footer" id="basicTable"></div>
128 </div> 128 </div>
129 </div> 129 </div>
@@ -2,12 +2,12 @@ @@ -2,12 +2,12 @@
2 <%include '../../common/__partail/ListHeader'%> 2 <%include '../../common/__partail/ListHeader'%>
3 <div class="contentpanel"> 3 <div class="contentpanel">
4 <div> 4 <div>
5 - <ul class="nav nav-pills">  
6 - <li>  
7 - <a class="tag active" href="javascript:void(0)" style="font-size: 14px;padding:20px;color: #428bca">特殊商品</a> 5 + <ul class="nav nav-pills" style="margin-bottom: 10px">
  6 + <li class="active">
  7 + <a class="tag" href="javascript:void(0)" style="font-size: 14px;padding:10px">特殊商品</a>
8 </li> 8 </li>
9 <li> 9 <li>
10 - <a class="hand " href="/goods/cod/goods/index" style="font-size: 14px;padding:20px;color: black">货到付款</a> 10 + <a class="hand" href="/goods/cod/goods/index" style="font-size: 14px;padding:10px">货到付款</a>
11 </li> 11 </li>
12 </ul> 12 </ul>
13 </div> 13 </div>
@@ -34,13 +34,13 @@ @@ -34,13 +34,13 @@
34 <input type="button" class="btn btn-default " value="返回" onclick="history.go(-1)"> 34 <input type="button" class="btn btn-default " value="返回" onclick="history.go(-1)">
35 </div> 35 </div>
36 <div class="moduleSubmite" style="display: none; text-align: right; margin-top: -10px"> 36 <div class="moduleSubmite" style="display: none; text-align: right; margin-top: -10px">
37 - <input id="saveModule" type="button" class="btn btn-success" value="暂存">  
38 - <input id="submitModule" type="button" class="btn btn-primary" value="提交审核"> 37 + <input id="saveModule" type="button" class="btn btn-success delay-btn" value="暂存">
  38 + <input id="submitModule" type="button" class="btn btn-primary delay-btn" value="提交审核">
39 <input type="button" class="btn btn-default " value="返回" onclick="history.go(-1)"> 39 <input type="button" class="btn btn-default " value="返回" onclick="history.go(-1)">
40 </div> 40 </div>
41 <div class="moduleCheck" style="display: none; text-align: right; margin-top: -10px"> 41 <div class="moduleCheck" style="display: none; text-align: right; margin-top: -10px">
42 - <input id="checkOk" type="button" class="btn btn-primary" value="审核通过">  
43 - <input id="checkNo" type="button" class="btn btn-danger" value="驳回"> 42 + <input id="checkOk" type="button" class="btn btn-primary delay-btn" value="审核通过">
  43 + <input id="checkNo" type="button" class="btn btn-danger delay-btn" value="驳回">
44 <input type="button" class="btn btn-default " value="返回" onclick="history.go(-1)"> 44 <input type="button" class="btn btn-default " value="返回" onclick="history.go(-1)">
45 </div> 45 </div>
46 </div> 46 </div>
@@ -127,8 +127,8 @@ @@ -127,8 +127,8 @@
127 </div> 127 </div>
128 128
129 <div style="text-align: center"> 129 <div style="text-align: center">
130 - <button type="button" data-oncheck='1' class="check btn btn-success">提交审核</button>  
131 - <button type="button" data-oncheck='2' class="check btn btn-info btn-cun">暂存</button> 130 + <button type="button" data-oncheck='1' class="check delay-btn btn btn-success">提交审核</button>
  131 + <button type="button" data-oncheck='2' class="check delay-btn btn btn-info btn-cun">暂存</button>
132 <button onclick="history.go(-1);" type="button" class="btn btn-danger">取消</button> 132 <button onclick="history.go(-1);" type="button" class="btn btn-danger">取消</button>
133 </div> 133 </div>
134 </div> 134 </div>
@@ -225,15 +225,15 @@ @@ -225,15 +225,15 @@
225 <a href="javascript:;" class="btn btn-default" 225 <a href="javascript:;" class="btn btn-default"
226 onclick="javascript:history.go(-1);">取消</a> 226 onclick="javascript:history.go(-1);">取消</a>
227 <%if add%> 227 <%if add%>
228 - <button type="submit" class="btn btn-info" data-loading-text="暂存中..." id="btnTemporary">暂存</button> 228 + <button type="submit" class="btn delay-btn btn-info" data-loading-text="暂存中..." id="btnTemporary">暂存</button>
229 <%/if%> 229 <%/if%>
230 230
231 <%if update%> 231 <%if update%>
232 - <button type="submit" class="btn btn-success mr5" data-loading-text="提交审核中..." id="btnReview">提交审核</button> 232 + <button type="submit" class="btn delay-btn btn-success mr5" data-loading-text="提交审核中..." id="btnReview">提交审核</button>
233 <%/if%> 233 <%/if%>
234 234
235 <%if updatecheck%> 235 <%if updatecheck%>
236 - <button type="submit" class="btn btn-success mr5" data-loading-text="提交审核中..." id="updatecheck">提交审核</button> 236 + <button type="submit" class="btn delay-btn btn-success mr5" data-loading-text="提交审核中..." id="updatecheck">提交审核</button>
237 <%/if%> 237 <%/if%>
238 </div> 238 </div>
239 </div> 239 </div>