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 42 additions and 45 deletions
... ... @@ -3,6 +3,10 @@
<div class="contentpanel" id="form-base">
<div class="panel panel-default" style="margin-bottom:10px;">
<div class="panel-body" style="padding-bottom:0;">
<a id="add-btn" href="javascript:;" class="btn btn-success"><i class="fa fa-plus"></i> 添加品牌款型</a>
</div>
<div class="panel-body">
<div class="row">
<div class="panel-col">
... ... @@ -16,18 +20,13 @@
<option value="2">品牌系列</option>
</select>
</div>
<div class="panel-col2">
<select name="shop" id="shop" tabindex="-1" title="" class="form-control height40">
<option value="-1">请选择店铺</option>
</select>
</div>
<div class="panel-col">
<select name="brand" id="brand" tabindex="-1" title="" class="form-control height40">
<option value="-1">请选择品牌</option>
</select>
</div>
<div class="panel-col">
<select name="status" id="status" tabindex="-1" title="" class="form-control height40">
<option value="-1">状态</option>
... ... @@ -36,14 +35,16 @@
</select>
</div>
<a id="filter-btn" href="javascript:;" class="btn btn-info">查询</a>
<a id="all-btn" href="" class="btn btn-info">全部</a>
</div>
<div class="panel-col2">
<select name="shop" id="shop" tabindex="-1" title="" class="form-control height40">
<option value="-1">请选择店铺</option>
</select>
</div>
<div class="row" style="margin-bottom:10px;">
<a id="add-btn" href="javascript:;" class="btn btn-info">添加</a>
<div class="panel-col">
<a id="filter-btn" href="javascript:;" class="btn btn-info">查询</a>
<a id="all-btn" href="" class="btn btn-info">全部</a>
</div>
</div>
</div>
</div>
... ...
... ... @@ -24,7 +24,7 @@
<div class="panel panel-default">
<div class="panel-heading noborder">
<button id="btn-add" class="btn btn-success model-attr-btn" disabled>
<i class="glyphicon-plus"></i>添加尺码
<i class="fa fa-plus"></i> 添加尺码
</button>
</div>
</div>
... ...
... ... @@ -25,7 +25,7 @@
<div class="panel panel-default">
<div class="panel-heading noborder">
<button id="btn-add" class="btn btn-success model-attr-btn" disabled>
<i class="glyphicon-plus"></i>尺码属性
<i class="fa fa-plus"></i> 尺码属性
</button>
</div>
</div>
... ...
... ... @@ -24,7 +24,7 @@
<div class="panel panel-default">
<div class="panel-heading noborder">
<button class="btn btn-success model-attr-btn" disabled data-toggle="modal" id="add-attri" data-target="#addAttr">
<i class="glyphicon-plus"></i>添加属性
<i class="fa fa-plus"></i> 添加属性
</button>
</div>
</div>
... ...
<%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">
<div class="row">
<a class="btn btn-info" id="add">添加尺码属性</a>
</div>
</div>
<div id="size-property">
<div style="margin-bottom: 20px">
<a class="btn btn-success" id="add"><i class="fa fa-plus"></i> 添加尺码属性</a>
</div>
<div class="panel">
<div class="panel-body nopadding">
<div id="size-property"></div>
</div>
</div>
</div>
... ...
<%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">
<div class="row">
<a class="btn btn-info" id="add">添加尺码</a>
</div>
</div>
<div id="size-list">
<div style="margin-bottom: 20px">
<a class="btn btn-success" id="add"><i class="fa fa-plus"></i> 添加尺码</a>
</div>
<div class="panel">
<div class="panel-body nopadding">
<div id="size-list"></div>
</div>
</div>
</div>
... ...
<%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">
<div class="row">
<a class="btn btn-info" href="/erpproduct/product/addColor">添加颜色</a>
</div>
</div>
<input type="hidden" id="url" value="/erpproduct/product/colorList"/>
<div id="color-list" class="color">
<div style="margin-bottom: 20px">
<a class="btn btn-success" href="/erpproduct/product/addColor"><i class="fa fa-plus"></i> 添加颜色</a>
</div>
<div class="panel">
<div class="panel-body nopadding">
<input type="hidden" id="url" value="/erpproduct/product/colorList"/>
<div id="color-list" class="color"></div>
</div>
</div>
</div>
... ...
... ... @@ -84,10 +84,9 @@ var g = new common.grid({
}, {
display: 'banner图片',
render: function(item) {
if(!item.bannarImg){
item.bannarImg="";
if(item.seriesBanner){
return '<img src="' + item.seriesBanner + '" style="width:78px; height:78px">';
}
return '<img src="' + item.bannarImg + '" style="width:78px; height:78px">';
}
}, {
... ...
... ... @@ -12,7 +12,7 @@ var g = new common.grid({
{display: "属性名", name: "attributeName"},
{
display: "操作", name: "", render: function (item) {
return '<a class="btn btn-info add2" data-index="' + item.__index + '">编辑</a>';
return '<a class="btn btn-xs btn-info add2" data-index="' + item.__index + '">编辑</a>';
}
}
]
... ...
... ... @@ -10,7 +10,7 @@ var $ = require('jquery');
{display: "尺码名", name: "sizeName"},
{
display: "操作", name: "", render: function (item) {
return '<a class="btn btn-info add2" data-index="' + item.__index + '">编辑</a>';
return '<a class="btn btn-xs btn-info add2" data-index="' + item.__index + '">编辑</a>';
}
}
]
... ...
... ... @@ -15,7 +15,7 @@ var g = new common.grid({
}},
{
display: "操作", name: "", render: function (item) {
return '<a class="btn btn-info save" href="/erpproduct/product/addColor/'+item.id+'" data-index="' + item.__index + '">编辑</a>';
return '<a class="btn btn-info btn-xs save" href="/erpproduct/product/addColor/'+item.id+'" data-index="' + item.__index + '">编辑</a>';
}
}
]
... ...