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 @@ @@ -5,6 +5,7 @@
5 .panel-col, .panel-col2 { 5 .panel-col, .panel-col2 {
6 float: left; 6 float: left;
7 width: 150px; 7 width: 150px;
  8 + height: 40px;
8 margin: 0 10px 10px; 9 margin: 0 10px 10px;
9 } 10 }
10 11
@@ -30,7 +30,7 @@ @@ -30,7 +30,7 @@
30 <div class="panel-body"> 30 <div class="panel-body">
31 31
32 <div class="panel panel-default"> 32 <div class="panel panel-default">
33 - <form id="basicForm" class="form-horizontal form-bordered" type="{{type}}" action="{{action}}"> 33 + <form class="form-horizontal form-bordered">
34 <div class="panel-heading"> 34 <div class="panel-heading">
35 <div class="panel-btns" style="display: none;"> 35 <div class="panel-btns" style="display: none;">
36 <a href="" class="panel-minimize tooltips" data-toggle="tooltip" title=""><i class="fa fa-minus"></i></a> 36 <a href="" class="panel-minimize tooltips" data-toggle="tooltip" title=""><i class="fa fa-minus"></i></a>
@@ -95,7 +95,7 @@ @@ -95,7 +95,7 @@
95 </div> 95 </div>
96 {{/ baseProduct}} 96 {{/ baseProduct}}
97 {{/ baseProductInfo}} 97 {{/ baseProductInfo}}
98 - {{# goodsList}} 98 +
99 <div class="form-group"> 99 <div class="form-group">
100 <div class="col-sm-12"> 100 <div class="col-sm-12">
101 <h4>能否补货：</h4> 101 <h4>能否补货：</h4>
@@ -108,18 +108,18 @@ @@ -108,18 +108,18 @@
108 </tr> 108 </tr>
109 </thead> 109 </thead>
110 <tbody> 110 <tbody>
111 - 111 + {{# goodsList}}
112 <tr> 112 <tr>
113 <td>{{productSkc}}（{{goodsName}}）</td> 113 <td>{{productSkc}}（{{goodsName}}）</td>
114 <td>{{# goodsSizeList}}{{productSku}}（{{sizeName}}）<br>{{/ goodsSizeList}}</td> 114 <td>{{# goodsSizeList}}{{productSku}}（{{sizeName}}）<br>{{/ goodsSizeList}}</td>
115 <td>{{# goodsSizeList}}{{isSuppled}}</br>{{/ goodsSizeList}}</td> 115 <td>{{# goodsSizeList}}{{isSuppled}}</br>{{/ goodsSizeList}}</td>
116 </tr> 116 </tr>
117 - 117 + {{/ goodsList}}
118 </tbody> 118 </tbody>
119 </table> 119 </table>
120 </div> 120 </div>
121 </div> 121 </div>
122 - {{/ goodsList}} 122 +
123 <div class="form-group"> 123 <div class="form-group">
124 <blockquote>上架必填：</blockquote> 124 <blockquote>上架必填：</blockquote>
125 </div> 125 </div>
@@ -150,7 +150,7 @@ @@ -150,7 +150,7 @@
150 </form> 150 </form>
151 </div> 151 </div>
152 <div class="panel panel-default"> 152 <div class="panel panel-default">
153 - <form action="" class="form-horizontal form-bordered"> 153 + <form class="form-horizontal form-bordered">
154 <div class="panel-heading"> 154 <div class="panel-heading">
155 <div class="panel-btns" style="display: none;"> 155 <div class="panel-btns" style="display: none;">
156 <a href="" class="panel-minimize tooltips" data-toggle="tooltip" title=""><i class="fa fa-minus"></i></a> 156 <a href="" class="panel-minimize tooltips" data-toggle="tooltip" title=""><i class="fa fa-minus"></i></a>
@@ -158,18 +158,22 @@ @@ -158,18 +158,22 @@
158 <h2 class="panel-title">封面设置</h2> 158 <h2 class="panel-title">封面设置</h2>
159 </div> 159 </div>
160 <div class="panel-body nopadding"> 160 <div class="panel-body nopadding">
161 - {{# goodsImagesList}} 161 +
162 <div class="form-group"> 162 <div class="form-group">
163 <div class="col-sm-1"> 163 <div class="col-sm-1">
164 <div class="goods-img"> 164 <div class="goods-img">
  165 + {{# goodsImagesList}}
165 <p>SKC: {{productSkc}}</p> 166 <p>SKC: {{productSkc}}</p>
166 <p>{{goodsName}}色</p> 167 <p>{{goodsName}}色</p>
  168 + {{/ goodsImagesList}}
167 </div> 169 </div>
168 <div class="cover-color height40">颜色封面：</div> 170 <div class="cover-color height40">颜色封面：</div>
169 <div class="goods-color height40">商品封面：</div> 171 <div class="goods-color height40">商品封面：</div>
170 </div> 172 </div>
171 <div class="col-sm-11"> 173 <div class="col-sm-11">
172 <ul class="cover-image-list col-sm-12"> 174 <ul class="cover-image-list col-sm-12">
  175 + {{# goodsImagesList}}
  176 + {{/ goodsImagesList}}
173 <li class="cover-image-item fileinput-button"> 177 <li class="cover-image-item fileinput-button">
174 <div class="goods-img"> 178 <div class="goods-img">
175 <a class="fileinput-button-icon" href="javascript:void(0);">+</a> 179 <a class="fileinput-button-icon" href="javascript:void(0);">+</a>
@@ -188,15 +192,39 @@ @@ -188,15 +192,39 @@
188 </ul> 192 </ul>
189 </div> 193 </div>
190 </div> 194 </div>
191 - {{/ goodsImagesList}}  
192 </div> 195 </div>
193 <div class="panel-footer"> 196 <div class="panel-footer">
194 <button class="btn btn-primary">保存封面</button> 197 <button class="btn btn-primary">保存封面</button>
195 </div> 198 </div>
196 </form> 199 </form>
197 </div> 200 </div>
  201 +
  202 + {{> netsale/goods_description}}
  203 + {{> netsale/size_info}}
  204 + {{> netsale/goods_params}}
  205 + {{> netsale/goods_sort}}
  206 + </div>
  207 +
  208 + </div>
  209 +
  210 + {{> netsale/search_key}}
  211 +
  212 + <div class="panel panel-danger">
  213 + <div class="panel-heading">
  214 + <div class="panel-btns" style="display: none;">
  215 + <a href="" class="panel-minimize tooltips" data-toggle="tooltip" title=""><i class="fa fa-minus"></i></a>
  216 + </div>
  217 + <h2 class="panel-title">上架后补全信息</h2>
198 </div> 218 </div>
199 219
  220 + <div class="panel-body">
  221 + {{> netsale/add_info}}
  222 + {{> netsale/editor_recommend}}
  223 + {{> netsale/model}}
  224 + {{> netsale/brand_relation}}
  225 + {{> netsale/close_match}}
  226 + {{> netsale/video}}
  227 + </div>
200 </div> 228 </div>
201 {{/ data}} 229 {{/ data}}
202 </div> 230 </div>
@@ -88,7 +88,7 @@ @@ -88,7 +88,7 @@
88 </div> 88 </div>
89 89
90 <div class="col-md-3 height60 order-by"> 90 <div class="col-md-3 height60 order-by">
91 - <label>排序</label> 91 + <label>排序<span class="red">*</span>：</label>
92 <label><input id="orderBy" value="{{orderBy}}" type="text" class="form-control" placeholder="排序" required></label> 92 <label><input id="orderBy" value="{{orderBy}}" type="text" class="form-control" placeholder="排序" required></label>
93 <p>（提示：数字越大越靠前）</p> 93 <p>（提示：数字越大越靠前）</p>
94 </div> 94 </div>
  1 +<div class="panel panel-default">
  2 + <form action="" class="form-horizontal form-bordered">
  3 + <div class="panel-heading">
  4 + <div class="panel-btns" style="display: none;">
  5 + <a href="" class="panel-minimize tooltips" data-toggle="tooltip" title=""><i class="fa fa-minus"></i></a>
  6 + </div>
  7 + <h2 class="panel-title">搭配</h2>
  8 + </div>
  9 + <div class="panel-body nopadding">
  10 + </div>
  11 + <div class="panel-footer">
  12 + <button class="btn btn-primary">保存</button>
  13 + </div>
  14 + </form>
  15 +</div>
  1 +<div class="panel panel-default">
  2 + <form action="" class="form-horizontal form-bordered">
  3 + <div class="panel-heading">
  4 + <div class="panel-btns" style="display: none;">
  5 + <a href="" class="panel-minimize tooltips" data-toggle="tooltip" title=""><i class="fa fa-minus"></i></a>
  6 + </div>
  7 + <h2 class="panel-title">小编推荐</h2>
  8 + </div>
  9 + <div class="panel-body nopadding">
  10 + </div>
  11 + <div class="panel-footer">
  12 + <button class="btn btn-primary">保存</button>
  13 + </div>
  14 + </form>
  15 +</div>
  1 +<div class="panel panel-default">
  2 + <form action="" class="form-horizontal form-bordered">
  3 + <div class="panel-heading">
  4 + <div class="panel-btns" style="display: none;">
  5 + <a href="" class="panel-minimize tooltips" data-toggle="tooltip" title=""><i class="fa fa-minus"></i></a>
  6 + </div>
  7 + <h2 class="panel-title">商品描述</h2>
  8 + </div>
  9 + <div class="panel-body nopadding">
  10 + </div>
  11 + <div class="panel-footer">
  12 + <button class="btn btn-primary">保存描述</button>
  13 + </div>
  14 + </form>
  15 +</div>
  1 +<div class="panel panel-default">
  2 + <form action="" class="form-horizontal form-bordered">
  3 + <div class="panel-heading">
  4 + <div class="panel-btns" style="display: none;">
  5 + <a href="" class="panel-minimize tooltips" data-toggle="tooltip" title=""><i class="fa fa-minus"></i></a>
  6 + </div>
  7 + <h2 class="panel-title">商品参数</h2>
  8 + </div>
  9 + <div class="panel-body nopadding">
  10 + </div>
  11 + <div class="panel-footer">
  12 + <button class="btn btn-primary">保存</button>
  13 + </div>
  14 + </form>
  15 +</div>
  1 +<div class="panel panel-default">
  2 + <form action="" class="form-horizontal form-bordered">
  3 + <div class="panel-heading">
  4 + <div class="panel-btns" style="display: none;">
  5 + <a href="" class="panel-minimize tooltips" data-toggle="tooltip" title=""><i class="fa fa-minus"></i></a>
  6 + </div>
  7 + <h2 class="panel-title">商品排序设置</h2>
  8 + </div>
  9 + <div class="panel-body nopadding">
  10 + </div>
  11 + <div class="panel-footer">
  12 + <button class="btn btn-primary">保存</button>
  13 + </div>
  14 + </form>
  15 +</div>
  1 +<div class="panel panel-danger">
  2 + <div class="panel-heading">
  3 + <div class="panel-btns" style="display: none;">
  4 + <a href="" class="panel-minimize tooltips" data-toggle="tooltip" title=""><i class="fa fa-minus"></i></a>
  5 + </div>
  6 + <h2 class="panel-title">搜索关键词</h2>
  7 + </div>
  8 +
  9 + <div class="panel-body"></div>
  10 + <div class="panel-footer">
  11 + <button class="btn btn-primary">保存</button>
  12 + </div>
  13 +</div>
  1 +<div class="panel panel-default">
  2 + <form action="" class="form-horizontal form-bordered">
  3 + <div class="panel-heading">
  4 + <div class="panel-btns" style="display: none;">
  5 + <a href="" class="panel-minimize tooltips" data-toggle="tooltip" title=""><i class="fa fa-minus"></i></a>
  6 + </div>
  7 + <h2 class="panel-title">尺码信息</h2>
  8 + </div>
  9 + <div class="panel-body nopadding">
  10 + </div>
  11 + <div class="panel-footer">
  12 + <button class="btn btn-primary">保存</button>
  13 + </div>
  14 + </form>
  15 +</div>