fe / yohobuy-portal-fe2 · Commits

Go to a project

Authored by xuhongyun
Commit b298543debd9a81d492eb3bf2f71173ca2a66b2e 1 parent b014064a

build

Inline Side-by-side
Showing 4 changed files with 48 additions and 13 deletions
... ... @@ -531,12 +531,29 @@ webpackJsonp([137],{
$(document).on("click", ".edit", function () {
var index = $(this).data("index");
var item = Bll.contentDatas[currIndex][index];
if(item.contentData.template_name=='shopRecommend'){
var list = item.contentData.data.list;
for(var i = 0; i < list.length; i++) {
if(typeof(list[i].goods2) == 'undefined'){
console.log("shopRec","append");
var goods2 = {
"src":"",
"url":{
"url":"",
"action":""
}
};
list[i].goods2 = goods2;
}
}
Bll.module = $.extend(true, {}, item);
Bll.renderDialog("shopRecommend-template");
Bll.toast(index, Bll.module);
if(item.contentData.template_name=='shopRecommend'){
var _shopRecommendFlag = item.contentData.isShopRecommend==''?"N":item.contentData.isShopRecommend;
item.contentData.isEdit="Y";
changeShopRecommendDivShow(_shopRecommendFlag);
}else{
Bll.module = $.extend(true, {}, item);
Bll.toast(index, Bll.module);
}
});
... ... @@ -2972,7 +2989,6 @@ webpackJsonp([137],{
__title:"好店推荐",
dialog: "shopRecommend-template",
isShopRecommend:"",
isEdit:"",
shopChannelId:"",
data: {
"title": {
... ...
... ... @@ -59,6 +59,9 @@ webpackJsonp([142],[
el: "#status-filter"
});
new common.dropDown({
el: "#channelIds-filter"
});
new common.dropDown({
el: "#channel-ops"
});
... ... @@ -74,6 +77,11 @@ webpackJsonp([142],[
return null;
},
_render1: function () {
if(parseInt(type) == PagEnum.DEF_HOT_SEARCH_WORDS || parseInt(type) == PagEnum.HOT_SEARCH_WORDS){
$('#channelIds-filter').parent().show();
}else{
$('#channelIds-filter').parent().hide();
}
//只有默认搜索词才显示时间选择
if (parseInt(type) == PagEnum.DEF_HOT_SEARCH_WORDS) {
$('#starttime-filter').parent().show();
... ... @@ -153,6 +161,7 @@ webpackJsonp([142],[
return {
type: type,
status: $.trim(common.util.__input("status-filter")),
channelIds: $.trim(common.util.__input("channelIds-filter")),
startTime: $.trim($('#starttime-filter').val()),
endTime: $.trim($('#endtime-filter').val()),
content: $.trim($('#content-filter').val())
... ... @@ -168,6 +177,7 @@ webpackJsonp([142],[
return {
type: type,
status: $.trim(common.util.__input("status-filter")),
channelIds: $.trim(common.util.__input("channelIds-filter")),
content: $.trim($('#content-filter').val())
};
}
... ...
... ... @@ -2194,7 +2194,6 @@
</td>
<td align="center"><button class="btn btn-danger btn-sm delBtn" data-event="shopRecommend.list" type="button" data-index="[[index]]">删除</button></td>
</tr>
[[ if item.isEdit != 'Y' || item.size >= 2 ]]
<tr>
<td align="center">商品</td>
<td align="center"><input type="file" name="file" value="[[item.goods2.src]]" class="shopRecommendRequired observe" data-field="list.[[index]].goods2.src" /></td>
... ... @@ -2213,7 +2212,6 @@
</div>
</td>
</tr>
[[ /if ]]
</tbody>
</table>
</li>
... ...
... ... @@ -25,6 +25,17 @@
</select>
</div>
<div class="panel-col">
<select name="channelIds" id="channelIds-filter" tabindex="-1" title=""
class="select2-offscreen brandBtn-group">
<option value="" selected="">选择频道</option>
<option value="1" >男生</option>
<option value="2" >女生</option>
<option value="3" >潮童</option>
<option value="4" >创意生活</option>
<option value="5" >全部</option>
</select>
</div>
<div class="panel-col">
<input type="text" id="starttime-filter" class="form-control panel-input hasDatepicker"
jsaction="time:end:endtime-filter" name="start_time" placeholder="开始时间" value="">
</div>
... ... @@ -65,15 +76,15 @@
[[if _type==1|_type==3]]
<div class="form-group">
<label for="content" class="col-sm-2 control-label"><i class="red">*</i> 频道</label>
<div class="col-sm-5">
<div class="col-sm-3">
<select name="channelIds" id="channelIds" tabindex="-1" title=""
class="select2-offscreen brandBtn-group observe" required="required" data-field="channelIds">
<option value="" selected="">选择频道</option>
<option value="1">男生</option>
<option value="2">女生</option>
<option value="3">潮童</option>
<option value="4">创意生活</option>
<option value="5">全部</option>
class="form-control observe" required="required" data-field="channelIds">
<option value="" [[if channelIds == '']]selected=""[[/if]]>选择频道</option>
<option value="1" [[if channelIds == '1']]selected=""[[/if]]>男生</option>
<option value="2" [[if channelIds == '2']]selected=""[[/if]]>女生</option>
<option value="3" [[if channelIds == '3']]selected=""[[/if]]>潮童</option>
<option value="4" [[if channelIds == '4']]selected=""[[/if]]>创意生活</option>
<option value="5" [[if channelIds == '5']]selected=""[[/if]]>全部</option>
</select>
</div>
</div>
... ...