fe / yohobuy-portal-fe · Commits

Go to a project

Authored by 姜敏
Commit a1ee3b757575d65b3e320698c910ca6f5fe17f20 2 parents 44c9a9a7 2a4204ab

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

Inline Side-by-side
Showing 8 changed files with 36 additions and 23 deletions
... ... @@ -124,6 +124,7 @@ $("#filter-btn").click(function(){
$("#add-btn").click(function(){
attributeOp("新建", '/erpproduct/brandfolder/add', {});
$('#type').attr("disabled", false);
});
$(document).on('click', '.edit-class-btn', function () {
... ... @@ -131,6 +132,8 @@ $(document).on('click', '.edit-class-btn', function () {
console.log(item);
attributeOp("修改", '/erpproduct/brandfolder/update', item);
$('#type').attr("disabled", true);
});
... ...
... ... @@ -224,4 +224,5 @@ app端店铺模板css
font-size: 22px;
display: block;
color: #fff;
font-weight: normal;
}
... ...
... ... @@ -74,8 +74,8 @@ pc端店铺模板css
/*------------------------商品分类列表--------------------------*/
.contentpanel-pc .sortList{
width: 100%;
height: 300px;
background: #f5f7f6;
height: 200px;
background: url("../assets/images/shop1.png");
}
.contentpanel-pc .sortList a{ color: #585858}
... ... @@ -163,6 +163,11 @@ pc端店铺模板css
width: 80%;
padding-left: 10px;
}
.contentpanel-pc .model-main-right-default{
width: 792px;
height: 920px;
background: url("../assets/images/shop2.png");
}
/*------------------------slide--------------------------*/
.contentpanel-pc .model-slide{
... ...
... ... @@ -108,7 +108,7 @@
</label>
<div class="panel-col">
<select name="type" id="type" value="[[type]]" disabled="true" tabindex="-1" required="required" title="" class="form-control height40">
<select name="type" id="type" value="[[type]]" tabindex="-1" required="required" title="" class="form-control height40">
<option value="-1">类型</option>
<option value="1">品牌款型</option>
<option value="2">品牌系列</option>
... ...
... ... @@ -75,7 +75,7 @@
<!--左侧main-->
<div class="model-main-left">
<!--商品列表-->
<div class="sortList">（固定内容！）</div>
<div class="sortList"></div>
<!--水牌-->
<div class="model-recommend model-signboard model-editor" data-toggle="editor-signboard" data-title="水牌位编辑">
<div class="recommendDetail signboardDetail">
... ... @@ -88,7 +88,7 @@
</div>
</div>
<!--右侧main-->
<div class="model-main-right">（固定内容！）</div>
<div class="model-main-right model-main-right-default"></div>
<div class="clear"></div>
</div>
</div>
... ... @@ -123,7 +123,7 @@
<!--左侧main-->
<div class="model-main-left">
<!--商品列表-->
<div class="sortList">（固定内容！）</div>
<div class="sortList"></div>
<!--品牌集合-->
<div class="model-recommend model-brand model-editor" style="display: none" data-toggle="editor-brand" data-title="品牌集合编辑">
<div class="recommendTitle">品牌集合</div>
... ... @@ -185,11 +185,7 @@
<!--新品上架-->
<div class="model-show">
<div class="model-showTitle">
[[if resources.newProducts.data.length > 0]]
<div class="showName"><span>新品上架&nbsp;&nbsp;NEW</span></div>
[[else]]
<div class="showName model-editor" data-toggle="editor-newProduct" data-title="新品上架商品编辑"><span>新品上架&nbsp;&nbsp;NEW</span></div>
[[/if]]
<div class="showTab model-editor" data-toggle="editor-newGoodTab" data-title="新品上架标签编辑">
<ul>
[[each resources.goodsTabBar.data.new as item _index]]
... ... @@ -207,9 +203,13 @@
</div>
<div class="model-showDetail model-editor" data-toggle="editor-newProduct" data-title="新品上架商品编辑">
<ul>
[[each resources.newProducts.data as item _index]]
<li><img src="[[item.src]]"><div class="shadow"><a href="javascript:">[[item.productName]]</a><b>￥[[item.salesPrice]]</b></div></li>
[[/each]]
[[if resources.newProducts.data.length > 0]]
[[each resources.newProducts.data as item _index]]
<li><img src="[[item.src]]"><div class="shadow"><a href="javascript:">[[item.productName]]</a><b>￥[[item.salesPrice]]</b></div></li>
[[/each]]
[[else]]
<li><img src=""><div class="shadow"><a href="javascript:">商品展示样例</a><b>￥商品价格</b></div></li>
[[/if]]
</ul>
<div class="clear"></div>
</div>
... ... @@ -218,11 +218,7 @@
<!--人气单品-->
<div class="model-show">
<div class="model-showTitle">
[[if resources.hotProducts.data.length > 0]]
<div class="showName"><span>人气单品&nbsp;&nbsp;NEW</span></div>
[[else]]
<div class="showName model-editor" data-toggle="editor-hotProduct" data-title="人气单品商品编辑"><span>人气单品&nbsp;&nbsp;NEW</span></div>
[[/if]]
<div class="showTab model-editor" data-toggle="editor-hotGoodTab" data-title="人气单品标签编辑">
<ul>
[[each resources.goodsTabBar.data.hot as item _index]]
... ... @@ -240,9 +236,13 @@
</div>
<div class="model-showDetail model-editor" data-toggle="editor-hotProduct" data-title="人气单品商品编辑">
<ul>
[[each resources.hotProducts.data as item _index]]
<li><img src="[[item.src]]"><div class="shadow"><a href="javascript:">[[item.productName]]</a><b>￥[[item.salesPrice]]</b></div></li>
[[/each]]
[[if resources.hotProducts.data.length > 0]]
[[each resources.hotProducts.data as item _index]]
<li><img src="[[item.src]]"><div class="shadow"><a href="javascript:">[[item.productName]]</a><b>￥[[item.salesPrice]]</b></div></li>
[[/each]]
[[else]]
<li><img src=""><div class="shadow"><a href="javascript:">商品展示样例</a><b>￥商品价格</b></div></li>
[[/if]]
</ul>
<div class="clear"></div>
</div>
... ... @@ -335,9 +335,13 @@
<li><img src="[[item.src]]"><div class="shadow"><a href="javascript:">[[item.productName]]</a><b>￥[[item.salesPrice]]</b></div></li>
[[/each]]
[[else]]
[[each resources.hotProducts.data as item _index]]
<li><img src="[[item.src]]"><div class="shadow"><a href="javascript:">[[item.productName]]</a><b>￥[[item.salesPrice]]</b></div></li>
[[/each]]
[[if resources.hotProducts.data.length > 0]]
[[each resources.hotProducts.data as item _index]]
<li><img src="[[item.src]]"><div class="shadow"><a href="javascript:">[[item.productName]]</a><b>￥[[item.salesPrice]]</b></div></li>
[[/each]]
[[else]]
<li><img src=""><div class="shadow"><a href="javascript:">商品展示样例</a><b>￥商品价格</b></div></li>
[[/if]]
[[/if]]
</ul>
<div class="clear"></div>
... ...