fe / yohobuy-portal-fe · Commits

Go to a project

Authored by weiqingting
Commit 6c54de33dc4853a2537aefc3b1b36ee59ec7269e 2 parents 348c0271 04405219

Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop

Inline Side-by-side
Showing 14 changed files with 141 additions and 9 deletions
... ... @@ -5,6 +5,7 @@
.panel-col, .panel-col2 {
float: left;
width: 150px;
height: 40px;
margin: 0 10px 10px;
}
... ...
... ... @@ -30,7 +30,7 @@
<div class="panel-body">
<div class="panel panel-default">
<form id="basicForm" class="form-horizontal form-bordered" type="{{type}}" action="{{action}}">
<form class="form-horizontal form-bordered">
<div class="panel-heading">
<div class="panel-btns" style="display: none;">
<a href="" class="panel-minimize tooltips" data-toggle="tooltip" title=""><i class="fa fa-minus"></i></a>
... ... @@ -95,7 +95,7 @@
</div>
{{/ baseProduct}}
{{/ baseProductInfo}}
{{# goodsList}}
<div class="form-group">
<div class="col-sm-12">
<h4>能否补货：</h4>
... ... @@ -108,18 +108,18 @@
</tr>
</thead>
<tbody>
{{# goodsList}}
<tr>
<td>{{productSkc}}（{{goodsName}}）</td>
<td>{{# goodsSizeList}}{{productSku}}（{{sizeName}}）<br>{{/ goodsSizeList}}</td>
<td>{{# goodsSizeList}}{{isSuppled}}</br>{{/ goodsSizeList}}</td>
</tr>
{{/ goodsList}}
</tbody>
</table>
</div>
</div>
{{/ goodsList}}
<div class="form-group">
<blockquote>上架必填：</blockquote>
</div>
... ... @@ -150,7 +150,7 @@
</form>
</div>
<div class="panel panel-default">
<form action="" class="form-horizontal form-bordered">
<form class="form-horizontal form-bordered">
<div class="panel-heading">
<div class="panel-btns" style="display: none;">
<a href="" class="panel-minimize tooltips" data-toggle="tooltip" title=""><i class="fa fa-minus"></i></a>
... ... @@ -158,18 +158,22 @@
<h2 class="panel-title">封面设置</h2>
</div>
<div class="panel-body nopadding">
{{# goodsImagesList}}
<div class="form-group">
<div class="col-sm-1">
<div class="goods-img">
{{# goodsImagesList}}
<p>SKC: {{productSkc}}</p>
<p>{{goodsName}}色</p>
{{/ goodsImagesList}}
</div>
<div class="cover-color height40">颜色封面：</div>
<div class="goods-color height40">商品封面：</div>
</div>
<div class="col-sm-11">
<ul class="cover-image-list col-sm-12">
{{# goodsImagesList}}
{{/ goodsImagesList}}
<li class="cover-image-item fileinput-button">
<div class="goods-img">
<a class="fileinput-button-icon" href="javascript:void(0);">+</a>
... ... @@ -188,15 +192,39 @@
</ul>
</div>
</div>
{{/ goodsImagesList}}
</div>
<div class="panel-footer">
<button class="btn btn-primary">保存封面</button>
</div>
</form>
</div>
{{> netsale/goods_description}}
{{> netsale/size_info}}
{{> netsale/goods_params}}
{{> netsale/goods_sort}}
</div>
</div>
{{> netsale/search_key}}
<div class="panel panel-danger">
<div class="panel-heading">
<div class="panel-btns" style="display: none;">
<a href="" class="panel-minimize tooltips" data-toggle="tooltip" title=""><i class="fa fa-minus"></i></a>
</div>
<h2 class="panel-title">上架后补全信息</h2>
</div>
<div class="panel-body">
{{> netsale/add_info}}
{{> netsale/editor_recommend}}
{{> netsale/model}}
{{> netsale/brand_relation}}
{{> netsale/close_match}}
{{> netsale/video}}
</div>
</div>
{{/ data}}
</div>
... ...
... ... @@ -88,7 +88,7 @@
</div>
<div class="col-md-3 height60 order-by">
<label>排序</label>
<label>排序<span class="red">*</span>：</label>
<label><input id="orderBy" value="{{orderBy}}" type="text" class="form-control" placeholder="排序" required></label>
<p>（提示：数字越大越靠前）</p>
</div>
... ...
<div class="panel panel-default">
<form action="" class="form-horizontal form-bordered">
<div class="panel-heading">
<div class="panel-btns" style="display: none;">
<a href="" class="panel-minimize tooltips" data-toggle="tooltip" title=""><i class="fa fa-minus"></i></a>
</div>
<h2 class="panel-title">搭配</h2>
</div>
<div class="panel-body nopadding">
</div>
<div class="panel-footer">
<button class="btn btn-primary">保存</button>
</div>
</form>
</div>
\ No newline at end of file
... ...
<div class="panel panel-default">
<form action="" class="form-horizontal form-bordered">
<div class="panel-heading">
<div class="panel-btns" style="display: none;">
<a href="" class="panel-minimize tooltips" data-toggle="tooltip" title=""><i class="fa fa-minus"></i></a>
</div>
<h2 class="panel-title">小编推荐</h2>
</div>
<div class="panel-body nopadding">
</div>
<div class="panel-footer">
<button class="btn btn-primary">保存</button>
</div>
</form>
</div>
\ No newline at end of file
... ...
<div class="panel panel-default">
<form action="" class="form-horizontal form-bordered">
<div class="panel-heading">
<div class="panel-btns" style="display: none;">
<a href="" class="panel-minimize tooltips" data-toggle="tooltip" title=""><i class="fa fa-minus"></i></a>
</div>
<h2 class="panel-title">商品描述</h2>
</div>
<div class="panel-body nopadding">
</div>
<div class="panel-footer">
<button class="btn btn-primary">保存描述</button>
</div>
</form>
</div>
\ No newline at end of file
... ...
<div class="panel panel-default">
<form action="" class="form-horizontal form-bordered">
<div class="panel-heading">
<div class="panel-btns" style="display: none;">
<a href="" class="panel-minimize tooltips" data-toggle="tooltip" title=""><i class="fa fa-minus"></i></a>
</div>
<h2 class="panel-title">商品参数</h2>
</div>
<div class="panel-body nopadding">
</div>
<div class="panel-footer">
<button class="btn btn-primary">保存</button>
</div>
</form>
</div>
\ No newline at end of file
... ...
<div class="panel panel-default">
<form action="" class="form-horizontal form-bordered">
<div class="panel-heading">
<div class="panel-btns" style="display: none;">
<a href="" class="panel-minimize tooltips" data-toggle="tooltip" title=""><i class="fa fa-minus"></i></a>
</div>
<h2 class="panel-title">商品排序设置</h2>
</div>
<div class="panel-body nopadding">
</div>
<div class="panel-footer">
<button class="btn btn-primary">保存</button>
</div>
</form>
</div>
\ No newline at end of file
... ...
<div class="panel panel-danger">
<div class="panel-heading">
<div class="panel-btns" style="display: none;">
<a href="" class="panel-minimize tooltips" data-toggle="tooltip" title=""><i class="fa fa-minus"></i></a>
</div>
<h2 class="panel-title">搜索关键词</h2>
</div>
<div class="panel-body"></div>
<div class="panel-footer">
<button class="btn btn-primary">保存</button>
</div>
</div>
\ No newline at end of file
... ...
<div class="panel panel-default">
<form action="" class="form-horizontal form-bordered">
<div class="panel-heading">
<div class="panel-btns" style="display: none;">
<a href="" class="panel-minimize tooltips" data-toggle="tooltip" title=""><i class="fa fa-minus"></i></a>
</div>
<h2 class="panel-title">尺码信息</h2>
</div>
<div class="panel-body nopadding">
</div>
<div class="panel-footer">
<button class="btn btn-primary">保存</button>
</div>
</form>
</div>
\ No newline at end of file
... ...