liuloulou / yohobuy-portal-fe2 · Commits

Go to a project

Authored by dongjunjie
Commit 1d812ac24ff14b2927f3e9220a414c16ca082d6f 1 parent ab881b4c

商品基础规则样式统一

Inline Side-by-side
Showing 11 changed files with 36 additions and 39 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
  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>
  43 +
  44 + <div class="panel-col">
39 <a id="filter-btn" href="javascript:;" class="btn btn-info">查询</a> 45 <a id="filter-btn" href="javascript:;" class="btn btn-info">查询</a>
40 <a id="all-btn" href="" class="btn btn-info">全部</a> 46 <a id="all-btn" href="" class="btn btn-info">全部</a>
41 -  
42 -  
43 </div> 47 </div>
44 -  
45 - <div class="row" style="margin-bottom:10px;">  
46 - <a id="add-btn" href="javascript:;" class="btn btn-info">添加</a>  
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/views/__ui/header'%> 1 <%include '../../common/views/__ui/header'%>
2 <%include '../../common/views/__partail/ListHeader'%> 2 <%include '../../common/views/__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> 4 +
  5 + <div style="margin-bottom: 20px">
  6 + <a class="btn btn-success" id="add"><i class="fa fa-plus"></i> 添加尺码属性</a>
9 </div> 7 </div>
10 - <div id="size-property">  
11 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/views/__ui/header'%> 1 <%include '../../common/views/__ui/header'%>
2 <%include '../../common/views/__partail/ListHeader'%> 2 <%include '../../common/views/__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> 4 + <div style="margin-bottom: 20px">
  5 + <a class="btn btn-success" id="add"><i class="fa fa-plus"></i> 添加尺码</a>
8 </div> 6 </div>
9 - </div>  
10 - <div id="size-list">  
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/views/__ui/header'%> 1 <%include '../../../common/views/__ui/header'%>
2 <%include '../../../common/views/__partail/ListHeader'%> 2 <%include '../../../common/views/__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> 4 + <div style="margin-bottom: 20px">
  5 + <a class="btn btn-success" href="/erpproduct/product/addColor"><i class="fa fa-plus"></i> 添加颜色</a>
9 </div> 6 </div>
  7 + <div class="panel">
  8 + <div class="panel-body nopadding">
10 <input type="hidden" id="url" value="/erpproduct/product/colorList"/> 9 <input type="hidden" id="url" value="/erpproduct/product/colorList"/>
11 - <div id="color-list" class="color">  
12 - 10 + <div id="color-list" class="color"></div>
13 </div> 11 </div>
14 </div> 12 </div>
15 </div> 13 </div>
@@ -84,10 +84,9 @@ var g = new common.grid({ @@ -84,10 +84,9 @@ var g = new common.grid({
84 }, { 84 }, {
85 display: 'banner图片', 85 display: 'banner图片',
86 render: function(item) { 86 render: function(item) {
87 - if(!item.bannarImg){  
88 - item.bannarImg=""; 87 + if(item.seriesBanner){
  88 + return '<img src="' + item.seriesBanner + '" style="width:78px; height:78px">';
89 } 89 }
90 - return '<img src="' + item.bannarImg + '" style="width:78px; height:78px">';  
91 } 90 }
92 91
93 }, { 92 }, {
@@ -12,7 +12,7 @@ var g = new common.grid({ @@ -12,7 +12,7 @@ var g = new common.grid({
12 {display: "属性名", name: "attributeName"}, 12 {display: "属性名", name: "attributeName"},
13 { 13 {
14 display: "操作", name: "", render: function (item) { 14 display: "操作", name: "", render: function (item) {
15 - return '<a class="btn btn-info add2" data-index="' + item.__index + '">编辑</a>'; 15 + return '<a class="btn btn-xs btn-info add2" data-index="' + item.__index + '">编辑</a>';
16 } 16 }
17 } 17 }
18 ] 18 ]
@@ -10,7 +10,7 @@ var $ = require('jquery'); @@ -10,7 +10,7 @@ var $ = require('jquery');
10 {display: "尺码名", name: "sizeName"}, 10 {display: "尺码名", name: "sizeName"},
11 { 11 {
12 display: "操作", name: "", render: function (item) { 12 display: "操作", name: "", render: function (item) {
13 - return '<a class="btn btn-info add2" data-index="' + item.__index + '">编辑</a>'; 13 + return '<a class="btn btn-xs btn-info add2" data-index="' + item.__index + '">编辑</a>';
14 } 14 }
15 } 15 }
16 ] 16 ]
@@ -15,7 +15,7 @@ var g = new common.grid({ @@ -15,7 +15,7 @@ var g = new common.grid({
15 }}, 15 }},
16 { 16 {
17 display: "操作", name: "", render: function (item) { 17 display: "操作", name: "", render: function (item) {
18 - return '<a class="btn btn-info save" href="/erpproduct/product/addColor/'+item.id+'" data-index="' + item.__index + '">编辑</a>'; 18 + return '<a class="btn btn-info btn-xs save" href="/erpproduct/product/addColor/'+item.id+'" data-index="' + item.__index + '">编辑</a>';
19 } 19 }
20 } 20 }
21 ] 21 ]