liuloulou / yohobuy-portal-fe2 · Commits

Go to a project

Authored by 陶雨
Commit e59d89dae97d43ca99814ca657bfa0059aa85825 2 parents 004b4f54 5290f189

Merge branch 'yohobuy_portak_dev_v4.8_20160620' of http://git.yoho.cn/fe/yohobuy… 

…-portal-fe2 into yohobuy_portak_dev_v4.8_20160620
Inline Side-by-side
Showing 6 changed files with 14 additions and 21 deletions
... ... @@ -79,7 +79,7 @@
</div>
</div>
<div class="panel panel-primary-head">
<div class="dataTab_wrapper" id="basicTab"></div>
<div class="dataTab_wrapper" id="basicTab" style="margin-bottom: 10px"></div>
<div class="dataTab_wrapper" id="basicTable" ></div>
</div>
</div>
... ...
... ... @@ -3,7 +3,7 @@
<div class="contentpanel">
<div class="panel panel-default" style="margin-bottom:10px;">
<div class="panel-heading">
<div class="panel-body" style="padding-bottom:0">
<a href="/base/goods/add" class="btn btn-success"><i class="fa fa-plus"></i> 添加基础商品</a>
</div>
<div class="panel-body">
... ... @@ -90,7 +90,7 @@
</div>
</div>
<div class="panel panel-primary-head">
<div class="dataTab_wrapper" id="basicTab"></div>
<div class="dataTab_wrapper" id="basicTab" style="margin-bottom: 10px"></div>
<div class="dataTab_wrapper" id="basicTable"></div>
</div>
</div>
... ...
... ... @@ -2,12 +2,12 @@
<%include '../../../common/views/__partail/ListHeader'%>
<div class="contentpanel">
<div>
<ul class="nav nav-pills">
<ul class="nav nav-pills" style="margin-bottom: 10px">
<li>
<a class="tag" href="/goods/special/index" style="font-size: 14px;padding:20px;color: black">特殊商品</a>
<a class="tag" href="/goods/special/index" style="font-size: 14px;padding:10px">特殊商品</a>
</li>
<li>
<a class="hand active" href="javascript:void(0)" style="font-size: 14px;padding:20px;color: #428bca">货到付款</a>
<li class="active">
<a class="hand" href="javascript:void(0)" style="font-size: 14px;padding:10px">货到付款</a>
</li>
</ul>
</div>
... ... @@ -36,20 +36,16 @@
</select>
</div>
<div class="panel-col-3">
<a id="filter-btn" href="javascript:;" class="btn btn-info">筛选</a>
<a id="export-btn" href="" class="btn btn-info">导出</a>
<a id="btn-input" href="/goods/cod/upload" class="btn btn-info">批量导入</a>
</div>
</div>
</div>
</div>
<div class="panel panel-primary-head">
<div class="dataTab_wrapper" id="basicTab"></div>
<div class="dataTab_wrapper" id="basicTab" style="margin-bottom: 10px"></div>
<div class="dataTab_wrapper" id="basicTable" ></div>
</div>
</div>
... ...
... ... @@ -123,7 +123,7 @@
</div>
<div class="panel">
<div class="panel-body nopadding">
<div class="dataTab_wrapper" id="basicTab"></div>
<div class="dataTab_wrapper" id="basicTab" style="margin-bottom: 10px"></div>
<div class="dataTables_wrapper no-footer" id="basicTable"></div>
</div>
</div>
... ...
... ... @@ -2,12 +2,12 @@
<%include '../../../common/views/__partail/ListHeader'%>
<div class="contentpanel">
<div>
<ul class="nav nav-pills">
<li>
<a class="tag active" href="javascript:void(0)" style="font-size: 14px;padding:20px;color: #428bca">特殊商品</a>
<ul class="nav nav-pills" style="margin-bottom: 10px">
<li class="active">
<a class="tag" href="javascript:void(0)" style="font-size: 14px;padding:10px">特殊商品</a>
</li>
<li>
<a class="hand " href="/goods/cod/goods/index" style="font-size: 14px;padding:20px;color: black">货到付款</a>
<a class="hand" href="/goods/cod/goods/index" style="font-size: 14px;padding:10px">货到付款</a>
</li>
</ul>
</div>
... ...
... ... @@ -16,10 +16,7 @@
<input type="text" class="form-control number" id="filter-orderCode" placeholder="订单号">
</div>
<div class="panel-col">
<input type="text" class="form-control" id="filter-couponName" placeholder="优惠券名称">
</div>
<div class="panel-col">
<a id="filter-btn" href="javascript:;" class="btn btn-info">筛选</a>
<a id="filter-btn" href="javascript:;" class="btn btn-info">查询</a>
</div>
</div>
</div>
... ...