fe / yohobuy-portal-fe2 · Commits

Go to a project

Authored by wangwei
Commit 0539649729ef452323cd91457757a4785945d6da 2 parents 3cbe10f8 7a1fba96

Merge branch 'dev6.3' into test6.3

Inline Side-by-side
Showing 3 changed files with 133 additions and 3 deletions
... ... @@ -91,6 +91,12 @@
<span>新品商品列表</span>
</div>
</div>
[[else if module.contentData.template_name=='blkNewProductFloor']]
<div class="col-sm-12">
<div class="wordText">
<span>BLK新品到着商品列表</span>
</div>
</div>
[[else if module.contentData.template_name=='findGoodsListFloor']]
<div class="col-sm-12">
<div class="wordText">
... ... @@ -1649,4 +1655,78 @@
</li>
[[/each]]
</ul>
</script>
\ No newline at end of file
</script>
<script type="text/template" id="blkNewProductFloor-template">
<div class="panel-body">
<div class="row">
<label class="col-sm-2 control-label">楼层名称:</label>
<div class="col-sm-8">
<input type="text" placeholder="楼层名称" class="form-control observe input-form" data-field="title" value="[[contentData.data.title]]" style="width:200px;margin-bottom: 20px" >
</div>
</div>
<div class="row">
<label class="col-sm-2 control-label">选择频道</label>
<div class="col-sm-8">
<select class="form-control observe input-form" name="channel" value="[[contentData.data.channel]]" data-field="channel">
<option value="-1">选择频道</option>
<option value="301">BLK男士</option>
<option value="302">BLK女士</option>
</select>
</div>
</div>
</div>
<div class="panel-body">
<div class="row">
<label class="col-sm-2 control-label">左滑链接</label>
<div class="col-sm-8">
<select name="goTo" class="form-control observe input-form" value="[[contentData.data.url.action]]" data-field="url.action">
[[layout action_template]]
</select>
<input value="[[contentData.data.url.url]]" class="form-control observe input-form" data-field="url.url" placeholder="url"/>
</div>
</div>
</div>
<div class="panel-body">
<div class="row">
<label class="col-sm-2 control-label">商品属性</label>
<div class="col-sm-8">
<input type="checkbox" id="productType_1" value="1" name="productType_1" [[contentData.data.productType_1=="1"?"checked":""]]>
<label>商品品牌</label>
<input type="checkbox" id="productType_2" value="1" name="productType_2" [[contentData.data.productType_2=="1"?"checked":""]]>
<label>商品名称</label>
<input type="checkbox" id="productType_3" value="1" name="productType_3" [[contentData.data.productType_3=="1"?"checked":""]]>
<label>商品价格</label>
</div>
</div>
</div>
<div class="panel-body">
<div class="row">
<label class="col-sm-2 control-label"></label>
<div class="col-sm-8">
<input type="radio" name="showType" class="showType" value="1" [[contentData.data.showType=="1"?"checked":""]]> 显示1行
<input type="radio" name="showType" class="showType" value="2" [[contentData.data.showType=="2"?"checked":""]]> 显示2行 &emsp;
</div>
</div>
</div>
<div class="panel-body">
<div class="row">
<label class="col-sm-2 control-label">默认逻辑</label>
<div class="col-sm-8">
<label style="color:#CCC">取BLK新品到着默认排序前X个商品数据（1行10个，2行20个）；
1行显示商品数小于4个不显示整个楼层，2行显示少于8个不展示楼层
</label>
</div>
</div>
</div>
<div class="panel-body">
<div class="row">
<label class="col-sm-2 control-label">干预SKN</label>
<div class="col-sm-8">
<input type="text" placeholder="多个SKN用英文逗号隔开，输入的SKN按照顺序排在BLK新品到着默认排序的数据前" class="observe form-control input-form" data-field="skns" value="[[contentData.data.skns]]" style="width:550px;">
</div>
</div>
</div>
</script>
\ No newline at end of file
... ...
... ... @@ -1778,6 +1778,23 @@ var Button = [
"title":""
},
"isNewFloor":"1"
},{
button_name: "BLK新品到着商品列表",
template_name: "blkNewProductFloor",
template_intro: "BLK新品到着商品列表",
__title:"BLK新品到着商品列表",
dialog: "blkNewProductFloor-template",
data: {
"channel":"",
"title":"",
"url": {
"action": "",
"url": ""
},
"showType":"",
"skns":"",
},
isNewFloor:"1"
}
];
... ...
... ... @@ -123,6 +123,13 @@ var Bll = {
module.contentData.data.recommendChannel='';
}
}
if(module.contentData.template_name == 'blkNewProductFloor'){
if(module.contentData.data.productType_1==''&&module.contentData.data.productType_2==''&&module.contentData.data.productType_3==''){
common.util.__tip('商品属性不能为空!', 'warning');
return false;
}
}
var couponFlag = true;
//好店推荐切换radio，增加/删除校验
var shopRecommendFlag = false;
... ... @@ -926,7 +933,30 @@ $(document).on("change", '#recommend-is_show', function () {
Bll.module.contentData.data.title.is_show = 1 - Bll.module.contentData.data.title.is_show;
Bll.renderDialog("editorRecommendFloor-template");
});
$(document).on("change", '#productType_1', function () {
if ($(this).is(':checked')) {
Bll.module.contentData.data.productType_1 = 1;
}else{
Bll.module.contentData.data.productType_1 = '';
}
Bll.renderDialog("blkNewProductFloor-template");
});
$(document).on("change", '#productType_2', function () {
if ($(this).is(':checked')) {
Bll.module.contentData.data.productType_2 = 1;
}else{
Bll.module.contentData.data.productType_2 = '';
}
Bll.renderDialog("blkNewProductFloor-template");
});
$(document).on("change", '#productType_3', function () {
if ($(this).is(':checked')) {
Bll.module.contentData.data.productType_3 = 1;
}else{
Bll.module.contentData.data.productType_3 = '';
}
Bll.renderDialog("blkNewProductFloor-template");
});
$(document).on("change", '.is_show_secondFloor', function () {
Bll.module.contentData.data.is_show_secondFloor = $(this).val();
var beginTime = Bll.module.contentData.begin_show_time;
... ... @@ -1109,7 +1139,10 @@ $(document).on("click", '.priceStyle', function () {
Bll.module.contentData.data.priceStyle = $(this).val();
Bll.renderDialog("tfGoodsList-template");
});
$(document).on("click", '.showType', function () {
Bll.module.contentData.data.showType = $(this).val();
Bll.renderDialog("blkNewProductFloor-template");
});
$(document).on("click", '.jumpType', function () {
Bll.module.contentData.data.jumpType = $(this).val();
Bll.renderDialog("tfGoodsList-template");
... ...